From 742b5e8d1c90c08fa0303d35d7849d51497a191f Mon Sep 17 00:00:00 2001
From: Teng Lu <teng.lu@linaro.org>
Date: Sat, 10 Jun 2017 16:01:29 +0800
Subject: [PATCH 01/83] 8181906: AArch64: port bugfix for 7009641 to AArch64

Allocation in the code cache returns NULL instead of failing the entire VM

Reviewed-by: aph
---
 hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp
index 223f1810a6f..9301f687169 100644
--- a/hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/vtableStubs_aarch64.cpp
@@ -51,6 +51,11 @@ extern "C" void bad_compiled_vtable_index(JavaThread* thread,
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
   const int aarch64_code_length = VtableStub::pd_code_size_limit(true);
   VtableStub* s = new(aarch64_code_length) VtableStub(true, vtable_index);
+  // Can be NULL if there is no free space in the code cache.
+  if (s == NULL) {
+    return NULL;
+  }
+
   ResourceMark rm;
   CodeBuffer cb(s->entry_point(), aarch64_code_length);
   MacroAssembler* masm = new MacroAssembler(&cb);

From 7311151cd6f078912ce171bcfa2c18e297650993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rickard=20B=C3=A4ckman?= <rbackman@openjdk.org>
Date: Fri, 2 Jun 2017 11:26:36 +0200
Subject: [PATCH 02/83] 8180197: Failing assert: id must be initialized

Reviewed-by: kvn, kbarrett
---
 hotspot/src/share/vm/compiler/compileBroker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 62433c1c088..df101a0a571 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -1557,7 +1557,7 @@ void CompileBroker::compiler_thread_loop() {
 
   // First thread to get here will initialize the compiler interface
 
-  if (!ciObjectFactory::is_initialized()) {
+  {
     ASSERT_IN_VM;
     MutexLocker only_one (CompileThread_lock, thread);
     if (!ciObjectFactory::is_initialized()) {

From a1ea4289182e2031f5deeee83190be619863dc53 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Tue, 13 Jun 2017 10:27:42 -0700
Subject: [PATCH 03/83] 8181757: NonNMethod heap in segmented CodeCache is not
 scanned in some cases 8171365: nsk/jvmti/scenarios/events/EM04/em04t001: many
 errors for missed events

Reviewed-by: thartmann, kvn
---
 hotspot/src/share/vm/code/codeCache.cpp | 32 +++++++++++++++----------
 hotspot/src/share/vm/code/codeCache.hpp |  6 +++++
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/hotspot/src/share/vm/code/codeCache.cpp b/hotspot/src/share/vm/code/codeCache.cpp
index 549535b7aa0..3765d129b3b 100644
--- a/hotspot/src/share/vm/code/codeCache.cpp
+++ b/hotspot/src/share/vm/code/codeCache.cpp
@@ -130,6 +130,7 @@ class CodeBlob_sizes {
 // Iterate over all CodeHeaps
 #define FOR_ALL_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _heaps->begin(); heap != _heaps->end(); ++heap)
 #define FOR_ALL_NMETHOD_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _nmethod_heaps->begin(); heap != _nmethod_heaps->end(); ++heap)
+#define FOR_ALL_ALLOCABLE_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _allocable_heaps->begin(); heap != _allocable_heaps->end(); ++heap)
 
 // Iterate over all CodeBlobs (cb) on the given CodeHeap
 #define FOR_ALL_BLOBS(cb, heap) for (CodeBlob* cb = first_blob(heap); cb != NULL; cb = next_blob(heap, cb))
@@ -140,10 +141,11 @@ int CodeCache::_number_of_nmethods_with_dependencies = 0;
 bool CodeCache::_needs_cache_clean = false;
 nmethod* CodeCache::_scavenge_root_nmethods = NULL;
 
-// Initialize array of CodeHeaps
+// Initialize arrays of CodeHeap subsets
 GrowableArray<CodeHeap*>* CodeCache::_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
 GrowableArray<CodeHeap*>* CodeCache::_compiled_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
 GrowableArray<CodeHeap*>* CodeCache::_nmethod_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
+GrowableArray<CodeHeap*>* CodeCache::_allocable_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
 
 void CodeCache::check_heap_sizes(size_t non_nmethod_size, size_t profiled_size, size_t non_profiled_size, size_t cache_size, bool all_set) {
   size_t total_size = non_nmethod_size + profiled_size + non_profiled_size;
@@ -338,6 +340,7 @@ ReservedCodeSpace CodeCache::reserve_heap_memory(size_t size) {
   return rs;
 }
 
+// Heaps available for allocation
 bool CodeCache::heap_available(int code_blob_type) {
   if (!SegmentedCodeCache) {
     // No segmentation: use a single code heap
@@ -391,6 +394,9 @@ void CodeCache::add_heap(CodeHeap* heap) {
   if (code_blob_type_accepts_nmethod(type)) {
     _nmethod_heaps->insert_sorted<code_heap_compare>(heap);
   }
+  if (code_blob_type_accepts_allocable(type)) {
+    _allocable_heaps->insert_sorted<code_heap_compare>(heap);
+  }
 }
 
 void CodeCache::add_heap(ReservedSpace rs, const char* name, int code_blob_type) {
@@ -620,7 +626,7 @@ nmethod* CodeCache::find_nmethod(void* start) {
 
 void CodeCache::blobs_do(void f(CodeBlob* nm)) {
   assert_locked_or_safepoint(CodeCache_lock);
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_HEAPS(heap) {
     FOR_ALL_BLOBS(cb, *heap) {
       f(cb);
     }
@@ -663,7 +669,7 @@ void CodeCache::do_unloading(BoolObjectClosure* is_alive, bool unloading_occurre
 
 void CodeCache::blobs_do(CodeBlobClosure* f) {
   assert_locked_or_safepoint(CodeCache_lock);
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     FOR_ALL_BLOBS(cb, *heap) {
       if (cb->is_alive()) {
         f->do_code_blob(cb);
@@ -960,7 +966,7 @@ address CodeCache::high_bound(int code_blob_type) {
 
 size_t CodeCache::capacity() {
   size_t cap = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     cap += (*heap)->capacity();
   }
   return cap;
@@ -973,7 +979,7 @@ size_t CodeCache::unallocated_capacity(int code_blob_type) {
 
 size_t CodeCache::unallocated_capacity() {
   size_t unallocated_cap = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     unallocated_cap += (*heap)->unallocated_capacity();
   }
   return unallocated_cap;
@@ -981,7 +987,7 @@ size_t CodeCache::unallocated_capacity() {
 
 size_t CodeCache::max_capacity() {
   size_t max_cap = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     max_cap += (*heap)->max_capacity();
   }
   return max_cap;
@@ -1007,7 +1013,7 @@ double CodeCache::reverse_free_ratio(int code_blob_type) {
 
 size_t CodeCache::bytes_allocated_in_freelists() {
   size_t allocated_bytes = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     allocated_bytes += (*heap)->allocated_in_freelist();
   }
   return allocated_bytes;
@@ -1015,7 +1021,7 @@ size_t CodeCache::bytes_allocated_in_freelists() {
 
 int CodeCache::allocated_segments() {
   int number_of_segments = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     number_of_segments += (*heap)->allocated_segments();
   }
   return number_of_segments;
@@ -1023,7 +1029,7 @@ int CodeCache::allocated_segments() {
 
 size_t CodeCache::freelists_length() {
   size_t length = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     length += (*heap)->freelist_length();
   }
   return length;
@@ -1354,7 +1360,7 @@ void CodeCache::report_codemem_full(int code_blob_type, bool print) {
 
 void CodeCache::print_memory_overhead() {
   size_t wasted_bytes = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
       CodeHeap* curr_heap = *heap;
       for (CodeBlob* cb = (CodeBlob*)curr_heap->first(); cb != NULL; cb = (CodeBlob*)curr_heap->next(cb)) {
         HeapBlock* heap_block = ((HeapBlock*)cb) - 1;
@@ -1400,7 +1406,7 @@ void CodeCache::print_internals() {
   ResourceMark rm;
 
   int i = 0;
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     if ((_nmethod_heaps->length() >= 1) && Verbose) {
       tty->print_cr("-- %s --", (*heap)->name());
     }
@@ -1497,7 +1503,7 @@ void CodeCache::print() {
   CodeBlob_sizes live;
   CodeBlob_sizes dead;
 
-  FOR_ALL_NMETHOD_HEAPS(heap) {
+  FOR_ALL_ALLOCABLE_HEAPS(heap) {
     FOR_ALL_BLOBS(cb, *heap) {
       if (!cb->is_alive()) {
         dead.add(cb);
@@ -1523,7 +1529,7 @@ void CodeCache::print() {
     int number_of_blobs = 0;
     int number_of_oop_maps = 0;
     int map_size = 0;
-    FOR_ALL_NMETHOD_HEAPS(heap) {
+    FOR_ALL_ALLOCABLE_HEAPS(heap) {
       FOR_ALL_BLOBS(cb, *heap) {
         if (cb->is_alive()) {
           number_of_blobs++;
diff --git a/hotspot/src/share/vm/code/codeCache.hpp b/hotspot/src/share/vm/code/codeCache.hpp
index 469ac0af329..e3b506b9a6a 100644
--- a/hotspot/src/share/vm/code/codeCache.hpp
+++ b/hotspot/src/share/vm/code/codeCache.hpp
@@ -85,6 +85,7 @@ class CodeCache : AllStatic {
   static GrowableArray<CodeHeap*>* _heaps;
   static GrowableArray<CodeHeap*>* _compiled_heaps;
   static GrowableArray<CodeHeap*>* _nmethod_heaps;
+  static GrowableArray<CodeHeap*>* _allocable_heaps;
 
   static address _low_bound;                            // Lower bound of CodeHeap addresses
   static address _high_bound;                           // Upper bound of CodeHeap addresses
@@ -237,6 +238,11 @@ class CodeCache : AllStatic {
     return type == CodeBlobType::All || type <= CodeBlobType::MethodProfiled;
   }
 
+  static bool code_blob_type_accepts_allocable(int type) {
+    return type <= CodeBlobType::All;
+  }
+
+
   // Returns the CodeBlobType for the given compilation level
   static int get_code_blob_type(int comp_level) {
     if (comp_level == CompLevel_none ||

From a8c2c0eadd6cdbe9853558200a0c1dd3bc4a9833 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Tue, 13 Jun 2017 10:44:11 -0700
Subject: [PATCH 04/83] 8182029: Make the top-level docs index.html to a
 HTML-level redirect to the API overview page

Reviewed-by: alanb, erikj, ihse
---
 make/Docs.gmk | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index d75398272d0..1e5a582a794 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -168,11 +168,6 @@ JDK_LONG_NAME := Standard Edition Development Kit (JDK&trade;) $(VERSION_SPECIFI
 JAVASE_SHORT_NAME := SE $(VERSION_SPECIFICATION)
 JAVASE_LONG_NAME := Standard Edition $(VERSION_SPECIFICATION)
 
-################################################################################
-# Index page text titles/snippets
-
-JDK_INDEX_TITLE := $(JAVA_PLATFORM), $(JDK_LONG_NAME) Specification $(DRAFT_MARKER_TITLE)
-
 ################################################################################
 # Functions
 
@@ -208,7 +203,6 @@ define create_overview_file
       #
   ifneq ($$($1_GROUPS),)
     $1_OVERVIEW_TEXT += \
-        <p>For an overview of the full specification, grouped by usage, see the <a href="../index.html">$$(JAVA_PLATFORM), $$($1_LONG_NAME) Specification</a>.</p> \
         <dl> \
         #
     $1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
@@ -442,15 +436,17 @@ $(eval $(call SetupApiDocsGeneration, JAVASE_API, \
 ################################################################################
 
 JDK_INDEX_HTML := $(DOCS_OUTPUTDIR)/index.html
-JDK_INDEX_TOOLS_DIR := $(TOOLS_CLASSES_DIR)/build/tools/docs
 
-$(JDK_INDEX_HTML): $(BUILD_JIGSAW_TOOLS) \
-    $(JDK_INDEX_TOOLS_DIR)/docs-bundle-page.html  \
-    $(JDK_INDEX_TOOLS_DIR)/docs-module-groups.properties
-	$(call LogInfo, Generating docs bundle index page)
-	$(MKDIR) -p $(@D)
-	$(TOOL_GEN_DOCS_BUNDLE_PAGE) --title '$(JDK_INDEX_TITLE)' \
-		--output $@
+JDK_INDEX_CONTENT := \
+    <!DOCTYPE html> \
+    <html lang="en"> \
+    <head> \
+    <meta http-equiv="refresh" content="0;url=api/index.html"> \
+    </head> \
+    </html>
+
+$(JDK_INDEX_HTML): 
+	$(ECHO) '$(JDK_INDEX_CONTENT)' > $@
 
 JDK_INDEX_TARGETS := $(JDK_INDEX_HTML)
 

From 17081a1945173809d089c9232a361aff56cb7025 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Tue, 13 Jun 2017 16:19:49 -0700
Subject: [PATCH 05/83] 8178054: [TESTBUG] Need test for JVM TI
 IsModifiableModule

Add new test hotspot/test/serviceability/jvmti/GetNamedModule

Reviewed-by: alanb, iignatyev
---
 hotspot/make/test/JtregNative.gmk             |   2 +
 .../MyPackage/GetNamedModuleTest.java         |   3 +-
 .../MyPackage/IsModifiableModuleTest.java     |  57 +++++
 .../libIsModifiableModuleTest.c               | 215 ++++++++++++++++++
 4 files changed, 276 insertions(+), 1 deletion(-)
 create mode 100644 hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java
 create mode 100644 hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c

diff --git a/hotspot/make/test/JtregNative.gmk b/hotspot/make/test/JtregNative.gmk
index 42eb76af57e..19faa10ad3d 100644
--- a/hotspot/make/test/JtregNative.gmk
+++ b/hotspot/make/test/JtregNative.gmk
@@ -56,6 +56,7 @@ BUILD_HOTSPOT_JTREG_NATIVE_SRC := \
     $(HOTSPOT_TOPDIR)/test/compiler/floatingpoint/ \
     $(HOTSPOT_TOPDIR)/test/compiler/calls \
     $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetNamedModule \
+    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/IsModifiableModule \
     $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleReads \
     $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleExportsAndOpens \
     $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleUsesAndProvides \
@@ -85,6 +86,7 @@ ifeq ($(TOOLCHAIN_TYPE), solstudio)
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liboverflow := -lc
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSimpleClassFileLoadHook := -lc
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetNamedModuleTest := -lc
+    BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsModifiableModuleTest := -lc
     BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libAddModuleReadsTest := -lc
     BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libAddModuleExportsAndOpensTest := -lc
     BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libAddModuleUsesAndProvidesTest := -lc
diff --git a/hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java b/hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java
index 80fab0a2ee5..6004b449263 100644
--- a/hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java
+++ b/hotspot/test/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -26,6 +26,7 @@ package MyPackage;
 /**
  * @test
  * @summary Verifies the JVMTI GetNamedModule API
+ * @modules jdk.jdi
  * @compile GetNamedModuleTest.java
  * @run main/othervm/native -agentlib:GetNamedModuleTest MyPackage.GetNamedModuleTest
  */
diff --git a/hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java b/hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java
new file mode 100644
index 00000000000..376d9264851
--- /dev/null
+++ b/hotspot/test/serviceability/jvmti/IsModifiableModule/MyPackage/IsModifiableModuleTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, 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 MyPackage;
+
+/**
+ * @test
+ * @summary Verifies the JVMTI IsModifiableModule API
+ * @modules jdk.jdi
+ * @compile IsModifiableModuleTest.java
+ * @run main/othervm/native -agentlib:IsModifiableModuleTest MyPackage.IsModifiableModuleTest
+ */
+
+import java.io.PrintStream;
+
+public class IsModifiableModuleTest {
+
+    static {
+        try {
+            System.loadLibrary("IsModifiableModuleTest");
+        } catch (UnsatisfiedLinkError ule) {
+            System.err.println("Could not load IsModifiableModuleTest library");
+            System.err.println("java.library.path: "
+                + System.getProperty("java.library.path"));
+            throw ule;
+        }
+    }
+
+    native static int check();
+
+    public static void main(String args[]) {
+        int status = check();
+        if (status != 0) {
+            throw new RuntimeException("Non-zero status returned from the agent: " + status);
+        }
+    }
+}
diff --git a/hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c b/hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c
new file mode 100644
index 00000000000..2e35e0d5aca
--- /dev/null
+++ b/hotspot/test/serviceability/jvmti/IsModifiableModule/libIsModifiableModuleTest.c
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "jvmti.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef JNI_ENV_ARG
+
+#ifdef __cplusplus
+#define JNI_ENV_ARG(x, y) y
+#define JNI_ENV_PTR(x) x
+#else
+#define JNI_ENV_ARG(x,y) x, y
+#define JNI_ENV_PTR(x) (*x)
+#endif
+
+#endif
+
+#define TranslateError(err) "JVMTI error"
+
+#define PASSED 0
+#define FAILED 2
+
+static const char *EXC_CNAME = "java/lang/AssertionError";
+
+static jvmtiEnv *jvmti = NULL;
+static jint result = PASSED;
+static jboolean printdump = JNI_FALSE;
+
+static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
+
+JNIEXPORT
+jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL Agent_OnAttach(JavaVM *jvm, char *options, void *reserved) {
+    return Agent_Initialize(jvm, options, reserved);
+}
+
+JNIEXPORT
+jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
+    return JNI_VERSION_1_8;
+}
+
+static
+jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
+    jint res;
+
+    if (options != NULL && strcmp(options, "printdump") == 0) {
+        printdump = JNI_TRUE;
+    }
+
+    res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
+        JVMTI_VERSION_9);
+    if (res != JNI_OK || jvmti == NULL) {
+        printf("    Error: wrong result of a valid call to GetEnv!\n");
+        return JNI_ERR;
+    }
+
+    return JNI_OK;
+}
+
+static
+jclass find_class(JNIEnv *env, const char* cname) {
+    jclass cls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, cname));
+
+    if (cls == NULL) {
+        printf("find_class: Error: FindClass(env, \"%s\") returned NULL\n", cname);
+    }
+    return cls;
+}
+
+static
+jint throw_exc(JNIEnv *env, char *msg) {
+    jclass exc_class = find_class(env, EXC_CNAME);
+
+    if (exc_class == NULL) {
+        printf("throw_exc: Error in find_class(env, \"%s\")\n", EXC_CNAME);
+        return -1;
+    }
+    return JNI_ENV_PTR(env)->ThrowNew(JNI_ENV_ARG(env, exc_class), msg);
+}
+
+static jobject get_module_by_class_name(JNIEnv *env, const char* cname) {
+    jobject module = NULL;
+    jclass cls = find_class(env, cname);
+
+    printf(">>> getting module by class name: \"%s\"\n", cname);
+    if (cls == NULL) {
+        printf("get_module_by_class_name: Error in find_class(env, \"%s\")\n", cname);
+        return NULL;
+    }
+    module = JNI_ENV_PTR(env)->GetModule(JNI_ENV_ARG(env, cls));
+    if (module == NULL) {
+        printf("get_module_by_class_name: Error in GetModule for class \"%s\"\n", cname);
+    }
+    return module;
+}
+
+static
+jint check_is_modifiable_error_codes(jobject module, jobject not_a_module) {
+    jvmtiError err = JVMTI_ERROR_NONE;
+    jboolean is_modifiable = JNI_FALSE;
+
+    printf(">>> passing a bad module argument to JVMTI IsModifiableModule\n");
+    err = (*jvmti)->IsModifiableModule(jvmti, not_a_module, &is_modifiable);
+    if (err != JVMTI_ERROR_INVALID_MODULE) {
+        printf("    Error #EC0: Did not get expected INVALID_MODULE error code from"
+               " IsModifiableModule: %s (%d)\n", TranslateError(err), err);
+        return FAILED;
+    }
+    printf(">>> passing NULL module argument to JVMTI IsModifiableModule\n");
+    err = (*jvmti)->IsModifiableModule(jvmti, NULL, &is_modifiable);
+    if (err != JVMTI_ERROR_NULL_POINTER) {
+        printf("    Error #EC1: Did not get expected NULL_POINTER error code from"
+               " IsModifiableModule: %s (%d)\n", TranslateError(err), err);
+        return FAILED;
+    }
+    printf(">>> passing NULL status pointer to JVMTI IsModifiableModule\n");
+    err = (*jvmti)->IsModifiableModule(jvmti, module, NULL);
+    if (err != JVMTI_ERROR_NULL_POINTER) {
+        printf("    Error #EC2: Did not get expected NULL_POINTER error code from"
+               " IsModifiableModule: %s (%d)\n", TranslateError(err), err);
+        return FAILED;
+    }
+    return PASSED;
+}
+
+static
+jint check_is_modifiable(jobject module) {
+    jvmtiError err = JVMTI_ERROR_NONE;
+    jboolean is_modifiable = JNI_FALSE;
+
+    printf(">>> checking module %p is modifiable\n", module);
+    err = (*jvmti)->IsModifiableModule(jvmti, module, &is_modifiable);
+    if (err != JVMTI_ERROR_NONE) {
+        printf("    Error in IsModifiableModule for module %p: %s (%d)\n",
+               module, TranslateError(err), err);
+        return FAILED;
+    }
+    if (is_modifiable == JNI_FALSE) {
+        printf("    unexpected non-modifiable status for module: %p\n", module);
+        return FAILED;
+    }
+    return PASSED;
+}
+
+JNIEXPORT jint JNICALL
+Java_MyPackage_IsModifiableModuleTest_check(JNIEnv *env, jclass cls) {
+    jobject module = NULL;
+
+    if (jvmti == NULL) {
+        throw_exc(env, "JVMTI client was not properly loaded!\n");
+        return FAILED;
+    }
+
+    printf("\n*** Testing IsModifiableModule ***\n\n");
+
+    if (check_is_modifiable_error_codes(module, cls) == FAILED) {
+        throw_exc(env, "check #MM0: failed to return expected error code from "
+                      "a bad call to JVMTI IsModifiableModule");
+        return FAILED;
+    }
+
+    module = get_module_by_class_name(env, "java/lang/Class");
+    if (check_is_modifiable(module) == FAILED) {
+        throw_exc(env, "check #MM1: failed to return modifiable module status");
+        return FAILED;
+    }
+
+    module = get_module_by_class_name(env, "com/sun/jdi/VirtualMachine");
+    if (check_is_modifiable(module) == FAILED) {
+        throw_exc(env, "check #MM2: failed to return modifiable module status");
+        return FAILED;
+    }
+
+    module = get_module_by_class_name(env, "MyPackage/IsModifiableModuleTest");
+    if (check_is_modifiable(module) == FAILED) {
+        throw_exc(env, "check #MM3: failed to return modifiable module status");
+        return FAILED;
+    }
+
+    return PASSED;
+}
+
+#ifdef __cplusplus
+}
+#endif

From 807e7e9268bd6e426ca35ea1086f2304389bf116 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 15 Jun 2017 11:54:26 -0700
Subject: [PATCH 06/83] 8182032: Make java.compiler upgradeable

Reviewed-by: alanb, erikj
---
 make/CreateJmods.gmk    |  5 ++---
 make/common/Modules.gmk | 25 ++++++++-----------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 2a27e3629a6..299198b9008 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -81,7 +81,6 @@ endif
 
 LEGAL_NOTICES := \
     $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
-    $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)) \
     $(call FindModuleLegalDirs, $(MODULE)) \
     #
 
@@ -106,10 +105,10 @@ ifeq ($(MODULE), java.base)
       DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \
           $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules)))
 
-      EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES))))
+      EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES))))
 
       JMOD_FLAGS += --module-path $(JMODS_DIR) \
-          --hash-modules '^(?!$(EXCLUDE_PATTERN))'
+          --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
     endif
   endif
 endif
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index de979bc3b83..9bbcf6c8f51 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -72,8 +72,11 @@ BOOT_MODULES += \
     jdk.naming.rmi \
     #
 
+# Modules that directly or indirectly requiring upgradeable modules
+# should carefully be considered if it should be upgradeable or not.
 UPGRADEABLE_MODULES += \
     java.activation \
+    java.compiler \
     java.corba \
     java.transaction \
     java.xml.bind \
@@ -82,10 +85,9 @@ UPGRADEABLE_MODULES += \
     jdk.internal.vm.compiler \
     #
 
-# Modules explicitly declared as not being upgradeable even though they require
-# an upgradeable module.
-NON_UPGRADEABLE_MODULES += \
-    jdk.aot \
+UPGRADEABLE_TOOL_MODULES += \
+    jdk.xml.bind \
+    jdk.xml.ws \
     #
 
 AGGREGATOR_MODULES += \
@@ -99,7 +101,6 @@ PLATFORM_MODULES += \
     #
 
 PLATFORM_MODULES += \
-    java.compiler \
     java.scripting \
     java.security.jgss \
     java.smartcardio \
@@ -175,13 +176,10 @@ DOCS_MODULES += \
     jdk.policytool \
     jdk.rmic \
     jdk.scripting.nashorn \
-    jdk.scripting.nashorn.shell \
     jdk.sctp \
     jdk.security.auth \
     jdk.security.jgss \
-    jdk.xml.bind \
     jdk.xml.dom \
-    jdk.xml.ws \
     jdk.zipfs \
     #
 
@@ -384,15 +382,8 @@ FindTransitiveIndirectDepsForModules = \
 # Upgradeable modules are those that are either defined as upgradeable or that
 # require an upradeable module.
 FindAllUpgradeableModules = \
-    $(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \
-        $(sort $(UPGRADEABLE_MODULES) $(foreach m, \
-            $(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \
-          $(if $(filter $(UPGRADEABLE_MODULES), \
-              $(call FindTransitiveDepsForModule, $m)), \
-            $m \
-          ) \
-        )) \
-    )
+    $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_MODULES) $(UPGRADEABLE_TOOL_MODULES)))
+
 
 ################################################################################
 

From 9c609d97c24c312cfd9ebcc581b10dec7610ee4f Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Thu, 15 Jun 2017 12:40:23 -0700
Subject: [PATCH 07/83] 8182111: Package summary is missing in jdk.xml.dom
 module

Reviewed-by: mchung
---
 .../classes/org/w3c/dom/css/package-info.java | 38 ++++++++++++++++
 .../org/w3c/dom/html/package-info.java        | 39 +++++++++++++++++
 .../org/w3c/dom/stylesheets/package-info.java | 38 ++++++++++++++++
 .../org/w3c/dom/xpath/package-info.java       | 43 +++++++++++++++++++
 4 files changed, 158 insertions(+)
 create mode 100644 jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java
 create mode 100644 jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java
 create mode 100644 jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java
 create mode 100644 jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java

diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java
new file mode 100644
index 00000000000..ae2acd8116b
--- /dev/null
+++ b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/css/package-info.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+/**
+ * Provides interfaces for DOM Level 2 Style Specification. Refer to the
+ * <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>
+ *     Document Object Model (DOM) Level 2 Style Specification</a>,
+ * the CSS and stylesheets modules define the Document Object Model Level 2 Style
+ * Sheets and Cascading Style Sheets (CSS) that allow programs and scripts to
+ * dynamically access and update the content of style sheets documents.
+ *
+ *
+ * @since 1.4
+ */
+
+package org.w3c.dom.css;
diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java
new file mode 100644
index 00000000000..3cc7ddd9a0a
--- /dev/null
+++ b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/html/package-info.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+/**
+ * Provides interfaces for DOM Level 2 HTML Specification. Refer to the
+ * <a href='http://www.w3.org/TR/2000/CR-DOM-Level-2-20000510'>
+ * Document Object Model (DOM) Level 2 Specification</a>,
+ * the HTML module extends the Core API to describe objects and methods specific
+ * to HTML documents that comply with
+ * <a href='https://www.w3.org/TR/1998/REC-html40-19980424/'>
+ * HTML 4.0 Specification</a>.
+ *
+ *
+ * @since 1.4
+ */
+
+package org.w3c.dom.html;
diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java
new file mode 100644
index 00000000000..d4c8037c5c9
--- /dev/null
+++ b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/stylesheets/package-info.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+/**
+ * Provides interfaces for DOM Level 2 Style Specification. Refer to the
+ * <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113'>
+ *     Document Object Model (DOM) Level 2 Style Specification</a>,
+ * the CSS and stylesheets modules define the Document Object Model Level 2 Style
+ * Sheets and Cascading Style Sheets (CSS) that allow programs and scripts to
+ * dynamically access and update the content of style sheets documents.
+ *
+ *
+ * @since 1.4
+ */
+
+package org.w3c.dom.stylesheets;
diff --git a/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java
new file mode 100644
index 00000000000..ed8004e226a
--- /dev/null
+++ b/jaxp/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/package-info.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+/**
+ * Provides interfaces for DOM Level 3 XPath Specification. The XPath module
+ * provides simple functionalities to access a DOM tree using
+ * <a href='https://www.w3.org/TR/1999/REC-xpath-19991116/'>XPath 1.0</a>.
+ * <p>
+ * The interfaces and classes in this package came from
+ * Document Object Model (DOM) Level 3 XPath Specification,
+ * Working Draft 20 August 2002. Refer to
+ * <a href='https://www.w3.org/TR/DOM-Level-3-XPath/'>
+ * Document Object Model (DOM) Level 3 XPath Specification, Version 1.0,
+ * W3C Working Group Note 26 February 2004</a> except that the values of
+ * {@link XPathException#INVALID_EXPRESSION_ERR} and {@link XPathException#TYPE_ERR}
+ * are 1 and 2 respectively (instead of 51 and 52).
+ *
+ * @since 1.4
+ */
+
+package org.w3c.dom.xpath;

From 6214a77ce1f1fd814b5508415537078e4fd6d462 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Thu, 15 Jun 2017 14:45:30 -0700
Subject: [PATCH 08/83] 8181825: Add tool and services information to module
 summary

Reviewed-by: mchung, rfield
---
 .../classes/com/sun/tools/javac/Main.java     |  6 +-
 .../com/sun/tools/javac/package-info.java     | 31 +++++++++
 .../share/classes/module-info.java            | 63 +++++++++++++++++--
 .../share/classes/module-info.java            | 36 +++++++++--
 .../jdk.jdeps/share/classes/module-info.java  | 37 +++++++++--
 .../jdk.jshell/share/classes/module-info.java | 19 ++++--
 6 files changed, 168 insertions(+), 24 deletions(-)
 create mode 100644 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
index 6d35e1dded8..91b242684ec 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2017, 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,8 +28,10 @@ package com.sun.tools.javac;
 import java.io.PrintWriter;
 
 /**
- * The programmatic interface for the Java Programming Language
+ * A legacy programmatic interface for the Java Programming Language
  * compiler, javac.
+ * See the <a href="{@docRoot}/jdk.compiler-summary.html">{@code jdk.compiler}</a>
+ * module for details on replacement APIs.
  */
 public class Main {
 
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java
new file mode 100644
index 00000000000..125c1915b92
--- /dev/null
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package provides a legacy entry point for the <em>javac</em> tool.
+ * See the <a href="{@docRoot}/jdk.compiler-summary.html">{@code jdk.compiler}</a>
+ * module for details on replacement APIs.
+ */
+package com.sun.tools.javac;
diff --git a/langtools/src/jdk.compiler/share/classes/module-info.java b/langtools/src/jdk.compiler/share/classes/module-info.java
index b777cecc682..5bfb4310e68 100644
--- a/langtools/src/jdk.compiler/share/classes/module-info.java
+++ b/langtools/src/jdk.compiler/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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,12 +23,63 @@
  * questions.
  */
 
-/** Defines the implementation of the
- *  {@link javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
- *  and its command line equivalent, <em>javac</em>, as well as <em>javah</em>.
+/**
+ * Defines the implementation of the
+ * {@link javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler}
+ * and its command line equivalent, <em>{@index javac javac tool}</em>,
+ * as well as <em>{@index javah javah tool}</em>.
  *
- *  @moduleGraph
- *  @since 9
+ * <h2 style="font-family:'DejaVu Sans Mono', monospace; font-style:italic">javac</h2>
+ *
+ * <p>
+ * This module provides the equivalent of command-line access to <em>javac</em>
+ * via the {@link java.util.spi.ToolProvider ToolProvider} and
+ * {@link javax.tools.Tool} service provider interfaces (SPIs),
+ * and more flexible access via the {@link javax.tools.JavaCompiler JavaCompiler}
+ * SPI.</p>
+ *
+ * <p> Instances of the tools can be obtained by calling
+ * {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
+ * or the {@link java.util.ServiceLoader service loader} with the name
+ * {@code "javac"}.
+ *
+ * <p>
+ * In addition, instances of {@link javax.tools.JavaCompiler.CompilationTask}
+ * obtained from {@linkplain javax.tools.JavaCompiler JavaCompiler} can be
+ * downcast to {@link com.sun.source.util.JavacTask JavacTask} for access to
+ * lower level aspects of <em>javac</em>, such as the
+ * {@link com.sun.source.tree Abstract Syntax Tree} (AST).</p>
+ *
+ * <p>This module uses the {@link java.nio.file.spi.FileSystemProvider
+ * FileSystemProvider} API to locate file system providers. In particular,
+ * this means that a jar file system provider, such as that in the
+ * {@code jdk.zipfs} module, must be available if the compiler is to be able
+ * to read JAR files.
+ *
+ * <h2 style="font-family:'DejaVu Sans Mono', monospace; font-style:italic">javah</h2>
+ *
+ * <p>
+ * <em>javah</em> only exists as a command line tool, and does not provide any
+ * direct API. As of JDK 9, it has been deprecated.
+ * Use the {@code -h} option in <em>javac</em> instead.</p>
+ *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink javac_tool_reference javac},
+ *     {@extLink javah_tool_reference javah}
+ * </dl>
+ *
+ * @provides java.util.spi.ToolProvider
+ * @provides com.sun.tools.javac.platform.PlatformProvider
+ * @provides javax.tools.JavaCompiler
+ * @provides javax.tools.Tool
+ *
+ * @uses javax.annotation.processing.Processor
+ * @uses com.sun.source.util.Plugin
+ * @uses com.sun.tools.javac.platform.PlatformProvider
+ *
+ * @moduleGraph
+ * @since 9
  */
 module jdk.compiler {
     requires transitive java.compiler;
diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/langtools/src/jdk.javadoc/share/classes/module-info.java
index 5499c7127d1..a5de5c4e036 100644
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java
@@ -23,15 +23,39 @@
  * questions.
  */
 
-/** Defines the implementation of the
- *  {@link javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
- *  and its command line equivalent, <em>javadoc</em>.
+/**
+ * Defines the implementation of the
+ * {@link javax.tools.ToolProvider#getSystemDocumentationTool system documentation tool}
+ * and its command line equivalent, <em>{@index javadoc javadoc tool}</em>.
  *
- *  @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * <h2 style="font-family:'DejaVu Sans Mono', monospace; font-style:italic">javadoc</h2>
+ *
+ * <p>
+ * This module provides the equivalent of command-line access to <em>javadoc</em>
+ * via the {@link java.util.spi.ToolProvider ToolProvider} and
+ * {@link javax.tools.Tool} service provider interfaces (SPIs),
+ * and more flexible access via the {@link javax.tools.DocumentationTool DocumentationTool}
+ * SPI.</p>
+ *
+ * <p> Instances of the tools can be obtained by calling
+ * {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
+ * or the {@link java.util.ServiceLoader service loader} with the name
+ * {@code "javadoc"}.
+ *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink javadoc_tool_reference javadoc}
+ * </dl>
+ *
+ * @provides java.util.spi.ToolProvider
+ * @provides javax.tools.DocumentationTool
+ * @provides javax.tools.Tool
+ *
+ * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
  *      Documentation Comment Specification for the Standard Doclet</a>
  *
- *  @moduleGraph
- *  @since 9
+ * @moduleGraph
+ * @since 9
  */
 module jdk.javadoc {
     requires transitive java.compiler;
diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/langtools/src/jdk.jdeps/share/classes/module-info.java
index a7708265097..69f8e11cdb2 100644
--- a/langtools/src/jdk.jdeps/share/classes/module-info.java
+++ b/langtools/src/jdk.jdeps/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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,11 +23,38 @@
  * questions.
  */
 
-/** Defines tools for analysing dependencies in Java libraries and programs, including
- *  the <em>jdeps</em> and <em>javap</em> tools.
+/**
+ * Defines tools for analysing dependencies in Java libraries and programs,
+ * including the <em>{@index jdeps jdeps tool}</em>,
+ * <em>{@index javap javap tool}</em> and
+ * <em>{@index jdeprscan jdeprscan tool}</em> tools.
  *
- *  @moduleGraph
- *  @since 9
+ * <p>
+ * This module provides the equivalent of command-line access to the
+ * <em>javap</em> and <em>jdeps</em> tools via the
+ * {@link java.util.spi.ToolProvider ToolProvider} service provider
+ * interface (SPI)</p>
+ *
+ * <p> Instances of the tools can be obtained by calling
+ * {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst}
+ * or the {@link java.util.ServiceLoader service loader} with the name
+ * {@code "javap"} or {@code "jdeps"} as appropriate.
+ *
+ * <p>
+ * <em>jdeprscan</em> only exists as a command line tool, and does not provide
+ * any direct API.
+ *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink javap_tool_reference javap},
+ *     {@extLink jdeprscan_tool_reference jdeprscan},
+ *     {@extLink jdeps_tool_reference jdeps}
+ * </dl>
+ *
+ * @provides java.util.spi.ToolProvider
+ *
+ * @moduleGraph
+ * @since 9
  */
 module jdk.jdeps {
     requires java.base;
diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/langtools/src/jdk.jshell/share/classes/module-info.java
index 8cf9bb038c3..e7d55d5838f 100644
--- a/langtools/src/jdk.jshell/share/classes/module-info.java
+++ b/langtools/src/jdk.jshell/share/classes/module-info.java
@@ -25,10 +25,10 @@
 
 /**
  * This module provides support for
- * Java&#x2122; Programming Language 'snippet' evaluating tools, such as
- * Read-Eval-Print Loops (REPLs).
+ * Java Programming Language 'snippet' evaluating tools, such as
+ * Read-Eval-Print Loops (REPLs), including the <em>{@index jshell jshell tool}</em> tool.
  * Separate packages support building tools, configuring the execution of tools,
- * and programmatically launching the existing Java&#x2122; shell tool.
+ * and programmatically launching the existing Java shell tool.
  * <p>
  *     The {@link jdk.jshell} is the package for creating 'snippet' evaluating tools.
  *     Generally, this is only package that would be needed for creating tools.
@@ -42,8 +42,8 @@
  *     implementations.
  * </p>
  * <p>
- *     The {@link jdk.jshell.tool} supports programmatically launching the
- *     "jshell tool".
+ *     The {@link jdk.jshell.tool} package supports programmatically launching the
+ *     <em>jshell</em> tool.
  * </p>
  * <p>
  *     The {@link jdk.jshell.execution} package contains implementations of the
@@ -52,6 +52,15 @@
  *     definitions.
  * </p>
  *
+ * <dl style="font-family:'DejaVu Sans', Arial, Helvetica, sans serif">
+ * <dt class="simpleTagLabel">Tool Guides:
+ * <dd>{@extLink jshell_tool_reference jshell}
+ * </dl>
+ *
+ * @provides javax.tools.Tool
+ * @provides jdk.jshell.spi.ExecutionControlProvider
+ * @uses jdk.jshell.spi.ExecutionControlProvider
+ *
  * @moduleGraph
  * @since 9
  */

From fee5ec656a8e834f697bc09a0f4dd0075b223c12 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 16 Jun 2017 11:41:25 +0200
Subject: [PATCH 09/83] 8179556: Add specs copyright file

Reviewed-by: erikj
---
 make/Docs.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 1e5a582a794..0abf9e1de5d 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -63,7 +63,7 @@ MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \
 # URLs
 JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&amp;id=homepage
 BUG_SUBMIT_URL := http://bugreport.java.com/bugreport/
-COPYRIGHT_URL := {@docroot}/../legal/cpyr.html
+COPYRIGHT_URL := {@docroot}/../legal/copyright.html
 LICENSE_URL := http://www.oracle.com/technetwork/java/javase/terms/license/java9speclicense.html
 REDISTRIBUTION_URL := http://www.oracle.com/technetwork/java/redist-137594.html
 
@@ -448,7 +448,7 @@ JDK_INDEX_CONTENT := \
 $(JDK_INDEX_HTML): 
 	$(ECHO) '$(JDK_INDEX_CONTENT)' > $@
 
-JDK_INDEX_TARGETS := $(JDK_INDEX_HTML)
+JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
 
 # Copy the global resources
 GLOBAL_SPECS_RESOURCES_DIR := $(JDK_TOPDIR)/make/data/docs-resources/

From d45f906ec449c62a6cd8fcbbaaf60df4195a3a9a Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 16 Jun 2017 09:20:15 -0700
Subject: [PATCH 10/83] 8181087: Module system implementation refresh (6/2017)

Reviewed-by: sspitsyn, hseigel
---
 test/lib/sun/hotspot/WhiteBox.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 5a2b5078d4f..b04735febc1 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -453,7 +453,6 @@ public class WhiteBox {
                                   Object[] packages);
   public native void AddModuleExports(Object from_module, String pkg, Object to_module);
   public native void AddReadsModule(Object from_module, Object source_module);
-  public native void AddModulePackage(Object module, String pkg);
   public native void AddModuleExportsToAllUnnamed(Object module, String pkg);
   public native void AddModuleExportsToAll(Object module, String pkg);
   public native Object GetModuleByPackageName(Object ldr, String pkg);

From 2f378477c4045f36afda121d196d706672bab721 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 16 Jun 2017 09:20:23 -0700
Subject: [PATCH 11/83] 8181087: Module system implementation refresh (6/2017)

Reviewed-by: sspitsyn, hseigel
---
 hotspot/make/symbols/symbols-unix             |   1 -
 hotspot/src/share/vm/classfile/modules.cpp    |  68 --------
 hotspot/src/share/vm/classfile/modules.hpp    |   8 -
 hotspot/src/share/vm/prims/jvm.cpp            |   5 -
 hotspot/src/share/vm/prims/jvm.h              |  10 +-
 hotspot/src/share/vm/prims/whitebox.cpp       |  13 +-
 hotspot/src/share/vm/runtime/arguments.cpp    |   4 +-
 .../runtime/modules/JVMAddModulePackage.java  | 154 ------------------
 .../test/runtime/modules/ModuleHelper.java    |   6 -
 .../java.base/java/lang/ModuleHelper.java     |   7 -
 10 files changed, 4 insertions(+), 272 deletions(-)
 delete mode 100644 hotspot/test/runtime/modules/JVMAddModulePackage.java

diff --git a/hotspot/make/symbols/symbols-unix b/hotspot/make/symbols/symbols-unix
index 11add06efac..7828c830b4b 100644
--- a/hotspot/make/symbols/symbols-unix
+++ b/hotspot/make/symbols/symbols-unix
@@ -188,7 +188,6 @@ JVM_Yield
 JVM_AddModuleExports
 JVM_AddModuleExportsToAll
 JVM_AddModuleExportsToAllUnnamed
-JVM_AddModulePackage
 JVM_AddReadsModule
 JVM_DefineModule
 JVM_SetBootLoaderUnnamedModule
diff --git a/hotspot/src/share/vm/classfile/modules.cpp b/hotspot/src/share/vm/classfile/modules.cpp
index 7328aec06fb..614986d164b 100644
--- a/hotspot/src/share/vm/classfile/modules.cpp
+++ b/hotspot/src/share/vm/classfile/modules.cpp
@@ -722,74 +722,6 @@ jobject Modules::get_module(Symbol* package_name, Handle h_loader, TRAPS) {
   return NULL;
 }
 
-void Modules::add_module_package(jobject module, const char* package_name, TRAPS) {
-  ResourceMark rm(THREAD);
-
-  if (module == NULL) {
-    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
-              "module is null");
-  }
-  if (package_name == NULL) {
-    THROW_MSG(vmSymbols::java_lang_NullPointerException(),
-              "package is null");
-  }
-  ModuleEntry* module_entry = get_module_entry(module, CHECK);
-  if (module_entry == NULL) {
-    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-              "module is invalid");
-  }
-  if (!module_entry->is_named()) {
-    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-              "module cannot be an unnamed module");
-  }
-  if (!verify_package_name(package_name)) {
-    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
-              err_msg("Invalid package name: %s", package_name));
-  }
-
-  ClassLoaderData *loader_data = module_entry->loader_data();
-
-  // Only modules defined to either the boot or platform class loader, can define a "java/" package.
-  if (!loader_data->is_the_null_class_loader_data() &&
-      !loader_data->is_platform_class_loader_data() &&
-      (strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0 &&
-        (package_name[JAVAPKG_LEN] == '/' || package_name[JAVAPKG_LEN] == '\0'))) {
-    const char* class_loader_name = SystemDictionary::loader_name(loader_data);
-    size_t pkg_len = strlen(package_name);
-    char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len);
-    strncpy(pkg_name, package_name, pkg_len);
-    StringUtils::replace_no_expand(pkg_name, "/", ".");
-    const char* msg_text1 = "Class loader (instance of): ";
-    const char* msg_text2 = " tried to define prohibited package name: ";
-    size_t len = strlen(msg_text1) + strlen(class_loader_name) + strlen(msg_text2) + pkg_len + 1;
-    char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
-    jio_snprintf(message, len, "%s%s%s%s", msg_text1, class_loader_name, msg_text2, pkg_name);
-    THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), message);
-  }
-
-  log_debug(module)("add_module_package(): Adding package %s to module %s",
-                    package_name, module_entry->name()->as_C_string());
-
-  TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK);
-  PackageEntryTable* package_table = loader_data->packages();
-  assert(package_table != NULL, "Missing package_table");
-
-  PackageEntry* existing_pkg = NULL;
-  {
-    MutexLocker ml(Module_lock, THREAD);
-
-    // Check that the package does not exist in the class loader's package table.
-    existing_pkg = package_table->lookup_only(pkg_symbol);
-    if (existing_pkg == NULL) {
-      PackageEntry* pkg = package_table->locked_create_entry_or_null(pkg_symbol, module_entry);
-      assert(pkg != NULL, "Unable to create a module's package entry");
-    }
-  }
-  if (existing_pkg != NULL) {
-    throw_dup_pkg_exception(module_entry->name()->as_C_string(), existing_pkg, CHECK);
-  }
-}
-
 // Export package in module to all unnamed modules.
 void Modules::add_module_exports_to_all_unnamed(jobject module, const char* package_name, TRAPS) {
   if (module == NULL) {
diff --git a/hotspot/src/share/vm/classfile/modules.hpp b/hotspot/src/share/vm/classfile/modules.hpp
index 4dc752c95a4..ae9781c313e 100644
--- a/hotspot/src/share/vm/classfile/modules.hpp
+++ b/hotspot/src/share/vm/classfile/modules.hpp
@@ -113,14 +113,6 @@ public:
   // Returns NULL if package is invalid or not defined by loader.
   static jobject get_module(Symbol* package_name, Handle h_loader, TRAPS);
 
-  // This adds package to module.
-  // It throws IllegalArgumentException if:
-  // * Module is bad
-  // * Module is unnamed
-  // * Package is not syntactically correct
-  // * Package is already defined for module's class loader.
-  static void add_module_package(jobject module, const char* package, TRAPS);
-
   // Marks the specified package as exported to all unnamed modules.
   // If either module or package is null then NullPointerException is thrown.
   // If module or package is bad, or module is unnamed, or package is not in
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index 71b0ea3e2e2..675506918cf 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -1039,11 +1039,6 @@ JVM_ENTRY (void, JVM_AddReadsModule(JNIEnv *env, jobject from_module, jobject so
   Modules::add_reads_module(from_module, source_module, CHECK);
 JVM_END
 
-JVM_ENTRY (void, JVM_AddModulePackage(JNIEnv *env, jobject module, const char* package))
-  JVMWrapper("JVM_AddModulePackage");
-  Modules::add_module_package(module, package, CHECK);
-JVM_END
-
 // Reflection support //////////////////////////////////////////////////////////////////////////////
 
 JVM_ENTRY(jstring, JVM_GetClassName(JNIEnv *env, jclass cls))
diff --git a/hotspot/src/share/vm/prims/jvm.h b/hotspot/src/share/vm/prims/jvm.h
index e105c97766d..b25724a1c7d 100644
--- a/hotspot/src/share/vm/prims/jvm.h
+++ b/hotspot/src/share/vm/prims/jvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -466,14 +466,6 @@ JVM_AddModuleExportsToAll(JNIEnv *env, jobject from_module, const char* package)
 JNIEXPORT void JNICALL
 JVM_AddReadsModule(JNIEnv *env, jobject from_module, jobject source_module);
 
-/*
- * Add a package to a module.
- *  module:  module that will contain the package
- *  package: package to add to the module
- */
-JNIEXPORT void JNICALL
-JVM_AddModulePackage(JNIEnv* env,  jobject module, const char* package);
-
 /*
  * Reflection support functions
  */
diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/hotspot/src/share/vm/prims/whitebox.cpp
index 513dfc8b985..952aa5fa47c 100644
--- a/hotspot/src/share/vm/prims/whitebox.cpp
+++ b/hotspot/src/share/vm/prims/whitebox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -1457,15 +1457,6 @@ WB_ENTRY(void, WB_AddReadsModule(JNIEnv* env, jobject o, jobject from_module, jo
   Modules::add_reads_module(from_module, source_module, CHECK);
 WB_END
 
-WB_ENTRY(void, WB_AddModulePackage(JNIEnv* env, jobject o, jclass module, jstring package))
-  ResourceMark rm(THREAD);
-  char* package_name = NULL;
-  if (package != NULL) {
-      package_name = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(package));
-  }
-  Modules::add_module_package(module, package_name, CHECK);
-WB_END
-
 WB_ENTRY(jobject, WB_GetModuleByPackageName(JNIEnv* env, jobject o, jobject loader, jstring package))
   ResourceMark rm(THREAD);
   char* package_name = NULL;
@@ -1910,8 +1901,6 @@ static JNINativeMethod methods[] = {
                                                       (void*)&WB_AddModuleExports },
   {CC"AddReadsModule",     CC"(Ljava/lang/Object;Ljava/lang/Object;)V",
                                                       (void*)&WB_AddReadsModule },
-  {CC"AddModulePackage",   CC"(Ljava/lang/Object;Ljava/lang/String;)V",
-                                                      (void*)&WB_AddModulePackage },
   {CC"GetModuleByPackageName", CC"(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;",
                                                       (void*)&WB_GetModuleByPackageName },
   {CC"AddModuleExportsToAllUnnamed", CC"(Ljava/lang/Object;Ljava/lang/String;)V",
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index dbbe55489e7..92f18dd42ef 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -2937,8 +2937,8 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
       if (res != JNI_OK) {
         return res;
       }
-    } else if (match_option(option, "--permit-illegal-access")) {
-      if (!create_property("jdk.module.permitIllegalAccess", "true", ExternalProperty)) {
+    } else if (match_option(option, "--illegal-access=", &tail)) {
+      if (!create_property("jdk.module.illegalAccess", tail, ExternalProperty)) {
         return JNI_ENOMEM;
       }
     // -agentlib and -agentpath
diff --git a/hotspot/test/runtime/modules/JVMAddModulePackage.java b/hotspot/test/runtime/modules/JVMAddModulePackage.java
deleted file mode 100644
index dc2237f39e3..00000000000
--- a/hotspot/test/runtime/modules/JVMAddModulePackage.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 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
- * @modules java.base/jdk.internal.misc
- * @library /test/lib ..
- * @build sun.hotspot.WhiteBox
- * @compile/module=java.base java/lang/ModuleHelper.java
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI JVMAddModulePackage
- */
-
-import static jdk.test.lib.Asserts.*;
-import java.sql.Time;
-
-public class JVMAddModulePackage {
-
-    public static void main(String args[]) throws Throwable {
-        MyClassLoader cl1 = new MyClassLoader();
-        MyClassLoader cl3 = new MyClassLoader();
-        Object module_one, module_two, module_three;
-        boolean result;
-
-        module_one = ModuleHelper.ModuleObject("module_one", cl1, new String[] { "mypackage" });
-        assertNotNull(module_one, "Module should not be null");
-        ModuleHelper.DefineModule(module_one, "9.0", "module_one/here", new String[] { "mypackage" });
-        module_two = ModuleHelper.ModuleObject("module_two", cl1, new String[] { "yourpackage" });
-        assertNotNull(module_two, "Module should not be null");
-        ModuleHelper.DefineModule(module_two, "9.0", "module_two/here", new String[] { "yourpackage" });
-        module_three = ModuleHelper.ModuleObject("module_three", cl3, new String[] { "apackage/num3" });
-        assertNotNull(module_three, "Module should not be null");
-        ModuleHelper.DefineModule(module_three, "9.0", "module_three/here", new String[] { "apackage/num3" });
-
-        // Simple call
-        ModuleHelper.AddModulePackage(module_one, "new_package");
-
-        // Add a package and export it
-        ModuleHelper.AddModulePackage(module_one, "apackage/num3");
-        ModuleHelper.AddModuleExportsToAll(module_one, "apackage/num3");
-
-        // Null module argument, expect an NPE
-        try {
-            ModuleHelper.AddModulePackage(null, "new_package");
-            throw new RuntimeException("Failed to get the expected NPE");
-        } catch(NullPointerException e) {
-            // Expected
-        }
-
-        // Bad module argument, expect an IAE
-        try {
-            ModuleHelper.AddModulePackage(cl1, "new_package");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            // Expected
-        }
-
-        // Null package argument, expect an NPE
-        try {
-            ModuleHelper.AddModulePackage(module_one, null);
-            throw new RuntimeException("Failed to get the expected NPE");
-        } catch(NullPointerException e) {
-            // Expected
-        }
-
-        // Existing package, expect an ISE
-        try {
-            ModuleHelper.AddModulePackage(module_one, "yourpackage");
-            throw new RuntimeException("Failed to get the expected ISE");
-        } catch(IllegalStateException e) {
-            // Expected
-        }
-
-        // Invalid package name, expect an IAE
-        try {
-            ModuleHelper.AddModulePackage(module_one, "your.apackage");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            // Expected
-        }
-
-        // Invalid package name, expect an IAE
-        try {
-            ModuleHelper.AddModulePackage(module_one, ";your/apackage");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            // Expected
-        }
-
-        // Invalid package name, expect an IAE
-        try {
-            ModuleHelper.AddModulePackage(module_one, "7[743");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            // Expected
-        }
-
-        // Empty package name, expect an IAE
-        try {
-            ModuleHelper.AddModulePackage(module_one, "");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            // Expected
-        }
-
-        // Add package named "java" to an module defined to a class loader other than the boot or platform loader.
-        try {
-            // module_one is defined to a MyClassLoader class loader.
-            ModuleHelper.AddModulePackage(module_one, "java/foo");
-            throw new RuntimeException("Failed to get the expected IAE");
-        } catch(IllegalArgumentException e) {
-            if (!e.getMessage().contains("prohibited package name")) {
-              throw new RuntimeException("Failed to get expected IAE message for prohibited package name: " + e.getMessage());
-            }
-        }
-
-        // Package "javabar" should be ok
-        ModuleHelper.AddModulePackage(module_one, "javabar");
-
-        // Package named "java" defined to the boot class loader, should be ok
-        Object module_javabase = module_one.getClass().getModule();
-        ModuleHelper.AddModulePackage(module_javabase, "java/foo");
-
-        // Package named "java" defined to the platform class loader, should be ok
-        // The module java.sql is defined to the platform class loader.
-        java.sql.Time jst = new java.sql.Time(45000); // milliseconds
-        Object module_javasql = jst.getClass().getModule();
-        ModuleHelper.AddModulePackage(module_javasql, "java/foo");
-    }
-
-    static class MyClassLoader extends ClassLoader { }
-}
-
diff --git a/hotspot/test/runtime/modules/ModuleHelper.java b/hotspot/test/runtime/modules/ModuleHelper.java
index e4db0f53a18..584eb3e3c88 100644
--- a/hotspot/test/runtime/modules/ModuleHelper.java
+++ b/hotspot/test/runtime/modules/ModuleHelper.java
@@ -49,12 +49,6 @@ public class ModuleHelper {
         java.lang.ModuleHelper.addReadsNoSync((Module)from, (Module)to);
     }
 
-    public static void AddModulePackage(Object m, String pkg) throws Throwable {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        wb.AddModulePackage(m, pkg);
-        java.lang.ModuleHelper.addPackageNoSync((Module)m, pkg);
-    }
-
     public static Module GetModuleByPackageName(Object ldr, String pkg) throws Throwable {
         WhiteBox wb = WhiteBox.getWhiteBox();
         return (Module)wb.GetModuleByPackageName(ldr, pkg);
diff --git a/hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java b/hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java
index 6aef814acf2..f310a26f22f 100644
--- a/hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java
+++ b/hotspot/test/runtime/modules/java.base/java/lang/ModuleHelper.java
@@ -63,11 +63,4 @@ public final class ModuleHelper {
         }
     }
 
-    /**
-     * Adds a package to a module without notifying the VM.
-     */
-    public static void addPackageNoSync(Module m, String pkg) {
-        m.implAddPackageNoSync(pkg);
-    }
-
 }

From 6dc7b171069e3d018e58a641c39fd04b134cb9f7 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 16 Jun 2017 09:21:38 -0700
Subject: [PATCH 12/83] 8181087: Module system implementation refresh (6/2017)

Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Reviewed-by: jjg
---
 .../com/sun/tools/javac/comp/Modules.java     |   9 +-
 .../com/sun/tools/javac/file/Locations.java   |  37 ++++
 .../tools/javac/resources/compiler.properties |   4 +
 .../jdk.jdeps/share/classes/module-info.java  |   4 +-
 .../PackageClashFromRequiresInUnnamed.java    |  25 +++
 .../modulepath/lib1x/exported/Api1.java       |  27 +++
 .../modulepath/lib1x/module-info.java         |  26 +++
 .../modulepath/lib2x/exported/Api2.java       |  27 +++
 .../modulepath/lib2x/module-info.java         |  26 +++
 .../tools/javac/modules/AutomaticModules.java | 204 ++++++++++++++++++
 .../javac/modules/PackageConflictTest.java    |  55 ++++-
 11 files changed, 438 insertions(+), 6 deletions(-)
 create mode 100644 langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java
 create mode 100644 langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java
 create mode 100644 langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java
 create mode 100644 langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java
 create mode 100644 langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 9b5da2bd856..32ef920cce6 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -1574,8 +1574,13 @@ public class Modules extends JCTree.Visitor {
                                                             : null;
                     DiagnosticPosition pos = env != null ? env.tree.pos() : null;
                     try {
-                        log.error(pos, Errors.PackageClashFromRequires(msym, packageName,
-                                                                      previousModule, exportsFrom));
+                        if (msym.isUnnamed()) {
+                            log.error(pos, Errors.PackageClashFromRequiresInUnnamed(packageName,
+                                                                                    previousModule, exportsFrom));
+                        } else {
+                            log.error(pos, Errors.PackageClashFromRequires(msym, packageName,
+                                                                           previousModule, exportsFrom));
+                        }
                     } finally {
                         if (env != null)
                             log.useSource(origSource);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
index a41caff182c..b46541911d4 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
@@ -29,6 +29,7 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URL;
@@ -65,6 +66,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 import javax.lang.model.SourceVersion;
 import javax.tools.JavaFileManager;
@@ -1341,6 +1344,24 @@ public class Locations {
                             String moduleName = readModuleName(moduleInfoClass);
                             return new Pair<>(moduleName, p);
                         }
+                        Path mf = fs.getPath("META-INF/MANIFEST.MF");
+                        if (Files.exists(mf)) {
+                            try (InputStream in = Files.newInputStream(mf)) {
+                                Manifest man = new Manifest(in);
+                                Attributes attrs = man.getMainAttributes();
+                                if (attrs != null) {
+                                    String moduleName = attrs.getValue(new Attributes.Name("Automatic-Module-Name"));
+                                    if (moduleName != null) {
+                                        if (isModuleName(moduleName)) {
+                                            return new Pair<>(moduleName, p);
+                                        } else {
+                                            log.error(Errors.LocnCantGetModuleNameForJar(p));
+                                            return null;
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     } catch (ModuleNameReader.BadClassFile e) {
                         log.error(Errors.LocnBadModuleInfo(p));
                         return null;
@@ -1428,6 +1449,22 @@ public class Locations {
             }
         }
 
+        //from jdk.internal.module.Checks:
+        /**
+         * Returns {@code true} if the given name is a legal module name.
+         */
+        private boolean isModuleName(String name) {
+            int next;
+            int off = 0;
+            while ((next = name.indexOf('.', off)) != -1) {
+                String id = name.substring(off, next);
+                if (!SourceVersion.isName(id))
+                    return false;
+                off = next+1;
+            }
+            String last = name.substring(off);
+            return SourceVersion.isName(last);
+        }
     }
 
     private class ModuleSourcePathLocationHandler extends BasicLocationHandler {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 7833fb21616..f7c6e90baa5 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -2990,6 +2990,10 @@ compiler.err.package.in.other.module=\
 compiler.err.package.clash.from.requires=\
     module {0} reads package {1} from both {2} and {3}
 
+# 0: name, 1: symbol, 2: symbol
+compiler.err.package.clash.from.requires.in.unnamed=\
+    the unnamed module reads package {0} from both {1} and {2}
+
 # 0: string
 compiler.err.module.not.found.in.module.source.path=\
     module {0} not found in module source path
diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/langtools/src/jdk.jdeps/share/classes/module-info.java
index a7708265097..9adb47ea15b 100644
--- a/langtools/src/jdk.jdeps/share/classes/module-info.java
+++ b/langtools/src/jdk.jdeps/share/classes/module-info.java
@@ -30,11 +30,9 @@
  *  @since 9
  */
 module jdk.jdeps {
-    requires java.base;
     requires java.compiler;
     requires jdk.compiler;
-    exports com.sun.tools.classfile to
-        jdk.jlink;
+    exports com.sun.tools.classfile to jdk.jlink;
 
     provides java.util.spi.ToolProvider with
         com.sun.tools.javap.Main.JavapToolProvider,
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java
new file mode 100644
index 00000000000..cd884531da2
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/PackageClashFromRequiresInUnnamed.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2017, 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.package.clash.from.requires.in.unnamed
+// options: --add-modules ALL-MODULE-PATH
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java
new file mode 100644
index 00000000000..2fc345375bb
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/exported/Api1.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2017, 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 exported;
+
+public class Api1 {
+}
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java
new file mode 100644
index 00000000000..74f347f7c5d
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib1x/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+module lib1x {
+     exports exported;
+}
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java
new file mode 100644
index 00000000000..921ebb0ad41
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/exported/Api2.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2017, 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 exported;
+
+public class Api2 {
+}
diff --git a/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java
new file mode 100644
index 00000000000..de0d460802a
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/PackageClashFromRequiresInUnnamed/modulepath/lib2x/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+module lib2x {
+     exports exported;
+}
diff --git a/langtools/test/tools/javac/modules/AutomaticModules.java b/langtools/test/tools/javac/modules/AutomaticModules.java
index 75b03739437..f08d6be8543 100644
--- a/langtools/test/tools/javac/modules/AutomaticModules.java
+++ b/langtools/test/tools/javac/modules/AutomaticModules.java
@@ -34,14 +34,18 @@
  * @run main AutomaticModules
  */
 
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 import toolbox.JarTask;
 import toolbox.JavacTask;
 import toolbox.Task;
+import toolbox.Task.Mode;
 
 public class AutomaticModules extends ModuleTestBase {
 
@@ -614,4 +618,204 @@ public class AutomaticModules extends ModuleTestBase {
         }
     }
 
+    @Test
+    public void testAutomaticModuleNameCorrect(Path base) throws Exception {
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        Path automaticSrc = base.resolve("automaticSrc");
+        tb.writeJavaFiles(automaticSrc, "package api; public class Api {}");
+        Path automaticClasses = base.resolve("automaticClasses");
+        tb.createDirectories(automaticClasses);
+
+        String automaticLog = new JavacTask(tb)
+                                .outdir(automaticClasses)
+                                .files(findJavaFiles(automaticSrc))
+                                .run()
+                                .writeAll()
+                                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!automaticLog.isEmpty())
+            throw new Exception("expected output not found: " + automaticLog);
+
+        Path automaticJar = modulePath.resolve("automatic-1.0.jar");
+
+        new JarTask(tb, automaticJar)
+          .baseDir(automaticClasses)
+          .files("api/Api.class")
+          .manifest("Automatic-Module-Name: custom.module.name\n\n")
+          .run();
+
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "module m { requires custom.module.name; }",
+                          "package impl; public class Impl { api.Api a; }");
+
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+                .options("--module-path", modulePath.toString(),
+                         "-XDrawDiagnostics")
+                .outdir(classes)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        tb.writeJavaFiles(src,
+                          "module m { requires automatic; }");
+
+        List<String> log = new JavacTask(tb)
+                .options("--module-path", modulePath.toString(),
+                         "-XDrawDiagnostics")
+                .outdir(classes)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                Arrays.asList("module-info.java:1:21: compiler.err.module.not.found: automatic",
+                              "1 error");
+
+        if (!expected.equals(log)) {
+            throw new Exception("expected output not found: " + log);
+        }
+    }
+
+    @Test
+    public void testAutomaticModuleNameIncorrect(Path base) throws Exception {
+        for (String name : new String[] {"", "999", "foo.class", "foo._"}) {
+            if (Files.isDirectory(base)) {
+                tb.cleanDirectory(base);
+            }
+            Path modulePath = base.resolve("module-path");
+
+            Files.createDirectories(modulePath);
+
+            Path automaticSrc = base.resolve("automaticSrc");
+            tb.writeJavaFiles(automaticSrc, "package api; public class Api {}");
+            Path automaticClasses = base.resolve("automaticClasses");
+            tb.createDirectories(automaticClasses);
+
+            String automaticLog = new JavacTask(tb)
+                                    .outdir(automaticClasses)
+                                    .files(findJavaFiles(automaticSrc))
+                                    .run()
+                                    .writeAll()
+                                    .getOutput(Task.OutputKind.DIRECT);
+
+            if (!automaticLog.isEmpty())
+                throw new Exception("expected output not found: " + automaticLog);
+
+            Path automaticJar = modulePath.resolve("automatic-1.0.jar");
+
+            new JarTask(tb, automaticJar)
+              .baseDir(automaticClasses)
+              .files("api/Api.class")
+              .manifest("Automatic-Module-Name: " + name + "\n\n")
+              .run();
+
+            Path src = base.resolve("src");
+
+            tb.writeJavaFiles(src,
+                              "package impl; public class Impl { api.Api a; }");
+
+            Path classes = base.resolve("classes");
+
+            Files.createDirectories(classes);
+
+            List<String> log = new JavacTask(tb, Mode.CMDLINE)
+                    .options("--module-path", modulePath.toString(),
+                             "--add-modules", "ALL-MODULE-PATH",
+                             "-XDrawDiagnostics")
+                    .outdir(classes)
+                    .files(findJavaFiles(src))
+                    .run(Task.Expect.FAIL)
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.DIRECT);
+
+            List<String> expected =
+                    Arrays.asList("- compiler.err.locn.cant.get.module.name.for.jar: " +
+                                      "testAutomaticModuleNameIncorrect/module-path/automatic-1.0.jar".replace("/", File.separator),
+                                  "1 error");
+
+            if (!expected.equals(log)) {
+                throw new Exception("expected output not found: " + log);
+            }
+        }
+    }
+
+    @Test
+    public void testAutomaticModuleNameBroken(Path base) throws Exception {
+        Path modulePath = base.resolve("module-path");
+
+        Files.createDirectories(modulePath);
+
+        Path automaticSrc = base.resolve("automaticSrc");
+        tb.writeJavaFiles(automaticSrc, "package api; public class Api {}");
+        Path automaticClasses = base.resolve("automaticClasses");
+        tb.createDirectories(automaticClasses);
+
+        String automaticLog = new JavacTask(tb)
+                                .outdir(automaticClasses)
+                                .files(findJavaFiles(automaticSrc))
+                                .run()
+                                .writeAll()
+                                .getOutput(Task.OutputKind.DIRECT);
+
+        if (!automaticLog.isEmpty())
+            throw new Exception("expected output not found: " + automaticLog);
+
+        Path automaticJar = modulePath.resolve("automatic-1.0.jar");
+
+        try (ZipOutputStream out = new ZipOutputStream(Files.newOutputStream(automaticJar))) {
+            out.putNextEntry(new ZipEntry("api/Api.class"));
+            Files.copy(automaticClasses.resolve("api").resolve("Api.class"), out);
+        }
+
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "module m { requires automatic; }",
+                          "package impl; public class Impl { api.Api a; }");
+
+        Path classes = base.resolve("classes");
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+                .options("--module-path", modulePath.toString(),
+                         "-XDrawDiagnostics")
+                .outdir(classes)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        tb.writeJavaFiles(src,
+                          "module m { requires custom.module.name; }");
+
+        List<String> log = new JavacTask(tb)
+                .options("--module-path", modulePath.toString(),
+                         "-XDrawDiagnostics")
+                .outdir(classes)
+                .files(findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected =
+                Arrays.asList("module-info.java:1:34: compiler.err.module.not.found: custom.module.name",
+                              "1 error");
+
+        if (!expected.equals(log)) {
+            throw new Exception("expected output not found: " + log);
+        }
+    }
+
 }
diff --git a/langtools/test/tools/javac/modules/PackageConflictTest.java b/langtools/test/tools/javac/modules/PackageConflictTest.java
index dda964f8731..1b6e94c441a 100644
--- a/langtools/test/tools/javac/modules/PackageConflictTest.java
+++ b/langtools/test/tools/javac/modules/PackageConflictTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -277,4 +277,57 @@ public class PackageConflictTest extends ModuleTestBase {
             throw new Exception("expected output not found");
         }
     }
+
+    @Test
+    public void testConflictInDependenciesInUnnamed(Path base) throws Exception {
+        Path msp = base.resolve("module-path-source");
+        Path m1 = msp.resolve("m1x");
+        Path m2 = msp.resolve("m2x");
+        tb.writeJavaFiles(m1,
+                          "module m1x { exports test; }",
+                          "package test; public class A { }");
+        tb.writeJavaFiles(m2,
+                          "module m2x { exports test; }",
+                          "package test; public class B { }");
+        Path mp = base.resolve("module-path");
+        Files.createDirectories(mp);
+
+        new JavacTask(tb)
+            .options("--module-source-path", msp.toString())
+            .outdir(mp)
+            .files(findJavaFiles(msp))
+            .run()
+            .writeAll();
+
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                          "package impl; public class Impl { }");
+
+        Path out = base.resolve("out");
+        Files.createDirectories(out);
+
+        List<String> log = new JavacTask(tb)
+                       .options("-XDrawDiagnostic",
+                                "--module-path", mp.toString(),
+                                "--add-modules", "ALL-MODULE-PATH")
+                       .outdir(out)
+                       .files(findJavaFiles(src))
+                       .run(Task.Expect.FAIL)
+                       .writeAll()
+                       .getOutputLines(Task.OutputKind.DIRECT);
+
+        List<String> expected1 =
+                Arrays.asList("error: the unnamed module reads package test from both m1x and m2x",
+                              "1 error");
+
+        List<String> expected2 =
+                Arrays.asList("error: the unnamed module reads package test from both m2x and m1x",
+                              "1 error");
+
+        if (!expected1.equals(log) && !expected2.equals(log)) {
+            throw new AssertionError("Unexpected output: " + log);
+        }
+    }
+
 }

From a7a368b2f9245d5da0bdaa1d2ccc3b6d46ec57a9 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 16 Jun 2017 12:18:46 -0700
Subject: [PATCH 13/83] 8182310: [AOT][JVMCI] Get host class of VM anonymous
 class

Add missing JVMCI functionality

Reviewed-by: dlong, kvn
---
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |  5 +++++
 .../HotSpotResolvedObjectTypeImpl.java        |  8 +++++++
 .../hotspot/HotSpotResolvedPrimitiveType.java |  5 +++++
 .../src/jdk/vm/ci/meta/ResolvedJavaType.java  |  7 ++++++
 .../src/share/vm/jvmci/jvmciCompilerToVM.cpp  |  8 +++++++
 .../ci/runtime/test/TestResolvedJavaType.java | 22 +++++++++++++++++++
 6 files changed, 55 insertions(+)

diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index a5c0c7c3b62..450c1dfc4dd 100644
--- a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -644,4 +644,9 @@ final class CompilerToVM {
      *         {@link Long}
      */
     native Object getFlagValue(String name);
+
+    /**
+     * Gets the host class for {@code type}.
+     */
+    native HotSpotResolvedObjectTypeImpl getHostClass(HotSpotResolvedObjectTypeImpl type);
 }
diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index a6d3428cccf..3b424770ca1 100644
--- a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -411,6 +411,14 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return false;
     }
 
+    @Override
+    public ResolvedJavaType getHostClass() {
+        if (isArray()) {
+            return null;
+        }
+        return compilerToVM().getHostClass(this);
+    }
+
     @Override
     public boolean isJavaLangObject() {
         return javaClass.equals(Object.class);
diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index 9c32e8d0894..784c9aa184e 100644
--- a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -153,6 +153,11 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
         return other.equals(this);
     }
 
+    @Override
+    public ResolvedJavaType getHostClass() {
+        return null;
+    }
+
     @Override
     public JavaKind getJavaKind() {
         return kind;
diff --git a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
index 891e7943de3..593d4f36eb9 100644
--- a/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/hotspot/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -104,6 +104,13 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
      */
     boolean isAssignableFrom(ResolvedJavaType other);
 
+    /**
+     * Returns the {@link ResolvedJavaType} object representing the host class of this VM anonymous
+     * class (as opposed to the unrelated concept specified by {@link Class#isAnonymousClass()}) or
+     * {@code null} if this object does not represent a VM anonymous class.
+     */
+    ResolvedJavaType getHostClass();
+
     /**
      * Returns true if this type is exactly the type {@link java.lang.Object}.
      */
diff --git a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
index 6f02a6ce79e..1e554a3f4b6 100644
--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
@@ -1687,6 +1687,13 @@ C2V_VMENTRY(jlong, getFingerprint, (JNIEnv*, jobject, jlong metaspace_klass))
   }
 C2V_END
 
+C2V_VMENTRY(jobject, getHostClass, (JNIEnv*, jobject, jobject jvmci_type))
+  InstanceKlass* k = InstanceKlass::cast(CompilerToVM::asKlass(jvmci_type));
+  InstanceKlass* host = k->host_klass();
+  oop result = CompilerToVM::get_jvmci_type(host, CHECK_NULL);
+  return JNIHandles::make_local(THREAD, result);
+C2V_END
+
 C2V_VMENTRY(int, interpreterFrameSize, (JNIEnv*, jobject, jobject bytecode_frame_handle))
   if (bytecode_frame_handle == NULL) {
     THROW_0(vmSymbols::java_lang_NullPointerException());
@@ -1817,6 +1824,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "flushDebugOutput",                             CC "()V",                                                                             FN_PTR(flushDebugOutput)},
   {CC "methodDataProfileDataSize",                    CC "(JI)I",                                                                           FN_PTR(methodDataProfileDataSize)},
   {CC "getFingerprint",                               CC "(J)J",                                                                            FN_PTR(getFingerprint)},
+  {CC "getHostClass",                                 CC "(" HS_RESOLVED_KLASS ")" HS_RESOLVED_KLASS,                                       FN_PTR(getHostClass)},
   {CC "interpreterFrameSize",                         CC "(" BYTECODE_FRAME ")I",                                                           FN_PTR(interpreterFrameSize)},
   {CC "compileToBytecode",                            CC "(" OBJECT ")V",                                                                   FN_PTR(compileToBytecode)},
   {CC "getFlagValue",                                 CC "(" STRING ")" OBJECT,                                                             FN_PTR(getFlagValue)},
diff --git a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index b732aca979a..516e793749c 100644
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -54,6 +54,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.function.Supplier;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -142,6 +143,27 @@ public class TestResolvedJavaType extends TypeUniverse {
         }
     }
 
+    @Test
+    public void getHostClassTest() {
+        for (Class<?> c : classes) {
+            ResolvedJavaType type = metaAccess.lookupJavaType(c);
+            ResolvedJavaType host = type.getHostClass();
+            assertNull(host);
+        }
+
+        class LocalClass {}
+        Cloneable clone = new Cloneable() {};
+        assertNull(metaAccess.lookupJavaType(LocalClass.class).getHostClass());
+        assertNull(metaAccess.lookupJavaType(clone.getClass()).getHostClass());
+
+        Supplier<Runnable> lambda = () -> () -> System.out.println("run");
+        ResolvedJavaType lambdaType = metaAccess.lookupJavaType(lambda.getClass());
+        ResolvedJavaType nestedLambdaType = metaAccess.lookupJavaType(lambda.get().getClass());
+        assertNotNull(lambdaType.getHostClass());
+        assertNotNull(nestedLambdaType.getHostClass());
+        assertEquals(lambdaType.getHostClass(), nestedLambdaType.getHostClass());
+    }
+
     @Test
     public void getModifiersTest() {
         for (Class<?> c : classes) {

From 6534a8605046bdfa765ce05c88dccf621b113151 Mon Sep 17 00:00:00 2001
From: Mark Sheppard <msheppar@openjdk.org>
Date: Fri, 16 Jun 2017 20:37:39 +0100
Subject: [PATCH 14/83] 8181836: BadKindHelper.html and BoundsHelper.html
 contains broken link in the javadoc

Reviewed-by: chegar
---
 .../java.corba/share/classes/org/omg/CORBA/BoundsHelper.java  | 4 ++--
 .../classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java   | 4 ++--
 .../classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java  | 4 ++--
 .../classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java
index 52f2128c51e..0d5d6cc9533 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/BoundsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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,7 +29,7 @@ package org.omg.CORBA;
 /**
  * This Helper class is used to facilitate the marshalling of {@code Bounds}.
  * For more information on Helper files, see
- * <a href="doc-files/generatedfiles.html#helper">
+ * <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
  * "Generated Files: Helper Files"</a>.
  */
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java
index 150f6374e80..afb6dac4e54 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ORBPackage/InvalidNameHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -30,7 +30,7 @@ package org.omg.CORBA.ORBPackage;
  * This Helper class is used to facilitate the marshalling of
  * {@code ORBPackage/InvalidName}.
  * For more information on Helper files, see
- * <a href="doc-files/generatedfiles.html#helper">
+ * <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
  * "Generated Files: Helper Files"</a>.
  */
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java
index 3db1ad89f54..b9c17569949 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BadKindHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -30,7 +30,7 @@ package org.omg.CORBA.TypeCodePackage;
  * This Helper class is used to facilitate the marshalling of
  * {@code TypeCodePackage/BadKind}.
  * For more information on Helper files, see
- * <a href="doc-files/generatedfiles.html#helper">
+ * <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
  * "Generated Files: Helper Files"</a>.
  */
 
diff --git a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java
index 1a9aeb71e2b..5c1c89f029c 100644
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/TypeCodePackage/BoundsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -30,7 +30,7 @@ package org.omg.CORBA.TypeCodePackage;
  * This Helper class is used to facilitate the marshalling of
  * {@code TypeCodePackage/Bounds}.
  * For more information on Helper files, see
- * <a href="doc-files/generatedfiles.html#helper">
+ * <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
  * "Generated Files: Helper Files"</a>.
  */
 

From 2a168d142652d1d99ceaae700f78a1fbf7798b6d Mon Sep 17 00:00:00 2001
From: Poonam Bajaj <poonam@openjdk.org>
Date: Fri, 16 Jun 2017 22:10:34 +0000
Subject: [PATCH 15/83] 8178536: OOM ERRORS + SERVICE-THREAD TAKES A PROCESSOR
 TO 100%

Clear the pending OOM exception in SensorInfo::trigger()

Reviewed-by: mchung, dcubed
---
 .../share/vm/services/lowMemoryDetector.cpp   | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/hotspot/src/share/vm/services/lowMemoryDetector.cpp b/hotspot/src/share/vm/services/lowMemoryDetector.cpp
index 33e1f45957b..f7553f562cc 100644
--- a/hotspot/src/share/vm/services/lowMemoryDetector.cpp
+++ b/hotspot/src/share/vm/services/lowMemoryDetector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -296,19 +296,41 @@ void SensorInfo::trigger(int count, TRAPS) {
     Klass* k = Management::sun_management_Sensor_klass(CHECK);
     instanceKlassHandle sensorKlass (THREAD, k);
     Handle sensor_h(THREAD, _sensor_obj);
-    Handle usage_h = MemoryService::create_MemoryUsage_obj(_usage, CHECK);
+
+    Symbol* trigger_method_signature;
 
     JavaValue result(T_VOID);
     JavaCallArguments args(sensor_h);
     args.push_int((int) count);
-    args.push_oop(usage_h);
+
+    Handle usage_h = MemoryService::create_MemoryUsage_obj(_usage, THREAD);
+    // Call Sensor::trigger(int, MemoryUsage) to send notification to listeners.
+    // When OOME occurs and fails to allocate MemoryUsage object, call
+    // Sensor::trigger(int) instead.  The pending request will be processed
+    // but no notification will be sent.
+    if (HAS_PENDING_EXCEPTION) {
+       assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOME here");
+       CLEAR_PENDING_EXCEPTION;
+       trigger_method_signature = vmSymbols::int_void_signature();
+    } else {
+       trigger_method_signature = vmSymbols::trigger_method_signature();
+       args.push_oop(usage_h);
+    }
 
     JavaCalls::call_virtual(&result,
-                            sensorKlass,
-                            vmSymbols::trigger_name(),
-                            vmSymbols::trigger_method_signature(),
-                            &args,
-                            CHECK);
+                        sensorKlass,
+                        vmSymbols::trigger_name(),
+                        trigger_method_signature,
+                        &args,
+                        THREAD);
+
+    if (HAS_PENDING_EXCEPTION) {
+       // We just clear the OOM pending exception that we might have encountered
+       // in Java's tiggerAction(), and continue with updating the counters since
+       // the Java counters have been updated too.
+       assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOME here");
+       CLEAR_PENDING_EXCEPTION;
+     }
   }
 
   {

From cd3957ce2e79877c39e2b2a5f6a0b1f6b6253537 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 16 Jun 2017 15:29:16 -0700
Subject: [PATCH 16/83] 8182406: Add missing legal file for jquery

Reviewed-by: mchung
---
 .../src/jdk.javadoc/share/legal/jquery.md     | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 langtools/src/jdk.javadoc/share/legal/jquery.md

diff --git a/langtools/src/jdk.javadoc/share/legal/jquery.md b/langtools/src/jdk.javadoc/share/legal/jquery.md
new file mode 100644
index 00000000000..197afc01a58
--- /dev/null
+++ b/langtools/src/jdk.javadoc/share/legal/jquery.md
@@ -0,0 +1,73 @@
+## jQuery v1.20.2
+
+### jQuery License
+<pre>
+jQuery v 1.10.2
+Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************
+
+The jQuery JavaScript Library v1.10.2 also includes Sizzle.js
+
+Sizzle.js includes the following license:
+
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/sizzle
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
+
+********************* 
+
+</pre>

From e72b5f7d8af1336045cfbca05cb187ccb30aada5 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Fri, 16 Jun 2017 19:12:34 -0400
Subject: [PATCH 17/83] 8182405: add legal file for freebxml

Reviewed-by: mchung
---
 .../src/jdk.xml.bind/share/legal/freebxml.md  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 jaxws/src/jdk.xml.bind/share/legal/freebxml.md

diff --git a/jaxws/src/jdk.xml.bind/share/legal/freebxml.md b/jaxws/src/jdk.xml.bind/share/legal/freebxml.md
new file mode 100644
index 00000000000..1648e61e928
--- /dev/null
+++ b/jaxws/src/jdk.xml.bind/share/legal/freebxml.md
@@ -0,0 +1,58 @@
+## freebXML v3.1
+
+### freebXML License v1.1.5
+<pre>
+freebxml: Copyright (c) 2001 freebxml.org. All rights reserved.
+
+The names "The freebXML Registry Project" and "freebxml Software Foundation" must not be 
+used to endorse or promote products derived from this software or be used in a product 
+name without prior written permission. For written permission, 
+please contact ebxmlrr-team@lists.sourceforge.net.
+
+This software consists of voluntary contributions made by many individuals on behalf of 
+the the freebxml Software Foundation. For more information on the freebxml Software 
+Foundation, please see <http://www.freebxml.org/>.
+
+This product includes software developed by the Apache Software Foundation 
+(http://www.apache.org/).
+
+The freebxml License, Version 1.1 5
+Copyright (c) 2001 freebxml.org. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are 
+permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of 
+conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list 
+of conditions and the following disclaimer in the documentation and/or other materials 
+provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, must include the 
+following acknowlegement:
+
+"This product includes software developed by freebxml.org (http://www.freebxml.org/)."
+
+Alternately, this acknowlegement may appear in the software itself, if and wherever 
+such third-party acknowlegements normally appear.
+
+4. The names "The freebXML Registry Project", "freebxml Software Foundation" must not be 
+used to endorse or promote products derived from this software without prior written 
+permission. For written permission, please contact ebxmlrr-team@lists.sourceforge.net.
+
+5. Products derived from this software may not be called "freebxml", "freebXML Registry" 
+nor may freebxml" appear in their names without prior written permission of the 
+freebxml Group.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE freebxml SOFTWARE FOUNDATION OR 
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+</pre>
\ No newline at end of file

From bd5e472874e66e514008cd91dee5b7e412ce72f6 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:50:34 -0700
Subject: [PATCH 18/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 corba/src/java.corba/share/classes/module-info.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/corba/src/java.corba/share/classes/module-info.java b/corba/src/java.corba/share/classes/module-info.java
index 0d3fbe284d3..f20ef16d44d 100644
--- a/corba/src/java.corba/share/classes/module-info.java
+++ b/corba/src/java.corba/share/classes/module-info.java
@@ -26,18 +26,21 @@
 /**
  * Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
  *
+ * <p> This module is upgradeble.
+ *
  * @moduleGraph
  * @since 9
  */
 @Deprecated(since="9", forRemoval=true)
 module java.corba {
-    requires transitive java.desktop;
-    requires transitive java.rmi;
     requires java.logging;
     requires java.naming;
     requires java.transaction;
     requires jdk.unsupported;
 
+    requires transitive java.desktop;
+    requires transitive java.rmi;
+
     exports javax.activity;
     exports javax.rmi;
     exports javax.rmi.CORBA;

From d33d6dc145c2a0881f383211e6ba6c216c78d469 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:50:39 -0700
Subject: [PATCH 19/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 jaxp/src/java.xml/share/classes/module-info.java    | 2 ++
 jaxp/src/jdk.xml.dom/share/classes/module-info.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/jaxp/src/java.xml/share/classes/module-info.java b/jaxp/src/java.xml/share/classes/module-info.java
index 683c524c87f..584b7f11854 100644
--- a/jaxp/src/java.xml/share/classes/module-info.java
+++ b/jaxp/src/java.xml/share/classes/module-info.java
@@ -67,6 +67,7 @@ module java.xml {
     exports org.xml.sax;
     exports org.xml.sax.ext;
     exports org.xml.sax.helpers;
+
     exports com.sun.org.apache.xml.internal.dtm to
         java.xml.crypto;
     exports com.sun.org.apache.xml.internal.utils to
@@ -83,6 +84,7 @@ module java.xml {
         java.xml.crypto;
     // reflection access from com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory
     exports com.sun.xml.internal.stream.writers to java.xml.ws;
+
     uses javax.xml.datatype.DatatypeFactory;
     uses javax.xml.parsers.DocumentBuilderFactory;
     uses javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/src/jdk.xml.dom/share/classes/module-info.java b/jaxp/src/jdk.xml.dom/share/classes/module-info.java
index 24b90c723f5..d033c2a76a6 100644
--- a/jaxp/src/jdk.xml.dom/share/classes/module-info.java
+++ b/jaxp/src/jdk.xml.dom/share/classes/module-info.java
@@ -32,6 +32,7 @@
  */
 module jdk.xml.dom {
     requires transitive java.xml;
+
     exports org.w3c.dom.css;
     exports org.w3c.dom.html;
     exports org.w3c.dom.stylesheets;

From 25f156ee338fb7ab8d29d77dbe11e4fbe319d316 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:50:42 -0700
Subject: [PATCH 20/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 .../share/classes/module-info.java                    |  4 ++--
 .../share/classes/module-info.java                    | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java
index 94ce60e239f..8f3a13550f4 100644
--- a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java
+++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/module-info.java
@@ -38,9 +38,9 @@
  * @since 9
  */
 module jdk.scripting.nashorn.shell {
-    requires java.desktop;
     requires java.compiler;
-    requires jdk.scripting.nashorn;
+    requires java.desktop;
     requires jdk.internal.le;
+    requires jdk.scripting.nashorn;
 }
 
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java b/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java
index dbe121fcd94..a73f3a57552 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/module-info.java
@@ -142,9 +142,10 @@ ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn"
  */
 module jdk.scripting.nashorn {
     requires java.logging;
-    requires transitive java.scripting;
     requires jdk.dynalink;
 
+    requires transitive java.scripting;
+
     exports jdk.nashorn.api.scripting;
     exports jdk.nashorn.api.tree;
 
@@ -155,9 +156,9 @@ module jdk.scripting.nashorn {
     exports jdk.nashorn.tools to
         jdk.scripting.nashorn.shell;
 
-    provides javax.script.ScriptEngineFactory
-        with jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+    provides javax.script.ScriptEngineFactory with
+        jdk.nashorn.api.scripting.NashornScriptEngineFactory;
 
-    provides jdk.dynalink.linker.GuardingDynamicLinkerExporter
-        with jdk.nashorn.api.linker.NashornLinkerExporter;
+    provides jdk.dynalink.linker.GuardingDynamicLinkerExporter with
+        jdk.nashorn.api.linker.NashornLinkerExporter;
 }

From 960807e246238cfd5379817c7a48810bf7c68303 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:50:45 -0700
Subject: [PATCH 21/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 .../share/classes/module-info.java            | 22 +++++-----
 .../share/classes/module-info.java            | 17 ++++----
 .../share/classes/module-info.java            | 15 +++----
 .../sun/tools/jdeps/ModuleInfoBuilder.java    | 41 +++++++++++++++----
 .../jdk.jdeps/share/classes/module-info.java  |  1 +
 .../jdk.jshell/share/classes/module-info.java | 23 ++++++-----
 6 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/langtools/src/java.compiler/share/classes/module-info.java b/langtools/src/java.compiler/share/classes/module-info.java
index b7fbef6664d..561e02dbfda 100644
--- a/langtools/src/java.compiler/share/classes/module-info.java
+++ b/langtools/src/java.compiler/share/classes/module-info.java
@@ -23,16 +23,18 @@
  * questions.
  */
 
- /**
-  * Defines the Language Model, Annotation Processing, and Java Compiler APIs.
-  * <P>
-  * These APIs model declarations and types of the Java programming language,
-  * and define interfaces for tools such as compilers which can be invoked
-  * from a program.
-  *
-  * @moduleGraph
-  * @since 9
-  */
+/**
+ * Defines the Language Model, Annotation Processing, and Java Compiler APIs.
+ * <p>
+ * These APIs model declarations and types of the Java programming language,
+ * and define interfaces for tools such as compilers which can be invoked
+ * from a program.
+ * <p>
+ * This module is upgradeble.
+ *
+ * @moduleGraph
+ * @since 9
+ */
 module java.compiler {
     exports javax.annotation.processing;
     exports javax.lang.model;
diff --git a/langtools/src/jdk.compiler/share/classes/module-info.java b/langtools/src/jdk.compiler/share/classes/module-info.java
index 5bfb4310e68..c2603662e8c 100644
--- a/langtools/src/jdk.compiler/share/classes/module-info.java
+++ b/langtools/src/jdk.compiler/share/classes/module-info.java
@@ -88,6 +88,7 @@ module jdk.compiler {
     exports com.sun.source.tree;
     exports com.sun.source.util;
     exports com.sun.tools.javac;
+
     exports com.sun.tools.doclint to
         jdk.javadoc;
     exports com.sun.tools.javac.api to
@@ -127,16 +128,16 @@ module jdk.compiler {
     uses com.sun.source.util.Plugin;
     uses com.sun.tools.javac.platform.PlatformProvider;
 
-    provides java.util.spi.ToolProvider
-        with com.sun.tools.javac.main.JavacToolProvider;
+    provides java.util.spi.ToolProvider with
+        com.sun.tools.javac.main.JavacToolProvider;
 
-    provides com.sun.tools.javac.platform.PlatformProvider
-        with com.sun.tools.javac.platform.JDKPlatformProvider;
+    provides com.sun.tools.javac.platform.PlatformProvider with
+        com.sun.tools.javac.platform.JDKPlatformProvider;
 
-    provides javax.tools.JavaCompiler
-        with com.sun.tools.javac.api.JavacTool;
+    provides javax.tools.JavaCompiler with
+        com.sun.tools.javac.api.JavacTool;
 
-    provides javax.tools.Tool
-        with com.sun.tools.javac.api.JavacTool;
+    provides javax.tools.Tool with
+        com.sun.tools.javac.api.JavacTool;
 }
 
diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/langtools/src/jdk.javadoc/share/classes/module-info.java
index a5de5c4e036..d4973a4652b 100644
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java
@@ -58,9 +58,10 @@
  * @since 9
  */
 module jdk.javadoc {
+    requires java.xml;
+
     requires transitive java.compiler;
     requires transitive jdk.compiler;
-    requires java.xml;
 
     exports com.sun.javadoc;
     exports com.sun.tools.doclets;
@@ -69,13 +70,13 @@ module jdk.javadoc {
 
     exports jdk.javadoc.doclet;
 
-    provides java.util.spi.ToolProvider
-        with jdk.javadoc.internal.tool.JavadocToolProvider;
+    provides java.util.spi.ToolProvider with
+        jdk.javadoc.internal.tool.JavadocToolProvider;
 
-    provides javax.tools.DocumentationTool
-        with jdk.javadoc.internal.api.JavadocTool;
+    provides javax.tools.DocumentationTool with
+        jdk.javadoc.internal.api.JavadocTool;
 
-    provides javax.tools.Tool
-        with jdk.javadoc.internal.api.JavadocTool;
+    provides javax.tools.Tool with
+        jdk.javadoc.internal.api.JavadocTool;
 }
 
diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java
index 1843ea0ffb5..846e1686423 100644
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java
@@ -203,21 +203,43 @@ public class ModuleInfoBuilder {
         writer.format("%smodule %s {%n", open ? "open " : "", md.name());
 
         Map<String, Module> modules = configuration.getModules();
-        // first print the JDK modules
-        md.requires().stream()
-          .filter(req -> !req.name().equals("java.base"))   // implicit requires
-          .sorted(Comparator.comparing(Requires::name))
-          .forEach(req -> writer.format("    requires %s;%n",
-                                        toString(req.modifiers(), req.name())));
+
+        // first print requires
+        Set<Requires> reqs = md.requires().stream()
+            .filter(req -> !req.name().equals("java.base") && req.modifiers().isEmpty())
+            .collect(Collectors.toSet());
+        reqs.stream()
+            .sorted(Comparator.comparing(Requires::name))
+            .forEach(req -> writer.format("    requires %s;%n",
+                                          toString(req.modifiers(), req.name())));
+        if (!reqs.isEmpty()) {
+            writer.println();
+        }
+
+        // requires transitive
+        reqs = md.requires().stream()
+                 .filter(req -> !req.name().equals("java.base") && !req.modifiers().isEmpty())
+                 .collect(Collectors.toSet());
+        reqs.stream()
+            .sorted(Comparator.comparing(Requires::name))
+            .forEach(req -> writer.format("    requires %s;%n",
+                                          toString(req.modifiers(), req.name())));
+        if (!reqs.isEmpty()) {
+            writer.println();
+        }
 
         if (!open) {
             md.exports().stream()
               .peek(exp -> {
                   if (exp.isQualified())
                       throw new InternalError(md.name() + " qualified exports: " + exp);
-              })
+                  })
               .sorted(Comparator.comparing(Exports::source))
               .forEach(exp -> writer.format("    exports %s;%n", exp.source()));
+
+            if (!md.exports().isEmpty()) {
+                writer.println();
+            }
         }
 
         md.provides().stream()
@@ -228,8 +250,11 @@ public class ModuleInfoBuilder {
                                       String.format("    provides %s with%n",
                                                     p.service().replace('$', '.')),
                                       ";")))
-          .forEach(writer::println);
+                     .forEach(writer::println);
 
+        if (!md.provides().isEmpty()) {
+            writer.println();
+        }
         writer.println("}");
     }
 
diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/langtools/src/jdk.jdeps/share/classes/module-info.java
index b874ca7f82e..55e202b9cb0 100644
--- a/langtools/src/jdk.jdeps/share/classes/module-info.java
+++ b/langtools/src/jdk.jdeps/share/classes/module-info.java
@@ -59,6 +59,7 @@
 module jdk.jdeps {
     requires java.compiler;
     requires jdk.compiler;
+
     exports com.sun.tools.classfile to jdk.jlink;
 
     provides java.util.spi.ToolProvider with
diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/langtools/src/jdk.jshell/share/classes/module-info.java
index e7d55d5838f..3e06d3b7294 100644
--- a/langtools/src/jdk.jshell/share/classes/module-info.java
+++ b/langtools/src/jdk.jshell/share/classes/module-info.java
@@ -65,27 +65,28 @@
  * @since 9
  */
 module jdk.jshell {
-    requires transitive java.compiler;
-    requires transitive jdk.jdi;
-    requires transitive java.prefs;
     requires java.logging;
     requires jdk.compiler;
-    requires jdk.internal.le;
     requires jdk.internal.ed;
+    requires jdk.internal.le;
     requires jdk.internal.opt;
 
+    requires transitive java.compiler;
+    requires transitive java.prefs;
+    requires transitive jdk.jdi;
+
     exports jdk.jshell;
-    exports jdk.jshell.spi;
     exports jdk.jshell.execution;
+    exports jdk.jshell.spi;
     exports jdk.jshell.tool;
 
     uses jdk.jshell.spi.ExecutionControlProvider;
     uses jdk.internal.editor.spi.BuildInEditorProvider;
 
-    provides javax.tools.Tool
-        with jdk.internal.jshell.tool.JShellToolProvider;
-    provides jdk.jshell.spi.ExecutionControlProvider
-        with jdk.jshell.execution.JdiExecutionControlProvider,
-             jdk.jshell.execution.LocalExecutionControlProvider,
-             jdk.jshell.execution.FailOverExecutionControlProvider;
+    provides javax.tools.Tool with
+        jdk.internal.jshell.tool.JShellToolProvider;
+    provides jdk.jshell.spi.ExecutionControlProvider with
+        jdk.jshell.execution.JdiExecutionControlProvider,
+        jdk.jshell.execution.LocalExecutionControlProvider,
+        jdk.jshell.execution.FailOverExecutionControlProvider;
 }

From bc6e52c2b3e1cb74b61873d0925c812157064064 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:50:50 -0700
Subject: [PATCH 22/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 hotspot/src/jdk.aot/share/classes/module-info.java       | 9 ++++++++-
 .../share/classes/module-info.java                       | 6 ++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hotspot/src/jdk.aot/share/classes/module-info.java b/hotspot/src/jdk.aot/share/classes/module-info.java
index 14d11197356..ced0bf61cfd 100644
--- a/hotspot/src/jdk.aot/share/classes/module-info.java
+++ b/hotspot/src/jdk.aot/share/classes/module-info.java
@@ -23,8 +23,15 @@
  * questions.
  */
 
+/**
+ * Defines the Ahead-of-Time (AOT) compiler, <em>{@index jaotc jaotc tool}</em>,
+ * for compiling Java classes into AOT library.
+ *
+ * @moduleGraph
+ * @since 9
+ */
 module jdk.aot {
-    requires jdk.management;
     requires jdk.internal.vm.ci;
     requires jdk.internal.vm.compiler;
+    requires jdk.management;
 }
diff --git a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java b/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java
index 783eef09fa5..0c96fff59a4 100644
--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/module-info.java
@@ -26,11 +26,9 @@
 module jdk.internal.vm.compiler {
     requires java.instrument;
     requires java.management;
-    requires jdk.management;
     requires jdk.internal.vm.ci;
-
-    // sun.misc.Unsafe is used
-    requires jdk.unsupported;
+    requires jdk.management;
+    requires jdk.unsupported;   // sun.misc.Unsafe is used
 
     uses org.graalvm.compiler.code.DisassemblerProvider;
     uses org.graalvm.compiler.core.match.MatchStatementSet;

From b55b119b302c4ac24230189081489f6983006b1f Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Sat, 17 Jun 2017 11:51:31 -0700
Subject: [PATCH 23/83] 8182416: Clean up module-info.java like move requires
 transitive adjacent to exports

Reviewed-by: alanb
---
 .../share/classes/module-info.java            |  5 ++-
 .../share/classes/module-info.java            | 11 ++++--
 .../share/classes/module-info.java            |  2 ++
 .../share/classes/module-info.java            | 34 ++++++++++---------
 .../share/classes/module-info.java            |  7 ++--
 .../jdk.xml.ws/share/classes/module-info.java |  1 +
 6 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/jaxws/src/java.activation/share/classes/module-info.java b/jaxws/src/java.activation/share/classes/module-info.java
index 8132ff67295..22b1512da9a 100644
--- a/jaxws/src/java.activation/share/classes/module-info.java
+++ b/jaxws/src/java.activation/share/classes/module-info.java
@@ -26,14 +26,17 @@
 /**
  * Defines the JavaBeans Activation Framework (JAF) API.
  *
+ * <p> This module is upgradeble.
+ *
  * @moduleGraph
  * @since 9
  */
 @Deprecated(since="9", forRemoval=true)
 module java.activation {
-    requires transitive java.datatransfer;
     requires java.logging;
 
+    requires transitive java.datatransfer;
+
     exports javax.activation;
 }
 
diff --git a/jaxws/src/java.xml.bind/share/classes/module-info.java b/jaxws/src/java.xml.bind/share/classes/module-info.java
index 61f80413966..e38ab7ab355 100644
--- a/jaxws/src/java.xml.bind/share/classes/module-info.java
+++ b/jaxws/src/java.xml.bind/share/classes/module-info.java
@@ -26,6 +26,8 @@
 /**
  * Defines the Java Architecture for XML Binding (JAXB) API.
  *
+ * <p> This module is upgradeble.
+ *
  * @uses javax.xml.bind.JAXBContextFactory
  *
  * @moduleGraph
@@ -33,14 +35,13 @@
  */
 @Deprecated(since="9", forRemoval=true)
 module java.xml.bind {
-    requires transitive java.activation;
-    requires transitive java.xml;
     requires java.compiler;
     requires java.desktop;
     requires java.logging;
     requires jdk.unsupported;
 
-    uses javax.xml.bind.JAXBContextFactory;
+    requires transitive java.activation;
+    requires transitive java.xml;
 
     exports javax.xml.bind;
     exports javax.xml.bind.annotation;
@@ -48,6 +49,7 @@ module java.xml.bind {
     exports javax.xml.bind.attachment;
     exports javax.xml.bind.helpers;
     exports javax.xml.bind.util;
+
     exports com.sun.istack.internal to
         java.xml.ws,
         jdk.xml.bind,
@@ -147,4 +149,7 @@ module java.xml.bind {
         java.xml.ws,
         jdk.xml.bind,
         jdk.xml.ws;
+
+    uses javax.xml.bind.JAXBContextFactory;
+
 }
diff --git a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java b/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java
index 6a16a31f6f6..768e4339611 100644
--- a/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java
+++ b/jaxws/src/java.xml.ws.annotation/share/classes/module-info.java
@@ -27,6 +27,8 @@
  * Defines a subset of the Common Annotations API to support programs running
  * on the Java SE Platform.
  *
+ * <p> This module is upgradeble.
+ *
  * @moduleGraph
  * @since 9
  */
diff --git a/jaxws/src/java.xml.ws/share/classes/module-info.java b/jaxws/src/java.xml.ws/share/classes/module-info.java
index 67ab3d18f0b..a9313c30fb8 100644
--- a/jaxws/src/java.xml.ws/share/classes/module-info.java
+++ b/jaxws/src/java.xml.ws/share/classes/module-info.java
@@ -27,6 +27,8 @@
  * Defines the Java API for XML-Based Web Services (JAX-WS), and
  * the Web Services Metadata API.
  *
+ * <p> This module is upgradeble.
+ *
  * @uses javax.xml.soap.MessageFactory
  * @uses javax.xml.soap.SAAJMetaFactory
  * @uses javax.xml.soap.SOAPConnectionFactory
@@ -38,21 +40,16 @@
  */
 @Deprecated(since="9", forRemoval=true)
 module java.xml.ws {
-    requires transitive java.activation;
-    requires transitive java.xml;
-    requires transitive java.xml.bind;
-    requires java.xml.ws.annotation;
     requires java.desktop;
     requires java.logging;
     requires java.management;
+    requires java.xml.ws.annotation;
     requires jdk.httpserver;
     requires jdk.unsupported;
 
-    uses javax.xml.ws.spi.Provider;
-    uses javax.xml.soap.MessageFactory;
-    uses javax.xml.soap.SAAJMetaFactory;
-    uses javax.xml.soap.SOAPConnectionFactory;
-    uses javax.xml.soap.SOAPFactory;
+    requires transitive java.activation;
+    requires transitive java.xml;
+    requires transitive java.xml.bind;
 
     exports javax.jws;
     exports javax.jws.soap;
@@ -66,8 +63,6 @@ module java.xml.ws {
     exports javax.xml.ws.spi.http;
     exports javax.xml.ws.wsaddressing;
 
-    opens javax.xml.ws.wsaddressing to java.xml.bind;
-
     exports com.oracle.webservices.internal.api.databinding to
         jdk.xml.ws;
     exports com.sun.xml.internal.ws.addressing to
@@ -113,6 +108,13 @@ module java.xml.ws {
         jdk.xml.ws;
     exports com.sun.xml.internal.ws.wsdl.writer to
         jdk.xml.ws;
+    // JAF data handlers
+    exports com.sun.xml.internal.messaging.saaj.soap to
+        java.activation;
+    exports com.sun.xml.internal.ws.encoding to
+        java.activation;
+
+    opens javax.xml.ws.wsaddressing to java.xml.bind;
 
     // XML document content needs to be exported
     opens com.sun.xml.internal.ws.runtime.config to java.xml.bind;
@@ -123,10 +125,10 @@ module java.xml.ws {
     // classes passed to JAXBContext.newInstance for deep reflection
     opens com.sun.xml.internal.ws.addressing to java.xml.bind;
 
-    // JAF data handlers
-    exports com.sun.xml.internal.messaging.saaj.soap to
-        java.activation;
-    exports com.sun.xml.internal.ws.encoding to
-        java.activation;
+    uses javax.xml.ws.spi.Provider;
+    uses javax.xml.soap.MessageFactory;
+    uses javax.xml.soap.SAAJMetaFactory;
+    uses javax.xml.soap.SOAPConnectionFactory;
+    uses javax.xml.soap.SOAPFactory;
 }
 
diff --git a/jaxws/src/jdk.xml.bind/share/classes/module-info.java b/jaxws/src/jdk.xml.bind/share/classes/module-info.java
index 3f33b76c05f..2fb19012634 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/module-info.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/module-info.java
@@ -69,15 +69,16 @@ module jdk.xml.bind {
         jdk.xml.ws;
     exports com.sun.xml.internal.xsom.parser to
         jdk.xml.ws;
+    // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses JAXBContext
+    exports com.sun.tools.internal.xjc.generator.bean to
+       java.xml.bind;
 
     // XML document content needs to be exported
     opens com.sun.tools.internal.xjc.reader.xmlschema.bindinfo to
         java.xml.bind;
 
-    // com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo uses JAXBContext
-    exports com.sun.tools.internal.xjc.generator.bean to java.xml.bind;
-
     uses com.sun.tools.internal.xjc.Plugin;
+
     provides com.sun.tools.internal.xjc.Plugin with
         com.sun.tools.internal.xjc.addon.accessors.PluginImpl,
         com.sun.tools.internal.xjc.addon.at_generated.PluginImpl,
diff --git a/jaxws/src/jdk.xml.ws/share/classes/module-info.java b/jaxws/src/jdk.xml.ws/share/classes/module-info.java
index 81a6d04e44f..a9064619f55 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/module-info.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/module-info.java
@@ -48,6 +48,7 @@ module jdk.xml.ws {
     requires jdk.xml.bind;
 
     uses com.sun.tools.internal.ws.wscompile.Plugin;
+
     provides com.sun.tools.internal.ws.wscompile.Plugin with
         com.sun.tools.internal.ws.wscompile.plugin.at_generated.PluginImpl;
 }

From 5e00da6b123ebc6c454eb07a3e6550b31696437a Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Sun, 18 Jun 2017 23:07:25 +0100
Subject: [PATCH 24/83] 8176508: Update JAX-WS RI integration to latest version

Reviewed-by: lancea, mchung, alanb, iris
---
 .../classes/javax/activation/CommandInfo.java |    5 +-
 .../javax/activation/CommandObject.java       |    3 +-
 .../classes/javax/activation/DataHandler.java |    3 +-
 .../classes/javax/activation/DataSource.java  |    4 +-
 .../javax/activation/MailcapCommandMap.java   |   47 +-
 .../classes/javax/activation/MimeType.java    |    4 +-
 .../activation/MimeTypeParameterList.java     |    4 +-
 .../activation/MimetypesFileTypeMap.java      |   49 +-
 .../bind/marshaller/MinimumEscapeHandler.java |   18 +-
 .../bind/marshaller/NoEscapeHandler.java      |   45 +
 .../internal/bind/v2/runtime/BridgeImpl.java  |    4 +-
 .../bind/v2/runtime/MarshallerImpl.java       |   20 +-
 .../output/FastInfosetStreamWriterOutput.java |   15 +-
 .../output/StAXExStreamWriterOutput.java      |    5 +-
 .../runtime/output/XMLStreamWriterOutput.java |   99 +-
 .../classes/javax/xml/bind/ContextFinder.java |  165 +-
 .../classes/javax/xml/bind/JAXBContext.java   |   68 +-
 .../javax/xml/bind/JAXBContextFactory.java    |   31 +-
 .../classes/javax/xml/bind/Messages.java      |    6 +
 .../javax/xml/bind/Messages.properties        |    8 +
 .../classes/javax/xml/bind/ModuleUtil.java    |  160 +
 .../classes/javax/xml/bind/Unmarshaller.java  |    5 +-
 .../saaj/client/p2p/HttpSOAPConnection.java   |    3 +
 .../client/p2p/HttpSOAPConnectionFactory.java |    3 +-
 .../packaging/mime/MessagingException.java    |    3 +-
 .../mime/internet/BMMimeMultipart.java        |  211 +-
 .../mime/internet/InternetHeaders.java        |    6 +-
 .../mime/internet/MimeMultipart.java          |   86 +-
 .../mime/internet/MimePartDataSource.java     |   24 +-
 .../mime/internet/MimePullMultipart.java      |    3 +-
 .../mime/internet/ParameterList.java          |    9 +-
 .../packaging/mime/util/ASCIIUtility.java     |   70 +-
 .../packaging/mime/util/QDecoderStream.java   |    3 +-
 .../packaging/mime/util/QPDecoderStream.java  |    6 +-
 .../packaging/mime/util/QPEncoderStream.java  |    7 +-
 .../packaging/mime/util/UUDecoderStream.java  |    6 +-
 .../saaj/soap/AttachmentPartImpl.java         |   34 +-
 .../saaj/soap/ContextClassloaderLocal.java    |    3 +-
 .../saaj/soap/MessageFactoryImpl.java         |    4 +-
 .../messaging/saaj/soap/MessageImpl.java      |   10 +-
 .../saaj/soap/SAAJMetaFactoryImpl.java        |    4 +-
 .../saaj/soap/SOAPDocumentFragment.java       |  234 ++
 .../messaging/saaj/soap/SOAPDocumentImpl.java |  138 +-
 .../messaging/saaj/soap/SOAPFactoryImpl.java  |   12 +-
 .../messaging/saaj/soap/SOAPIOException.java  |    9 +-
 .../messaging/saaj/soap/SOAPPartImpl.java     |   98 +-
 .../saaj/soap/StaxLazySourceBridge.java       |   54 +-
 .../messaging/saaj/soap/StaxReaderBridge.java |   47 +-
 .../soap/dynamic/SOAPFactoryDynamicImpl.java  |    4 +-
 .../SOAPMessageFactoryDynamicImpl.java        |    3 +-
 .../saaj/soap/impl/BodyElementImpl.java       |    8 +-
 .../messaging/saaj/soap/impl/BodyImpl.java    |   35 +-
 .../messaging/saaj/soap/impl/CDATAImpl.java   |  318 +-
 .../saaj/soap/impl/DetailEntryImpl.java       |    7 +-
 .../messaging/saaj/soap/impl/DetailImpl.java  |   19 +-
 .../saaj/soap/impl/ElementFactory.java        |    4 +-
 .../messaging/saaj/soap/impl/ElementImpl.java |  284 +-
 .../saaj/soap/impl/EnvelopeImpl.java          |   13 +
 .../saaj/soap/impl/FaultElementImpl.java      |    1 +
 .../saaj/soap/impl/HeaderElementImpl.java     |   16 +-
 .../messaging/saaj/soap/impl/HeaderImpl.java  |   45 +-
 .../saaj/soap/impl/LocalStrings.properties    |    6 +-
 .../saaj/soap/impl/NamedNodeMapImpl.java      |   94 +
 .../saaj/soap/impl/SOAPCommentImpl.java       |  303 +-
 .../saaj/soap/impl/SOAPTextImpl.java          |  318 +-
 .../messaging/saaj/soap/impl/TextImpl.java    |  342 ++
 .../saaj/soap/ver1_1/Body1_1Impl.java         |    6 +
 .../saaj/soap/ver1_1/BodyElement1_1Impl.java  |    9 +-
 .../saaj/soap/ver1_1/Detail1_1Impl.java       |    2 +
 .../saaj/soap/ver1_1/DetailEntry1_1Impl.java  |    9 +-
 .../saaj/soap/ver1_1/Envelope1_1Impl.java     |    2 +
 .../saaj/soap/ver1_1/Fault1_1Impl.java        |   45 +-
 .../saaj/soap/ver1_1/FaultElement1_1Impl.java |    4 +-
 .../saaj/soap/ver1_1/Header1_1Impl.java       |    6 +
 .../soap/ver1_1/HeaderElement1_1Impl.java     |   17 +-
 .../saaj/soap/ver1_1/Message1_1Impl.java      |   10 +-
 .../saaj/soap/ver1_1/SOAPFactory1_1Impl.java  |   10 +-
 .../ver1_1/SOAPMessageFactory1_1Impl.java     |    5 +-
 .../saaj/soap/ver1_1/SOAPPart1_1Impl.java     |    6 +-
 .../saaj/soap/ver1_2/Body1_2Impl.java         |   16 +
 .../saaj/soap/ver1_2/BodyElement1_2Impl.java  |    8 +-
 .../saaj/soap/ver1_2/Detail1_2Impl.java       |    5 +
 .../saaj/soap/ver1_2/DetailEntry1_2Impl.java  |    8 +-
 .../saaj/soap/ver1_2/Envelope1_2Impl.java     |    8 +
 .../saaj/soap/ver1_2/Fault1_2Impl.java        |   67 +-
 .../saaj/soap/ver1_2/FaultElement1_2Impl.java |   12 +-
 .../saaj/soap/ver1_2/Header1_2Impl.java       |   10 +
 .../soap/ver1_2/HeaderElement1_2Impl.java     |   17 +-
 .../saaj/soap/ver1_2/Message1_2Impl.java      |    6 +-
 .../saaj/soap/ver1_2/SOAPFactory1_2Impl.java  |   10 +-
 .../ver1_2/SOAPMessageFactory1_2Impl.java     |    5 +-
 .../saaj/soap/ver1_2/SOAPPart1_2Impl.java     |    6 +-
 .../messaging/saaj/util/ByteInputStream.java  |    3 +-
 .../messaging/saaj/util/JAXMStreamSource.java |    4 +-
 .../saaj/util/NamespaceContextIterator.java   |    5 +-
 .../saaj/util/RejectDoctypeSaxFilter.java     |   11 +-
 .../messaging/saaj/util/TeeInputStream.java   |   11 +-
 .../util/stax/LazyEnvelopeStaxReader.java     |   47 +-
 .../saaj/util/stax/SaajStaxWriter.java        |    6 +
 .../saaj/util/stax/SaajStaxWriterEx.java      |   14 +-
 .../api/message/saaj/SAAJMessageHeaders.java  |   30 +-
 .../ws/api/server/SDDocumentSource.java       |   11 +-
 .../api/streaming/XMLStreamReaderFactory.java |    5 +-
 .../api/streaming/XMLStreamWriterFactory.java |    5 +-
 .../xml/internal/ws/model/RuntimeModeler.java |    2 +-
 .../privateutil/LocalizationMessages.java     |  417 +-
 .../attach/ContextClassloaderLocal.java       |   34 +-
 .../ContextClassloaderLocalMessages.java      |   71 +
 .../ws/resources/AddressingMessages.java      |  655 ++--
 .../ws/resources/BindingApiMessages.java      |   37 +-
 .../internal/ws/resources/ClientMessages.java |  501 +--
 .../ws/resources/DispatchMessages.java        |  363 +-
 .../ws/resources/EncodingMessages.java        |  169 +-
 .../ws/resources/HandlerMessages.java         |  161 +-
 .../ws/resources/HttpserverMessages.java      |   37 +-
 .../ws/resources/ManagementMessages.java      |  185 +-
 .../ws/resources/ModelerMessages.java         |  659 ++--
 .../internal/ws/resources/PolicyMessages.java |  477 +--
 .../ws/resources/ProviderApiMessages.java     |  159 +-
 .../internal/ws/resources/SenderMessages.java |  109 +-
 .../internal/ws/resources/ServerMessages.java | 1269 +++---
 .../internal/ws/resources/SoapMessages.java   |  117 +-
 .../ws/resources/StreamingMessages.java       |  521 +--
 .../resources/TubelineassemblyMessages.java   |  453 +--
 .../internal/ws/resources/UtilMessages.java   |  205 +-
 .../ws/resources/WsdlmodelMessages.java       |   45 +-
 .../ws/resources/WsservletMessages.java       | 3419 +++++++++--------
 .../ws/resources/XmlmessageMessages.java      |  277 +-
 .../internal/ws/resources/modeler.properties  |    6 +-
 .../ws/resources/modeler_de.properties        |    4 +-
 .../ws/resources/modeler_es.properties        |    4 +-
 .../ws/resources/modeler_fr.properties        |    4 +-
 .../ws/resources/modeler_it.properties        |    4 +-
 .../ws/resources/modeler_ja.properties        |    4 +-
 .../ws/resources/modeler_ko.properties        |    4 +-
 .../ws/resources/modeler_pt_BR.properties     |    4 +-
 .../ws/resources/modeler_zh_CN.properties     |    4 +-
 .../ws/resources/modeler_zh_TW.properties     |    4 +-
 .../ws/util/HandlerAnnotationProcessor.java   |    3 +-
 .../sun/xml/internal/ws/util/MrJarUtil.java   |   55 +
 .../com/sun/xml/internal/ws/util/Pool.java    |   12 +-
 .../ws/util/exception/JAXWSExceptionBase.java |   55 +-
 .../pipe/AbstractSchemaValidationTube.java    |    4 +-
 .../xml/internal/ws/util/version.properties   |    2 +-
 .../javax/xml/soap/AttachmentPart.java        |    9 +-
 .../share/classes/javax/xml/soap/Detail.java  |   10 +-
 .../classes/javax/xml/soap/MimeHeaders.java   |   51 +-
 .../share/classes/javax/xml/soap/Node.java    |    5 +-
 .../javax/xml/soap/SAAJMetaFactory.java       |    6 +-
 .../classes/javax/xml/soap/SOAPElement.java   |   22 +-
 .../javax/xml/soap/SOAPElementFactory.java    |    5 +-
 .../classes/javax/xml/soap/SOAPException.java |    8 +-
 .../classes/javax/xml/soap/SOAPFactory.java   |    4 +-
 .../classes/javax/xml/soap/SOAPFault.java     |   10 +-
 .../classes/javax/xml/soap/SOAPHeader.java    |   20 +-
 .../classes/javax/xml/soap/SOAPMessage.java   |   14 +-
 .../classes/javax/xml/soap/SOAPPart.java      |    8 +-
 .../javax/xml/soap/ServiceLoaderUtil.java     |    5 +-
 .../classes/javax/xml/soap/package-info.java  |    5 +-
 .../share/classes/javax/xml/ws/Action.java    |    8 +-
 .../classes/javax/xml/ws/AsyncHandler.java    |    3 +-
 .../classes/javax/xml/ws/BindingProvider.java |    3 +-
 .../classes/javax/xml/ws/BindingType.java     |   13 +-
 .../share/classes/javax/xml/ws/Dispatch.java  |    4 +-
 .../share/classes/javax/xml/ws/Endpoint.java  |    9 +-
 .../javax/xml/ws/EndpointReference.java       |   10 +-
 .../classes/javax/xml/ws/FaultAction.java     |   10 +-
 .../share/classes/javax/xml/ws/Holder.java    |    3 +-
 .../share/classes/javax/xml/ws/Provider.java  |    5 +-
 .../classes/javax/xml/ws/RequestWrapper.java  |    6 +-
 .../classes/javax/xml/ws/RespectBinding.java  |    4 +-
 .../share/classes/javax/xml/ws/Response.java  |    5 +-
 .../classes/javax/xml/ws/ResponseWrapper.java |    6 +-
 .../share/classes/javax/xml/ws/Service.java   |   50 +-
 .../classes/javax/xml/ws/ServiceMode.java     |    6 +-
 .../classes/javax/xml/ws/WebEndpoint.java     |    4 +-
 .../javax/xml/ws/WebServiceClient.java        |   32 +-
 .../javax/xml/ws/WebServiceContext.java       |    3 +-
 .../javax/xml/ws/WebServiceFeature.java       |    9 +-
 .../javax/xml/ws/WebServiceProvider.java      |   10 +-
 .../classes/javax/xml/ws/WebServiceRef.java   |   26 +-
 .../classes/javax/xml/ws/WebServiceRefs.java  |    4 +-
 .../classes/javax/xml/ws/handler/Handler.java |    4 +-
 .../javax/xml/ws/handler/LogicalHandler.java  |    3 +-
 .../javax/xml/ws/handler/MessageContext.java  |   14 +-
 .../javax/xml/ws/handler/package-info.java    |   29 +
 .../classes/javax/xml/ws/handler/package.html |   30 -
 .../xml/ws/handler/soap/SOAPHandler.java      |    3 +-
 .../xml/ws/handler/soap/package-info.java     |   29 +
 .../javax/xml/ws/handler/soap/package.html    |   30 -
 .../javax/xml/ws/http/package-info.java       |   29 +
 .../classes/javax/xml/ws/http/package.html    |   30 -
 .../classes/javax/xml/ws/soap/Addressing.java |   11 +-
 .../share/classes/javax/xml/ws/soap/MTOM.java |    6 +-
 .../javax/xml/ws/soap/package-info.java       |   29 +
 .../classes/javax/xml/ws/soap/package.html    |   30 -
 .../classes/javax/xml/ws/spi/Provider.java    |    9 +-
 .../javax/xml/ws/spi/ServiceDelegate.java     |   17 +-
 .../ws/spi/WebServiceFeatureAnnotation.java   |    5 +-
 .../javax/xml/ws/spi/http/HttpContext.java    |    5 +-
 .../javax/xml/ws/spi/package-info.java        |   29 +
 .../classes/javax/xml/ws/spi/package.html     |   30 -
 .../ws/wsaddressing/W3CEndpointReference.java |   11 +-
 .../share/classes/module-info.java            |   12 +-
 .../codemodel/internal/JModuleDirective.java  |   11 +-
 .../internal/jxc/MessageBundle.properties     |    4 +-
 .../internal/jxc/MessageBundle_de.properties  |    4 +-
 .../internal/jxc/MessageBundle_es.properties  |    4 +-
 .../internal/jxc/MessageBundle_fr.properties  |    4 +-
 .../internal/jxc/MessageBundle_it.properties  |    4 +-
 .../internal/jxc/MessageBundle_ja.properties  |    4 +-
 .../internal/jxc/MessageBundle_ko.properties  |    4 +-
 .../jxc/MessageBundle_pt_BR.properties        |    4 +-
 .../jxc/MessageBundle_zh_CN.properties        |    4 +-
 .../jxc/MessageBundle_zh_TW.properties        |    4 +-
 .../internal/xjc/MessageBundle.properties     |   12 +-
 .../internal/xjc/MessageBundle_de.properties  |   12 +-
 .../internal/xjc/MessageBundle_es.properties  |   12 +-
 .../internal/xjc/MessageBundle_fr.properties  |   12 +-
 .../internal/xjc/MessageBundle_it.properties  |   12 +-
 .../internal/xjc/MessageBundle_ja.properties  |   12 +-
 .../internal/xjc/MessageBundle_ko.properties  |   12 +-
 .../xjc/MessageBundle_pt_BR.properties        |   12 +-
 .../xjc/MessageBundle_zh_CN.properties        |   12 +-
 .../xjc/MessageBundle_zh_TW.properties        |   12 +-
 .../com/sun/tools/internal/xjc/Options.java   |  298 +-
 .../tools/internal/xjc/api/SpecVersion.java   |   18 +-
 .../xjc/reader/internalizer/DOMForest.java    |    4 +-
 .../ws/processor/ProcessorException.java      |   10 +-
 .../ws/resources/ConfigurationMessages.java   |   36 +-
 .../ws/resources/GeneratorMessages.java       |  135 +-
 .../ws/resources/JavacompilerMessages.java    |   35 +-
 .../internal/ws/resources/ModelMessages.java  |  715 ++--
 .../ws/resources/ModelerMessages.java         | 2789 +++++++-------
 .../ws/resources/ProcessorMessages.java       |   28 +-
 .../internal/ws/resources/UtilMessages.java   |   63 +-
 .../ws/resources/WebserviceapMessages.java    | 1675 ++++----
 .../ws/resources/WscompileMessages.java       | 1188 +++---
 .../internal/ws/resources/WsdlMessages.java   | 1655 ++++----
 .../ws/resources/newmessages.properties       |    6 -
 .../ws/resources/wscompile.properties         |   12 +-
 .../ws/resources/wscompile_de.properties      |    6 +-
 .../ws/resources/wscompile_es.properties      |    6 +-
 .../ws/resources/wscompile_fr.properties      |    6 +-
 .../ws/resources/wscompile_it.properties      |    6 +-
 .../ws/resources/wscompile_ja.properties      |    6 +-
 .../ws/resources/wscompile_ko.properties      |    6 +-
 .../ws/resources/wscompile_pt_BR.properties   |    6 +-
 .../ws/resources/wscompile_zh_CN.properties   |    6 +-
 .../ws/resources/wscompile_zh_TW.properties   |    6 +-
 .../internal/ws/util/WSDLParseException.java  |   10 +-
 .../sun/tools/internal/ws/version.properties  |    2 +-
 .../ws/wsdl/framework/ParseException.java     |   10 +-
 .../wsdl/framework/ValidationException.java   |   10 +-
 .../internal/ws/wsdl/parser/DOMForest.java    |   18 +-
 255 files changed, 13112 insertions(+), 11291 deletions(-)
 create mode 100644 jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java
 create mode 100644 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java
 create mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java
 delete mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html
 create mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java
 delete mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html
 create mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java
 delete mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html
 create mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java
 delete mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html
 create mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java
 delete mode 100644 jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html
 delete mode 100644 jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/newmessages.properties

diff --git a/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java b/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java
index b6312e0c253..5e8d3d35dd0 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/CommandInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -118,6 +118,9 @@ public class CommandInfo {
      *                  passed to the command.
      * @param loader    The ClassLoader to be used to instantiate the bean.
      * @return The bean
+     * @exception       IOException     for failures reading data
+     * @exception       ClassNotFoundException  if command object class can't
+     *                                          be found
      * @see java.beans.Beans#instantiate
      * @see javax.activation.CommandObject
      */
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java b/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java
index 7dda0239819..1ec5849b38b 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/CommandObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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 @@ public interface CommandObject {
      *
      * @param verb The Command Verb this object refers to.
      * @param dh The DataHandler.
+     * @exception       IOException     for failures accessing data
      */
     public void setCommandContext(String verb, DataHandler dh)
                                                 throws IOException;
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java b/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java
index 27f72484f69..59503997eb4 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/DataHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -326,6 +326,7 @@ public class DataHandler implements Transferable {
      * Otherwise, {@code null} is returned.
      *
      * @return the OutputStream
+     * @exception       IOException     for failures creating the OutputStream
      *
      * @see javax.activation.DataSource#getOutputStream
      * @see javax.activation.URLDataSource
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java b/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java
index 8439eb19787..cee1018d1fd 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/DataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -49,6 +49,7 @@ public interface DataSource {
      * positioned at the beginning of the data.
      *
      * @return an InputStream
+     * @exception       IOException     for failures creating the InputStream
      */
     public InputStream getInputStream() throws IOException;
 
@@ -60,6 +61,7 @@ public interface DataSource {
      * be positioned at the location the data is to be written.
      *
      * @return an OutputStream
+     * @exception       IOException     for failures creating the OutputStream
      */
     public OutputStream getOutputStream() throws IOException;
 
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java b/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
index 29bc9ad0a44..d88a4405166 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/MailcapCommandMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +29,8 @@ package javax.activation;
 import java.util.*;
 import java.io.*;
 import java.net.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import com.sun.activation.registries.MailcapFile;
 import com.sun.activation.registries.LogSupport;
 
@@ -48,12 +50,19 @@ import com.sun.activation.registries.LogSupport;
  * <ol>
  * <li> Programatically added entries to the MailcapCommandMap instance.
  * <li> The file {@code .mailcap} in the user's home directory.
- * <li> The file {@literal <}<i>java.home</i>{@literal >}{@code /lib/mailcap}.
+ * <li> The file {@code mailcap} in the Java runtime.
  * <li> The file or resources named {@code META-INF/mailcap}.
  * <li> The file or resource named {@code META-INF/mailcap.default}
  * (usually found only in the {@code activation.jar} file).
  * </ol>
  * <p>
+ * (The current implementation looks for the {@code mailcap} file
+ * in the Java runtime in the directory <i>java.home</i>{@code /conf}
+ * if it exists, and otherwise in the directory
+ * <i>java.home</i>{@code /lib}, where <i>java.home</i> is the value
+ * of the "java.home" System property.  Note that the "conf" directory was
+ * introduced in JDK 9.)
+ * <p>
  * <b>Mailcap file format:</b><p>
  *
  * Mailcap files must conform to the mailcap
@@ -120,6 +129,29 @@ public class MailcapCommandMap extends CommandMap {
     private MailcapFile[] DB;
     private static final int PROG = 0;  // programmatically added entries
 
+    private static final String confDir;
+
+    static {
+        String dir = null;
+        try {
+            dir = (String)AccessController.doPrivileged(
+                new PrivilegedAction() {
+                    public Object run() {
+                        String home = System.getProperty("java.home");
+                        String newdir = home + File.separator + "conf";
+                        File conf = new File(newdir);
+                        if (conf.exists())
+                            return newdir + File.separator;
+                        else
+                            return home + File.separator + "lib" + File.separator;
+                    }
+                });
+        } catch (Exception ex) {
+            // ignore any exceptions
+        }
+        confDir = dir;
+    }
+
     /**
      * The default Constructor.
      */
@@ -144,11 +176,11 @@ public class MailcapCommandMap extends CommandMap {
         LogSupport.log("MailcapCommandMap: load SYS");
         try {
             // check system's home
-            String system_mailcap = System.getProperty("java.home") +
-                File.separator + "lib" + File.separator + "mailcap";
-            mf = loadFile(system_mailcap);
-            if (mf != null)
-                dbv.add(mf);
+            if (confDir != null) {
+                mf = loadFile(confDir + "mailcap");
+                if (mf != null)
+                    dbv.add(mf);
+            }
         } catch (SecurityException ex) {}
 
         LogSupport.log("MailcapCommandMap: load JAR");
@@ -633,6 +665,7 @@ public class MailcapCommandMap extends CommandMap {
      * entries that specify a view command for the specified
      * MIME type are returned.
      *
+     * @param   mimeType        the MIME type
      * @return          array of native command entries
      * @since   1.6, JAF 1.1
      */
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java b/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java
index 7f751fab98c..d96f454270a 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/MimeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -58,6 +58,7 @@ public class MimeType implements Externalizable {
      * Constructor that builds a MimeType from a String.
      *
      * @param rawdata   the MIME type string
+     * @exception       MimeTypeParseException  if the MIME type can't be parsed
      */
     public MimeType(String rawdata) throws MimeTypeParseException {
         parse(rawdata);
@@ -258,6 +259,7 @@ public class MimeType implements Externalizable {
      *
      * @param rawdata   the MIME type string to compare with
      * @return          true if they match
+     * @exception       MimeTypeParseException  if the MIME type can't be parsed
      */
     public boolean match(String rawdata) throws MimeTypeParseException {
         return match(new MimeType(rawdata));
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java b/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java
index 869dcfa6752..83822fa5a66 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/MimeTypeParameterList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -58,6 +58,7 @@ public class MimeTypeParameterList {
      * Constructs a new MimeTypeParameterList with the passed in data.
      *
      * @param parameterList an RFC 2045, 2046 compliant parameter list.
+     * @exception       MimeTypeParseException  if the MIME type can't be parsed
      */
     public MimeTypeParameterList(String parameterList)
                                         throws MimeTypeParseException {
@@ -71,6 +72,7 @@ public class MimeTypeParameterList {
      * A routine for parsing the parameter list out of a String.
      *
      * @param parameterList an RFC 2045, 2046 compliant parameter list.
+     * @exception       MimeTypeParseException  if the MIME type can't be parsed
      */
     protected void parse(String parameterList) throws MimeTypeParseException {
         if (parameterList == null)
diff --git a/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java b/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java
index 430b43b1ed7..d2494634410 100644
--- a/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java
+++ b/jaxws/src/java.activation/share/classes/javax/activation/MimetypesFileTypeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +28,8 @@ package javax.activation;
 import java.io.*;
 import java.net.*;
 import java.util.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import com.sun.activation.registries.MimeTypeFile;
 import com.sun.activation.registries.LogSupport;
 
@@ -43,12 +45,19 @@ import com.sun.activation.registries.LogSupport;
  * <ol>
  * <li> Programmatically added entries to the MimetypesFileTypeMap instance.
  * <li> The file {@code .mime.types} in the user's home directory.
- * <li> The file {@literal <}<i>java.home</i>{@literal >}{@code /lib/mime.types}.
+ * <li> The file {@code mime.types} in the Java runtime.
  * <li> The file or resources named {@code META-INF/mime.types}.
  * <li> The file or resource named {@code META-INF/mimetypes.default}
  * (usually found only in the {@code activation.jar} file).
  * </ol>
  * <p>
+ * (The current implementation looks for the {@code mime.types} file
+ * in the Java runtime in the directory <i>java.home</i>{@code /conf}
+ * if it exists, and otherwise in the directory
+ * <i>java.home</i>{@code /lib}, where <i>java.home</i> is the value
+ * of the "java.home" System property.  Note that the "conf" directory was
+ * introduced in JDK 9.)
+ * <p>
  * <b>MIME types file format:</b>
  *
  * <pre>{@code
@@ -72,7 +81,30 @@ public class MimetypesFileTypeMap extends FileTypeMap {
     private MimeTypeFile[] DB;
     private static final int PROG = 0;  // programmatically added entries
 
-    private static String defaultType = "application/octet-stream";
+    private static final String defaultType = "application/octet-stream";
+
+    private static final String confDir;
+
+    static {
+        String dir = null;
+        try {
+            dir = (String)AccessController.doPrivileged(
+                new PrivilegedAction() {
+                    public Object run() {
+                        String home = System.getProperty("java.home");
+                        String newdir = home + File.separator + "conf";
+                        File conf = new File(newdir);
+                        if (conf.exists())
+                            return newdir + File.separator;
+                        else
+                            return home + File.separator + "lib" + File.separator;
+                    }
+                });
+        } catch (Exception ex) {
+            // ignore any exceptions
+        }
+        confDir = dir;
+    }
 
     /**
      * The default constructor.
@@ -97,11 +129,11 @@ public class MimetypesFileTypeMap extends FileTypeMap {
         LogSupport.log("MimetypesFileTypeMap: load SYS");
         try {
             // check system's home
-            String system_mimetypes = System.getProperty("java.home") +
-                File.separator + "lib" + File.separator + "mime.types";
-            mf = loadFile(system_mimetypes);
-            if (mf != null)
-                dbv.addElement(mf);
+            if (confDir != null) {
+                mf = loadFile(confDir + "mime.types");
+                if (mf != null)
+                    dbv.addElement(mf);
+            }
         } catch (SecurityException ex) {}
 
         LogSupport.log("MimetypesFileTypeMap: load JAR");
@@ -239,6 +271,7 @@ public class MimetypesFileTypeMap extends FileTypeMap {
      * added from the named file.
      *
      * @param mimeTypeFileName  the file name
+     * @exception       IOException     for errors reading the file
      */
     public MimetypesFileTypeMap(String mimeTypeFileName) throws IOException {
         this();
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
index d993fd6f5d1..fb83399f496 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,10 +48,10 @@ public class MinimumEscapeHandler implements CharacterEscapeHandler {
         int limit = start+length;
         for (int i = start; i < limit; i++) {
             char c = ch[i];
-                if(c == '&' || c == '<' || c == '>' || c == '\r' || (c == '\"' && isAttVal) ) {
-                if(i!=start)
-                    out.write(ch,start,i-start);
-                start = i+1;
+            if (c == '&' || c == '<' || c == '>' || c == '\r' || (c == '\n' && isAttVal) || (c == '\"' && isAttVal)) {
+                if (i != start)
+                    out.write(ch, start, i - start);
+                start = i + 1;
                 switch (ch[i]) {
                     case '&':
                         out.write("&amp;");
@@ -65,6 +65,14 @@ public class MinimumEscapeHandler implements CharacterEscapeHandler {
                     case '\"':
                         out.write("&quot;");
                         break;
+                    case '\n':
+                    case '\r':
+                        out.write("&#");
+                        out.write(Integer.toString(c));
+                        out.write(';');
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Cannot escape: '" + c + "'");
                 }
             }
         }
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java
new file mode 100644
index 00000000000..5edfb0c3aa0
--- /dev/null
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NoEscapeHandler.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.bind.marshaller;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Performs no character escaping.
+ *
+ * @author
+ *     Roman Grigoriadi (roman.grigoriadi@oracle.com)
+ */
+public class NoEscapeHandler implements CharacterEscapeHandler {
+
+    public static final NoEscapeHandler theInstance = new NoEscapeHandler();
+
+    @Override
+    public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException {
+        out.write(ch, start, length);
+    }
+}
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
index 21420097f63..86742930830 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -76,7 +76,7 @@ final class BridgeImpl<T> extends InternalBridge<T> {
 
     public void marshal(Marshaller _m, T t, XMLStreamWriter output) throws JAXBException {
         MarshallerImpl m = (MarshallerImpl)_m;
-        m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context),new StAXPostInitAction(output,m.serializer));
+        m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context, m.getEscapeHandler()),new StAXPostInitAction(output,m.serializer));
     }
 
     public void marshal(Marshaller _m, T t, OutputStream output, NamespaceContext nsContext) throws JAXBException {
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
index 4891984195b..5796b019954 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -165,7 +165,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
 
     @Override
     public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
-        write(obj, XMLStreamWriterOutput.create(writer,context), new StAXPostInitAction(writer,serializer));
+        write(obj, XMLStreamWriterOutput.create(writer,context, escapeHandler), new StAXPostInitAction(writer,serializer));
     }
 
     @Override
@@ -371,6 +371,15 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
     }
 
 
+    /**
+     * Returns escape handler provided with JAXB context parameters.
+     *
+     * @return escape handler
+     */
+    CharacterEscapeHandler getEscapeHandler() {
+        return escapeHandler;
+    }
+
     //
     //
     // create XMLWriter by specifing various type of output.
@@ -436,13 +445,14 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
         if(encoding.equals("UTF-8")) {
             Encoded[] table = context.getUTF8NameTable();
             final UTF8XmlOutput out;
+            CharacterEscapeHandler ceh = createEscapeHandler(encoding);
             if(isFormattedOutput())
-                out = new IndentingUTF8XmlOutput(os, indent, table, escapeHandler);
+                out = new IndentingUTF8XmlOutput(os, indent, table, ceh);
             else {
                 if(c14nSupport)
-                    out = new C14nXmlOutput(os, table, context.c14nSupport, escapeHandler);
+                    out = new C14nXmlOutput(os, table, context.c14nSupport, ceh);
                 else
-                    out = new UTF8XmlOutput(os, table, escapeHandler);
+                    out = new UTF8XmlOutput(os, table, ceh);
             }
             if(header!=null)
                 out.setHeader(header);
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
index 2e1ca69389f..4a1de635539 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,22 @@
 
 package com.sun.xml.internal.bind.v2.runtime.output;
 
+import com.sun.xml.internal.bind.marshaller.NoEscapeHandler;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
-import javax.xml.stream.XMLStreamException;
-
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
 import com.sun.xml.internal.fastinfoset.EncodingConstants;
 import com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer;
+import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.stream.XMLStreamException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.WeakHashMap;
-import javax.xml.bind.JAXBContext;
-import com.sun.xml.internal.org.jvnet.fastinfoset.VocabularyApplicationData;
-import org.xml.sax.SAXException;
 
 /**
  * {@link XmlOutput} for {@link StAXDocumentSerializer}.
@@ -220,7 +221,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
 
     public FastInfosetStreamWriterOutput(StAXDocumentSerializer out,
             JAXBContextImpl context) {
-        super(out);
+        super(out, NoEscapeHandler.theInstance);
 
         this.fiout = out;
         this.localNames = context.getUTF8NameTable();
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
index 67d7fb40d44..c39199f814d 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -27,6 +27,7 @@ package com.sun.xml.internal.bind.v2.runtime.output;
 
 import javax.xml.stream.XMLStreamException;
 
+import com.sun.xml.internal.bind.marshaller.NoEscapeHandler;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
 
 import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
@@ -40,7 +41,7 @@ public final class StAXExStreamWriterOutput extends XMLStreamWriterOutput {
     private final XMLStreamWriterEx out;
 
     public StAXExStreamWriterOutput(XMLStreamWriterEx out) {
-        super(out);
+        super(out, NoEscapeHandler.theInstance);
         this.out = out;
     }
 
diff --git a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
index c4721fd5ea8..892adcd1d1f 100644
--- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
+++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -26,15 +26,16 @@
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
+import java.io.Writer;
 import java.lang.reflect.Constructor;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import com.sun.xml.internal.bind.marshaller.CharacterEscapeHandler;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallerImpl;
 import org.xml.sax.SAXException;
 
 /**
@@ -53,7 +54,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
      * Creates a new {@link XmlOutput} from a {@link XMLStreamWriter}.
      * This method recognizes an FI StAX writer.
      */
-    public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context) {
+    public static XmlOutput create(XMLStreamWriter out, JAXBContextImpl context, CharacterEscapeHandler escapeHandler) {
         // try optimized path
         final Class writerClass = out.getClass();
         if (writerClass==FI_STAX_WRITER_CLASS) {
@@ -69,17 +70,26 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
             }
         }
 
+        CharacterEscapeHandler xmlStreamEscapeHandler = escapeHandler != null ?
+                escapeHandler : NewLineEscapeHandler.theInstance;
+
         // otherwise the normal writer.
-        return new XMLStreamWriterOutput(out);
+        return new XMLStreamWriterOutput(out, xmlStreamEscapeHandler);
     }
 
 
     private final XMLStreamWriter out;
 
+    private final CharacterEscapeHandler escapeHandler;
+
+    private final XmlStreamOutWriterAdapter writerWrapper;
+
     protected final char[] buf = new char[256];
 
-    protected XMLStreamWriterOutput(XMLStreamWriter out) {
+    protected XMLStreamWriterOutput(XMLStreamWriter out, CharacterEscapeHandler escapeHandler) {
         this.out = out;
+        this.escapeHandler = escapeHandler;
+        this.writerWrapper = new XmlStreamOutWriterAdapter(out);
     }
 
     // not called if we are generating fragments
@@ -137,7 +147,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
     public void text(String value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException {
         if(needsSeparatingWhitespace)
             out.writeCharacters(" ");
-        out.writeCharacters(value);
+        escapeHandler.escape(value.toCharArray(), 0, value.length(), false, writerWrapper);
     }
 
     public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException, SAXException, XMLStreamException {
@@ -207,4 +217,81 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
         }
     }
 
+    /**
+     * Performs character escaping only for new lines.
+     */
+    private static class NewLineEscapeHandler implements CharacterEscapeHandler {
+
+        public static final NewLineEscapeHandler theInstance = new NewLineEscapeHandler();
+
+        @Override
+        public void escape(char[] ch, int start, int length, boolean isAttVal, Writer out) throws IOException {
+            int limit = start+length;
+            int lastEscaped = start;
+            for (int i = start; i < limit; i++) {
+                char c = ch[i];
+                if (c == '\r' || c == '\n') {
+                    if (i != lastEscaped) {
+                        out.write(ch, lastEscaped, i - lastEscaped);
+                    }
+                    lastEscaped = i + 1;
+                    if (out instanceof XmlStreamOutWriterAdapter) {
+                        try {
+                            ((XmlStreamOutWriterAdapter)out).writeEntityRef("#x" + Integer.toHexString(c));
+                        } catch (XMLStreamException e) {
+                            throw new IOException("Error writing xml stream", e);
+                        }
+                    } else {
+                        out.write("&#x");
+                        out.write(Integer.toHexString(c));
+                        out.write(';');
+                    }
+                }
+            }
+
+            if (lastEscaped != limit) {
+                out.write(ch, lastEscaped, length - lastEscaped);
+            }
+        }
+    }
+
+    private static final class XmlStreamOutWriterAdapter extends Writer {
+
+        private final XMLStreamWriter writer;
+
+        private XmlStreamOutWriterAdapter(XMLStreamWriter writer) {
+            this.writer = writer;
+        }
+
+        @Override
+        public void write(char[] cbuf, int off, int len) throws IOException {
+            try {
+                writer.writeCharacters(cbuf, off, len);
+            } catch (XMLStreamException e) {
+                throw new IOException("Error writing XML stream", e);
+            }
+        }
+
+        public void writeEntityRef(String entityReference) throws XMLStreamException {
+            writer.writeEntityRef(entityReference);
+        }
+
+        @Override
+        public void flush() throws IOException {
+            try {
+                writer.flush();
+            } catch (XMLStreamException e) {
+                throw new IOException("Error flushing XML stream", e);
+            }
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                writer.close();
+            } catch (XMLStreamException e) {
+                throw new IOException("Error closing XML stream", e);
+            }
+        }
+    }
 }
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java
index d59b0e40471..278756423e0 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ContextFinder.java
@@ -150,13 +150,14 @@ class ContextFinder {
      * Create an instance of a class using the specified ClassLoader
      */
     static JAXBContext newInstance(String contextPath,
+                                   Class[] contextPathClasses,
                                    String className,
                                    ClassLoader classLoader,
                                    Map properties) throws JAXBException {
 
         try {
             Class spFactory = ServiceLoaderUtil.safeLoadClass(className, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader);
-            return newInstance(contextPath, spFactory, classLoader, properties);
+            return newInstance(contextPath, contextPathClasses, spFactory, classLoader, properties);
         } catch (ClassNotFoundException x) {
             throw new JAXBException(Messages.format(Messages.DEFAULT_PROVIDER_NOT_FOUND), x);
 
@@ -175,6 +176,7 @@ class ContextFinder {
     }
 
     static JAXBContext newInstance(String contextPath,
+                                   Class[] contextPathClasses,
                                    Class spFactory,
                                    ClassLoader classLoader,
                                    Map properties) throws JAXBException {
@@ -212,6 +214,9 @@ class ContextFinder {
                 // the cast would fail, so generate an exception with a nice message
                 throw handleClassCastException(context.getClass(), JAXBContext.class);
             }
+
+            ModuleUtil.delegateAddOpensToImplModule(contextPathClasses, spFactory);
+
             return (JAXBContext) context;
         } catch (InvocationTargetException x) {
             // throw if it is exception not to be wrapped
@@ -277,6 +282,7 @@ class ContextFinder {
                 // the cast would fail, so generate an exception with a nice message
                 throw handleClassCastException(context.getClass(), JAXBContext.class);
             }
+            ModuleUtil.delegateAddOpensToImplModule(classes,  spFactory);
             return (JAXBContext) context;
 
         } catch (NoSuchMethodException | IllegalAccessException e) {
@@ -295,50 +301,52 @@ class ContextFinder {
                             ClassLoader classLoader,
                             Map properties) throws JAXBException {
 
-        StringTokenizer packages = new StringTokenizer(contextPath, ":");
-        if (!packages.hasMoreTokens()) {
+        if (contextPath == null || contextPath.isEmpty()) {
             // no context is specified
             throw new JAXBException(Messages.format(Messages.NO_PACKAGE_IN_CONTEXTPATH));
         }
 
-        // search for jaxb.properties in the class loader of each class first
-        logger.fine("Searching jaxb.properties");
-        while (packages.hasMoreTokens()) {
-            // com.acme.foo - > com/acme/foo/jaxb.properties
-            String factoryClassName =
-                    classNameFromPackageProperties(
-                        classLoader,
-                        packages.nextToken(":").replace('.', '/'),
-                        factoryId,
-                        JAXB_CONTEXT_FACTORY_DEPRECATED);
+        //ModuleUtil is mr-jar class, scans context path for jaxb classes on jdk9 and higher
+        Class[] contextPathClasses = ModuleUtil.getClassesFromContextPath(contextPath, classLoader);
 
-            if (factoryClassName != null) {
-                return newInstance(contextPath, factoryClassName, classLoader, properties);
-            }
+        //first try with classloader#getResource
+        String factoryClassName = jaxbProperties(contextPath, classLoader, factoryId);
+        if (factoryClassName == null && contextPathClasses != null) {
+            //try with class#getResource
+            factoryClassName = jaxbProperties(contextPathClasses, factoryId);
         }
 
+        if (factoryClassName != null) {
+            return newInstance(contextPath, contextPathClasses, factoryClassName, classLoader, properties);
+        }
+
+
         String factoryName = classNameFromSystemProperties();
-        if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
+        if (factoryName != null) return newInstance(contextPath, contextPathClasses, factoryName, classLoader, properties);
 
         JAXBContextFactory obj = ServiceLoaderUtil.firstByServiceLoader(
                 JAXBContextFactory.class, logger, EXCEPTION_HANDLER);
 
-        if (obj != null) return obj.createContext(contextPath, classLoader, properties);
+        if (obj != null) {
+            JAXBContext context = obj.createContext(contextPath, classLoader, properties);
+            ModuleUtil.delegateAddOpensToImplModule(contextPathClasses, obj.getClass());
+            return context;
+        }
 
         // to ensure backwards compatibility
         factoryName = firstByServiceLoaderDeprecated(JAXBContext.class, classLoader);
-        if (factoryName != null) return newInstance(contextPath, factoryName, classLoader, properties);
+        if (factoryName != null) return newInstance(contextPath, contextPathClasses, factoryName, classLoader, properties);
 
         Class ctxFactory = (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader(
                 "javax.xml.bind.JAXBContext", logger);
 
         if (ctxFactory != null) {
-            return newInstance(contextPath, ctxFactory, classLoader, properties);
+            return newInstance(contextPath, contextPathClasses, ctxFactory, classLoader, properties);
         }
 
         // else no provider found
         logger.fine("Trying to create the platform default provider");
-        return newInstance(contextPath, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
+        return newInstance(contextPath, contextPathClasses, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
     }
 
     static JAXBContext find(Class<?>[] classes, Map<String, ?> properties) throws JAXBException {
@@ -356,13 +364,18 @@ class ContextFinder {
             // TODO: it's easier to look things up from the class
             // c.getResourceAsStream("jaxb.properties");
 
-            String factoryClassName =
-                    classNameFromPackageProperties(
-                            getClassClassLoader(c),
-                            c.getPackage().getName().replace('.', '/'),
-                            JAXBContext.JAXB_CONTEXT_FACTORY, JAXB_CONTEXT_FACTORY_DEPRECATED);
+            URL jaxbPropertiesUrl = getResourceUrl(c, "jaxb.properties");
+
+            if (jaxbPropertiesUrl != null) {
+
+                String factoryClassName =
+                        classNameFromPackageProperties(
+                                jaxbPropertiesUrl,
+                                JAXBContext.JAXB_CONTEXT_FACTORY, JAXB_CONTEXT_FACTORY_DEPRECATED);
+
+                return newInstance(classes, properties, factoryClassName);
+            }
 
-            if (factoryClassName != null) return newInstance(classes, properties, factoryClassName);
         }
 
         String factoryClassName = classNameFromSystemProperties();
@@ -371,7 +384,11 @@ class ContextFinder {
         JAXBContextFactory factory =
                 ServiceLoaderUtil.firstByServiceLoader(JAXBContextFactory.class, logger, EXCEPTION_HANDLER);
 
-        if (factory != null) return factory.createContext(classes, properties);
+        if (factory != null) {
+            JAXBContext context = factory.createContext(classes, properties);
+            ModuleUtil.delegateAddOpensToImplModule(classes, factory.getClass());
+            return context;
+        }
 
         // to ensure backwards compatibility
         String className = firstByServiceLoaderDeprecated(JAXBContext.class, getContextClassLoader());
@@ -395,22 +412,20 @@ class ContextFinder {
      * first factoryId should be the preferred one,
      * more of those can be provided to support backwards compatibility
      */
-    private static String classNameFromPackageProperties(ClassLoader classLoader,
-                                                         String packageName,
+    private static String classNameFromPackageProperties(URL packagePropertiesUrl,
                                                          String ... factoryIds) throws JAXBException {
 
-        String resourceName = packageName + "/jaxb.properties";
-        logger.log(Level.FINE, "Trying to locate {0}", resourceName);
-        Properties props = loadJAXBProperties(classLoader, resourceName);
-        if (props != null) {
-            for(String factoryId : factoryIds) {
-                if (props.containsKey(factoryId)) {
-                    return props.getProperty(factoryId);
-                }
+        logger.log(Level.FINE, "Trying to locate {0}", packagePropertiesUrl.toString());
+        Properties props = loadJAXBProperties(packagePropertiesUrl);
+        for(String factoryId : factoryIds) {
+            if (props.containsKey(factoryId)) {
+                return props.getProperty(factoryId);
             }
-            throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryIds[0]));
         }
-        return null;
+        //Factory key not found
+        String propertiesUrl = packagePropertiesUrl.toExternalForm();
+        String packageName = propertiesUrl.substring(0, propertiesUrl.indexOf("/jaxb.properties"));
+        throw new JAXBException(Messages.format(Messages.MISSING_PROPERTY, packageName, factoryIds[0]));
     }
 
     private static String classNameFromSystemProperties() throws JAXBException {
@@ -452,30 +467,40 @@ class ContextFinder {
         return value;
     }
 
-    private static Properties loadJAXBProperties(ClassLoader classLoader,
-                                                 String propFileName) throws JAXBException {
+    private static Properties loadJAXBProperties(URL url) throws JAXBException {
 
-        Properties props = null;
         try {
-            URL url;
-            if (classLoader == null)
-                url = ClassLoader.getSystemResource(propFileName);
-            else
-                url = classLoader.getResource(propFileName);
-
-            if (url != null) {
-                logger.log(Level.FINE, "loading props from {0}", url);
-                props = new Properties();
-                InputStream is = url.openStream();
-                props.load(is);
-                is.close();
-            }
+            Properties props;
+            logger.log(Level.FINE, "loading props from {0}", url);
+            props = new Properties();
+            InputStream is = url.openStream();
+            props.load(is);
+            is.close();
+            return props;
         } catch (IOException ioe) {
-            logger.log(Level.FINE, "Unable to load " + propFileName, ioe);
+            logger.log(Level.FINE, "Unable to load " + url.toString(), ioe);
             throw new JAXBException(ioe.toString(), ioe);
         }
+    }
 
-        return props;
+    /**
+     * If run on JPMS package containing resource must be open unconditionally.
+     *
+     * @param classLoader classloader to load resource with
+     * @param resourceName qualified name of the resource
+     * @return resource url if found
+     */
+    private static URL getResourceUrl(ClassLoader classLoader, String resourceName) {
+        URL url;
+        if (classLoader == null)
+            url = ClassLoader.getSystemResource(resourceName);
+        else
+            url = classLoader.getResource(resourceName);
+        return url;
+    }
+
+    private static URL getResourceUrl(Class<?> clazz, String resourceName) {
+        return clazz.getResource(resourceName);
     }
 
 
@@ -606,4 +631,28 @@ class ContextFinder {
         }
     }
 
+    private static String jaxbProperties(String contextPath, ClassLoader classLoader, String factoryId) throws JAXBException {
+        String[] packages = contextPath.split(":");
+
+        for (String pkg : packages) {
+            String pkgUrl = pkg.replace('.', '/');
+            URL jaxbPropertiesUrl = getResourceUrl(classLoader, pkgUrl + "/jaxb.properties");
+            if (jaxbPropertiesUrl != null) {
+                return classNameFromPackageProperties(jaxbPropertiesUrl,
+                                                      factoryId, JAXB_CONTEXT_FACTORY_DEPRECATED);
+            }
+        }
+        return null;
+    }
+
+    private static String jaxbProperties(Class[] classesFromContextPath, String factoryId) throws JAXBException {
+        for (Class c : classesFromContextPath) {
+            URL jaxbPropertiesUrl = getResourceUrl(c, "jaxb.properties");
+            if (jaxbPropertiesUrl != null) {
+                return classNameFromPackageProperties(jaxbPropertiesUrl, factoryId, JAXB_CONTEXT_FACTORY_DEPRECATED);
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java
index 4b4f6e55c46..9bb4ceae18f 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -27,11 +27,11 @@ package javax.xml.bind;
 
 import org.w3c.dom.Node;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
-import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * The {@code JAXBContext} class provides the client's entry point to the
@@ -227,6 +227,9 @@ import java.io.InputStream;
  * This phase of the look up allows some packages to force the use of a certain JAXB implementation.
  * (For example, perhaps the schema compiler has generated some vendor extension in the code.)
  *
+ * <p>
+ * This configuration method is deprecated.
+ *
  * <li>
  * If the system property {@link #JAXB_CONTEXT_FACTORY} exists, then its value is assumed to be the provider
  * factory class. If no such property exists, properties {@code "javax.xml.bind.context.factory"} and
@@ -332,7 +335,14 @@ public abstract class JAXBContext {
      * the context class loader of the current thread.
      *
      * @throws JAXBException if an error was encountered while creating the
-     *               {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+     *                       {@code JAXBContext} such as
+     * <ol>
+     *   <li>failure to locate either ObjectFactory.class or jaxb.index in the packages</li>
+     *   <li>an ambiguity among global elements contained in the contextPath</li>
+     *   <li>failure to locate a value for the context factory provider property</li>
+     *   <li>mixing schema derived packages from different providers on the same contextPath</li>
+     *   <li>packages are not open to {@code java.xml.bind} module</li>
+     * </ol>
      */
     public static JAXBContext newInstance( String contextPath )
             throws JAXBException {
@@ -414,16 +424,26 @@ public abstract class JAXBContext {
      * <p>
      * The steps involved in discovering the JAXB implementation is discussed in the class javadoc.
      *
-     * @param contextPath list of java package names that contain schema
-     *                    derived class and/or java to schema (JAXB-annotated)
-     *                    mapped classes
+     * @param contextPath
+     *      List of java package names that contain schema
+     *      derived class and/or java to schema (JAXB-annotated)
+     *      mapped classes.
+     *      Packages in {@code contextPath} that are in named modules must be
+     *      {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      * @param classLoader
      *      This class loader will be used to locate the implementation
      *      classes.
      *
      * @return a new instance of a {@code JAXBContext}
      * @throws JAXBException if an error was encountered while creating the
-     *               {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+     *                       {@code JAXBContext} such as
+     * <ol>
+     *   <li>failure to locate either ObjectFactory.class or jaxb.index in the packages</li>
+     *   <li>an ambiguity among global elements contained in the contextPath</li>
+     *   <li>failure to locate a value for the context factory provider property</li>
+     *   <li>mixing schema derived packages from different providers on the same contextPath</li>
+     *   <li>packages are not open to {@code java.xml.bind} module</li>
+     * </ol>
      */
     public static JAXBContext newInstance( String contextPath, ClassLoader classLoader ) throws JAXBException {
 
@@ -442,7 +462,12 @@ public abstract class JAXBContext {
      * The interpretation of properties is up to implementations. Implementations must
      * throw {@code JAXBException} if it finds properties that it doesn't understand.
      *
-     * @param contextPath list of java package names that contain schema derived classes
+     * @param contextPath
+     *      List of java package names that contain schema
+     *      derived class and/or java to schema (JAXB-annotated)
+     *      mapped classes.
+     *      Packages in {@code contextPath} that are in named modules must be
+     *      {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      * @param classLoader
      *      This class loader will be used to locate the implementation classes.
      * @param properties
@@ -457,6 +482,7 @@ public abstract class JAXBContext {
      *   <li>an ambiguity among global elements contained in the contextPath</li>
      *   <li>failure to locate a value for the context factory provider property</li>
      *   <li>mixing schema derived packages from different providers on the same contextPath</li>
+     *   <li>packages are not open to {@code java.xml.bind} module</li>
      * </ol>
      * @since 1.6, JAXB 2.0
      */
@@ -588,15 +614,27 @@ public abstract class JAXBContext {
      * The steps involved in discovering the JAXB implementation is discussed in the class javadoc.
      *
      * @param classesToBeBound
-     *      list of java classes to be recognized by the new {@link JAXBContext}.
+     *      List of java classes to be recognized by the new {@link JAXBContext}.
+     *      Classes in {@code classesToBeBound} that are in named modules must be in a package
+     *      that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      *      Can be empty, in which case a {@link JAXBContext} that only knows about
      *      spec-defined classes will be returned.
      *
      * @return
      *      A new instance of a {@code JAXBContext}.
      *
-     * @throws JAXBException if an error was encountered while creating the
-     *               {@code JAXBContext}. See {@link JAXBContext#newInstance(Class[], Map)} for details.
+     * @throws JAXBException
+     *      if an error was encountered while creating the
+     *      {@code JAXBContext}, such as (but not limited to):
+     * <ol>
+     *  <li>No JAXB implementation was discovered
+     *  <li>Classes use JAXB annotations incorrectly
+     *  <li>Classes have colliding annotations (i.e., two classes with the same type name)
+     *  <li>The JAXB implementation was unable to locate
+     *      provider-specific out-of-band information (such as additional
+     *      files generated at the development time.)
+     *  <li>{@code classesToBeBound} are not open to {@code java.xml.bind} module
+     * </ol>
      *
      * @throws IllegalArgumentException
      *      if the parameter contains {@code null} (i.e., {@code newInstance(null);})
@@ -621,7 +659,9 @@ public abstract class JAXBContext {
      * throw {@code JAXBException} if it finds properties that it doesn't understand.
      *
      * @param classesToBeBound
-     *      list of java classes to be recognized by the new {@link JAXBContext}.
+     *      List of java classes to be recognized by the new {@link JAXBContext}.
+     *      Classes in {@code classesToBeBound} that are in named modules must be in a package
+     *      that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      *      Can be empty, in which case a {@link JAXBContext} that only knows about
      *      spec-defined classes will be returned.
      * @param properties
@@ -641,6 +681,7 @@ public abstract class JAXBContext {
      *  <li>The JAXB implementation was unable to locate
      *      provider-specific out-of-band information (such as additional
      *      files generated at the development time.)
+     *  <li>{@code classesToBeBound} are not open to {@code java.xml.bind} module
      * </ol>
      *
      * @throws IllegalArgumentException
@@ -702,6 +743,7 @@ public abstract class JAXBContext {
      *                       {@code Validator} object
      * @deprecated since JAXB2.0
      */
+    @Deprecated
     public abstract Validator createValidator() throws JAXBException;
 
     /**
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
index ef98dc61e4f..90fad73aea8 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/JAXBContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -44,7 +44,9 @@ public interface JAXBContextFactory {
      * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)}
      *
      * @param classesToBeBound
-     *      list of java classes to be recognized by the new {@link JAXBContext}.
+     *      List of java classes to be recognized by the new {@link JAXBContext}.
+     *      Classes in {@code classesToBeBound} that are in named modules must be in a package
+     *      that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      *      Can be empty, in which case a {@link JAXBContext} that only knows about
      *      spec-defined classes will be returned.
      * @param properties
@@ -56,7 +58,16 @@ public interface JAXBContextFactory {
      *
      * @throws JAXBException
      *      if an error was encountered while creating the
-     *      {@code JAXBContext}. See {@link JAXBContext#newInstance(Class[], Map)} for details.
+     *      {@code JAXBContext}, such as (but not limited to):
+     * <ol>
+     *  <li>No JAXB implementation was discovered
+     *  <li>Classes use JAXB annotations incorrectly
+     *  <li>Classes have colliding annotations (i.e., two classes with the same type name)
+     *  <li>The JAXB implementation was unable to locate
+     *      provider-specific out-of-band information (such as additional
+     *      files generated at the development time.)
+     *  <li>{@code classesToBeBound} are not open to {@code java.xml.bind} module
+     * </ol>
      *
      * @throws IllegalArgumentException
      *      if the parameter contains {@code null} (i.e., {@code newInstance(null,someMap);})
@@ -77,7 +88,10 @@ public interface JAXBContextFactory {
      * The interpretation of properties is up to implementations. Implementations must
      * throw {@code JAXBException} if it finds properties that it doesn't understand.
      *
-     * @param contextPath list of java package names that contain schema derived classes
+     * @param contextPath
+     *      List of java package names that contain schema derived classes.
+     *      Classes in {@code classesToBeBound} that are in named modules must be in a package
+     *      that is {@linkplain java.lang.Module#isOpen open} to at least the {@code java.xml.bind} module.
      * @param classLoader
      *      This class loader will be used to locate the implementation classes.
      * @param properties
@@ -86,7 +100,14 @@ public interface JAXBContextFactory {
      *
      * @return a new instance of a {@code JAXBContext}
      * @throws JAXBException if an error was encountered while creating the
-     *      {@code JAXBContext}. See {@link JAXBContext#newInstance(String, ClassLoader, Map)} for details.
+     *                       {@code JAXBContext} such as
+     * <ol>
+     *   <li>failure to locate either ObjectFactory.class or jaxb.index in the packages</li>
+     *   <li>an ambiguity among global elements contained in the contextPath</li>
+     *   <li>failure to locate a value for the context factory provider property</li>
+     *   <li>mixing schema derived packages from different providers on the same contextPath</li>
+     *   <li>packages are not open to {@code java.xml.bind} module</li>
+     * </ol>
      *
      * @since 9, JAXB 2.3
      */
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java
index 79ede4ff185..cbde96f86e2 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.java
@@ -91,4 +91,10 @@ class Messages
 
     static final String ILLEGAL_CAST = // 2 args
         "JAXBContext.IllegalCast";
+
+    static final String ERROR_LOAD_CLASS = // 2 args
+            "ContextFinder.ErrorLoadClass";
+
+    static final String JAXB_CLASSES_NOT_OPEN = // 1 arg
+            "JAXBClasses.notOpen";
 }
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties
index 548001abfe7..8ea89d31487 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Messages.properties
@@ -44,6 +44,11 @@ ContextFinder.MissingProperty = \
 ContextFinder.NoPackageInContextPath = \
     No package name is given
 
+ContextFinder.ErrorLoadClass = \
+    Error loading class {0} listed in {1}, make sure that entries are accessable \
+    on CLASSPATH and of the form ClassName or OuterClass.InnerClass \
+    not ClassName.class or fully.qualified.ClassName
+
 PropertyException.NameValue = \
         name: {0} value: {1}
 
@@ -52,3 +57,6 @@ DatatypeConverter.ConverterMustNotBeNull = \
 
 JAXBContext.IllegalCast = \
     ClassCastException: attempting to cast {0} to {1}.  Please make sure that you are specifying the proper ClassLoader.
+
+JAXBClasses.notOpen = \
+    Package {0} with JAXB class {1} defined in a module {2} must be open to at least java.xml.bind module.
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java
new file mode 100644
index 00000000000..d78441ca835
--- /dev/null
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ModuleUtil.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2017, 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 javax.xml.bind;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.Module;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Propagates openness of JAXB annottated classess packages to JAXB impl module.
+ *
+ * @author Roman Grigoriadi
+ */
+class ModuleUtil {
+
+    private static Logger logger = Logger.getLogger("javax.xml.bind");
+
+    /**
+     * Resolves classes from context path.
+     * Only one class per package is needed to access its {@link java.lang.Module}
+     */
+    static Class[] getClassesFromContextPath(String contextPath, ClassLoader classLoader) throws JAXBException {
+        List<Class> classes = new ArrayList<>();
+        if (contextPath == null || contextPath.isEmpty()){
+          return classes.toArray(new Class[]{});
+        }
+
+        String [] tokens = contextPath.split(":");
+        for (String pkg : tokens){
+
+           // look for ObjectFactory and load it
+           final Class<?> o;
+           try {
+               o = classLoader.loadClass(pkg+".ObjectFactory");
+               classes.add(o);
+               continue;
+           } catch (ClassNotFoundException e) {
+               // not necessarily an error
+           }
+
+           // look for jaxb.index and load the list of classes
+           try {
+               final Class firstByJaxbIndex = findFirstByJaxbIndex(pkg, classLoader);
+               if (firstByJaxbIndex != null) {
+                   classes.add(firstByJaxbIndex);
+               }
+           } catch (IOException e) {
+               throw new JAXBException(e);
+           }
+        }
+
+        if (logger.isLoggable(Level.FINE)) {
+            logger.log(Level.FINE, "Resolved classes from context path: {0}", classes);
+        }
+        return classes.toArray(new Class[]{});
+    }
+
+    /**
+     * Find first class in package by {@code jaxb.index} file.
+     */
+    static Class findFirstByJaxbIndex(String pkg, ClassLoader classLoader) throws IOException, JAXBException {
+        final String resource = pkg.replace('.', '/') + "/jaxb.index";
+        final InputStream resourceAsStream = classLoader.getResourceAsStream(resource);
+
+        if (resourceAsStream == null) {
+            return null;
+        }
+
+        BufferedReader in =
+                new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8"));
+        try {
+            String className = in.readLine();
+            while (className != null) {
+                className = className.trim();
+                if (className.startsWith("#") || (className.length() == 0)) {
+                    className = in.readLine();
+                    continue;
+                }
+
+                try {
+                    return classLoader.loadClass(pkg + '.' + className);
+                } catch (ClassNotFoundException e) {
+                    throw new JAXBException(Messages.format(Messages.ERROR_LOAD_CLASS, className, pkg), e);
+                }
+
+            }
+        } finally {
+            in.close();
+        }
+        return null;
+    }
+
+    /**
+     * Implementation may be defined in other module than {@code java.xml.bind}. In that case openness
+     * {@linkplain Module#isOpen open} of classes should be delegated to implementation module.
+     *
+     * @param classes used to resolve module for {@linkplain Module#addOpens(String, Module)}
+     * @param factorySPI used to resolve {@link Module} of the implementation.
+     *
+     * @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module.
+     */
+    static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException {
+        final Module implModule = factorySPI.getModule();
+        if (!implModule.isNamed()) {
+            return;
+        }
+
+        Module jaxbModule = JAXBContext.class.getModule();
+
+        for (Class cls : classes) {
+            final Module classModule = cls.getModule();
+            final String packageName = cls.getPackageName();
+            //no need for unnamed
+            if (!classModule.isNamed()) {
+                continue;
+            }
+            //report error if they are not open to java.xml.bind
+            if (!classModule.isOpen(packageName, jaxbModule)) {
+                throw new JAXBException(Messages.format(Messages.JAXB_CLASSES_NOT_OPEN,
+                                                        packageName, cls.getName(), classModule.getName()));
+            }
+            //propagate openness to impl module
+            classModule.addOpens(packageName, implModule);
+            if (logger.isLoggable(Level.FINE)) {
+                logger.log(Level.FINE, "Propagating openness of package {0} in {1} to {2}.",
+                           new String[]{ packageName, classModule.getName(), implModule.getName() });
+            }
+        }
+    }
+
+}
diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java
index f075443bdfa..f8424dd1881 100644
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Unmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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,6 +23,8 @@
  * questions.
  */
 
+
+
 package javax.xml.bind;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
@@ -975,7 +977,6 @@ public interface Unmarshaller {
      * {@link #isValidating()} API as well as access to the Schema object.
      * To determine if the Unmarshaller has validation enabled, simply
      * test the return type for null:
-     * <p>
      * <pre>{@code
      *   boolean isValidating = u.getSchema()!=null;
      * }</pre>
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
index a032c589dfe..aadf04a996d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
@@ -76,6 +76,7 @@ class HttpSOAPConnection extends SOAPConnection {
         }
     }
 
+    @Override
     public void close() throws SOAPException {
         if (closed) {
             log.severe("SAAJ0002.p2p.close.already.closed.conn");
@@ -86,6 +87,7 @@ class HttpSOAPConnection extends SOAPConnection {
         closed = true;
     }
 
+    @Override
    public SOAPMessage call(SOAPMessage message, Object endPoint)
         throws SOAPException {
         if (closed) {
@@ -348,6 +350,7 @@ class HttpSOAPConnection extends SOAPConnection {
     // Object identifies where the request should be sent.
     // It is required to support objects of type String and java.net.URL.
 
+    @Override
     public SOAPMessage get(Object endPoint) throws SOAPException {
         if (closed) {
             log.severe("SAAJ0011.p2p.get.already.closed.conn");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
index d2e626a045b..c22b8e45e55 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -34,6 +34,7 @@ import javax.xml.soap.*;
  */
 public class HttpSOAPConnectionFactory extends SOAPConnectionFactory {
 
+    @Override
     public SOAPConnection createConnection()
         throws SOAPException
     {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
index df55da3dac3..eab9cc35d38 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +116,7 @@ public class MessagingException extends Exception {
      * Produce the message, include the message from the nested
      * exception if there is one.
      */
+    @Override
     public String getMessage() {
         if (next == null)
             return super.getMessage();
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
index 96a7702e580..d6bd51371a4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
@@ -28,18 +28,20 @@
  */
 
 
-
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
-import java.io.*;
-import java.util.BitSet;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 
 import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.*;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
-
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.BitSet;
 
 /**
  * The MimeMultipart class is an implementation of the abstract Multipart
@@ -67,11 +69,10 @@ import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
  * subtype by using the <code>MimeMultipart(String subtype)</code>
  * constructor.  For example, to create a "multipart/alternative" object,
  * use <code>new MimeMultipart("alternative")</code>.
- *
  */
 
 //TODO: cleanup the SharedInputStream handling
-public  class BMMimeMultipart extends MimeMultipart {
+public class BMMimeMultipart extends MimeMultipart {
 
     /*
      * When true it indicates parsing hasnt been done at all
@@ -120,12 +121,12 @@ public  class BMMimeMultipart extends MimeMultipart {
      */
     public BMMimeMultipart(String subtype) {
         super(subtype);
-        /*
-         * Compute a boundary string.
-        String boundary = UniqueValue.getUniqueBoundaryValue();
-        ContentType cType = new ContentType("multipart", subtype, null);
+    /*
+     * Compute a boundary string.
+    String boundary = UniqueValue.getUniqueBoundaryValue();
+    ContentType cType = new ContentType("multipart", subtype, null);
         contentType.setParameter("boundary", boundary);
-         */
+     */
     }
 
     /**
@@ -144,25 +145,25 @@ public  class BMMimeMultipart extends MimeMultipart {
      * skips the 'preamble' and reads bytes till the terminating
      * boundary and creates MimeBodyParts for each part of the stream.
      *
-     * @param   ds      DataSource, can be a MultipartDataSource.
-     * @param   ct      content type.
-     * @exception MessagingException in case of error.
+     * @param   ct  content type.
+     * @param   ds  DataSource, can be a MultipartDataSource.
+     * @throws  MessagingException in case of error.
      */
     public BMMimeMultipart(DataSource ds, ContentType ct)
-        throws MessagingException {
-        super(ds,ct);
+            throws MessagingException {
+        super(ds, ct);
         boundary = ct.getParameter("boundary");
         /*
-        if (ds instanceof MultipartDataSource) {
-            // ask super to do this for us.
-            setMultipartDataSource((MultipartDataSource)ds);
-            return;
-        }
+    if (ds instanceof MultipartDataSource) {
+        // ask super to do this for us.
+        setMultipartDataSource((MultipartDataSource)ds);
+        return;
+    }
 
-        // 'ds' was not a MultipartDataSource, we have
-        // to parse this ourself.
-        parsed = false;
-        this.ds = ds;
+    // 'ds' was not a MultipartDataSource, we have
+    // to parse this ourself.
+    parsed = false;
+    this.ds = ds;
         if (ct==null)
             contentType = new ContentType(ds.getContentType());
         else
@@ -177,8 +178,8 @@ public  class BMMimeMultipart extends MimeMultipart {
             try {
                 in = ds.getInputStream();
                 if (!(in instanceof ByteArrayInputStream) &&
-                    !(in instanceof BufferedInputStream) &&
-                    !(in instanceof SharedInputStream))
+                        !(in instanceof BufferedInputStream) &&
+                        !(in instanceof SharedInputStream))
                     in = new BufferedInputStream(in);
             } catch (Exception ex) {
                 throw new MessagingException("No inputstream from datasource");
@@ -186,7 +187,7 @@ public  class BMMimeMultipart extends MimeMultipart {
 
             if (!in.markSupported()) {
                 throw new MessagingException(
-                    "InputStream does not support Marking");
+                        "InputStream does not support Marking");
             }
         }
         return in;
@@ -199,10 +200,10 @@ public  class BMMimeMultipart extends MimeMultipart {
      * method is called by all other methods that need data for
      * the body parts, to make sure the data has been parsed.
      *
-     * @since   JavaMail 1.2
+     * @since JavaMail 1.2
      */
     @Override
-    protected  void parse() throws  MessagingException {
+    protected void parse() throws MessagingException {
         if (parsed)
             return;
 
@@ -210,7 +211,7 @@ public  class BMMimeMultipart extends MimeMultipart {
 
         SharedInputStream sin = null;
         if (in instanceof SharedInputStream) {
-            sin = (SharedInputStream)in;
+            sin = (SharedInputStream) in;
         }
 
         String bnd = "--" + boundary;
@@ -231,8 +232,8 @@ public  class BMMimeMultipart extends MimeMultipart {
     }
 
     public MimeBodyPart getNextPart(
-        InputStream stream, byte[] pattern, SharedInputStream sin)
-        throws Exception {
+            InputStream stream, byte[] pattern, SharedInputStream sin)
+            throws Exception {
 
         if (!stream.markSupported()) {
             throw new Exception("InputStream does not support Marking");
@@ -242,7 +243,7 @@ public  class BMMimeMultipart extends MimeMultipart {
             compile(pattern);
             if (!skipPreamble(stream, pattern, sin)) {
                 throw new Exception(
-                    "Missing Start Boundary, or boundary does not start on a new line");
+                        "Missing Start Boundary, or boundary does not start on a new line");
             }
             begining = false;
         }
@@ -256,7 +257,7 @@ public  class BMMimeMultipart extends MimeMultipart {
             b = readHeaders(stream);
             if (b == -1) {
                 throw new Exception(
-                    "End of Stream encountered while reading part headers");
+                        "End of Stream encountered while reading part headers");
             }
             long[] v = new long[1];
             v[0] = -1; // just to ensure the code later sets it correctly
@@ -276,7 +277,7 @@ public  class BMMimeMultipart extends MimeMultipart {
         } else {
             InternetHeaders headers = createInternetHeaders(stream);
             ByteOutputStream baos = new ByteOutputStream();
-            b = readBody(stream, pattern, null,baos, null);
+            b = readBody(stream, pattern, null, baos, null);
             // looks like this check has to be disabled
             // in the old impl it is allowed to have Mime Package
             // without closing boundary
@@ -286,7 +287,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                 }
             }
             MimeBodyPart mbp = createMimeBodyPart(
-                headers, baos.getBytes(), baos.getCount());
+                    headers, baos.getBytes(), baos.getCount());
             addBodyPart(mbp);
             return mbp;
         }
@@ -294,11 +295,11 @@ public  class BMMimeMultipart extends MimeMultipart {
     }
 
     public boolean parse(
-        InputStream stream, byte[] pattern, SharedInputStream sin)
-        throws Exception {
+            InputStream stream, byte[] pattern, SharedInputStream sin)
+            throws Exception {
 
         while (!lastPartFound.get(0) && (b != -1)) {
-           getNextPart(stream, pattern, sin);
+            getNextPart(stream, pattern, sin);
         }
         return true;
     }
@@ -307,7 +308,7 @@ public  class BMMimeMultipart extends MimeMultipart {
         // if the headers are to end properly then there has to be CRLF
         // actually we just need to mark the start and end positions
         int b = is.read();
-        while(b != -1) {
+        while (b != -1) {
             // when it is a shared input stream no need to copy
             if (b == '\r') {
                 b = is.read();
@@ -316,7 +317,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                     if (b == '\r') {
                         b = is.read();
                         if (b == '\n') {
-                           return b;
+                            return b;
                         } else {
                             continue;
                         }
@@ -331,43 +332,43 @@ public  class BMMimeMultipart extends MimeMultipart {
         }
         if (b == -1) {
             throw new Exception(
-            "End of inputstream while reading Mime-Part Headers");
+                    "End of inputstream while reading Mime-Part Headers");
         }
         return b;
     }
 
     private int readBody(
-        InputStream is, byte[] pattern, long[] posVector,
-        ByteOutputStream baos, SharedInputStream sin)
-        throws Exception {
+            InputStream is, byte[] pattern, long[] posVector,
+            ByteOutputStream baos, SharedInputStream sin)
+            throws Exception {
         if (!find(is, pattern, posVector, baos, sin)) {
             throw new Exception(
-            "Missing boundary delimitier while reading Body Part");
+                    "Missing boundary delimitier while reading Body Part");
         }
         return b;
     }
 
     private boolean skipPreamble(
-        InputStream is, byte[] pattern, SharedInputStream sin)
-        throws Exception {
+            InputStream is, byte[] pattern, SharedInputStream sin)
+            throws Exception {
         if (!find(is, pattern, sin)) {
             return false;
         }
         if (lastPartFound.get(0)) {
             throw new Exception(
-            "Found closing boundary delimiter while trying to skip preamble");
+                    "Found closing boundary delimiter while trying to skip preamble");
         }
         return true;
     }
 
 
-    public int  readNext(InputStream is, byte[] buff, int patternLength,
-        BitSet eof, long[] posVector, SharedInputStream sin)
-        throws Exception {
+    public int readNext(InputStream is, byte[] buff, int patternLength,
+                        BitSet eof, long[] posVector, SharedInputStream sin)
+            throws Exception {
 
         int bufferLength = is.read(buffer, 0, patternLength);
         if (bufferLength == -1) {
-           eof.flip(0);
+            eof.flip(0);
         } else if (bufferLength < patternLength) {
             //repeatedly read patternLength - bufferLength
             int temp = 0;
@@ -385,18 +386,18 @@ public  class BMMimeMultipart extends MimeMultipart {
                     }
                     break;
                 }
-                buffer[i] = (byte)temp;
+                buffer[i] = (byte) temp;
             }
-            bufferLength=i;
+            bufferLength = i;
         }
         return bufferLength;
     }
 
     public boolean find(InputStream is, byte[] pattern, SharedInputStream sin)
-        throws Exception {
+            throws Exception {
         int i;
         int l = pattern.length;
-        int lx = l -1;
+        int lx = l - 1;
         BitSet eof = new BitSet(1);
         long[] posVector = new long[1];
 
@@ -409,12 +410,12 @@ public  class BMMimeMultipart extends MimeMultipart {
             }
 
             /*
-            if (bufferLength < l) {
-                //is.reset();
-                return false;
-            }*/
+        if (bufferLength < l) {
+            //is.reset();
+        return false;
+        }*/
 
-            for(i = lx; i >= 0; i--) {
+            for (i = lx; i >= 0; i--) {
                 if (buffer[i] != pattern[i]) {
                     break;
                 }
@@ -435,11 +436,11 @@ public  class BMMimeMultipart extends MimeMultipart {
     }
 
     public boolean find(
-        InputStream is, byte[] pattern, long[] posVector,
-        ByteOutputStream out, SharedInputStream sin) throws Exception {
+            InputStream is, byte[] pattern, long[] posVector,
+            ByteOutputStream out, SharedInputStream sin) throws Exception {
         int i;
         int l = pattern.length;
-        int lx = l -1;
+        int lx = l - 1;
         int bufferLength = 0;
         int s = 0;
         long endPos = -1;
@@ -466,7 +467,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                 // looks like it is allowed to not have a closing boundary
                 //return false;
                 //if (sin != null) {
-                 //   posVector[0] = endPos;
+                //   posVector[0] = endPos;
                 //}
                 b = -1;
                 if ((s == l) && (sin == null)) {
@@ -482,7 +483,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                 } else {
                     // looks like it is allowed to not have a closing boundary
                     // in the old implementation
-                        out.write(buffer, 0, bufferLength);
+                    out.write(buffer, 0, bufferLength);
                 }
                 // looks like it is allowed to not have a closing boundary
                 // in the old implementation
@@ -491,7 +492,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                 return true;
             }
 
-            for(i = lx; i >= 0; i--) {
+            for (i = lx; i >= 0; i--) {
                 if (buffer[i] != pattern[i]) {
                     break;
                 }
@@ -507,7 +508,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                         if (s == 2) {
                             if (prevBuffer[1] == '\n') {
                                 if (prevBuffer[0] != '\r' && prevBuffer[0] != '\n') {
-                                    out.write(prevBuffer,0,1);
+                                    out.write(prevBuffer, 0, 1);
                                 }
                                 if (sin != null) {
                                     posVector[0] = endPos;
@@ -516,15 +517,15 @@ public  class BMMimeMultipart extends MimeMultipart {
                             } else {
                                 throw new Exception(
                                         "Boundary characters encountered in part Body " +
-                                        "without a preceeding CRLF");
+                                                "without a preceeding CRLF");
                             }
 
-                        } else if (s==1) {
+                        } else if (s == 1) {
                             if (prevBuffer[0] != '\n') {
                                 throw new Exception(
                                         "Boundary characters encountered in part Body " +
-                                        "without a preceeding CRLF");
-                            }else {
+                                                "without a preceeding CRLF");
+                            } else {
                                 if (sin != null) {
                                     posVector[0] = endPos;
                                 }
@@ -532,13 +533,13 @@ public  class BMMimeMultipart extends MimeMultipart {
                         }
 
                     } else if (s > 2) {
-                        if ((prevBuffer[s-2] == '\r') && (prevBuffer[s-1] == '\n')) {
+                        if ((prevBuffer[s - 2] == '\r') && (prevBuffer[s - 1] == '\n')) {
                             if (sin != null) {
                                 posVector[0] = endPos - 2;
                             } else {
                                 out.write(prevBuffer, 0, s - 2);
                             }
-                        } else if (prevBuffer[s-1] == '\n') {
+                        } else if (prevBuffer[s - 1] == '\n') {
                             //old impl allowed just a \n
                             if (sin != null) {
                                 posVector[0] = endPos - 1;
@@ -547,8 +548,8 @@ public  class BMMimeMultipart extends MimeMultipart {
                             }
                         } else {
                             throw new Exception(
-                                "Boundary characters encountered in part Body " +
-                                "without a preceeding CRLF");
+                                    "Boundary characters encountered in part Body " +
+                                            "without a preceeding CRLF");
                         }
                     }
                 }
@@ -561,22 +562,22 @@ public  class BMMimeMultipart extends MimeMultipart {
             }
 
             if ((s > 0) && (sin == null)) {
-                if (prevBuffer[s-1] == (byte)13) {
+                if (prevBuffer[s - 1] == (byte) 13) {
                     // if buffer[0] == (byte)10
-                    if (buffer[0] == (byte)10) {
+                    if (buffer[0] == (byte) 10) {
                         int j;
-                        for(j = lx-1; j > 0; j--) {
-                            if (buffer[j+1] != pattern[j]) {
+                        for (j = lx - 1; j > 0; j--) {
+                            if (buffer[j + 1] != pattern[j]) {
                                 break;
-                             }
-                         }
-                         if (j == 0) {
-                             // matched the pattern excluding the last char of the pattern
-                             // so dont write the CR into stream
-                             out.write(prevBuffer,0,s-1);
-                         } else {
-                             out.write(prevBuffer,0,s);
-                         }
+                            }
+                        }
+                        if (j == 0) {
+                            // matched the pattern excluding the last char of the pattern
+                            // so dont write the CR into stream
+                            out.write(prevBuffer, 0, s - 1);
+                        } else {
+                            out.write(prevBuffer, 0, s);
+                        }
                     } else {
                         out.write(prevBuffer, 0, s);
                     }
@@ -612,20 +613,20 @@ public  class BMMimeMultipart extends MimeMultipart {
                 return true;
             } else {
                 throw new Exception(
-                    "transport padding after a Mime Boundary  should end in a CRLF, found CR only");
+                        "transport padding after a Mime Boundary  should end in a CRLF, found CR only");
             }
         }
 
         if (b == '-') {
             b = is.read();
             if (b != '-') {
-               throw new Exception(
-                   "Unexpected singular '-' character after Mime Boundary");
+                throw new Exception(
+                        "Unexpected singular '-' character after Mime Boundary");
             } else {
                 //System.out.println("Last Part Found");
                 lastPartFound.flip(0);
                 // read the next char
-                b  = is.read();
+                b = is.read();
             }
         }
 
@@ -641,7 +642,7 @@ public  class BMMimeMultipart extends MimeMultipart {
                     b = is.read();
                 }
                 if (b == '\n') {
-                   return true;
+                    return true;
                 }
             }
         }
@@ -673,7 +674,8 @@ public  class BMMimeMultipart extends MimeMultipart {
 
         // Initialise Good Suffix Shift table
         gss = new int[l];
-  NEXT: for (i = l; i > 0; i--) {
+        NEXT:
+        for (i = l; i > 0; i--) {
             // j is the beginning index of suffix being considered
             for (j = l - 1; j >= i; j--) {
                 // Testing for good suffix
@@ -681,9 +683,9 @@ public  class BMMimeMultipart extends MimeMultipart {
                     // pattern[j..len] is a good suffix
                     gss[j - 1] = i;
                 } else {
-                   // No match. The array has already been
-                   // filled up with correct values before.
-                   continue NEXT;
+                    // No match. The array has already been
+                    // filled up with correct values before.
+                    continue NEXT;
                 }
             }
             while (j > 0) {
@@ -756,6 +758,7 @@ public  class BMMimeMultipart extends MimeMultipart {
             this.contentType.setParameter("boundary", bnd);
         }
     }
+
     public String getBoundary() {
         return this.boundary;
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
index 84616c89b96..0c724613b7d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
@@ -320,15 +320,15 @@ public final class InternetHeaders {
      * @return list of header lines.
      */
     public List<String> getAllHeaderLines() {
-        if(headerValueView==null)
+        if (headerValueView == null)
             headerValueView = new AbstractList<String>() {
                 @Override
-                                public String get(int index) {
+                public String get(int index) {
                     return headers.get(index).line;
                 }
 
                 @Override
-                                public int size() {
+                public int size() {
                     return headers.size();
                 }
             };
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
index 6c5bf210d13..02437053265 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
@@ -31,15 +31,21 @@
 
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
-import java.io.*;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MultipartDataSource;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.LineInputStream;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
+import com.sun.xml.internal.messaging.saaj.util.FinalArrayList;
+import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
 
 import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.*;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.*;
-import com.sun.xml.internal.messaging.saaj.util.FinalArrayList;
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * The MimeMultipart class is an implementation
@@ -211,7 +217,7 @@ public  class MimeMultipart {
      * @exception       MessagingException if no such MimeBodyPart exists
      */
     public  MimeBodyPart getBodyPart(int index)
-                        throws MessagingException {
+            throws MessagingException {
         parse();
         if (parts == null)
             throw new IndexOutOfBoundsException("No such BodyPart");
@@ -228,19 +234,19 @@ public  class MimeMultipart {
      * @exception       MessagingException if no such MimeBodyPart exists.
      */
     public  MimeBodyPart getBodyPart(String CID)
-                        throws MessagingException {
+            throws MessagingException {
         parse();
 
         int count = getCount();
         for (int i = 0; i < count; i++) {
            MimeBodyPart part = getBodyPart(i);
            String s = part.getContentID();
-           // Old versions of AXIS2 put angle brackets around the content
-           // id but not the start param
-           String sNoAngle = (s!= null) ? s.replaceFirst("^<", "").replaceFirst(">$", "")
-                   :null;
+               // Old versions of AXIS2 put angle brackets around the content
+               // id but not the start param
+               String sNoAngle = (s!= null) ? s.replaceFirst("^<", "").replaceFirst(">$", "")
+                       :null;
            if (s != null && (s.equals(CID) || CID.equals(sNoAngle)))
-                return part;
+               return part;
         }
         return null;
     }
@@ -319,14 +325,14 @@ public  class MimeMultipart {
         try {
             in = ds.getInputStream();
             if (!(in instanceof ByteArrayInputStream) &&
-                !(in instanceof BufferedInputStream) &&
-                !(in instanceof SharedInputStream))
+                    !(in instanceof BufferedInputStream) &&
+                    !(in instanceof SharedInputStream))
                 in = new BufferedInputStream(in);
         } catch (Exception ex) {
             throw new MessagingException("No inputstream from datasource");
         }
         if (in instanceof SharedInputStream)
-            sin = (SharedInputStream)in;
+            sin = (SharedInputStream) in;
 
         String boundary = "--" + contentType.getParameter("boundary");
         byte[] bndbytes = ASCIIUtility.getBytes(boundary);
@@ -338,12 +344,12 @@ public  class MimeMultipart {
             LineInputStream lin = new LineInputStream(in);
             String line;
             while ((line = lin.readLine()) != null) {
-                /*
-                 * Strip trailing whitespace.  Can't use trim method
-                 * because it's too aggressive.  Some bogus MIME
-                 * messages will include control characters in the
-                 * boundary string.
-                 */
+        /*
+         * Strip trailing whitespace.  Can't use trim method
+         * because it's too aggressive.  Some bogus MIME
+         * messages will include control characters in the
+         * boundary string.
+         */
                 int i;
                 for (i = line.length() - 1; i >= 0; i--) {
                     char c = line.charAt(i);
@@ -357,12 +363,12 @@ public  class MimeMultipart {
             if (line == null)
                 throw new MessagingException("Missing start boundary");
 
-            /*
-             * Read and process body parts until we see the
-             * terminating boundary line (or EOF).
-             */
+        /*
+         * Read and process body parts until we see the
+         * terminating boundary line (or EOF).
+         */
             boolean done = false;
-        getparts:
+            getparts:
             while (!done) {
                 InternetHeaders headers = null;
                 if (sin != null) {
@@ -372,7 +378,7 @@ public  class MimeMultipart {
                         ;
                     if (line == null) {
                         if (!ignoreMissingEndBoundary) {
-                           throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
+                            throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
                         }
                         // assume there's just a missing end boundary
                         break getparts;
@@ -397,7 +403,7 @@ public  class MimeMultipart {
                 /*
                  * Read and save the content bytes in buf.
                  */
-                for (;;) {
+                for (; ; ) {
                     if (bol) {
                         /*
                          * At the beginning of a line, check whether the
@@ -416,7 +422,7 @@ public  class MimeMultipart {
                                 if (in.read() == '-') {
                                     done = true;
                                     foundClosingBoundary = true;
-                                    break;      // ignore trailing text
+                                    break;    // ignore trailing text
                                 }
                             }
                             // skip linear whitespace
@@ -424,12 +430,12 @@ public  class MimeMultipart {
                                 b2 = in.read();
                             // check for end of line
                             if (b2 == '\n')
-                                break;  // got it!  break out of the loop
+                                break;    // got it!  break out of the loop
                             if (b2 == '\r') {
                                 in.mark(1);
                                 if (in.read() != '\n')
                                     in.reset();
-                                break;  // got it!  break out of the loop
+                                break;    // got it!  break out of the loop
                             }
                         }
                         // failed to match, reset and proceed normally
@@ -491,7 +497,7 @@ public  class MimeMultipart {
                 buf.close();
         }
 
-        if (!ignoreMissingEndBoundary && !foundClosingBoundary && sin== null) {
+        if (!ignoreMissingEndBoundary && !foundClosingBoundary && sin == null) {
             throw new MessagingException("Missing End Boundary for Mime Package : EOF while skipping headers");
         }
         parsed = true;
@@ -510,7 +516,7 @@ public  class MimeMultipart {
      * @since           JavaMail 1.2
      */
     protected InternetHeaders createInternetHeaders(InputStream is)
-                                throws MessagingException {
+                throws MessagingException {
         return new InternetHeaders(is);
     }
 
@@ -523,12 +529,12 @@ public  class MimeMultipart {
      *
      * @param   headers         the headers for the body part.
      * @param   content         the content of the body part.
-     * @param   len             the content length.
+     * @param   len                     the content length.
      * @return  MimeBodyPart
      * @since                   JavaMail 1.2
      */
     protected MimeBodyPart createMimeBodyPart(InternetHeaders headers, byte[] content, int len) {
-            return new MimeBodyPart(headers, content,len);
+        return new MimeBodyPart(headers, content,len);
     }
 
     /**
@@ -544,7 +550,7 @@ public  class MimeMultipart {
      * @since                   JavaMail 1.2
      */
     protected MimeBodyPart createMimeBodyPart(InputStream is) throws MessagingException {
-            return new MimeBodyPart(is);
+        return new MimeBodyPart(is);
     }
 
     /**
@@ -564,7 +570,7 @@ public  class MimeMultipart {
      * @exception               MessagingException in case of error.
      */
     protected void setMultipartDataSource(MultipartDataSource mp)
-                        throws MessagingException {
+            throws MessagingException {
         contentType = new ContentType(mp.getContentType());
 
         int count = mp.getCount();
@@ -582,7 +588,7 @@ public  class MimeMultipart {
      * @see     #contentType
      */
     public ContentType getContentType() {
-            return contentType;
+        return contentType;
     }
 
     /**
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
index eb7b46c5656..786a1f7dd83 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
@@ -28,21 +28,21 @@
  */
 
 
-
 package com.sun.xml.internal.messaging.saaj.packaging.mime.internet;
 
-import java.io.*;
-import java.net.UnknownServiceException;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
 
 import javax.activation.DataSource;
-
-import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.UnknownServiceException;
 
 /**
  * A utility class that implements a DataSource out of
  * a MimeBodyPart. This class is primarily meant for service providers.
  *
- * @author      John Mani
+ * @author John Mani
  */
 
 public final class MimePartDataSource implements DataSource {
@@ -68,13 +68,13 @@ public final class MimePartDataSource implements DataSource {
      * using the <code>getContentStream()</code> method and decodes
      * it using the <code>MimeUtility.decode()</code> method.
      *
-     * @return  decoded input stream
+     * @return decoded input stream
      */
     @Override
     public InputStream getInputStream() throws IOException {
 
         try {
-        InputStream is = part.getContentStream();
+            InputStream is = part.getContentStream();
 
             String encoding = part.getEncoding();
             if (encoding != null)
@@ -92,7 +92,7 @@ public final class MimePartDataSource implements DataSource {
      * This implementation throws the UnknownServiceException.
      */
     @Override
-        public OutputStream getOutputStream() throws IOException {
+    public OutputStream getOutputStream() throws IOException {
         throw new UnknownServiceException();
     }
 
@@ -113,11 +113,11 @@ public final class MimePartDataSource implements DataSource {
      * This implementation just returns an empty string.
      */
     @Override
-        public String getName() {
+    public String getName() {
         try {
-                return part.getFileName();
+            return part.getFileName();
         } catch (MessagingException mex) {
-        return "";
+            return "";
         }
     }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java
index 76f4c78ac29..40589ed30ce 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -113,6 +113,7 @@ public class MimePullMultipart  extends MimeMultipart {
        parsed = true;
     }
 
+    @Override
     protected  void parse() throws MessagingException {
         parseAll();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
index f1dcc12e143..e16ba612952 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -50,7 +50,7 @@ public final class ParameterList {
      * No-arg Constructor.
      */
     public ParameterList() {
-        this.list = new HashMap<String, String>();
+        this.list = new HashMap<>();
     }
 
     private ParameterList(HashMap<String, String> m) {
@@ -73,7 +73,7 @@ public final class ParameterList {
         int type;
         String name;
 
-        list = new HashMap<String, String>();
+        list = new HashMap<>();
         while (true) {
             tk = h.next();
             type = tk.getType();
@@ -171,6 +171,7 @@ public final class ParameterList {
      *
      * @return          String
      */
+    @Override
     public String toString() {
         return toString(0);
     }
@@ -232,6 +233,6 @@ public final class ParameterList {
     }
 
     public ParameterList copy() {
-        return new ParameterList((HashMap)list.clone());
+        return new ParameterList((HashMap<String, String>)list.clone());
     }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
index a85fc85dc67..6e11534bee4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
@@ -32,12 +32,14 @@ package com.sun.xml.internal.messaging.saaj.packaging.mime.util;
 
 import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class ASCIIUtility {
 
     // Private constructor so that this class is not instantiated
-    private ASCIIUtility() { }
+    private ASCIIUtility() {
+    }
 
 
     /**
@@ -47,16 +49,14 @@ public class ASCIIUtility {
      *
      * Based on java.lang.Integer.parseInt().
      *
-     * @param b bytes to convert to integer.
+     * @param b     bytes to convert to integer.
      * @param start start of the range.
-     * @param end end of the range (not including).
+     * @param end   end of the range (not including).
      * @param radix radix.
-     *
      * @return integer.
-     *
      */
     public static int parseInt(byte[] b, int start, int end, int radix)
-                throws NumberFormatException {
+            throws NumberFormatException {
         if (b == null)
             throw new NumberFormatException("null");
 
@@ -77,18 +77,18 @@ public class ASCIIUtility {
             }
             multmin = limit / radix;
             if (i < end) {
-                digit = Character.digit((char)b[i++], radix);
+                digit = Character.digit((char) b[i++], radix);
                 if (digit < 0) {
                     throw new NumberFormatException(
-                        "illegal number: " + toString(b, start, end)
-                        );
+                            "illegal number: " + toString(b, start, end)
+                    );
                 } else {
                     result = -digit;
                 }
             }
             while (i < end) {
                 // Accumulating negatively avoids surprises near MAX_VALUE
-                digit = Character.digit((char)b[i++], radix);
+                digit = Character.digit((char) b[i++], radix);
                 if (digit < 0) {
                     throw new NumberFormatException("illegal number");
                 }
@@ -120,56 +120,48 @@ public class ASCIIUtility {
      * array into a String. The range extends from <code>start</code>
      * till, but not including <code>end</code>.
      *
-     * @param b bytes to convert to integer.
+     * @param b     bytes to convert to integer.
      * @param start start of the range.
-     * @param end end of the range (not including).
-     *
+     * @param end   end of the range (not including).
      * @return integer.
-     *
      */
     public static String toString(byte[] b, int start, int end) {
         int size = end - start;
         char[] theChars = new char[size];
 
         for (int i = 0, j = start; i < size; )
-            theChars[i++] = (char)(b[j++]&0xff);
+            theChars[i++] = (char) (b[j++] & 0xff);
 
         return new String(theChars);
     }
 
-        /**
-         * Encodes specified String into a sequence of bytes using the platform's
-         * default charset, storing the result into a new byte array.
-         *
-         * @param s string to encode into byte array.
-         *
-         * @return byte array.
-         *
-         */
+    /**
+     * Encodes specified String into a sequence of bytes using the platform's
+     * default charset, storing the result into a new byte array.
+     *
+     * @param s string to encode into byte array.
+     * @return byte array.
+     */
     public static byte[] getBytes(String s) {
-        char [] chars= s.toCharArray();
+        char[] chars = s.toCharArray();
         int size = chars.length;
         byte[] bytes = new byte[size];
 
-        for (int i = 0; i < size;)
+        for (int i = 0; i < size; )
             bytes[i] = (byte) chars[i++];
         return bytes;
     }
 
     /**
-         * Converts input stream to array.
-         *
-         * @param is stream to convert to array.
-         *
-         * @return byte array.
-         *
-         * @throws IOException if an I/O error occurs.
+     * Converts input stream to array.
      *
-     * @deprecated
-     *      this is an expensive operation that require an additional
-     *      buffer reallocation just to get the array of an exact size.
-     *      Unless you absolutely need the exact size array, don't use this.
-     *      Use {@link ByteOutputStream} and {@link ByteOutputStream#write(InputStream)}.
+     * @param is stream to convert to array.
+     * @return byte array.
+     * @throws IOException if an I/O error occurs.
+     * @deprecated this is an expensive operation that require an additional
+     * buffer reallocation just to get the array of an exact size.
+     * Unless you absolutely need the exact size array, don't use this.
+     * Use {@link ByteOutputStream} and {@link ByteOutputStream#write(InputStream)}.
      */
     @Deprecated
     public static byte[] getBytes(InputStream is) throws IOException {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
index 06ea9380930..ab8c3ab834a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -63,6 +63,7 @@ public class QDecoderStream extends QPDecoderStream {
      *             stream is reached.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public int read() throws IOException {
         int c = in.read();
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
index 1f60b1a7503..7184e002a96 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -67,6 +67,7 @@ public class QPDecoderStream extends FilterInputStream {
      *             stream is reached.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public int read() throws IOException {
         if (spaces > 0) {
             // We have cached space characters, return one
@@ -150,6 +151,7 @@ public class QPDecoderStream extends FilterInputStream {
      *             the stream has been reached.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public int read(byte[] buf, int off, int len) throws IOException {
         int i, c;
         for (i = 0; i < len; i++) {
@@ -167,6 +169,7 @@ public class QPDecoderStream extends FilterInputStream {
      * Tests if this input stream supports marks. Currently this class
      * does not support marks
      */
+    @Override
     public boolean markSupported() {
         return false;
     }
@@ -178,6 +181,7 @@ public class QPDecoderStream extends FilterInputStream {
      * this method just invokes the <code>available</code> method
      * of the original input stream.
      */
+    @Override
     public int available() throws IOException {
         // This is bogus ! We don't really know how much
         // bytes are available *after* decoding
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
index 3f80d39ff09..74ac839646d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -81,6 +81,7 @@ public class QPEncoderStream extends FilterOutputStream {
      * @param      len   the number of bytes to write.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void write(byte[] b, int off, int len) throws IOException {
         for (int i = 0; i < len; i++)
             write(b[off + i]);
@@ -91,6 +92,7 @@ public class QPEncoderStream extends FilterOutputStream {
      * @param      b   the data to be written.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
@@ -100,6 +102,7 @@ public class QPEncoderStream extends FilterOutputStream {
      * @param      c   the <code>byte</code>.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void write(int c) throws IOException {
         c = c & 0xff; // Turn off the MSB.
         if (gotSpace) { // previous character was <SPACE>
@@ -139,6 +142,7 @@ public class QPEncoderStream extends FilterOutputStream {
      * to be encoded out to the stream.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void flush() throws IOException {
         out.flush();
     }
@@ -147,6 +151,7 @@ public class QPEncoderStream extends FilterOutputStream {
      * Forces any buffered output bytes to be encoded out to the stream
      * and closes this output stream
      */
+    @Override
     public void close() throws IOException {
         out.close();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
index d012014bed5..1945aefa3cc 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -78,6 +78,7 @@ public class UUDecoderStream extends FilterInputStream {
      * @see        java.io.FilterInputStream#in
      */
 
+    @Override
     public int read() throws IOException {
         if (index >= bufsize) {
             readPrefix();
@@ -88,6 +89,7 @@ public class UUDecoderStream extends FilterInputStream {
         return buffer[index++] & 0xff; // return lower byte
     }
 
+    @Override
     public int read(byte[] buf, int off, int len) throws IOException {
         int i, c;
         for (i = 0; i < len; i++) {
@@ -101,10 +103,12 @@ public class UUDecoderStream extends FilterInputStream {
         return i;
     }
 
+    @Override
     public boolean markSupported() {
         return false;
     }
 
+    @Override
     public int available() throws IOException {
          // This is only an estimate, since in.available()
          // might include CRLFs too ..
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
index ada4a7de7be..d82c0284265 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -88,6 +88,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public int getSize() throws SOAPException {
         if (mimePart != null) {
             try {
@@ -124,6 +125,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public void clearContent() {
         if (mimePart != null) {
             mimePart.close();
@@ -133,6 +135,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         rawContent = null;
     }
 
+    @Override
     public Object getContent() throws SOAPException {
         try {
             if (mimePart != null) {
@@ -153,6 +156,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public void setContent(Object object, String contentType)
         throws IllegalArgumentException {
         if (mimePart != null) {
@@ -165,23 +169,28 @@ public class AttachmentPartImpl extends AttachmentPart {
     }
 
 
+    @Override
     public DataHandler getDataHandler() throws SOAPException {
         if (mimePart != null) {
             //return an inputstream
             return new DataHandler(new DataSource() {
 
+                @Override
                 public InputStream getInputStream() throws IOException {
                     return mimePart.read();
                 }
 
+                @Override
                 public OutputStream getOutputStream() throws IOException {
                     throw new UnsupportedOperationException("getOutputStream cannot be supported : You have enabled LazyAttachments Option");
                 }
 
+                @Override
                 public String getContentType() {
                     return mimePart.getContentType();
                 }
 
+                @Override
                 public String getName() {
                     return "MIMEPart Wrapper DataSource";
                 }
@@ -197,6 +206,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         return dataHandler;
     }
 
+    @Override
     public void setDataHandler(DataHandler dataHandler)
         throws IllegalArgumentException {
         if (mimePart != null) {
@@ -216,35 +226,43 @@ public class AttachmentPartImpl extends AttachmentPart {
         setMimeHeader("Content-Type", dataHandler.getContentType());
     }
 
+    @Override
     public void removeAllMimeHeaders() {
         headers.removeAllHeaders();
     }
 
+    @Override
     public void removeMimeHeader(String header) {
         headers.removeHeader(header);
     }
 
+    @Override
     public String[] getMimeHeader(String name) {
         return headers.getHeader(name);
     }
 
+    @Override
     public void setMimeHeader(String name, String value) {
         headers.setHeader(name, value);
     }
 
+    @Override
     public void addMimeHeader(String name, String value) {
         headers.addHeader(name, value);
     }
 
-    public Iterator getAllMimeHeaders() {
+    @Override
+    public Iterator<MimeHeader> getAllMimeHeaders() {
         return headers.getAllHeaders();
     }
 
-    public Iterator getMatchingMimeHeaders(String[] names) {
+    @Override
+    public Iterator<MimeHeader> getMatchingMimeHeaders(String[] names) {
         return headers.getMatchingHeaders(names);
     }
 
-    public Iterator getNonMatchingMimeHeaders(String[] names) {
+    @Override
+    public Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names) {
         return headers.getNonMatchingHeaders(names);
     }
 
@@ -329,6 +347,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public  void setBase64Content(InputStream content, String contentType)
         throws SOAPException {
 
@@ -365,6 +384,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public  InputStream getBase64Content() throws SOAPException {
         InputStream stream;
         if (mimePart != null) {
@@ -425,6 +445,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public void setRawContent(InputStream content, String contentType)
         throws SOAPException {
         if (mimePart != null) {
@@ -475,6 +496,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     } */
 
+    @Override
     public void setRawContentBytes(
         byte[] content, int off, int len, String contentType)
         throws SOAPException {
@@ -498,6 +520,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public  InputStream getRawContent() throws SOAPException {
         if (mimePart != null) {
             return mimePart.read();
@@ -522,6 +545,7 @@ public class AttachmentPartImpl extends AttachmentPart {
         }
     }
 
+    @Override
     public  byte[] getRawContentBytes() throws SOAPException {
         InputStream ret;
         if (mimePart != null) {
@@ -556,12 +580,14 @@ public class AttachmentPartImpl extends AttachmentPart {
     }
 
     // attachments are equal if they are the same reference
+    @Override
     public boolean equals(Object o) {
         return (this == o);
     }
 
     // In JDK 8 we get a warning if we implement equals() but not hashCode().
     // There is no intuitive value for this, the default one in Object is fine.
+    @Override
     public int hashCode() {
         return super.hashCode();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java
index 22efd453799..09de9035f6e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -71,6 +71,7 @@ abstract class ContextClassloaderLocal<V> {
 
     private static ClassLoader getContextClassLoader() {
         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+                    @Override
                     public ClassLoader run() {
                         ClassLoader cl = null;
                         try {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
index d7a0226671b..d2d5c6e3173 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -63,6 +63,7 @@ public class MessageFactoryImpl extends MessageFactory {
         return oldListener;
     }
 
+    @Override
     public SOAPMessage createMessage() throws SOAPException {
         throw new UnsupportedOperationException();
     }
@@ -105,6 +106,7 @@ public class MessageFactoryImpl extends MessageFactory {
                 "Unable to parse content type: " + e.getMessage());
         }
     }
+    @Override
     public SOAPMessage createMessage(MimeHeaders headers, InputStream in)
         throws SOAPException, IOException {
         String contentTypeString = MessageImpl.getContentType(headers);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
index a7df70323a4..b7fab4715b8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
@@ -87,7 +87,7 @@ public abstract class MessageImpl
     protected boolean saved = false;
     protected byte[] messageBytes;
     protected int messageByteCount;
-    protected HashMap properties = new HashMap();
+    protected Map<String, Object> properties = new HashMap<>();
 
     // used for lazy attachment initialization
     protected MimeMultipart multiPart = null;
@@ -883,17 +883,17 @@ public abstract class MessageImpl
             throw new RuntimeException(e);
         }
         if (attachments == null)
-            attachments = new FinalArrayList<AttachmentPart>();
+            attachments = new FinalArrayList<>();
 
         attachments.add(attachment);
 
         needsSave();
     }
 
-    static private final Iterator nullIter = Collections.EMPTY_LIST.iterator();
+    static private final Iterator<AttachmentPart> nullIter = Collections.<AttachmentPart>EMPTY_LIST.iterator();
 
     @Override
-    public Iterator getAttachments() {
+    public Iterator<AttachmentPart> getAttachments() {
         try {
             initializeAllAttachments();
         } catch (Exception e) {
@@ -963,7 +963,7 @@ public abstract class MessageImpl
     }
 
     @Override
-    public Iterator getAttachments(MimeHeaders headers) {
+    public Iterator<AttachmentPart> getAttachments(MimeHeaders headers) {
         try {
             initializeAllAttachments();
         } catch (Exception e) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
index 022741ee91f..d4faa0a6a25 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -42,6 +42,7 @@ public class SAAJMetaFactoryImpl extends SAAJMetaFactory {
         Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
                          "com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
 
+    @Override
     protected  MessageFactory newMessageFactory(String protocol)
         throws SOAPException {
         if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol)) {
@@ -60,6 +61,7 @@ public class SAAJMetaFactoryImpl extends SAAJMetaFactory {
         }
     }
 
+    @Override
     protected  SOAPFactory newSOAPFactory(String protocol)
         throws SOAPException {
         if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol)) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
new file mode 100644
index 00000000000..84c6d69f9d5
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.messaging.saaj.soap;
+
+import com.sun.xml.internal.messaging.saaj.soap.impl.NodeListImpl;
+import org.w3c.dom.*;
+
+/**
+ * SAAJ wrapper for {@link DocumentFragment}
+ *
+ * @author Yan GAO.
+ */
+public class SOAPDocumentFragment implements DocumentFragment {
+
+    private SOAPDocumentImpl soapDocument;
+    private DocumentFragment documentFragment;
+
+    public SOAPDocumentFragment(SOAPDocumentImpl ownerDoc) {
+        this.soapDocument = ownerDoc;
+        this.documentFragment = soapDocument.getDomDocument().createDocumentFragment();
+    }
+
+    public SOAPDocumentFragment() {}
+
+    @Override
+    public boolean hasAttributes() {
+        return documentFragment.hasAttributes();
+    }
+
+    @Override
+    public boolean isSameNode(Node other) {
+        return documentFragment.isSameNode(getDomNode(other));
+    }
+
+    @Override
+    public String lookupNamespaceURI(String prefix) {
+        return documentFragment.lookupNamespaceURI(prefix);
+    }
+
+    @Override
+    public Node getParentNode() {
+        return soapDocument.findIfPresent(documentFragment.getParentNode());
+    }
+
+    @Override
+    public Node getFirstChild() {
+        return soapDocument.findIfPresent(documentFragment.getFirstChild());
+    }
+
+    @Override
+    public Object getUserData(String key) {
+        return documentFragment.getUserData(key);
+    }
+
+    @Override
+    public String getTextContent() throws DOMException {
+        return documentFragment.getTextContent();
+    }
+    @Override
+    public short getNodeType() {
+        return documentFragment.getNodeType();
+    }
+
+    public Node getDomNode(Node node) {
+        return soapDocument.getDomNode(node);
+    }
+
+    @Override
+    public Node appendChild(Node newChild) throws DOMException {
+        Node node = soapDocument.importNode(newChild, true);
+        return soapDocument.findIfPresent(documentFragment.appendChild(getDomNode(node)));
+    }
+
+    @Override
+    public Node removeChild(Node oldChild) throws DOMException {
+        return soapDocument.findIfPresent(documentFragment.removeChild(getDomNode(oldChild)));
+    }
+
+    @Override
+    public NamedNodeMap getAttributes() {
+        return documentFragment.getAttributes();
+    }
+
+    @Override
+    public short compareDocumentPosition(Node other) throws DOMException {
+        return documentFragment.compareDocumentPosition(getDomNode(other));
+    }
+    @Override
+    public void setTextContent(String textContent) throws DOMException {
+        documentFragment.setTextContent(textContent);
+    }
+    @Override
+    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
+        Node node = soapDocument.importNode(newChild, true);
+        return soapDocument.findIfPresent(documentFragment.insertBefore(getDomNode(node), getDomNode(refChild)));
+    }
+    @Override
+    public Object setUserData(String key, Object data, UserDataHandler handler) {
+        return documentFragment.setUserData(key, data, handler);
+    }
+    @Override
+    public boolean isDefaultNamespace(String namespaceURI) {
+        return documentFragment.isDefaultNamespace(namespaceURI);
+    }
+
+    @Override
+    public Node getLastChild() {
+        return soapDocument.findIfPresent(documentFragment.getLastChild());
+    }
+
+    @Override
+    public void setPrefix(String prefix) throws DOMException {
+        documentFragment.setPrefix(prefix);
+    }
+    @Override
+    public String getNodeName() {
+        return documentFragment.getNodeName();
+    }
+
+    @Override
+    public void setNodeValue(String nodeValue) throws DOMException {
+        documentFragment.setNodeValue(nodeValue);
+    }
+    @Override
+    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
+        Node node = soapDocument.importNode(newChild, true);
+        return soapDocument.findIfPresent(documentFragment.replaceChild(getDomNode(node), getDomNode(oldChild)));
+    }
+    @Override
+    public String getLocalName() {
+        return documentFragment.getLocalName();
+    }
+
+    @Override
+    public void normalize() {
+        documentFragment.normalize();
+    }
+
+    @Override
+    public Node cloneNode(boolean deep) {
+        Node node= documentFragment.cloneNode(deep);
+        soapDocument.registerChildNodes(node, deep);
+        return soapDocument.findIfPresent(node);
+    }
+
+    @Override
+    public boolean isSupported(String feature, String version) {
+        return documentFragment.isSupported(feature, version);
+    }
+
+    @Override
+    public boolean isEqualNode(Node arg) {
+        return documentFragment.isEqualNode(getDomNode(arg));
+    }
+
+    @Override
+    public boolean hasChildNodes() {
+        return documentFragment.hasChildNodes();
+    }
+
+    @Override
+    public String lookupPrefix(String namespaceURI) {
+        return documentFragment.lookupPrefix(namespaceURI);
+    }
+
+    @Override
+    public String getNodeValue() throws DOMException {
+        return documentFragment.getNodeValue();
+    }
+    @Override
+    public Document getOwnerDocument() {
+        return documentFragment.getOwnerDocument();
+    }
+    @Override
+    public Object getFeature(String feature, String version) {
+        return documentFragment.getFeature(feature, version);
+    }
+
+    @Override
+    public Node getPreviousSibling() {
+        return soapDocument.findIfPresent(documentFragment.getPreviousSibling());
+    }
+
+    @Override
+    public NodeList getChildNodes() {
+        return new NodeListImpl(soapDocument, documentFragment.getChildNodes());
+    }
+
+    @Override
+    public String getBaseURI() {
+        return documentFragment.getBaseURI();
+    }
+
+    @Override
+    public Node getNextSibling() {
+        return soapDocument.findIfPresent(documentFragment.getNextSibling());
+    }
+
+    @Override
+    public String getPrefix() {
+        return documentFragment.getPrefix();
+    }
+
+    @Override
+    public String getNamespaceURI() {
+        return documentFragment.getNamespaceURI();
+    }
+    public Document getSoapDocument() {
+        return soapDocument;
+    }
+}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
index 417cd9a9cc9..d08f01c876c 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
@@ -32,6 +32,8 @@ package com.sun.xml.internal.messaging.saaj.soap;
 import com.sun.xml.internal.messaging.saaj.soap.impl.CDATAImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.ElementFactory;
 import com.sun.xml.internal.messaging.saaj.soap.impl.ElementImpl;
+import com.sun.xml.internal.messaging.saaj.soap.impl.NamedNodeMapImpl;
+import com.sun.xml.internal.messaging.saaj.soap.impl.NodeListImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.SOAPCommentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.SOAPTextImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
@@ -39,6 +41,7 @@ import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
 import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
+import org.w3c.dom.CharacterData;
 import org.w3c.dom.Comment;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMException;
@@ -52,6 +55,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
 import org.w3c.dom.UserDataHandler;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -59,13 +63,14 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPException;
+import java.lang.reflect.Constructor;
 import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.logging.Logger;
 
 public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Document {
 
+    public static final String SAAJ_NODE = "javax.xml.soap.Node";
+
     private static final String XMLNS = "xmlns".intern();
     protected static final Logger log =
         Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
@@ -75,8 +80,6 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     private Document document;
 
-    private Map<Node, javax.xml.soap.Node> domToSoap = new HashMap<>();
-
     public SOAPDocumentImpl(SOAPPartImpl enclosingDocument) {
         document = createDocument();
         this.enclosingSOAPPart = enclosingDocument;
@@ -105,6 +108,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
     //        super(doctype, grammarAccess);
     //    }
 
+    @Override
     public SOAPPartImpl getSOAPPart() {
         if (enclosingSOAPPart == null) {
             log.severe("SAAJ0541.soap.fragment.not.bound.to.part");
@@ -113,19 +117,23 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         return enclosingSOAPPart;
     }
 
+    @Override
     public SOAPDocumentImpl getDocument() {
         return this;
     }
 
+    @Override
     public DocumentType getDoctype() {
         // SOAP means no DTD, No DTD means no doctype (SOAP 1.2 only?)
         return null;
     }
 
+    @Override
     public DOMImplementation getImplementation() {
         return document.getImplementation();
     }
 
+    @Override
     public Element getDocumentElement() {
         // This had better be an Envelope!
         getSOAPPart().doGetDocumentElement();
@@ -136,6 +144,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         return document.getDocumentElement();
     }
 
+    @Override
     public Element createElement(String tagName) throws DOMException {
         return ElementFactory.createElement(
             this,
@@ -144,22 +153,27 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
             null);
     }
 
+    @Override
     public DocumentFragment createDocumentFragment() {
-        return document.createDocumentFragment();
+        return new SOAPDocumentFragment(this);
     }
 
+    @Override
     public org.w3c.dom.Text createTextNode(String data) {
         return new SOAPTextImpl(this, data);
     }
 
+    @Override
     public Comment createComment(String data) {
         return new SOAPCommentImpl(this, data);
     }
 
+    @Override
     public CDATASection createCDATASection(String data) throws DOMException {
         return new CDATAImpl(this, data);
     }
 
+    @Override
     public ProcessingInstruction createProcessingInstruction(
         String target,
         String data)
@@ -168,6 +182,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         throw new UnsupportedOperationException("Processing Instructions are not allowed in SOAP documents");
     }
 
+    @Override
     public Attr createAttribute(String name) throws DOMException {
         boolean isQualifiedName = (name.indexOf(":") > 0);
         if (isQualifiedName) {
@@ -184,24 +199,70 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         return document.createAttribute(name);
     }
 
+    @Override
     public EntityReference createEntityReference(String name)
         throws DOMException {
             log.severe("SAAJ0543.soap.entity.refs.not.allowed.in.docs");
             throw new UnsupportedOperationException("Entity References are not allowed in SOAP documents");
     }
 
+    @Override
     public NodeList getElementsByTagName(String tagname) {
-        return document.getElementsByTagName(tagname);
+        return new NodeListImpl(this, document.getElementsByTagName(tagname));
     }
 
+    @Override
     public org.w3c.dom.Node importNode(Node importedNode, boolean deep)
         throws DOMException {
-        final Node node = document.importNode(getDomNode(importedNode), deep);
-        return node instanceof Element ?
-            ElementFactory.createElement(this, (Element) node)
-                : node;
+        Node domNode = getDomNode(importedNode);
+        final Node newNode = document.importNode(domNode, deep);
+
+        if (importedNode instanceof javax.xml.soap.Node) {
+            Node newSoapNode = createSoapNode(importedNode.getClass(), newNode);
+            newNode.setUserData(SAAJ_NODE, newSoapNode, null);
+            if (deep && importedNode.hasChildNodes()) {
+                NodeList childNodes = importedNode.getChildNodes();
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    registerChildNodes(childNodes.item(i), deep);
+                }
+            }
+            return newSoapNode;
+        }
+
+        registerChildNodes(newNode, deep);
+        return findIfPresent(newNode);
     }
 
+    //If the parentNode is not registered to domToSoap, create soap wapper for parentNode and register it to domToSoap
+    //If deep = true, also register all children of parentNode to domToSoap map.
+    public void registerChildNodes(Node parentNode, boolean deep) {
+        if (parentNode.getUserData(SAAJ_NODE) == null) {
+            if (parentNode instanceof Element) {
+                ElementFactory.createElement(this, (Element) parentNode);
+            } else if (parentNode instanceof CharacterData) {
+                switch (parentNode.getNodeType()) {
+                    case CDATA_SECTION_NODE:
+                        new CDATAImpl(this, (CharacterData) parentNode);
+                        break;
+                    case COMMENT_NODE:
+                        new SOAPCommentImpl(this, (CharacterData) parentNode);
+                        break;
+                    case TEXT_NODE:
+                        new SOAPTextImpl(this, (CharacterData) parentNode);
+                        break;
+                }
+            }
+        }
+        if (deep) {
+            NodeList nodeList = parentNode.getChildNodes();
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node nextChild = nodeList.item(i);
+                registerChildNodes(nextChild, true);
+            }
+        }
+    }
+
+    @Override
     public Element createElementNS(String namespaceURI, String qualifiedName)
         throws DOMException {
         return ElementFactory.createElement(
@@ -211,19 +272,22 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
             namespaceURI);
     }
 
+    @Override
     public Attr createAttributeNS(String namespaceURI, String qualifiedName)
         throws DOMException {
         return document.createAttributeNS(namespaceURI, qualifiedName);
     }
 
+    @Override
     public NodeList getElementsByTagNameNS(
         String namespaceURI,
         String localName) {
-        return document.getElementsByTagNameNS(namespaceURI, localName);
+        return new NodeListImpl(this, document.getElementsByTagNameNS(namespaceURI, localName));
     }
 
+    @Override
     public Element getElementById(String elementId) {
-        return document.getElementById(elementId);
+        return (Element) findIfPresent(document.getElementById(elementId));
     }
 
     @Override
@@ -293,7 +357,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
-        return document.renameNode(n, namespaceURI, qualifiedName);
+        return findIfPresent(document.renameNode(n, namespaceURI, qualifiedName));
     }
 
     @Override
@@ -318,37 +382,37 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public Node getParentNode() {
-        return document.getParentNode();
+        return findIfPresent(document.getParentNode());
     }
 
     @Override
     public NodeList getChildNodes() {
-        return document.getChildNodes();
+        return new NodeListImpl(this, document.getChildNodes());
     }
 
     @Override
     public Node getFirstChild() {
-        return document.getFirstChild();
+        return findIfPresent(document.getFirstChild());
     }
 
     @Override
     public Node getLastChild() {
-        return document.getLastChild();
+        return findIfPresent(document.getLastChild());
     }
 
     @Override
     public Node getPreviousSibling() {
-        return document.getPreviousSibling();
+        return findIfPresent(document.getPreviousSibling());
     }
 
     @Override
     public Node getNextSibling() {
-        return document.getNextSibling();
+        return findIfPresent(document.getNextSibling());
     }
 
     @Override
     public NamedNodeMap getAttributes() {
-        return document.getAttributes();
+        return new NamedNodeMapImpl(document.getAttributes(), this);
     }
 
     @Override
@@ -383,7 +447,9 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public Node cloneNode(boolean deep) {
-        return document.cloneNode(deep);
+        Node node = document.cloneNode(deep);
+        registerChildNodes(node, deep);
+        return findIfPresent(node);
     }
 
     @Override
@@ -428,7 +494,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public short compareDocumentPosition(Node other) throws DOMException {
-        return document.compareDocumentPosition(other);
+        return document.compareDocumentPosition(getDomNode(other));
     }
 
     @Override
@@ -443,7 +509,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public boolean isSameNode(Node other) {
-        return document.isSameNode(other);
+        return document.isSameNode(getDomNode(other));
     }
 
     @Override
@@ -463,7 +529,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
 
     @Override
     public boolean isEqualNode(Node arg) {
-        return document.isEqualNode(arg);
+        return document.isEqualNode(getDomNode(arg));
     }
 
     @Override
@@ -496,11 +562,11 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
      */
     public void register(javax.xml.soap.Node node) {
         final Node domElement = getDomNode(node);
-        if (domToSoap.containsKey(domElement)) {
+        if (domElement.getUserData(SAAJ_NODE) != null) {
             throw new IllegalStateException("Element " + domElement.getNodeName()
                     + " is already registered");
         }
-        domToSoap.put(domElement, node);
+        domElement.setUserData(SAAJ_NODE, node, null);
     }
 
     /**
@@ -522,7 +588,7 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         if (node instanceof javax.xml.soap.Node) {
             return (javax.xml.soap.Node) node;
         }
-        final javax.xml.soap.Node found = domToSoap.get(node);
+        final javax.xml.soap.Node found = (javax.xml.soap.Node) node.getUserData(SAAJ_NODE);
         if (found == null && required) {
             throw new IllegalArgumentException(MessageFormat.format("Cannot find SOAP wrapper for element {0}", node));
         }
@@ -562,6 +628,24 @@ public class SOAPDocumentImpl implements SOAPDocument, javax.xml.soap.Node, Docu
         return node;
     }
 
+
+    private Node createSoapNode(Class nodeType, Node node) {
+        if (SOAPTextImpl.class.isAssignableFrom(nodeType)) {
+            return new SOAPTextImpl(this, (Text) node);
+        } else if (SOAPCommentImpl.class.isAssignableFrom(nodeType)) {
+            return new SOAPCommentImpl(this, (Comment) node);
+        } else if (CDATAImpl.class.isAssignableFrom(nodeType)) {
+            return new CDATAImpl(this, (CDATASection) node);
+        }
+        try {
+            Constructor<Node> constructor = nodeType.getConstructor(SOAPDocumentImpl.class, Element.class);
+            return constructor.newInstance(this, node);
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+
     public Document getDomElement() {
         return document;
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
index fc97fa83488..ac5d9eec006 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -49,6 +49,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
 
     protected abstract SOAPDocumentImpl createDocument();
 
+    @Override
     public SOAPElement createElement(String tagName) throws SOAPException {
          if (tagName == null) {
              log.log(
@@ -60,6 +61,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
                         NameImpl.createFromTagName(tagName));
     }
 
+    @Override
     public SOAPElement createElement(Name name) throws SOAPException {
         // @since SAAJ 1.3
         // If the Name was null it would cause a NullPointerException in earlier release
@@ -71,6 +73,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         return ElementFactory.createElement(createDocument(), name);
     }
 
+    @Override
     public SOAPElement createElement(QName qname) throws SOAPException {
         if (qname == null) {
             log.log(Level.SEVERE,"SAAJ0567.soap.null.input",
@@ -80,6 +83,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         return ElementFactory.createElement(createDocument(),qname);
     }
 
+    @Override
     public SOAPElement createElement(
         String localName,
         String prefix,
@@ -96,6 +100,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         return ElementFactory.createElement(createDocument(), localName, prefix, uri);
     }
 
+    @Override
     public Name createName(String localName, String prefix, String uri)
         throws SOAPException {
         // @since SAAJ 1.3
@@ -110,6 +115,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         return NameImpl.create(localName, prefix, uri);
     }
 
+    @Override
     public Name createName(String localName) throws SOAPException {
         // @since SAAJ 1.3
         // if localName==null, earlier impl would create Name with localName=null
@@ -125,6 +131,7 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
 
     // Note: the child elements might still be org.w3c.dom.Element's, but the
     // getChildElements will do the conversion to SOAPElement when called.
+    @Override
     public SOAPElement createElement(Element domElement) throws SOAPException {
         if (domElement == null) {
             return null;
@@ -163,14 +170,17 @@ public abstract class SOAPFactoryImpl extends SOAPFactory {
         return copy;
     }
 
+    @Override
     public Detail createDetail() throws SOAPException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public  SOAPFault createFault(String reasonText, QName faultCode) throws SOAPException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public SOAPFault createFault() throws SOAPException {
         throw new UnsupportedOperationException();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
index 772fcd5662f..90782ccbdad 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -64,6 +64,7 @@ public class SOAPIOException extends IOException {
         soapException.fillInStackTrace();
     }
 
+    @Override
     public Throwable fillInStackTrace() {
         if (soapException != null) {
             soapException.fillInStackTrace();
@@ -71,26 +72,32 @@ public class SOAPIOException extends IOException {
         return this;
     }
 
+    @Override
     public String getLocalizedMessage() {
         return soapException.getLocalizedMessage();
     }
 
+    @Override
     public String getMessage() {
         return soapException.getMessage();
     }
 
+    @Override
     public void printStackTrace() {
         soapException.printStackTrace();
     }
 
+    @Override
     public void printStackTrace(PrintStream s) {
         soapException.printStackTrace(s);
     }
 
+    @Override
     public void printStackTrace(PrintWriter s) {
         soapException.printStackTrace(s);
     }
 
+    @Override
     public String toString() {
         return soapException.toString();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
index 49abddb9f94..1410930bf74 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
@@ -75,6 +75,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.xml.soap.MimeHeader;
 
 /**
  * SOAPPartImpl is the first attachment. This contains the XML/SOAP document.
@@ -136,6 +137,7 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return (message != null) ? message.isFastInfoset() : false;
     }
 
+    @Override
     public SOAPEnvelope getEnvelope() throws SOAPException {
 
         // If there is no SOAP envelope already created, then create
@@ -185,38 +187,47 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         }
     }
 
+    @Override
     public void removeAllMimeHeaders() {
         headers.removeAllHeaders();
     }
 
+    @Override
     public void removeMimeHeader(String header) {
         headers.removeHeader(header);
     }
 
+    @Override
     public String[] getMimeHeader(String name) {
         return headers.getHeader(name);
     }
 
+    @Override
     public void setMimeHeader(String name, String value) {
         headers.setHeader(name, value);
     }
 
+    @Override
     public void addMimeHeader(String name, String value) {
         headers.addHeader(name, value);
     }
 
-    public Iterator getAllMimeHeaders() {
+    @Override
+    public Iterator<MimeHeader> getAllMimeHeaders() {
         return headers.getAllHeaders();
     }
 
-    public Iterator getMatchingMimeHeaders(String[] names) {
+    @Override
+    public Iterator<MimeHeader> getMatchingMimeHeaders(String[] names) {
         return headers.getMatchingHeaders(names);
     }
 
-    public Iterator getNonMatchingMimeHeaders(String[] names) {
+    @Override
+    public Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names) {
         return headers.getNonMatchingHeaders(names);
     }
 
+    @Override
     public Source getContent() throws SOAPException {
         if (source != null) {
             InputStream bis = null;
@@ -248,6 +259,7 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return ((Envelope) getEnvelope()).getContent();
     }
 
+    @Override
     public void setContent(Source source) throws SOAPException {
         try {
             if (source instanceof StreamSource) {
@@ -376,18 +388,22 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
 
     DataHandler getDataHandler() {
         DataSource ds = new DataSource() {
+            @Override
             public OutputStream getOutputStream() throws IOException {
                 throw new IOException("Illegal Operation");
             }
 
+            @Override
             public String getContentType() {
                 return getContentTypeString();
             }
 
+            @Override
             public String getName() {
                 return getContentId();
             }
 
+            @Override
             public InputStream getInputStream() throws IOException {
                 return getContentAsStream();
             }
@@ -395,15 +411,18 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return new DataHandler(ds);
     }
 
+    @Override
     public SOAPDocumentImpl getDocument() {
         handleNewSource();
         return document;
     }
 
+    @Override
     public SOAPPartImpl getSOAPPart() {
         return this;
     }
 
+    @Override
     public DocumentType getDoctype() {
         return document.getDoctype();
     }
@@ -412,10 +431,12 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
     // same way whether they are called from here or directly from the document.
     // If the document needs any help from this SOAPPart then
     // Make it use a call-back as in doGetDocumentElement() below
+    @Override
     public DOMImplementation getImplementation() {
         return document.getImplementation();
     }
 
+    @Override
     public Element getDocumentElement() {
         // If there is no SOAP envelope already created, then create
         // one from a source if one exists. If there is a newer source
@@ -435,26 +456,32 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         }
     }
 
+    @Override
     public Element createElement(String tagName) throws DOMException {
         return document.createElement(tagName);
     }
 
+    @Override
     public DocumentFragment createDocumentFragment() {
         return document.createDocumentFragment();
     }
 
+    @Override
     public org.w3c.dom.Text createTextNode(String data) {
         return document.createTextNode(data);
     }
 
+    @Override
     public Comment createComment(String data) {
         return document.createComment(data);
     }
 
+    @Override
     public CDATASection createCDATASection(String data) throws DOMException {
         return document.createCDATASection(data);
     }
 
+    @Override
     public ProcessingInstruction createProcessingInstruction(
     String target,
     String data)
@@ -462,20 +489,24 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return document.createProcessingInstruction(target, data);
     }
 
+    @Override
     public Attr createAttribute(String name) throws DOMException {
         return document.createAttribute(name);
     }
 
+    @Override
     public EntityReference createEntityReference(String name)
     throws DOMException {
         return document.createEntityReference(name);
     }
 
+    @Override
     public NodeList getElementsByTagName(String tagname) {
         handleNewSource();
         return document.getElementsByTagName(tagname);
     }
 
+    @Override
     public org.w3c.dom.Node importNode(
         org.w3c.dom.Node importedNode,
         boolean deep)
@@ -484,16 +515,19 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return document.importNode(importedNode, deep);
     }
 
+    @Override
     public Element createElementNS(String namespaceURI, String qualifiedName)
     throws DOMException {
         return document.createElementNS(namespaceURI, qualifiedName);
     }
 
+    @Override
     public Attr createAttributeNS(String namespaceURI, String qualifiedName)
     throws DOMException {
         return document.createAttributeNS(namespaceURI, qualifiedName);
     }
 
+    @Override
     public NodeList getElementsByTagNameNS(
         String namespaceURI,
         String localName) {
@@ -501,16 +535,19 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return document.getElementsByTagNameNS(namespaceURI, localName);
     }
 
+    @Override
     public Element getElementById(String elementId) {
         handleNewSource();
         return document.getElementById(elementId);
     }
+    @Override
     public org.w3c.dom.Node appendChild(org.w3c.dom.Node newChild)
         throws DOMException {
         handleNewSource();
         return document.appendChild(newChild);
     }
 
+    @Override
     public org.w3c.dom.Node cloneNode(boolean deep) {
         handleNewSource();
         return document.cloneNode(deep);
@@ -525,75 +562,92 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return newSoapPart;
     }
 
+    @Override
     public NamedNodeMap getAttributes() {
         return document.getDomDocument().getAttributes();
     }
 
+    @Override
     public NodeList getChildNodes() {
         handleNewSource();
         return document.getChildNodes();
     }
 
+    @Override
     public org.w3c.dom.Node getFirstChild() {
         handleNewSource();
         return document.getFirstChild();
     }
 
+    @Override
     public org.w3c.dom.Node getLastChild() {
         handleNewSource();
         return document.getLastChild();
     }
 
+    @Override
     public String getLocalName() {
         return document.getDomDocument().getLocalName();
     }
 
+    @Override
     public String getNamespaceURI() {
         return document.getDomDocument().getNamespaceURI();
     }
 
+    @Override
     public org.w3c.dom.Node getNextSibling() {
         handleNewSource();
         return document.getNextSibling();
     }
 
+    @Override
     public String getNodeName() {
         return document.getDomDocument().getNodeName();
     }
 
+    @Override
     public short getNodeType() {
         return document.getDomDocument().getNodeType();
     }
 
+    @Override
     public String getNodeValue() throws DOMException {
         return document.getNodeValue();
     }
 
+    @Override
     public Document getOwnerDocument() {
         return document.getDomDocument().getOwnerDocument();
     }
 
+    @Override
     public org.w3c.dom.Node getParentNode() {
         return document.getDomDocument().getParentNode();
     }
 
+    @Override
     public String getPrefix() {
         return document.getDomDocument().getPrefix();
     }
 
+    @Override
     public org.w3c.dom.Node getPreviousSibling() {
         return document.getDomDocument().getPreviousSibling();
     }
 
+    @Override
     public boolean hasAttributes() {
         return document.getDomDocument().hasAttributes();
     }
 
+    @Override
     public boolean hasChildNodes() {
         handleNewSource();
         return document.hasChildNodes();
     }
 
+    @Override
     public org.w3c.dom.Node insertBefore(
         org.w3c.dom.Node arg0,
         org.w3c.dom.Node arg1)
@@ -602,21 +656,25 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return document.insertBefore(arg0, arg1);
     }
 
+    @Override
     public boolean isSupported(String arg0, String arg1) {
         return document.getDomDocument().isSupported(arg0, arg1);
     }
 
+    @Override
     public void normalize() {
         handleNewSource();
         document.normalize();
     }
 
+    @Override
     public org.w3c.dom.Node removeChild(org.w3c.dom.Node arg0)
         throws DOMException {
         handleNewSource();
         return document.removeChild(arg0);
     }
 
+    @Override
     public org.w3c.dom.Node replaceChild(
         org.w3c.dom.Node arg0,
         org.w3c.dom.Node arg1)
@@ -625,10 +683,12 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         return document.replaceChild(arg0, arg1);
     }
 
+    @Override
     public void setNodeValue(String arg0) throws DOMException {
         document.setNodeValue(arg0);
     }
 
+    @Override
     public void setPrefix(String arg0) throws DOMException {
         document.setPrefix(arg0);
     }
@@ -703,141 +763,173 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
         this.sourceCharsetEncoding = charset;
     }
 
+    @Override
     public org.w3c.dom.Node renameNode(org.w3c.dom.Node n, String namespaceURI, String qualifiedName)
         throws DOMException {
         handleNewSource();
         return document.renameNode(n, namespaceURI, qualifiedName);
     }
 
+    @Override
     public void normalizeDocument() {
         document.normalizeDocument();
     }
 
+    @Override
     public DOMConfiguration getDomConfig() {
         return document.getDomDocument().getDomConfig();
     }
 
+    @Override
     public org.w3c.dom.Node adoptNode(org.w3c.dom.Node source) throws DOMException {
         handleNewSource();
         return document.adoptNode(source);
     }
 
+    @Override
     public void setDocumentURI(String documentURI) {
         document.setDocumentURI(documentURI);
     }
 
+    @Override
     public String getDocumentURI() {
         return document.getDomDocument().getDocumentURI();
     }
 
+    @Override
     public void  setStrictErrorChecking(boolean strictErrorChecking) {
         document.setStrictErrorChecking(strictErrorChecking);
     }
 
+    @Override
     public String getInputEncoding() {
         return document.getDomDocument().getInputEncoding();
     }
 
+    @Override
     public String getXmlEncoding() {
         return document.getDomDocument().getXmlEncoding();
     }
 
+    @Override
     public boolean getXmlStandalone() {
         return document.getDomDocument().getXmlStandalone();
     }
 
+    @Override
     public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
         document.setXmlStandalone(xmlStandalone);
     }
 
+    @Override
     public String getXmlVersion() {
         return document.getDomDocument().getXmlVersion();
     }
 
+    @Override
     public void setXmlVersion(String xmlVersion) throws DOMException {
         document.setXmlVersion(xmlVersion);
     }
 
+    @Override
     public boolean  getStrictErrorChecking() {
         return document.getDomDocument().getStrictErrorChecking();
     }
 
     // DOM L3 methods from org.w3c.dom.Node
+    @Override
     public String getBaseURI() {
         return document.getDomDocument().getBaseURI();
     }
 
+    @Override
     public short compareDocumentPosition(org.w3c.dom.Node other)
                               throws DOMException {
         return document.compareDocumentPosition(other);
     }
 
+    @Override
     public String getTextContent()
                       throws DOMException {
         return document.getTextContent();
     }
 
+    @Override
     public void setTextContent(String textContent) throws DOMException {
          document.setTextContent(textContent);
     }
 
+    @Override
     public boolean isSameNode(org.w3c.dom.Node other) {
         return document.isSameNode(other);
     }
 
+    @Override
     public String lookupPrefix(String namespaceURI) {
         return document.getDomDocument().lookupPrefix(namespaceURI);
     }
 
+    @Override
     public boolean isDefaultNamespace(String namespaceURI) {
         return document.isDefaultNamespace(namespaceURI);
     }
 
+    @Override
     public String lookupNamespaceURI(String prefix) {
         return document.lookupNamespaceURI(prefix);
     }
 
+    @Override
     public boolean isEqualNode(org.w3c.dom.Node arg) {
         return document.getDomDocument().isEqualNode(arg);
     }
 
+    @Override
     public Object getFeature(String feature,
                   String version) {
         return  document.getFeature(feature,version);
     }
 
+    @Override
     public Object setUserData(String key,
                    Object data,
                   UserDataHandler handler) {
         return document.setUserData(key, data, handler);
     }
 
+    @Override
     public Object getUserData(String key) {
         return document.getDomDocument().getUserData(key);
     }
 
+    @Override
     public void recycleNode() {
         // Nothing seems to be required to be done here
     }
 
+    @Override
     public String getValue() {
         return null;
     }
 
+    @Override
     public void setValue(String value) {
         log.severe("SAAJ0571.soappart.setValue.not.defined");
         throw new IllegalStateException("Setting value of a soap part is not defined");
     }
 
+    @Override
     public void setParentElement(SOAPElement parent) throws SOAPException {
         log.severe("SAAJ0570.soappart.parent.element.not.defined");
         throw new SOAPExceptionImpl("The parent element of a soap part is not defined");
     }
 
+    @Override
     public SOAPElement getParentElement() {
         return null;
     }
 
+    @Override
     public void detachNode() {
         // Nothing seems to be required to be done here
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java
index 751a014c163..cd78cdda2fe 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxLazySourceBridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -42,38 +42,39 @@ import com.sun.xml.internal.org.jvnet.staxex.util.XMLStreamReaderToXMLStreamWrit
  * @author shih-chang.chen@oracle.com
  */
 public class StaxLazySourceBridge extends StaxBridge {
-        private LazyEnvelopeSource lazySource;
+    private LazyEnvelopeSource lazySource;
 
-        public StaxLazySourceBridge(LazyEnvelopeSource src, SOAPPartImpl soapPart) throws SOAPException {
-                super(soapPart);
-                lazySource = src;
-                final String soapEnvNS = soapPart.getSOAPNamespace();
-                try {
-                        breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(src.readToBodyStarTag(), saajWriter) {
-                                        public boolean proceedAfterStartElement()  {
-                                                if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
-                                                        return false;
-                                                } else
-                                                        return true;
-                                        }
-                                };
-                } catch (XMLStreamException e) {
-                        throw new SOAPException(e);
+    public StaxLazySourceBridge(LazyEnvelopeSource src, SOAPPartImpl soapPart) throws SOAPException {
+        super(soapPart);
+        lazySource = src;
+        final String soapEnvNS = soapPart.getSOAPNamespace();
+        try {
+            breakpoint = new XMLStreamReaderToXMLStreamWriter.Breakpoint(src.readToBodyStarTag(), saajWriter) {
+                @Override
+                public boolean proceedAfterStartElement()  {
+                    if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
+                        return false;
+                    } else
+                        return true;
                 }
+            };
+        } catch (XMLStreamException e) {
+            throw new SOAPException(e);
         }
+    }
 
-        @Override
+    @Override
     public XMLStreamReader getPayloadReader() {
         return lazySource.readPayload();
 //              throw new UnsupportedOperationException();
     }
 
-        @Override
+    @Override
     public QName getPayloadQName() {
         return lazySource.getPayloadQName();
     }
 
-        @Override
+    @Override
     public String getPayloadAttributeValue(String attName) {
         if (lazySource.isPayloadStreamReader()) {
             XMLStreamReader reader = lazySource.readPayload();
@@ -84,7 +85,7 @@ public class StaxLazySourceBridge extends StaxBridge {
         return null;
     }
 
-        @Override
+    @Override
     public String getPayloadAttributeValue(QName attName) {
         if (lazySource.isPayloadStreamReader()) {
             XMLStreamReader reader = lazySource.readPayload();
@@ -95,12 +96,13 @@ public class StaxLazySourceBridge extends StaxBridge {
         return null;
     }
 
-        public void bridgePayload() throws XMLStreamException {
-                //Assuming out is at Body
-                writePayloadTo(saajWriter);
-        }
+        @Override
+    public void bridgePayload() throws XMLStreamException {
+        //Assuming out is at Body
+        writePayloadTo(saajWriter);
+    }
 
-        public void writePayloadTo(XMLStreamWriter writer) throws XMLStreamException {
+    public void writePayloadTo(XMLStreamWriter writer) throws XMLStreamException {
         lazySource.writePayloadTo(writer);
     }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java
index 753a26313e8..551de80d962 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/StaxReaderBridge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -38,41 +38,46 @@ import com.sun.xml.internal.org.jvnet.staxex.util.XMLStreamReaderToXMLStreamWrit
  * @author shih-chang.chen@oracle.com
  */
 public class StaxReaderBridge extends StaxBridge {
-        private XMLStreamReader in;
+    private XMLStreamReader in;
 
-        public StaxReaderBridge(XMLStreamReader reader, SOAPPartImpl soapPart) throws SOAPException {
-                super(soapPart);
-                in = reader;
-                final String soapEnvNS = soapPart.getSOAPNamespace();
-                breakpoint =  new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, saajWriter) {
-                        boolean seenBody = false;
-                        boolean stopedAtBody = false;
-                    public boolean proceedBeforeStartElement()  {
-                        if (stopedAtBody) return true;
-                        if (seenBody) {
-                                stopedAtBody = true;
-                                return false;
-                        }
-                            if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
-                                seenBody = true;
-                            }
-                            return true;
+    public StaxReaderBridge(XMLStreamReader reader, SOAPPartImpl soapPart) throws SOAPException {
+        super(soapPart);
+        in = reader;
+        final String soapEnvNS = soapPart.getSOAPNamespace();
+        breakpoint =  new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, saajWriter) {
+                boolean seenBody = false;
+                boolean stopedAtBody = false;
+                @Override
+                public boolean proceedBeforeStartElement()  {
+                    if (stopedAtBody) return true;
+                    if (seenBody) {
+                        stopedAtBody = true;
+                        return false;
                     }
-                };
-        }
+                    if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
+                        seenBody = true;
+                    }
+                    return true;
+                }
+            };
+    }
 
+    @Override
     public XMLStreamReader getPayloadReader() {
         return in;
     }
 
+    @Override
     public QName getPayloadQName() {
         return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getName() : null;
     }
 
+    @Override
     public String getPayloadAttributeValue(String attName) {
         return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(null, attName) : null;
     }
 
+    @Override
     public String getPayloadAttributeValue(QName attName) {
         return (in.getEventType() == XMLStreamConstants.START_ELEMENT) ? in.getAttributeValue(attName.getNamespaceURI(), attName.getLocalPart()) : null;
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
index 58136239bdf..d7a45dcc97e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,10 +36,12 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
 
 public class SOAPFactoryDynamicImpl extends SOAPFactoryImpl {
+    @Override
     protected SOAPDocumentImpl createDocument() {
         return null;
     }
 
+    @Override
     public Detail createDetail() throws SOAPException {
         throw new UnsupportedOperationException(
                 "createDetail() not supported for Dynamic Protocol");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
index 2ea59f9d015..64b2678172a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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.xml.soap.*;
 import com.sun.xml.internal.messaging.saaj.soap.MessageFactoryImpl;
 
 public class SOAPMessageFactoryDynamicImpl extends MessageFactoryImpl {
+    @Override
     public SOAPMessage createMessage() throws SOAPException {
         throw new UnsupportedOperationException(
                 "createMessage() not supported for Dynamic Protocol");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
index 30777a7ef03..10a45b7a93a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +29,7 @@ import javax.xml.namespace.QName;
 import javax.xml.soap.*;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import org.w3c.dom.Element;
 
 /**
  * All elements of the SOAP-ENV:BODY.
@@ -47,6 +48,11 @@ public abstract class BodyElementImpl
         super(ownerDoc, qname);
     }
 
+    public BodyElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public void setParentElement(SOAPElement element) throws SOAPException {
         if (! (element instanceof SOAPBody)) {
             log.severe("SAAJ0101.impl.parent.of.body.elem.mustbe.body");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
index 4993bf71e7e..d5885ea5d26 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
@@ -30,21 +30,30 @@ import java.util.Locale;
 import java.util.logging.Level;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.*;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
-import org.w3c.dom.*;
-import org.w3c.dom.Node;
 
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.StaxBridge;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * The implementation of SOAP-ENV:BODY or the SOAPBody abstraction.
@@ -72,6 +81,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
     protected abstract SOAPFault createFaultElement();
     protected abstract QName getDefaultFaultCode();
 
+    @Override
     public SOAPFault addFault() throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0110.impl.fault.already.exists");
@@ -88,6 +98,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return fault;
     }
 
+    @Override
     public SOAPFault addFault(
         Name faultCode,
         String faultString,
@@ -100,6 +111,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return fault;
     }
 
+    @Override
    public SOAPFault addFault(
         QName faultCode,
         String faultString,
@@ -112,6 +124,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return fault;
     }
 
+    @Override
     public SOAPFault addFault(Name faultCode, String faultString)
         throws SOAPException {
 
@@ -121,6 +134,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return fault;
     }
 
+    @Override
     public SOAPFault addFault(QName faultCode, String faultString)
         throws SOAPException {
 
@@ -147,6 +161,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return null;
     }
 
+    @Override
     public boolean hasFault() {
         QName payloadQName = getPayloadQName();
         return getFaultQName().equals(payloadQName);
@@ -156,6 +171,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return new QName(getNamespaceURI(), "Fault");
     }
 
+    @Override
     public SOAPFault getFault() {
         if (hasFault()) {
             if (fault == null) {
@@ -167,6 +183,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return null;
     }
 
+    @Override
     public SOAPBodyElement addBodyElement(Name name) throws SOAPException {
         SOAPBodyElement newBodyElement =
             (SOAPBodyElement) ElementFactory.createNamedElement(
@@ -181,6 +198,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return newBodyElement;
     }
 
+    @Override
     public SOAPBodyElement addBodyElement(QName qname) throws SOAPException {
         SOAPBodyElement newBodyElement =
             (SOAPBodyElement) ElementFactory.createNamedElement(
@@ -195,6 +213,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         return newBodyElement;
     }
 
+    @Override
     public void setParentElement(SOAPElement element) throws SOAPException {
 
         if (!(element instanceof SOAPEnvelope)) {
@@ -204,10 +223,12 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         super.setParentElement(element);
     }
 
+    @Override
     protected SOAPElement addElement(Name name) throws SOAPException {
         return addBodyElement(name);
     }
 
+    @Override
     protected SOAPElement addElement(QName name) throws SOAPException {
         return addBodyElement(name);
     }
@@ -226,6 +247,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
     //        return super.replaceChild(newElement, ref);
     //    }
 
+    @Override
     public SOAPBodyElement addDocument(Document document)
         throws SOAPException {
         /*
@@ -252,7 +274,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
             org.w3c.dom.Node replacingNode = ownerDoc.importNode(docFrag, true);
             // Adding replacingNode at the last of the children list of body
             addNode(replacingNode);
-            Iterator<Node> i =
+            Iterator<javax.xml.soap.Node> i =
                 getChildElements(NameImpl.copyElementName(rootElement));
             // Return the child element with the required name which is at the
             // end of the list
@@ -263,6 +285,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         //*/
     }
 
+    @Override
     protected SOAPElement convertToSoapElement(Element element) {
         final Node soapNode = getSoapDocument().findIfPresent(element);
         if ((soapNode instanceof SOAPBodyElement) &&
@@ -278,6 +301,7 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
         }
     }
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         log.log(Level.SEVERE,
                 "SAAJ0146.impl.invalid.name.change.requested",
@@ -288,9 +312,10 @@ public abstract class BodyImpl extends ElementImpl implements SOAPBody {
                                 + newName.getLocalPart());
     }
 
+    @Override
     public Document extractContentAsDocument() throws SOAPException {
 
-        Iterator<Node> eachChild = getChildElements();
+        Iterator<javax.xml.soap.Node> eachChild = getChildElements();
         javax.xml.soap.Node firstBodyElement = null;
 
         while (eachChild.hasNext() &&
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
index b406caf111e..975d2cc4a1a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
@@ -25,325 +25,61 @@
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
 import org.w3c.dom.CDATASection;
+import org.w3c.dom.CharacterData;
 import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
-import org.w3c.dom.UserDataHandler;
 
-public class CDATAImpl implements CDATASection, javax.xml.soap.Text {
-
-    protected static final Logger log =
-        Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
-                         "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
+public class CDATAImpl extends TextImpl<CDATASection> implements CDATASection {
 
     static final String cdataUC = "<![CDATA[";
     static final String cdataLC = "<![cdata[";
 
+    public CDATAImpl(SOAPDocumentImpl ownerDoc, String text) {
+        super(ownerDoc, text);
+    }
+
+    public CDATAImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        super(ownerDoc, data);
+    }
+
+    @Override
+    protected CDATASection createN(SOAPDocumentImpl ownerDoc, String text) {
+        CDATASection c = ownerDoc.getDomDocument().createCDATASection(text);
+//        ownerDoc.register(this);
+        return c;
+    }
+
+    @Override
+    protected CDATASection createN(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        CDATASection c = (CDATASection) data;
+        return c;
+    }
+
     @Override
     public Text splitText(int offset) throws DOMException {
-        return cdataSection.splitText(offset);
+        return getDomElement().splitText(offset);
     }
 
     @Override
     public boolean isElementContentWhitespace() {
-        return cdataSection.isElementContentWhitespace();
+        return getDomElement().isElementContentWhitespace();
     }
 
     @Override
     public String getWholeText() {
-        return cdataSection.getWholeText();
+        return getDomElement().getWholeText();
     }
 
     @Override
     public Text replaceWholeText(String content) throws DOMException {
-        return cdataSection.replaceWholeText(content);
+        return getDomElement().replaceWholeText(content);
     }
 
     @Override
-    public String getData() throws DOMException {
-        return cdataSection.getData();
-    }
-
-    @Override
-    public void setData(String data) throws DOMException {
-        cdataSection.setData(data);
-    }
-
-    @Override
-    public int getLength() {
-        return cdataSection.getLength();
-    }
-
-    @Override
-    public String substringData(int offset, int count) throws DOMException {
-        return cdataSection.substringData(offset, count);
-    }
-
-    @Override
-    public void appendData(String arg) throws DOMException {
-        cdataSection.appendData(arg);
-    }
-
-    @Override
-    public void insertData(int offset, String arg) throws DOMException {
-        cdataSection.insertData(offset, arg);
-    }
-
-    @Override
-    public void deleteData(int offset, int count) throws DOMException {
-        cdataSection.deleteData(offset, count);
-    }
-
-    @Override
-    public void replaceData(int offset, int count, String arg) throws DOMException {
-        cdataSection.replaceData(offset, count, arg);
-    }
-
-    @Override
-    public String getNodeName() {
-        return cdataSection.getNodeName();
-    }
-
-    @Override
-    public String getNodeValue() throws DOMException {
-        return cdataSection.getNodeValue();
-    }
-
-    @Override
-    public void setNodeValue(String nodeValue) throws DOMException {
-        cdataSection.setNodeValue(nodeValue);
-    }
-
-    @Override
-    public short getNodeType() {
-        return cdataSection.getNodeType();
-    }
-
-    @Override
-    public Node getParentNode() {
-        return cdataSection.getParentNode();
-    }
-
-    @Override
-    public NodeList getChildNodes() {
-        return cdataSection.getChildNodes();
-    }
-
-    @Override
-    public Node getFirstChild() {
-        return cdataSection.getFirstChild();
-    }
-
-    @Override
-    public Node getLastChild() {
-        return cdataSection.getLastChild();
-    }
-
-    @Override
-    public Node getPreviousSibling() {
-        return cdataSection.getPreviousSibling();
-    }
-
-    @Override
-    public Node getNextSibling() {
-        return cdataSection.getNextSibling();
-    }
-
-    @Override
-    public NamedNodeMap getAttributes() {
-        return cdataSection.getAttributes();
-    }
-
-    @Override
-    public Document getOwnerDocument() {
-        return cdataSection.getOwnerDocument();
-    }
-
-    @Override
-    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-        return cdataSection.insertBefore(newChild, refChild);
-    }
-
-    @Override
-    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-        return cdataSection.replaceChild(newChild, oldChild);
-    }
-
-    @Override
-    public Node removeChild(Node oldChild) throws DOMException {
-        return cdataSection.removeChild(oldChild);
-    }
-
-    @Override
-    public Node appendChild(Node newChild) throws DOMException {
-        return cdataSection.appendChild(newChild);
-    }
-
-    @Override
-    public boolean hasChildNodes() {
-        return cdataSection.hasChildNodes();
-    }
-
-    @Override
-    public Node cloneNode(boolean deep) {
-        return cdataSection.cloneNode(deep);
-    }
-
-    @Override
-    public void normalize() {
-        cdataSection.normalize();
-    }
-
-    @Override
-    public boolean isSupported(String feature, String version) {
-        return cdataSection.isSupported(feature, version);
-    }
-
-    @Override
-    public String getNamespaceURI() {
-        return cdataSection.getNamespaceURI();
-    }
-
-    @Override
-    public String getPrefix() {
-        return cdataSection.getPrefix();
-    }
-
-    @Override
-    public void setPrefix(String prefix) throws DOMException {
-        cdataSection.setPrefix(prefix);
-    }
-
-    @Override
-    public String getLocalName() {
-        return cdataSection.getLocalName();
-    }
-
-    @Override
-    public boolean hasAttributes() {
-        return cdataSection.hasAttributes();
-    }
-
-    @Override
-    public String getBaseURI() {
-        return cdataSection.getBaseURI();
-    }
-
-    @Override
-    public short compareDocumentPosition(Node other) throws DOMException {
-        return cdataSection.compareDocumentPosition(other);
-    }
-
-    @Override
-    public String getTextContent() throws DOMException {
-        return cdataSection.getTextContent();
-    }
-
-    @Override
-    public void setTextContent(String textContent) throws DOMException {
-        cdataSection.setTextContent(textContent);
-    }
-
-    @Override
-    public boolean isSameNode(Node other) {
-        return cdataSection.isSameNode(other);
-    }
-
-    @Override
-    public String lookupPrefix(String namespaceURI) {
-        return cdataSection.lookupPrefix(namespaceURI);
-    }
-
-    @Override
-    public boolean isDefaultNamespace(String namespaceURI) {
-        return cdataSection.isDefaultNamespace(namespaceURI);
-    }
-
-    @Override
-    public String lookupNamespaceURI(String prefix) {
-        return cdataSection.lookupNamespaceURI(prefix);
-    }
-
-    @Override
-    public boolean isEqualNode(Node arg) {
-        return cdataSection.isEqualNode(arg);
-    }
-
-    @Override
-    public Object getFeature(String feature, String version) {
-        return cdataSection.getFeature(feature, version);
-    }
-
-    @Override
-    public Object setUserData(String key, Object data, UserDataHandler handler) {
-        return cdataSection.setUserData(key, data, handler);
-    }
-
-    @Override
-    public Object getUserData(String key) {
-        return cdataSection.getUserData(key);
-    }
-
-    private CDATASection cdataSection;
-
-    public CDATAImpl(SOAPDocumentImpl ownerDoc, String text) {
-        cdataSection = ownerDoc.getDomDocument().createCDATASection(text);
-        ownerDoc.register(this);
-    }
-
-    public String getValue() {
-        String nodeValue = getNodeValue();
-        return (nodeValue.equals("") ? null : nodeValue);
-    }
-
-    public void setValue(String text) {
-        setNodeValue(text);
-    }
-
-    public void setParentElement(SOAPElement parent) throws SOAPException {
-        if (parent == null) {
-            log.severe("SAAJ0145.impl.no.null.to.parent.elem");
-            throw new SOAPException("Cannot pass NULL to setParentElement");
-        }
-        ((ElementImpl) parent).addNode(this);
-    }
-
-    public SOAPElement getParentElement() {
-        return (SOAPElement) getParentNode();
-    }
-
-
-    public void detachNode() {
-        org.w3c.dom.Node parent = getParentNode();
-        if (parent != null) {
-            parent.removeChild(this);
-        }
-    }
-
-    public void recycleNode() {
-        detachNode();
-        // TBD
-        //  - add this to the factory so subsequent
-        //    creations can reuse this object.
-    }
-
     public boolean isComment() {
         return false;
     }
 
-    public CDATASection getDomElement() {
-        return cdataSection;
-    }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
index 923c48df048..e6e964dcf41 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -30,6 +30,7 @@ import javax.xml.soap.DetailEntry;
 import javax.xml.soap.Name;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import org.w3c.dom.Element;
 
 public abstract class DetailEntryImpl
     extends ElementImpl
@@ -40,4 +41,8 @@ public abstract class DetailEntryImpl
     public DetailEntryImpl(SOAPDocumentImpl ownerDoc, QName qname) {
         super(ownerDoc, qname);
     }
+
+    public DetailEntryImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
index aeeb60b4608..c1651ee01b0 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
@@ -31,7 +31,6 @@ import java.util.NoSuchElementException;
 import javax.xml.namespace.QName;
 import javax.xml.soap.*;
 
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
 import org.w3c.dom.Element;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
@@ -49,26 +48,31 @@ public abstract class DetailImpl extends FaultElementImpl implements Detail {
     protected abstract DetailEntry createDetailEntry(Name name);
     protected abstract DetailEntry createDetailEntry(QName name);
 
+    @Override
     public DetailEntry addDetailEntry(Name name) throws SOAPException {
         DetailEntry entry = createDetailEntry(name);
         addNode(entry);
         return entry;
     }
 
+    @Override
     public DetailEntry addDetailEntry(QName qname) throws SOAPException {
         DetailEntry entry = createDetailEntry(qname);
         addNode(entry);
         return entry;
     }
 
+    @Override
     protected SOAPElement addElement(Name name) throws SOAPException {
         return addDetailEntry(name);
     }
 
+    @Override
     protected SOAPElement addElement(QName name) throws SOAPException {
         return addDetailEntry(name);
     }
 
+    @Override
     protected SOAPElement convertToSoapElement(Element element) {
         final javax.xml.soap.Node soapNode = getSoapDocument().find(element);
         if (soapNode instanceof DetailEntry) {
@@ -82,12 +86,14 @@ public abstract class DetailImpl extends FaultElementImpl implements Detail {
         }
     }
 
-    public Iterator getDetailEntries() {
-        return new Iterator<SOAPElement>() {
+    @Override
+    public Iterator<DetailEntry> getDetailEntries() {
+        return new Iterator<DetailEntry>() {
             Iterator<org.w3c.dom.Node> eachNode = getChildElementNodes();
             SOAPElement next = null;
             SOAPElement last = null;
 
+            @Override
             public boolean hasNext() {
                 if (next == null) {
                     while (eachNode.hasNext()) {
@@ -101,15 +107,17 @@ public abstract class DetailImpl extends FaultElementImpl implements Detail {
                 return next != null;
             }
 
-            public SOAPElement next() {
+            @Override
+            public DetailEntry next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
                 last = next;
                 next = null;
-                return last;
+                return (DetailEntry) last;
             }
 
+            @Override
             public void remove() {
                 if (last == null) {
                     throw new IllegalStateException();
@@ -121,6 +129,7 @@ public abstract class DetailImpl extends FaultElementImpl implements Detail {
         };
     }
 
+    @Override
    protected  boolean isStandardFaultElement() {
        return true;
    }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
index 20aa00b0e2b..b704bf32d66 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
@@ -106,9 +106,9 @@ public class ElementFactory {
         }
         if ("Fault".equalsIgnoreCase(localName)) {
             if (NameImpl.SOAP11_NAMESPACE.equals(namespaceUri)) {
-                return new Fault1_1Impl(element, ownerDocument);
+                return new Fault1_1Impl(ownerDocument, element);
             } else if (NameImpl.SOAP12_NAMESPACE.equals(namespaceUri)) {
-                return new Fault1_2Impl(element, ownerDocument);
+                return new Fault1_2Impl(ownerDocument, element);
             }
 
         }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
index 5f9ffc3eaac..efbc0dffe1c 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
@@ -27,21 +27,37 @@ package com.sun.xml.internal.messaging.saaj.soap.impl;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.*;
 
-import org.w3c.dom.*;
 import org.w3c.dom.Node;
 
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
-import com.sun.xml.internal.messaging.saaj.util.*;
+import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import com.sun.xml.internal.messaging.saaj.util.NamespaceContextIterator;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBodyElement;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
+import org.w3c.dom.UserDataHandler;
 
 public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
@@ -108,7 +124,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public NodeList getElementsByTagName(String name) {
-        return new NodeListImpl(getSoapDocument(), element.getElementsByTagName(name));
+        return new NodeListImpl(soapDocument, element.getElementsByTagName(name));
     }
 
     @Override
@@ -139,21 +155,21 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         this.soapDocument = ownerDoc;
         this.element = ownerDoc.getDomDocument().createElementNS(name.getURI(), name.getQualifiedName());
         elementQName = NameImpl.convertToQName(name);
-        getSoapDocument().register(this);
+        soapDocument.register(this);
     }
 
     public ElementImpl(SOAPDocumentImpl ownerDoc, QName name) {
         this.soapDocument = ownerDoc;
         this.element = ownerDoc.getDomDocument().createElementNS(name.getNamespaceURI(), getQualifiedName(name));
         elementQName = name;
-        getSoapDocument().register(this);
+        soapDocument.register(this);
     }
 
     public ElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
         this.element = domElement;
         this.soapDocument = ownerDoc;
         this.elementQName = new QName(domElement.getNamespaceURI(), domElement.getLocalName());
-        getSoapDocument().register(this);
+        soapDocument.register(this);
     }
 
     public ElementImpl(
@@ -165,7 +181,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         this.element = ownerDoc.getDomDocument().createElementNS(uri, qualifiedName);
         elementQName =
             new QName(uri, getLocalPart(qualifiedName), getPrefix(qualifiedName));
-        getSoapDocument().register(this);
+        soapDocument.register(this);
     }
 
     public void ensureNamespaceIsDeclared(String prefix, String uri) {
@@ -178,28 +194,29 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         }
     }
 
+    @Override
     public Document getOwnerDocument() {
         return soapDocument;
     }
 
     @Override
     public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-        return element.insertBefore(getSoapDocument().getDomNode(newChild), getSoapDocument().getDomNode(refChild));
+        return soapDocument.findIfPresent(element.insertBefore(soapDocument.getDomNode(newChild), soapDocument.getDomNode(refChild)));
     }
 
     @Override
     public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-        return element.replaceChild(getSoapDocument().getDomNode(newChild), getSoapDocument().getDomNode(oldChild));
+        return soapDocument.findIfPresent(element.replaceChild(soapDocument.getDomNode(newChild), soapDocument.getDomNode(oldChild)));
     }
 
     @Override
     public Node removeChild(Node oldChild) throws DOMException {
-        return element.removeChild(getSoapDocument().getDomNode(oldChild));
+        return soapDocument.findIfPresent(element.removeChild(soapDocument.getDomNode(oldChild)));
     }
 
     @Override
     public Node appendChild(Node newChild) throws DOMException {
-        return element.appendChild(getSoapDocument().getDomNode(newChild));
+        return soapDocument.findIfPresent(element.appendChild(soapDocument.getDomNode(newChild)));
     }
 
     @Override
@@ -209,7 +226,9 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public Node cloneNode(boolean deep) {
-        return element.cloneNode(deep);
+        Node elementNSNode = element.cloneNode(deep);
+        soapDocument.registerChildNodes(elementNSNode, deep);
+        return soapDocument.findIfPresent(soapDocument.getDomNode(elementNSNode));
     }
 
     @Override
@@ -254,7 +273,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public short compareDocumentPosition(Node other) throws DOMException {
-        return element.compareDocumentPosition(other);
+        return element.compareDocumentPosition(soapDocument.getDomNode(other));
     }
 
     @Override
@@ -269,7 +288,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public boolean isSameNode(Node other) {
-        return element.isSameNode(other);
+        return element.isSameNode(soapDocument.getDomNode(other));
     }
 
     @Override
@@ -289,7 +308,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public boolean isEqualNode(Node arg) {
-        return element.isEqualNode(arg);
+        return element.isEqualNode(soapDocument.getDomNode(arg));
     }
 
     @Override
@@ -307,14 +326,17 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return element.getUserData(key);
     }
 
+    @Override
     public SOAPElement addChildElement(Name name) throws SOAPException {
         return  addElement(name);
     }
 
+    @Override
     public SOAPElement addChildElement(QName qname) throws SOAPException {
         return  addElement(qname);
     }
 
+    @Override
     public SOAPElement addChildElement(String localName) throws SOAPException {
         String nsUri = getNamespaceURI("");
         Name name = (nsUri == null || nsUri.isEmpty())
@@ -323,6 +345,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return addChildElement(name);
     }
 
+    @Override
     public SOAPElement addChildElement(String localName, String prefix)
         throws SOAPException {
         String uri = getNamespaceURI(prefix);
@@ -337,6 +360,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return addChildElement(localName, prefix, uri);
     }
 
+    @Override
     public String getNamespaceURI(String prefix) {
 
         if ("xmlns".equals(prefix)) {
@@ -415,12 +439,14 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return null;
     }
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         ElementImpl copy =
             new ElementImpl((SOAPDocumentImpl) getOwnerDocument(), newName);
         return replaceElementWithSOAPElement(this,copy);
     }
 
+    @Override
     public QName createQName(String localName, String prefix)
         throws SOAPException {
         String uri = getNamespaceURI(prefix);
@@ -485,6 +511,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return new NamespaceContextIterator(this, traverseStack);
     }
 
+    @Override
     public SOAPElement addChildElement(
         String localName,
         String prefix,
@@ -496,6 +523,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return convertToSoapElement(newElement);
     }
 
+    @Override
     public SOAPElement addChildElement(SOAPElement element)
         throws SOAPException {
 
@@ -531,7 +559,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                    log.severe("SAAJ0158.impl.version.mismatch.fault");
                    throw new SOAPExceptionImpl("SOAP Version mismatch encountered when trying to add SOAPFault to SOAPBody");
                }
-               Iterator<Node> it = this.getChildElements();
+               Iterator<javax.xml.soap.Node> it = this.getChildElements();
                if (it.hasNext()) {
                    log.severe("SAAJ0156.impl.adding.fault.error");
                    throw new SOAPExceptionImpl("Cannot add SOAPFault as a child of a non-Empty SOAPBody");
@@ -542,8 +570,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         // preserve the encodingStyle attr as it may get lost in the import
         String encodingStyle = element.getEncodingStyle();
 
-        final Element domElement = ((ElementImpl) element).getDomElement();
-        final Element importedElement = importElement(domElement);
+        final Element importedElement = importElement(element);
         addNode(importedElement);
 
         final SOAPElement converted = convertToSoapElement(importedElement);
@@ -603,7 +630,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
     }
 
     protected void addNode(org.w3c.dom.Node newElement) throws SOAPException {
-        insertBefore(getSoapDocument().getDomNode(newElement), null);
+        insertBefore(soapDocument.getDomNode(newElement), null);
 
         if (getOwnerDocument() instanceof DocumentFragment)
             return;
@@ -623,7 +650,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         Node child = getFirstChild();
         while (child != null) {
             if (child instanceof Element) {
-                return (Element) getSoapDocument().find(child);
+                return (Element) soapDocument.find(child);
             }
             child = child.getNextSibling();
         }
@@ -634,7 +661,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         Node eachChild = getFirstChild();
         while (eachChild != null) {
             if (eachChild instanceof Element) {
-                SOAPElement eachChildSoap = (SOAPElement) getSoapDocument().find(eachChild);
+                SOAPElement eachChildSoap = (SOAPElement) soapDocument.find(eachChild);
                 if (eachChildSoap != null) {
                     if (eachChildSoap.getElementName().equals(name)) {
                         return eachChildSoap;
@@ -658,6 +685,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return null;
     }
 
+    @Override
     public SOAPElement addTextNode(String text) throws SOAPException {
         if (text.startsWith(CDATAImpl.cdataUC)
             || text.startsWith(CDATAImpl.cdataLC))
@@ -680,6 +708,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return this;
     }
 
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         addAttributeBare(name, value);
@@ -689,6 +718,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return this;
     }
 
+    @Override
     public SOAPElement addAttribute(QName qname, String value)
         throws SOAPException {
         addAttributeBare(qname, value);
@@ -731,6 +761,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         }
     }
 
+    @Override
     public SOAPElement addNamespaceDeclaration(String prefix, String uri)
         throws SOAPException {
         if (prefix.length() > 0) {
@@ -743,10 +774,12 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return this;
     }
 
+    @Override
     public String getAttributeValue(Name name) {
         return getAttributeValueFrom(this, name);
     }
 
+    @Override
     public String getAttributeValue(QName qname) {
         return getAttributeValueFrom(
                    this,
@@ -756,9 +789,10 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                    getQualifiedName(qname));
     }
 
-    public Iterator getAllAttributes() {
+    @Override
+    public Iterator<Name> getAllAttributes() {
         Iterator<Name> i = getAllAttributesFrom(this);
-        ArrayList<Name> list = new ArrayList<Name>();
+        ArrayList<Name> list = new ArrayList<>();
         while (i.hasNext()) {
             Name name = i.next();
             if (!"xmlns".equalsIgnoreCase(name.getPrefix()))
@@ -767,9 +801,10 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return list.iterator();
     }
 
-    public Iterator getAllAttributesAsQNames() {
+    @Override
+    public Iterator<QName> getAllAttributesAsQNames() {
         Iterator<Name> i = getAllAttributesFrom(this);
-        ArrayList<QName> list = new ArrayList<QName>();
+        ArrayList<QName> list = new ArrayList<>();
         while (i.hasNext()) {
             Name name = i.next();
             if (!"xmlns".equalsIgnoreCase(name.getPrefix())) {
@@ -780,11 +815,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
     }
 
 
-    public Iterator getNamespacePrefixes() {
+    @Override
+    public Iterator<String> getNamespacePrefixes() {
         return doGetNamespacePrefixes(false);
     }
 
-    public Iterator getVisibleNamespacePrefixes() {
+    @Override
+    public Iterator<String> getVisibleNamespacePrefixes() {
         return doGetNamespacePrefixes(true);
     }
 
@@ -805,11 +842,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 }
             }
 
+            @Override
             public boolean hasNext() {
                 findNext();
                 return next != null;
             }
 
+            @Override
             public String next() {
                 findNext();
                 if (next == null) {
@@ -821,6 +860,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 return last;
             }
 
+            @Override
             public void remove() {
                 if (last == null) {
                     throw new IllegalStateException();
@@ -832,18 +872,22 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         };
     }
 
+    @Override
     public Name getElementName() {
         return NameImpl.convertToName(elementQName);
     }
 
+    @Override
     public QName getElementQName() {
         return elementQName;
     }
 
+    @Override
     public boolean removeAttribute(Name name) {
         return removeAttribute(name.getURI(), name.getLocalName());
     }
 
+    @Override
     public boolean removeAttribute(QName name) {
         return removeAttribute(name.getNamespaceURI(), name.getLocalPart());
     }
@@ -860,6 +904,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return true;
     }
 
+    @Override
     public boolean removeNamespaceDeclaration(String prefix) {
         org.w3c.dom.Attr declaration = getNamespaceAttr(prefix);
         if (declaration == null) {
@@ -873,12 +918,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return true;
     }
 
-    public Iterator<Node> getChildElements() {
+    @Override
+    public Iterator<javax.xml.soap.Node> getChildElements() {
         return getChildElementsFrom(this);
     }
 
     protected SOAPElement convertToSoapElement(Element element) {
-        final Node soapNode = getSoapDocument().findIfPresent(element);
+        final Node soapNode = soapDocument.findIfPresent(element);
         if (soapNode instanceof SOAPElement) {
             return (SOAPElement) soapNode;
         } else {
@@ -888,6 +934,36 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         }
     }
 
+    protected TextImpl convertToSoapText(CharacterData characterData) {
+        final Node soapNode = getSoapDocument().findIfPresent(characterData);
+        if (soapNode instanceof TextImpl) {
+            return (TextImpl) soapNode;
+        } else {
+            TextImpl t = null;
+            switch (characterData.getNodeType()) {
+                case CDATA_SECTION_NODE:
+                    t = new CDATAImpl(getSoapDocument(), characterData.getData());
+                    break;
+                case COMMENT_NODE:
+                    t = new SOAPCommentImpl(getSoapDocument(), characterData.getData());
+                    break;
+                case TEXT_NODE:
+                    t = new SOAPTextImpl(getSoapDocument(), characterData.getData());
+                    break;
+            }
+            Node parent = getSoapDocument().find(characterData.getParentNode());
+            if (parent != null) {
+                parent.replaceChild(t, characterData);
+            } // XXX else throw an exception?
+
+            return t;
+
+//            return replaceElementWithSOAPElement(
+//                element,
+//                (ElementImpl) createElement(NameImpl.copyElementName(element)));
+        }
+    }
+
     protected SOAPElement replaceElementWithSOAPElement(
         Element element,
         ElementImpl copy) {
@@ -898,13 +974,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
             copy.addAttributeBare(name, getAttributeValueFrom(element, name));
         }
 
-        Iterator<Node> eachChild = getChildElementsFrom(element);
+        Iterator<Node> eachChild = getChildElementsFromDOM(element);
         while (eachChild.hasNext()) {
             Node nextChild = eachChild.next();
             copy.insertBefore(nextChild, null);
         }
 
-        Node parent = getSoapDocument().find(element.getParentNode());
+        Node parent = soapDocument.find(element.getParentNode());
         if (parent != null) {
             parent.replaceChild(copy, element);
         } // XXX else throw an exception?
@@ -912,22 +988,22 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return copy;
     }
 
-    protected Iterator<Node> getChildElementNodes() {
+    private Iterator<Node> getChildElementsFromDOM(final Element el) {
         return new Iterator<Node>() {
-            Iterator<Node> eachNode = getChildElements();
-            Node next = null;
+            Node next = el.getFirstChild();
+            Node nextNext = null;
             Node last = null;
+            Node soapElement = getSoapDocument().findIfPresent(el);
 
+            @Override
             public boolean hasNext() {
-                if (next == null) {
-                    while (eachNode.hasNext()) {
-                        Node node = eachNode.next();
-                        if (node instanceof Element) {
-                            next = getSoapDocument().findIfPresent(node);
-                            break;
-                        }
-                    }
+                if (next != null) {
+                    return true;
                 }
+                if (nextNext != null) {
+                    next = nextNext;
+                }
+
                 return next != null;
             }
 
@@ -935,11 +1011,66 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 if (hasNext()) {
                     last = next;
                     next = null;
+
+                    if ((soapElement instanceof ElementImpl)
+                            && (last instanceof Element)) {
+                        last =
+                                ((ElementImpl) soapElement).convertToSoapElement(
+                                        (Element) last);
+                    } else if ((soapElement instanceof ElementImpl) && (last instanceof CharacterData)) {
+                        last = ((ElementImpl) soapElement).convertToSoapText(
+                                        (CharacterData) last);
+                    }
+
+                    nextNext = last.getNextSibling();
                     return last;
                 }
                 throw new NoSuchElementException();
             }
 
+            @Override
+            public void remove() {
+                if (last == null) {
+                    throw new IllegalStateException();
+                }
+                Node target = last;
+                last = null;
+                el.removeChild(target);
+            }
+        };
+    }
+
+    protected Iterator<Node> getChildElementNodes() {
+        return new Iterator<Node>() {
+            Iterator<javax.xml.soap.Node> eachNode = getChildElements();
+            Node next = null;
+            Node last = null;
+
+            @Override
+            public boolean hasNext() {
+                if (next == null) {
+                    while (eachNode.hasNext()) {
+                        Node node = eachNode.next();
+                        if (node instanceof Element) {
+                            next = soapDocument.findIfPresent(node);
+                            break;
+                        }
+                    }
+                }
+                return next != null;
+            }
+
+            @Override
+            public javax.xml.soap.Node next() {
+                if (hasNext()) {
+                    last = next;
+                    next = null;
+                    return (javax.xml.soap.Node) last;
+                }
+                throw new NoSuchElementException();
+            }
+
+            @Override
             public void remove() {
                 if (last == null) {
                     throw new IllegalStateException();
@@ -951,20 +1082,23 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         };
     }
 
-    public Iterator getChildElements(final Name name) {
+    @Override
+    public Iterator<javax.xml.soap.Node> getChildElements(final Name name) {
        return getChildElements(name.getURI(), name.getLocalName());
     }
 
-    public Iterator getChildElements(final QName qname) {
+    @Override
+    public Iterator<javax.xml.soap.Node> getChildElements(final QName qname) {
         return getChildElements(qname.getNamespaceURI(), qname.getLocalPart());
     }
 
-    private Iterator<Node> getChildElements(final String nameUri, final String nameLocal) {
-        return new Iterator<Node>() {
+    private Iterator<javax.xml.soap.Node> getChildElements(final String nameUri, final String nameLocal) {
+        return new Iterator<javax.xml.soap.Node>() {
             Iterator<Node> eachElement = getChildElementNodes();
             Node next = null;
             Node last = null;
 
+            @Override
             public boolean hasNext() {
                 if (next == null) {
                     while (eachElement.hasNext()) {
@@ -982,15 +1116,17 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 return next != null;
             }
 
-            public Node next() {
+            @Override
+            public javax.xml.soap.Node next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
                 last = next;
                 next = null;
-                return last;
+                return (javax.xml.soap.Node) last;
             }
 
+            @Override
             public void remove() {
                 if (last == null) {
                     throw new IllegalStateException();
@@ -1002,6 +1138,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         };
     }
 
+    @Override
     public void removeContents() {
         Node currentChild = getFirstChild();
 
@@ -1020,6 +1157,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         }
     }
 
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         if (!"".equals(encodingStyle)) {
             try {
@@ -1037,6 +1175,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         tryToFindEncodingStyleAttributeName();
     }
 
+    @Override
     public String getEncodingStyle() {
         String encodingStyle = encodingStyleAttribute.getValue();
         if (encodingStyle != null)
@@ -1058,11 +1197,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
     }
 
     // Node methods
+    @Override
     public String getValue() {
         javax.xml.soap.Node valueNode = getValueNode();
         return valueNode == null ? null : valueNode.getValue();
     }
 
+    @Override
     public void setValue(String value) {
         Node valueNode = getValueNodeStrict();
         if (valueNode != null) {
@@ -1092,7 +1233,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
     }
 
     protected javax.xml.soap.Node getValueNode() {
-        Iterator<Node> i = getChildElements();
+        Iterator<javax.xml.soap.Node> i = getChildElements();
         while (i.hasNext()) {
             Node n = i.next();
             if (n.getNodeType() == org.w3c.dom.Node.TEXT_NODE ||
@@ -1101,12 +1242,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 normalize();
                 // Should remove the normalization step when this gets fixed in
                 // DOM/Xerces.
-                return getSoapDocument().find(n);
+                return soapDocument.find(n);
             }
         }
         return null;
     }
 
+    @Override
     public void setParentElement(SOAPElement element) throws SOAPException {
         if (element == null) {
             log.severe("SAAJ0106.impl.no.null.to.parent.elem");
@@ -1138,12 +1280,13 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         encodingStyleAttribute.setName(encodingStyleAttributeName);
     }
 
+    @Override
     public SOAPElement getParentElement() {
         Node parentNode = getParentNode();
         if (parentNode instanceof SOAPDocument) {
             return null;
         }
-        return (SOAPElement) getSoapDocument().find(parentNode);
+        return (SOAPElement) soapDocument.find(parentNode);
     }
 
     protected String getSOAPNamespace() {
@@ -1167,6 +1310,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return soapNamespace;
     }
 
+    @Override
     public void detachNode() {
         Node parent = getParentNode();
         if (parent != null) {
@@ -1184,6 +1328,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         }
     }
 
+    @Override
     public void recycleNode() {
         detachNode();
         // TBD
@@ -1260,10 +1405,12 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
             int attributeIndex = 0;
             String currentName;
 
+            @Override
             public boolean hasNext() {
                 return attributeIndex < attributesLength;
             }
 
+            @Override
             public Name next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
@@ -1283,6 +1430,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 }
             }
 
+            @Override
             public void remove() {
                 if (currentName == null) {
                     throw new IllegalStateException();
@@ -1331,13 +1479,14 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
         return attribute == null ? null : attribute.getValue();
     }
 
-    protected Iterator<Node> getChildElementsFrom(final Element element) {
-        return new Iterator<Node>() {
+    protected Iterator<javax.xml.soap.Node> getChildElementsFrom(final Element element) {
+        return new Iterator<javax.xml.soap.Node>() {
             Node next = element.getFirstChild();
             Node nextNext = null;
             Node last = null;
-            Node soapElement = getSoapDocument().findIfPresent(element);
+            Node soapElement = soapDocument.findIfPresent(element);
 
+            @Override
             public boolean hasNext() {
                 if (next != null) {
                     return true;
@@ -1349,7 +1498,8 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                 return next != null;
             }
 
-            public Node next() {
+            @Override
+            public javax.xml.soap.Node next() {
                 if (hasNext()) {
                     last = next;
                     next = null;
@@ -1362,11 +1512,12 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
                     }
 
                     nextNext = last.getNextSibling();
-                    return getSoapDocument().findIfPresent(last);
+                    return (javax.xml.soap.Node) soapDocument.findIfPresent(last);
                 }
                 throw new NoSuchElementException();
             }
 
+            @Override
             public void remove() {
                 if (last == null) {
                     throw new IllegalStateException();
@@ -1428,6 +1579,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
     //TODO: This is a temporary SAAJ workaround for optimizing XWS
     // should be removed once the corresponding JAXP bug is fixed
     // It appears the bug will be fixed in JAXP 1.4 (not by Appserver 9 timeframe)
+    @Override
     public void setAttributeNS(
         String namespaceURI,String qualifiedName, String value) {
         int index = qualifiedName.indexOf(':');
@@ -1483,7 +1635,7 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public NodeList getElementsByTagNameNS(String namespaceURI, String localName) throws DOMException {
-        return new NodeListImpl(getSoapDocument(), element.getElementsByTagNameNS(namespaceURI, localName));
+        return new NodeListImpl(soapDocument, element.getElementsByTagNameNS(namespaceURI, localName));
     }
 
     @Override
@@ -1538,37 +1690,37 @@ public class ElementImpl implements SOAPElement, SOAPBodyElement {
 
     @Override
     public Node getParentNode() {
-        return getSoapDocument().find(element.getParentNode());
+        return soapDocument.find(element.getParentNode());
     }
 
     @Override
     public NodeList getChildNodes() {
-        return new NodeListImpl(getSoapDocument(), element.getChildNodes());
+        return new NodeListImpl(soapDocument, element.getChildNodes());
     }
 
     @Override
     public Node getFirstChild() {
-        return getSoapDocument().findIfPresent(element.getFirstChild());
+        return soapDocument.findIfPresent(element.getFirstChild());
     }
 
     @Override
     public Node getLastChild() {
-        return getSoapDocument().findIfPresent(element.getLastChild());
+        return soapDocument.findIfPresent(element.getLastChild());
     }
 
     @Override
     public Node getPreviousSibling() {
-        return getSoapDocument().findIfPresent(element.getPreviousSibling());
+        return soapDocument.findIfPresent(element.getPreviousSibling());
     }
 
     @Override
     public Node getNextSibling() {
-        return getSoapDocument().findIfPresent(element.getNextSibling());
+        return soapDocument.findIfPresent(element.getNextSibling());
     }
 
     @Override
     public NamedNodeMap getAttributes() {
-        return element.getAttributes();
+        return new NamedNodeMapImpl(element.getAttributes(), soapDocument);
     }
 
     public Element getDomElement() {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
index faaa3d8f61a..a1564b4a450 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
@@ -100,6 +100,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
     protected abstract NameImpl getHeaderName(String prefix);
     protected abstract NameImpl getBodyName(String prefix);
 
+    @Override
     public SOAPHeader addHeader() throws SOAPException {
         return addHeader(null);
     }
@@ -140,6 +141,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         header = hdr;
     }
 
+    @Override
     public SOAPHeader getHeader() throws SOAPException {
         lookForHeader();
         return header;
@@ -152,6 +154,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         body = bodyChildElement;
     }
 
+    @Override
     public SOAPBody addBody() throws SOAPException {
         return addBody(null);
     }
@@ -176,6 +179,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         return body;
     }
 
+    @Override
     protected SOAPElement addElement(Name name) throws SOAPException {
         if (getBodyName(null).equals(name)) {
             return addBody(name.getPrefix());
@@ -187,6 +191,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         return super.addElement(name);
     }
 
+    @Override
     protected SOAPElement addElement(QName name) throws SOAPException {
         if (getBodyName(null).equals(NameImpl.convertToName(name))) {
             return addBody(name.getPrefix());
@@ -198,15 +203,18 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         return super.addElement(name);
     }
 
+    @Override
     public SOAPBody getBody() throws SOAPException {
         lookForBody();
         return body;
     }
 
+    @Override
     public Source getContent() {
         return new DOMSource(getOwnerDocument());
     }
 
+    @Override
     public Name createName(String localName, String prefix, String uri)
         throws SOAPException {
 
@@ -241,6 +249,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         return NameImpl.create(localName, prefix, namespace);
     }
 
+    @Override
     public Name createName(String localName) throws SOAPException {
         return NameImpl.createFromUnqualifiedName(localName);
     }
@@ -257,6 +266,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
         charset = value;
     }
 
+    @Override
     public void output(OutputStream out) throws IOException {
         try {
 //            materializeBody();
@@ -301,6 +311,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
     /**
      * Serialize to FI if boolean parameter set.
      */
+    @Override
     public void output(OutputStream out, boolean isFastInfoset)
         throws IOException
     {
@@ -353,6 +364,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
     //    }
 
 
+    @Override
      public SOAPElement setElementQName(QName newName) throws SOAPException {
         log.log(Level.SEVERE,
                 "SAAJ0146.impl.invalid.name.change.requested",
@@ -389,6 +401,7 @@ public abstract class EnvelopeImpl extends ElementImpl implements LazyEnvelope {
                 final DOMStreamReader reader = new DOMStreamReader(this);
                 XMLStreamReaderToXMLStreamWriter writingBridge =  new XMLStreamReaderToXMLStreamWriter();
                 writingBridge.bridge( new XMLStreamReaderToXMLStreamWriter.Breakpoint(reader, writer) {
+                        @Override
                         public boolean proceedAfterStartElement()  {
                                 if ("Body".equals(reader.getLocalName()) && soapEnvNS.equals(reader.getNamespaceURI()) ){
                                         return false;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
index 447039ed8e6..07f25dfd8ba 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
@@ -54,6 +54,7 @@ public abstract class FaultElementImpl
 
     protected abstract boolean isStandardFaultElement();
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
             log.log(Level.SEVERE,
                     "SAAJ0146.impl.invalid.name.change.requested",
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
index c45594601fd..73b4725abf6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -30,6 +30,7 @@ import javax.xml.soap.*;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import org.w3c.dom.Element;
 
 public abstract class HeaderElementImpl
     extends ElementImpl
@@ -47,6 +48,10 @@ public abstract class HeaderElementImpl
         super(ownerDoc, qname);
     }
 
+    public HeaderElementImpl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
     protected abstract NameImpl getActorAttributeName();
     protected abstract NameImpl getRoleAttributeName();
     protected abstract NameImpl getMustunderstandAttributeName();
@@ -58,6 +63,7 @@ public abstract class HeaderElementImpl
     protected abstract String getActorOrRole();
 
 
+    @Override
     public void setParentElement(SOAPElement element) throws SOAPException {
         if (!(element instanceof SOAPHeader)) {
             log.severe("SAAJ0130.impl.header.elem.parent.mustbe.header");
@@ -67,6 +73,7 @@ public abstract class HeaderElementImpl
         super.setParentElement(element);
     }
 
+    @Override
     public void setActor(String actorUri) {
         try {
             removeAttribute(getActorAttributeName());
@@ -76,6 +83,7 @@ public abstract class HeaderElementImpl
     }
 
     //SOAP 1.2 supports Role
+    @Override
     public void setRole(String roleUri) throws SOAPException {
         // runtime exception thrown if called for SOAP 1.1
         removeAttribute(getRoleAttributeName());
@@ -85,6 +93,7 @@ public abstract class HeaderElementImpl
 
     Name actorAttNameWithoutNS = NameImpl.createFromTagName("actor");
 
+    @Override
     public String getActor() {
         String actor = getAttributeValue(getActorAttributeName());
         return actor;
@@ -92,12 +101,14 @@ public abstract class HeaderElementImpl
 
     Name roleAttNameWithoutNS = NameImpl.createFromTagName("role");
 
+    @Override
     public String getRole() {
         // runtime exception thrown for 1.1
         String role = getAttributeValue(getRoleAttributeName());
         return role;
     }
 
+    @Override
     public void setMustUnderstand(boolean mustUnderstand) {
         try {
             removeAttribute(getMustunderstandAttributeName());
@@ -108,6 +119,7 @@ public abstract class HeaderElementImpl
         }
     }
 
+    @Override
     public boolean getMustUnderstand() {
         String mu = getAttributeValue(getMustunderstandAttributeName());
 
@@ -117,6 +129,7 @@ public abstract class HeaderElementImpl
         return false;
     }
 
+    @Override
     public void setRelay(boolean relay) throws SOAPException {
         // runtime exception thrown for 1.1
         removeAttribute(getRelayAttributeName());
@@ -125,6 +138,7 @@ public abstract class HeaderElementImpl
             getRelayLiteralValue(relay));
     }
 
+    @Override
     public boolean getRelay() {
         String mu = getAttributeValue(getRelayAttributeName());
         if (mu != null)
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
index 0d9f7ad8ae4..aaf56be8d9a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
@@ -25,19 +25,25 @@
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
-import java.util.*;
 import java.util.logging.Level;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.*;
 
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
 import org.w3c.dom.Element;
 
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
 
 public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
     protected static final boolean MUST_UNDERSTAND_ONLY = false;
@@ -58,6 +64,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
     protected abstract NameImpl getUpgradeName();
     protected abstract NameImpl getSupportedEnvelopeName();
 
+    @Override
     public SOAPHeaderElement addHeaderElement(Name name) throws SOAPException {
         SOAPElement newHeaderElement =
             ElementFactory.createNamedElement(
@@ -81,6 +88,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         return (SOAPHeaderElement) newHeaderElement;
     }
 
+    @Override
     public SOAPHeaderElement addHeaderElement(QName name) throws SOAPException {
         SOAPElement newHeaderElement =
             ElementFactory.createNamedElement(
@@ -104,19 +112,23 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         return (SOAPHeaderElement) newHeaderElement;
     }
 
+    @Override
     protected SOAPElement addElement(Name name) throws SOAPException {
         return addHeaderElement(name);
     }
 
+    @Override
     protected SOAPElement addElement(QName name) throws SOAPException {
         return addHeaderElement(name);
     }
 
-    public Iterator examineHeaderElements(String actor) {
+    @Override
+    public Iterator<SOAPHeaderElement> examineHeaderElements(String actor) {
         return getHeaderElementsForActor(actor, false, false);
     }
 
-    public Iterator extractHeaderElements(String actor) {
+    @Override
+    public Iterator<SOAPHeaderElement> extractHeaderElements(String actor) {
         return getHeaderElementsForActor(actor, true, false);
     }
 
@@ -135,9 +147,9 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         String actor,
         boolean detach,
         boolean mustUnderstand) {
-        List<SOAPHeaderElement> elementList = new ArrayList<SOAPHeaderElement>();
+        List<SOAPHeaderElement> elementList = new ArrayList<>();
 
-        Iterator<org.w3c.dom.Node> eachChild = getChildElements();
+        Iterator<javax.xml.soap.Node> eachChild = getChildElements();
 
         org.w3c.dom.Node currentChild = iterate(eachChild);
         while (currentChild != null) {
@@ -181,6 +193,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         return each.hasNext() ? each.next() : null;
     }
 
+    @Override
     public void setParentElement(SOAPElement element) throws SOAPException {
         if (!(element instanceof SOAPEnvelope)) {
             log.severe("SAAJ0133.impl.header.parent.mustbe.envelope");
@@ -193,6 +206,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
     // namespace qualified. Holds for both SOAP versions.
     // TODO - This check needs to be made for other addChildElement() methods
     // as well.
+    @Override
     public SOAPElement addChildElement(String localName) throws SOAPException {
 
         SOAPElement element = super.addChildElement(localName);
@@ -205,19 +219,23 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         return element;
     }
 
-    public Iterator examineAllHeaderElements() {
+    @Override
+    public Iterator<SOAPHeaderElement> examineAllHeaderElements() {
         return getHeaderElements(null, false, MUST_UNDERSTAND_ONLY);
     }
 
-    public Iterator examineMustUnderstandHeaderElements(String actor) {
+    @Override
+    public Iterator<SOAPHeaderElement> examineMustUnderstandHeaderElements(String actor) {
         return getHeaderElements(actor, false, true);
 
     }
 
-    public Iterator extractAllHeaderElements() {
+    @Override
+    public Iterator<SOAPHeaderElement> extractAllHeaderElements() {
         return getHeaderElements(null, true, false);
     }
 
+    @Override
     public SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSoapUris)
         throws SOAPException {
         if (supportedSoapUris == null) {
@@ -241,18 +259,19 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
                 NameImpl.createFromUnqualifiedName("qname"),
                 ns + ":Envelope");
             subElement.addNamespaceDeclaration(
-                ns,
-                (String) supportedSoapUris.next());
+                ns, (String) supportedSoapUris.next());
             i ++;
         }
         return upgradeHeaderElement;
     }
 
+    @Override
     public SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri)
         throws SOAPException {
         return addUpgradeHeaderElement(new String[] {supportedSoapUri});
     }
 
+    @Override
     public SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris)
         throws SOAPException {
 
@@ -280,6 +299,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         return upgradeHeaderElement;
     }
 
+    @Override
     protected SOAPElement convertToSoapElement(Element element) {
         final org.w3c.dom.Node soapNode = getSoapDocument().findIfPresent(element);
         if (soapNode instanceof SOAPHeaderElement) {
@@ -298,6 +318,7 @@ public abstract class HeaderImpl extends ElementImpl implements SOAPHeader {
         }
     }
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
        log.log(Level.SEVERE,
                 "SAAJ0146.impl.invalid.name.change.requested",
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
index b4b7b999748..87c0ec75bd9 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -46,7 +46,7 @@ SAAJ0122.impl.body.already.exists=SAAJ0122: Can't add a body when one is already
 SAAJ0123.impl.no.reserved.xmlns=SAAJ0123: Cannot declare reserved xmlns prefix
 SAAJ0124.impl.qualified.name.cannot.be.xmlns=SAAJ0124: Qualified name cannot be xmlns
 #SAAJ0125.impl.URI.cannot.be.null=SAAJ0125: URI cannot be null
-SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0}
+#SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0}
 SAAJ0127.impl.no.null.for.parent.elem=SAAJ0127: Cannot pass NULL to setParentElement
 
 SAAJ0130.impl.header.elem.parent.mustbe.header=SAAJ0130: Parent of a SOAPHeaderElement has to be a SOAPHeader
@@ -60,7 +60,7 @@ SAAJ0141.impl.detail.exists=SAAJ0141: Detail already exists
 SAAJ0142.impl.reason.or.text.not.supported=SAAJ0142: Fault/Reason/Text not supported by this SOAP version, try SOAP 1.2 or later
 SAAJ0143.impl.node.not.supported=SAAJ0143: Fault/Node not supported by this SOAP version, try SOAP 1.2 or later
 SAAJ0144.impl.role.not.supported=SAAJ0144: Fault/Role not supported by this SOAP version, try SOAP 1.2 or later
-SAAJ0145.impl.no.null.to.parent.elem=SAAJ0145: Cannot pass NULL to setParentElement
+#SAAJ0145.impl.no.null.to.parent.elem=SAAJ0145: Cannot pass NULL to setParentElement
 SAAJ0146.impl.invalid.name.change.requested=SAAJ0146: Cannot change name of element {0} to {1}
 SAAJ0147.impl.invalid.uri.change.requested=SAAJ0147: Cannot change the URI for prefix {0} from {1} to {2} in setElementQName
 SAAJ0148.impl.invalid.prefix.for.uri=Non-empty namespace URI: {0} for an empty prefix in SetElementQName
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java
new file mode 100644
index 00000000000..fb7f28d28ef
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/NamedNodeMapImpl.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.messaging.saaj.soap.impl;
+
+import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * {@link NamedNodeMap} wrapper, finding SOAP elements automatically when possible.
+ *
+ * @author Roman Grigoriadi
+ */
+public class NamedNodeMapImpl implements NamedNodeMap {
+
+    private final NamedNodeMap namedNodeMap;
+
+    private final SOAPDocumentImpl soapDocument;
+
+    /**
+     * Create wrapper.
+     *
+     * @param namedNodeMap node map to wrap
+     * @param soapDocument soap document to find soap elements
+     */
+    public NamedNodeMapImpl(NamedNodeMap namedNodeMap, SOAPDocumentImpl soapDocument) {
+        this.namedNodeMap = namedNodeMap;
+        this.soapDocument = soapDocument;
+    }
+
+    @Override
+    public Node getNamedItem(String name) {
+        return soapDocument.findIfPresent(namedNodeMap.getNamedItem(name));
+    }
+
+    @Override
+    public Node setNamedItem(Node arg) throws DOMException {
+        return namedNodeMap.setNamedItem(arg);
+    }
+
+    @Override
+    public Node removeNamedItem(String name) throws DOMException {
+        return namedNodeMap.removeNamedItem(name);
+    }
+
+    @Override
+    public Node item(int index) {
+        return namedNodeMap.item(index);
+    }
+
+    @Override
+    public int getLength() {
+        return namedNodeMap.getLength();
+    }
+
+    @Override
+    public Node getNamedItemNS(String namespaceURI, String localName) throws DOMException {
+        return namedNodeMap.getNamedItemNS(namespaceURI, localName);
+    }
+
+    @Override
+    public Node setNamedItemNS(Node arg) throws DOMException {
+        return namedNodeMap.setNamedItemNS(arg);
+    }
+
+    @Override
+    public Node removeNamedItemNS(String namespaceURI, String localName) throws DOMException {
+        return namedNodeMap.removeNamedItemNS(namespaceURI, localName);
+    }
+}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java
index 85fbb14aacd..b05af537243 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPCommentImpl.java
@@ -25,327 +25,64 @@
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
-import com.sun.xml.internal.messaging.saaj.util.SAAJUtil;
+import org.w3c.dom.CharacterData;
 import org.w3c.dom.Comment;
 import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
-import org.w3c.dom.UserDataHandler;
+import static com.sun.xml.internal.messaging.saaj.soap.impl.TextImpl.log;
 
-public class SOAPCommentImpl
-    implements javax.xml.soap.Text, org.w3c.dom.Comment {
-
-    protected static final Logger log =
-        Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
-                         "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
-    protected static ResourceBundle rb =
-        log.getResourceBundle();
-
-    @Override
-    public String getData() throws DOMException {
-        return comment.getData();
-    }
-
-    @Override
-    public void setData(String data) throws DOMException {
-        comment.setData(data);
-    }
-
-    @Override
-    public int getLength() {
-        return comment.getLength();
-    }
-
-    @Override
-    public String substringData(int offset, int count) throws DOMException {
-        return comment.substringData(offset, count);
-    }
-
-    @Override
-    public void appendData(String arg) throws DOMException {
-        comment.appendData(arg);
-    }
-
-    @Override
-    public void insertData(int offset, String arg) throws DOMException {
-        comment.insertData(offset, arg);
-    }
-
-    @Override
-    public void deleteData(int offset, int count) throws DOMException {
-        comment.deleteData(offset, count);
-    }
-
-    @Override
-    public void replaceData(int offset, int count, String arg) throws DOMException {
-        comment.replaceData(offset, count, arg);
-    }
-
-    @Override
-    public String getNodeName() {
-        return comment.getNodeName();
-    }
-
-    @Override
-    public String getNodeValue() throws DOMException {
-        return comment.getNodeValue();
-    }
-
-    @Override
-    public void setNodeValue(String nodeValue) throws DOMException {
-        comment.setNodeValue(nodeValue);
-    }
-
-    @Override
-    public short getNodeType() {
-        return comment.getNodeType();
-    }
-
-    @Override
-    public Node getParentNode() {
-        return comment.getParentNode();
-    }
-
-    @Override
-    public NodeList getChildNodes() {
-        return comment.getChildNodes();
-    }
-
-    @Override
-    public Node getFirstChild() {
-        return comment.getFirstChild();
-    }
-
-    @Override
-    public Node getLastChild() {
-        return comment.getLastChild();
-    }
-
-    @Override
-    public Node getPreviousSibling() {
-        return comment.getPreviousSibling();
-    }
-
-    @Override
-    public Node getNextSibling() {
-        return comment.getNextSibling();
-    }
-
-    @Override
-    public NamedNodeMap getAttributes() {
-        return comment.getAttributes();
-    }
-
-    @Override
-    public Document getOwnerDocument() {
-        return comment.getOwnerDocument();
-    }
-
-    @Override
-    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-        return comment.insertBefore(newChild, refChild);
-    }
-
-    @Override
-    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-        return comment.replaceChild(newChild, oldChild);
-    }
-
-    @Override
-    public Node removeChild(Node oldChild) throws DOMException {
-        return comment.removeChild(oldChild);
-    }
-
-    @Override
-    public Node appendChild(Node newChild) throws DOMException {
-        return comment.appendChild(newChild);
-    }
-
-    @Override
-    public boolean hasChildNodes() {
-        return comment.hasChildNodes();
-    }
-
-    @Override
-    public Node cloneNode(boolean deep) {
-        return comment.cloneNode(deep);
-    }
-
-    @Override
-    public void normalize() {
-        comment.normalize();
-    }
-
-    @Override
-    public boolean isSupported(String feature, String version) {
-        return comment.isSupported(feature, version);
-    }
-
-    @Override
-    public String getNamespaceURI() {
-        return comment.getNamespaceURI();
-    }
-
-    @Override
-    public String getPrefix() {
-        return comment.getPrefix();
-    }
-
-    @Override
-    public void setPrefix(String prefix) throws DOMException {
-        comment.setPrefix(prefix);
-    }
-
-    @Override
-    public String getLocalName() {
-        return comment.getLocalName();
-    }
-
-    @Override
-    public boolean hasAttributes() {
-        return comment.hasAttributes();
-    }
-
-    @Override
-    public String getBaseURI() {
-        return comment.getBaseURI();
-    }
-
-    @Override
-    public short compareDocumentPosition(Node other) throws DOMException {
-        return comment.compareDocumentPosition(other);
-    }
-
-    @Override
-    public String getTextContent() throws DOMException {
-        return comment.getTextContent();
-    }
-
-    @Override
-    public void setTextContent(String textContent) throws DOMException {
-        comment.setTextContent(textContent);
-    }
-
-    @Override
-    public boolean isSameNode(Node other) {
-        return comment.isSameNode(other);
-    }
-
-    @Override
-    public String lookupPrefix(String namespaceURI) {
-        return comment.lookupPrefix(namespaceURI);
-    }
-
-    @Override
-    public boolean isDefaultNamespace(String namespaceURI) {
-        return comment.isDefaultNamespace(namespaceURI);
-    }
-
-    @Override
-    public String lookupNamespaceURI(String prefix) {
-        return comment.lookupNamespaceURI(prefix);
-    }
-
-    @Override
-    public boolean isEqualNode(Node arg) {
-        return comment.isEqualNode(arg);
-    }
-
-    @Override
-    public Object getFeature(String feature, String version) {
-        return comment.getFeature(feature, version);
-    }
-
-    @Override
-    public Object setUserData(String key, Object data, UserDataHandler handler) {
-        return comment.setUserData(key, data, handler);
-    }
-
-    @Override
-    public Object getUserData(String key) {
-        return comment.getUserData(key);
-    }
-
-    private Comment comment;
+public class SOAPCommentImpl extends TextImpl<Comment> implements Comment {
 
     public SOAPCommentImpl(SOAPDocumentImpl ownerDoc, String text) {
-        comment = ownerDoc.getDomDocument().createComment(text);
-        ownerDoc.register(this);
+        super(ownerDoc, text);
     }
 
-    public String getValue() {
-        String nodeValue = getNodeValue();
-        return (nodeValue.equals("") ? null : nodeValue);
+    public SOAPCommentImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        super(ownerDoc, data);
     }
 
-    public void setValue(String text) {
-        setNodeValue(text);
+    @Override
+    protected Comment createN(SOAPDocumentImpl ownerDoc, String text) {
+        Comment c = ownerDoc.getDomDocument().createComment(text);
+//        ownerDoc.register(this);
+        return c;
     }
 
-
-    public void setParentElement(SOAPElement element) throws SOAPException {
-        if (element == null) {
-            log.severe("SAAJ0112.impl.no.null.to.parent.elem");
-            throw new SOAPException("Cannot pass NULL to setParentElement");
-        }
-        ((ElementImpl) element).addNode(this);
-    }
-
-    public SOAPElement getParentElement() {
-        return (SOAPElement) getParentNode();
-    }
-
-    public void detachNode() {
-        org.w3c.dom.Node parent = getParentNode();
-        if (parent != null) {
-            parent.removeChild(this);
-        }
-    }
-
-    public void recycleNode() {
-        detachNode();
-        // TBD
-        //  - add this to the factory so subsequent
-        //    creations can reuse this object.
+    @Override
+    protected Comment createN(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        Comment c = (Comment) data;
+        return c;
     }
 
+    @Override
     public boolean isComment() {
         return true;
     }
 
+    @Override
     public Text splitText(int offset) throws DOMException {
         log.severe("SAAJ0113.impl.cannot.split.text.from.comment");
         throw new UnsupportedOperationException("Cannot split text from a Comment Node.");
     }
 
+    @Override
     public Text replaceWholeText(String content) throws DOMException {
         log.severe("SAAJ0114.impl.cannot.replace.wholetext.from.comment");
         throw new UnsupportedOperationException("Cannot replace Whole Text from a Comment Node.");
     }
 
+    @Override
     public String getWholeText() {
         //TODO: maybe we have to implement this in future.
         throw new UnsupportedOperationException("Not Supported");
     }
 
+    @Override
     public boolean isElementContentWhitespace() {
         //TODO: maybe we have to implement this in future.
         throw new UnsupportedOperationException("Not Supported");
     }
 
-    public Comment getDomElement() {
-        return comment;
-    }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java
index 076cacb202d..63cb43a3bc0 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/SOAPTextImpl.java
@@ -25,316 +25,55 @@
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
 
-import java.util.logging.Logger;
-
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import org.w3c.dom.CharacterData;
 import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
-import org.w3c.dom.UserDataHandler;
 
-public class SOAPTextImpl
-    implements javax.xml.soap.Text, org.w3c.dom.Text {
+public class SOAPTextImpl extends TextImpl<Text> implements Text {
+
+    public SOAPTextImpl(SOAPDocumentImpl ownerDoc, String text) {
+        super(ownerDoc, text);
+    }
+
+    public SOAPTextImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        super(ownerDoc, data);
+    }
+
+    @Override
+    protected Text createN(SOAPDocumentImpl ownerDoc, String text) {
+        Text t = ownerDoc.getDomDocument().createTextNode(text);
+//        ownerDoc.register(this);
+        return t;
+    }
+
+    @Override
+    protected Text createN(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        Text t = (Text) data;
+        return t;
+    }
 
     @Override
     public Text splitText(int offset) throws DOMException {
-        return textNode.splitText(offset);
+        return getDomElement().splitText(offset);
     }
 
     @Override
     public boolean isElementContentWhitespace() {
-        return textNode.isElementContentWhitespace();
+        return getDomElement().isElementContentWhitespace();
     }
 
     @Override
     public String getWholeText() {
-        return textNode.getWholeText();
+        return getDomElement().getWholeText();
     }
 
     @Override
     public Text replaceWholeText(String content) throws DOMException {
-        return textNode.replaceWholeText(content);
+        return getDomElement().replaceWholeText(content);
     }
 
     @Override
-    public String getData() throws DOMException {
-        return textNode.getData();
-    }
-
-    @Override
-    public void setData(String data) throws DOMException {
-        textNode.setData(data);
-    }
-
-    @Override
-    public int getLength() {
-        return textNode.getLength();
-    }
-
-    @Override
-    public String substringData(int offset, int count) throws DOMException {
-        return textNode.substringData(offset, count);
-    }
-
-    @Override
-    public void appendData(String arg) throws DOMException {
-        textNode.appendData(arg);
-    }
-
-    @Override
-    public void insertData(int offset, String arg) throws DOMException {
-        textNode.insertData(offset, arg);
-    }
-
-    @Override
-    public void deleteData(int offset, int count) throws DOMException {
-        textNode.deleteData(offset, count);
-    }
-
-    @Override
-    public void replaceData(int offset, int count, String arg) throws DOMException {
-        textNode.replaceData(offset, count, arg);
-    }
-
-    @Override
-    public String getNodeName() {
-        return textNode.getNodeName();
-    }
-
-    @Override
-    public String getNodeValue() throws DOMException {
-        return textNode.getNodeValue();
-    }
-
-    @Override
-    public void setNodeValue(String nodeValue) throws DOMException {
-        textNode.setNodeValue(nodeValue);
-    }
-
-    @Override
-    public short getNodeType() {
-        return textNode.getNodeType();
-    }
-
-    @Override
-    public Node getParentNode() {
-        return textNode.getParentNode();
-    }
-
-    @Override
-    public NodeList getChildNodes() {
-        return textNode.getChildNodes();
-    }
-
-    @Override
-    public Node getFirstChild() {
-        return textNode.getFirstChild();
-    }
-
-    @Override
-    public Node getLastChild() {
-        return textNode.getLastChild();
-    }
-
-    @Override
-    public Node getPreviousSibling() {
-        return textNode.getPreviousSibling();
-    }
-
-    @Override
-    public Node getNextSibling() {
-        return textNode.getNextSibling();
-    }
-
-    @Override
-    public NamedNodeMap getAttributes() {
-        return textNode.getAttributes();
-    }
-
-    @Override
-    public Document getOwnerDocument() {
-        return textNode.getOwnerDocument();
-    }
-
-    @Override
-    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-        return textNode.insertBefore(newChild, refChild);
-    }
-
-    @Override
-    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-        return textNode.replaceChild(newChild, oldChild);
-    }
-
-    @Override
-    public Node removeChild(Node oldChild) throws DOMException {
-        return textNode.removeChild(oldChild);
-    }
-
-    @Override
-    public Node appendChild(Node newChild) throws DOMException {
-        return textNode.appendChild(newChild);
-    }
-
-    @Override
-    public boolean hasChildNodes() {
-        return textNode.hasChildNodes();
-    }
-
-    @Override
-    public Node cloneNode(boolean deep) {
-        return textNode.cloneNode(deep);
-    }
-
-    @Override
-    public void normalize() {
-        textNode.normalize();
-    }
-
-    @Override
-    public boolean isSupported(String feature, String version) {
-        return textNode.isSupported(feature, version);
-    }
-
-    @Override
-    public String getNamespaceURI() {
-        return textNode.getNamespaceURI();
-    }
-
-    @Override
-    public String getPrefix() {
-        return textNode.getPrefix();
-    }
-
-    @Override
-    public void setPrefix(String prefix) throws DOMException {
-        textNode.setPrefix(prefix);
-    }
-
-    @Override
-    public String getLocalName() {
-        return textNode.getLocalName();
-    }
-
-    @Override
-    public boolean hasAttributes() {
-        return textNode.hasAttributes();
-    }
-
-    @Override
-    public String getBaseURI() {
-        return textNode.getBaseURI();
-    }
-
-    @Override
-    public short compareDocumentPosition(Node other) throws DOMException {
-        return textNode.compareDocumentPosition(other);
-    }
-
-    @Override
-    public String getTextContent() throws DOMException {
-        return textNode.getTextContent();
-    }
-
-    @Override
-    public void setTextContent(String textContent) throws DOMException {
-        textNode.setTextContent(textContent);
-    }
-
-    @Override
-    public boolean isSameNode(Node other) {
-        return textNode.isSameNode(other);
-    }
-
-    @Override
-    public String lookupPrefix(String namespaceURI) {
-        return textNode.lookupPrefix(namespaceURI);
-    }
-
-    @Override
-    public boolean isDefaultNamespace(String namespaceURI) {
-        return textNode.isDefaultNamespace(namespaceURI);
-    }
-
-    @Override
-    public String lookupNamespaceURI(String prefix) {
-        return textNode.lookupNamespaceURI(prefix);
-    }
-
-    @Override
-    public boolean isEqualNode(Node arg) {
-        return textNode.isEqualNode(arg);
-    }
-
-    @Override
-    public Object getFeature(String feature, String version) {
-        return textNode.getFeature(feature, version);
-    }
-
-    @Override
-    public Object setUserData(String key, Object data, UserDataHandler handler) {
-        return textNode.setUserData(key, data, handler);
-    }
-
-    @Override
-    public Object getUserData(String key) {
-        return textNode.getUserData(key);
-    }
-
-    protected static final Logger log =
-        Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
-                         "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
-
-    private Text textNode;
-
-    public SOAPTextImpl(SOAPDocumentImpl ownerDoc, String text) {
-        textNode = ownerDoc.getDomDocument().createTextNode(text);
-        ownerDoc.register(this);
-    }
-
-    public String getValue() {
-        String nodeValue = getNodeValue();
-        return (nodeValue.equals("") ? null : nodeValue);
-    }
-
-    public void setValue(String text) {
-        setNodeValue(text);
-    }
-
-    public void setParentElement(SOAPElement parent) throws SOAPException {
-        if (parent == null) {
-            log.severe("SAAJ0126.impl.cannot.locate.ns");
-            throw new SOAPException("Cannot pass NULL to setParentElement");
-        }
-        ((ElementImpl) parent).addNode(this);
-    }
-
-    public SOAPElement getParentElement() {
-        return (SOAPElement) getParentNode();
-    }
-
-
-    public void detachNode() {
-        org.w3c.dom.Node parent = getParentNode();
-        if (parent != null) {
-            parent.removeChild(getDomElement());
-        }
-    }
-
-    public void recycleNode() {
-        detachNode();
-        // TBD
-        //  - add this to the factory so subsequent
-        //    creations can reuse this object.
-    }
-
     public boolean isComment() {
         String txt = getNodeValue();
         if (txt == null) {
@@ -343,7 +82,4 @@ public class SOAPTextImpl
         return txt.startsWith("<!--") && txt.endsWith("-->");
     }
 
-    public Text getDomElement() {
-        return textNode;
-    }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
new file mode 100644
index 00000000000..0a49b10a75e
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.messaging.saaj.soap.impl;
+
+import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
+import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import java.util.logging.Logger;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.Text;
+import org.w3c.dom.CharacterData;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
+
+/**
+ *
+ * @author lukas
+ * @param <T>
+ */
+public abstract class TextImpl<T extends CharacterData> implements Text, CharacterData {
+
+    protected static final Logger log
+            = Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
+                    "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
+    private final T domNode;
+
+    private final SOAPDocumentImpl soapDocument;
+
+    protected TextImpl(SOAPDocumentImpl ownerDoc, String text) {
+        this.soapDocument = ownerDoc;
+        domNode = createN(ownerDoc, text);
+        ownerDoc.register(this);
+    }
+
+    protected TextImpl(SOAPDocumentImpl ownerDoc, CharacterData data) {
+        this.soapDocument = ownerDoc;
+        domNode = createN(ownerDoc, data);
+        ownerDoc.register(this);
+    }
+
+    protected abstract T createN(SOAPDocumentImpl ownerDoc, CharacterData data);
+
+    protected abstract T createN(SOAPDocumentImpl ownerDoc, String text);
+
+    public T getDomElement() {
+        return domNode;
+    }
+
+    @Override
+    public String getValue() {
+        String nodeValue = getNodeValue();
+        return (nodeValue.equals("") ? null : nodeValue);
+    }
+
+    @Override
+    public void setValue(String text) {
+        setNodeValue(text);
+    }
+
+    @Override
+    public void setParentElement(SOAPElement parent) throws SOAPException {
+        if (parent == null) {
+            log.severe("SAAJ0112.impl.no.null.to.parent.elem");
+            throw new SOAPException("Cannot pass NULL to setParentElement");
+        }
+        ((ElementImpl) parent).addNode(this);
+    }
+
+    @Override
+    public SOAPElement getParentElement() {
+        return (SOAPElement) getParentNode();
+    }
+
+    @Override
+    public void detachNode() {
+        org.w3c.dom.Node parent = getParentNode();
+        if (parent != null) {
+             parent.removeChild(getDomElement());
+        }
+    }
+
+    @Override
+    public void recycleNode() {
+        detachNode();
+        // TBD
+        //  - add this to the factory so subsequent
+        //    creations can reuse this object.
+    }
+
+    @Override
+    public String getNodeName() {
+        return domNode.getNodeName();
+    }
+
+    @Override
+    public String getNodeValue() throws DOMException {
+        return domNode.getNodeValue();
+    }
+
+    @Override
+    public void setNodeValue(String nodeValue) throws DOMException {
+        domNode.setNodeValue(nodeValue);
+    }
+
+    @Override
+    public short getNodeType() {
+        return domNode.getNodeType();
+    }
+
+    @Override
+    public Node getParentNode() {
+        return domNode.getParentNode();
+    }
+
+    @Override
+    public NodeList getChildNodes() {
+        return domNode.getChildNodes();
+    }
+
+    @Override
+    public Node getFirstChild() {
+        return domNode.getFirstChild();
+    }
+
+    @Override
+    public Node getLastChild() {
+        return domNode.getLastChild();
+    }
+
+    @Override
+    public Node getPreviousSibling() {
+        return domNode.getPreviousSibling();
+    }
+
+    @Override
+    public Node getNextSibling() {
+        return domNode.getNextSibling();
+    }
+
+    @Override
+    public NamedNodeMap getAttributes() {
+        return domNode.getAttributes();
+    }
+
+    @Override
+    public Document getOwnerDocument() {
+        return domNode.getOwnerDocument();
+    }
+
+    @Override
+    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
+        return domNode.insertBefore(newChild, refChild);
+    }
+
+    @Override
+    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
+        return domNode.replaceChild(newChild, oldChild);
+    }
+
+    @Override
+    public Node removeChild(Node oldChild) throws DOMException {
+        return domNode.removeChild(oldChild);
+    }
+
+    @Override
+    public Node appendChild(Node newChild) throws DOMException {
+        return domNode.appendChild(newChild);
+    }
+
+    @Override
+    public boolean hasChildNodes() {
+        return domNode.hasChildNodes();
+    }
+
+    @Override
+    public Node cloneNode(boolean deep) {
+        return domNode.cloneNode(deep);
+    }
+
+    @Override
+    public void normalize() {
+        domNode.normalize();
+    }
+
+    @Override
+    public boolean isSupported(String feature, String version) {
+        return domNode.isSupported(feature, version);
+    }
+
+    @Override
+    public String getNamespaceURI() {
+        return domNode.getNamespaceURI();
+    }
+
+    @Override
+    public String getPrefix() {
+        return domNode.getPrefix();
+    }
+
+    @Override
+    public void setPrefix(String prefix) throws DOMException {
+        domNode.setPrefix(prefix);
+    }
+
+    @Override
+    public String getLocalName() {
+        return domNode.getLocalName();
+    }
+
+    @Override
+    public boolean hasAttributes() {
+        return domNode.hasAttributes();
+    }
+
+    @Override
+    public String getBaseURI() {
+        return domNode.getBaseURI();
+    }
+
+    @Override
+    public short compareDocumentPosition(Node other) throws DOMException {
+        return domNode.compareDocumentPosition(other);
+    }
+
+    @Override
+    public String getTextContent() throws DOMException {
+        return domNode.getTextContent();
+    }
+
+    @Override
+    public void setTextContent(String textContent) throws DOMException {
+        domNode.setTextContent(textContent);;
+    }
+
+    @Override
+    public boolean isSameNode(Node other) {
+        return domNode.isSameNode(other);
+    }
+
+    @Override
+    public String lookupPrefix(String namespaceURI) {
+        return domNode.lookupPrefix(namespaceURI);
+    }
+
+    @Override
+    public boolean isDefaultNamespace(String namespaceURI) {
+        return domNode.isDefaultNamespace(namespaceURI);
+    }
+
+    @Override
+    public String lookupNamespaceURI(String prefix) {
+        return domNode.lookupNamespaceURI(prefix);
+    }
+
+    @Override
+    public boolean isEqualNode(Node arg) {
+        return domNode.isEqualNode(arg);
+    }
+
+    @Override
+    public Object getFeature(String feature, String version) {
+        return domNode.getFeature(feature, version);
+    }
+
+    @Override
+    public Object setUserData(String key, Object data, UserDataHandler handler) {
+        return domNode.setUserData(key, data, handler);
+    }
+
+    @Override
+    public Object getUserData(String key) {
+        return domNode.getUserData(key);
+    }
+
+    @Override
+    public String getData() throws DOMException {
+        return domNode.getData();
+    }
+
+    @Override
+    public void setData(String data) throws DOMException {
+        domNode.setData(data);
+    }
+
+    @Override
+    public int getLength() {
+        return domNode.getLength();
+    }
+
+    @Override
+    public String substringData(int offset, int count) throws DOMException {
+        return domNode.substringData(offset, count);
+    }
+
+    @Override
+    public void appendData(String arg) throws DOMException {
+        domNode.appendData(arg);
+    }
+
+    @Override
+    public void insertData(int offset, String arg) throws DOMException {
+        domNode.insertData(offset, arg);
+    }
+
+    @Override
+    public void deleteData(int offset, int count) throws DOMException {
+        domNode.deleteData(offset, count);
+    }
+
+    @Override
+    public void replaceData(int offset, int count, String arg) throws DOMException {
+        domNode.replaceData(offset, count, arg);
+    }
+
+}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
index 453abec8d51..f841bf72734 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
@@ -54,32 +54,38 @@ public class Body1_1Impl extends BodyImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     protected NameImpl getFaultName(String name) {
         // Ignore name
         return NameImpl.createFault1_1Name(null);
     }
 
+    @Override
     protected SOAPBodyElement createBodyElement(Name name) {
         return new BodyElement1_1Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
 
+    @Override
     protected SOAPBodyElement createBodyElement(QName name) {
         return new BodyElement1_1Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
 
+    @Override
     protected QName getDefaultFaultCode() {
         return new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Server");
     }
 
+    @Override
     protected boolean isFault(SOAPElement child) {
         // SOAP 1.1 faults always use the default name
         return child.getElementName().equals(getFaultName(null));
     }
 
+    @Override
     protected SOAPFault createFaultElement() {
         return new Fault1_1Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(), getPrefix());
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
index 6cc387d5d79..9f6db55ca1a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,6 +36,7 @@ import javax.xml.soap.SOAPException;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.BodyElementImpl;
+import org.w3c.dom.Element;
 
 public class BodyElement1_1Impl extends BodyElementImpl {
 
@@ -45,6 +46,12 @@ public class BodyElement1_1Impl extends BodyElementImpl {
     public BodyElement1_1Impl(SOAPDocumentImpl ownerDoc, QName qname) {
         super(ownerDoc, qname);
     }
+
+    public BodyElement1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         BodyElementImpl copy =
             new BodyElement1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
index acd4612488f..6d4fe38f6b3 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
@@ -51,11 +51,13 @@ public class Detail1_1Impl extends DetailImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected DetailEntry createDetailEntry(Name name) {
         return new DetailEntry1_1Impl(
             (SOAPDocumentImpl) getOwnerDocument(),
             name);
     }
+    @Override
     protected DetailEntry createDetailEntry(QName name) {
         return new DetailEntry1_1Impl(
             (SOAPDocumentImpl) getOwnerDocument(),
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
index 6c9ea4efb7f..a0571e29005 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,6 +36,7 @@ import javax.xml.soap.SOAPException;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.DetailEntryImpl;
+import org.w3c.dom.Element;
 
 public class DetailEntry1_1Impl extends DetailEntryImpl {
 
@@ -45,6 +46,12 @@ public class DetailEntry1_1Impl extends DetailEntryImpl {
     public DetailEntry1_1Impl(SOAPDocumentImpl ownerDoc, QName qname) {
         super(ownerDoc, qname);
     }
+
+    public DetailEntry1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         DetailEntryImpl copy =
             new DetailEntry1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
index de55d8fa86c..31429c7ef68 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
@@ -58,10 +58,12 @@ public class Envelope1_1Impl extends EnvelopeImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected NameImpl getBodyName(String prefix) {
         return NameImpl.createBody1_1Name(prefix);
     }
 
+    @Override
     protected NameImpl getHeaderName(String prefix) {
         return NameImpl.createHeader1_1Name(prefix);
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
index 58c00c4823e..c2cf2c05839 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
@@ -60,37 +60,48 @@ public class Fault1_1Impl extends FaultImpl {
        super(ownerDocument, NameImpl.createFault1_1Name(prefix));
     }
 
-    public Fault1_1Impl(Element domElement, SOAPDocumentImpl ownerDoc) {
+    public Fault1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
         super(ownerDoc, domElement);
     }
 
+    public Fault1_1Impl(SOAPDocumentImpl ownerDoc) {
+        super(ownerDoc, NameImpl.createFault1_1Name(null));
+    }
+
+    @Override
     protected NameImpl getDetailName() {
         return NameImpl.createDetail1_1Name();
     }
 
+    @Override
     protected NameImpl getFaultCodeName() {
         return NameImpl.createFromUnqualifiedName("faultcode");
     }
 
+    @Override
     protected NameImpl getFaultStringName() {
         return NameImpl.createFromUnqualifiedName("faultstring");
     }
 
+    @Override
     protected NameImpl getFaultActorName() {
         return NameImpl.createFromUnqualifiedName("faultactor");
     }
 
+    @Override
     protected DetailImpl createDetail() {
         return new Detail1_1Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument());
     }
 
+    @Override
     protected FaultElementImpl createSOAPFaultElement(String localName) {
         return new FaultElement1_1Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        localName);
     }
 
+    @Override
     protected void checkIfStandardFaultCode(String faultCode, String uri)
         throws SOAPException {
         // SOAP 1.1 doesn't seem to mandate using faultcode from a particular
@@ -98,16 +109,19 @@ public class Fault1_1Impl extends FaultImpl {
         // Also need to be backward compatible.
     }
 
+    @Override
     protected void finallySetFaultCode(String faultcode) throws SOAPException {
         this.faultCodeElement.addTextNode(faultcode);
     }
 
+    @Override
     public String getFaultCode() {
         if (this.faultCodeElement == null)
             findFaultCodeElement();
         return this.faultCodeElement.getValue();
     }
 
+    @Override
     public Name getFaultCodeAsName() {
 
         String faultcodeString = getFaultCode();
@@ -132,6 +146,7 @@ public class Fault1_1Impl extends FaultImpl {
         return NameImpl.createFromQualifiedName(faultcodeString, nsName);
     }
 
+    @Override
     public QName getFaultCodeAsQName() {
         String faultcodeString = getFaultCode();
         if (faultcodeString == null) {
@@ -142,6 +157,7 @@ public class Fault1_1Impl extends FaultImpl {
         return convertCodeToQName(faultcodeString, this.faultCodeElement);
     }
 
+    @Override
     public void setFaultString(String faultString) throws SOAPException {
 
         if (this.faultStringElement == null)
@@ -158,6 +174,7 @@ public class Fault1_1Impl extends FaultImpl {
         this.faultStringElement.addTextNode(faultString);
     }
 
+    @Override
     public String getFaultString() {
         if (this.faultStringElement == null)
             findFaultStringElement();
@@ -165,6 +182,7 @@ public class Fault1_1Impl extends FaultImpl {
 
     }
 
+    @Override
     public Locale getFaultStringLocale() {
         if (this.faultStringElement == null)
             findFaultStringElement();
@@ -178,6 +196,7 @@ public class Fault1_1Impl extends FaultImpl {
         return null;
     }
 
+    @Override
     public void setFaultString(String faultString, Locale locale)
         throws SOAPException {
         setFaultString(faultString);
@@ -186,6 +205,7 @@ public class Fault1_1Impl extends FaultImpl {
             localeToXmlLang(locale));
     }
 
+    @Override
     protected boolean isStandardFaultElement(String localName) {
         if (localName.equalsIgnoreCase("detail") ||
             localName.equalsIgnoreCase("faultcode") ||
@@ -196,6 +216,7 @@ public class Fault1_1Impl extends FaultImpl {
         return false;
     }
 
+    @Override
     public void appendFaultSubcode(QName subcode) {
         log.log(
             Level.SEVERE,
@@ -204,6 +225,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public void removeAllFaultSubcodes() {
         log.log(
             Level.SEVERE,
@@ -212,7 +234,8 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
-    public Iterator getFaultSubcodes() {
+    @Override
+    public Iterator<QName> getFaultSubcodes() {
         log.log(
             Level.SEVERE,
             "SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -220,6 +243,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public String getFaultReasonText(Locale locale) {
         log.log(
             Level.SEVERE,
@@ -228,7 +252,8 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
-    public Iterator getFaultReasonTexts() {
+    @Override
+    public Iterator<String> getFaultReasonTexts() {
         log.log(
             Level.SEVERE,
             "SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -236,7 +261,8 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
-    public Iterator getFaultReasonLocales() {
+    @Override
+    public Iterator<Locale> getFaultReasonLocales() {
         log.log(
             Level.SEVERE,
             "SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1",
@@ -244,6 +270,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public void addFaultReasonText(String text, java.util.Locale locale)
         throws SOAPException {
         log.log(
@@ -253,6 +280,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public String getFaultRole() {
         log.log(
             Level.SEVERE,
@@ -261,6 +289,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public void setFaultRole(String uri) {
         log.log(
             Level.SEVERE,
@@ -269,6 +298,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public String getFaultNode() {
         log.log(
             Level.SEVERE,
@@ -277,6 +307,7 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     public void setFaultNode(String uri) {
         log.log(
             Level.SEVERE,
@@ -285,10 +316,12 @@ public class Fault1_1Impl extends FaultImpl {
         throw new UnsupportedOperationException("Not supported in SOAP 1.1");
     }
 
+    @Override
     protected QName getDefaultFaultCode() {
         return new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Server");
     }
 
+    @Override
     public SOAPElement addChildElement(SOAPElement element)
         throws SOAPException {
         String localName = element.getLocalName();
@@ -301,18 +334,21 @@ public class Fault1_1Impl extends FaultImpl {
         return super.addChildElement(element);
     }
 
+    @Override
     protected FaultElementImpl createSOAPFaultElement(QName qname) {
          return new FaultElement1_1Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        qname);
     }
 
+    @Override
     protected FaultElementImpl createSOAPFaultElement(Name qname) {
          return new FaultElement1_1Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        (NameImpl)qname);
     }
 
+    @Override
     public void setFaultCode(String faultCode, String prefix, String uri)
         throws SOAPException {
         if (prefix == null || "".equals(prefix)) {
@@ -370,6 +406,7 @@ public class Fault1_1Impl extends FaultImpl {
         return false;
     }
 
+    @Override
      public void setFaultActor(String faultActor) throws SOAPException {
         if (this.faultActorElement == null)
             findFaultActorElement();
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
index 22bcab053da..62f9c8c1909 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -59,6 +59,7 @@ public class FaultElement1_1Impl extends FaultElementImpl {
               NameImpl.createFaultElement1_1Name(localName, prefix));
     }
 
+    @Override
     protected boolean isStandardFaultElement() {
         String localName = elementQName.getLocalPart();
         if (localName.equalsIgnoreCase("faultcode") ||
@@ -69,6 +70,7 @@ public class FaultElement1_1Impl extends FaultElementImpl {
         return false;
     }
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         if (!isStandardFaultElement()) {
             FaultElement1_1Impl copy =
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
index 75b76d513f5..cff022a7609 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
@@ -56,6 +56,7 @@ public class Header1_1Impl extends HeaderImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected NameImpl getNotUnderstoodName() {
         log.log(
             Level.SEVERE,
@@ -64,6 +65,7 @@ public class Header1_1Impl extends HeaderImpl {
         throw new UnsupportedOperationException("Not supported by SOAP 1.1");
     }
 
+    @Override
     protected NameImpl getUpgradeName() {
         return NameImpl.create(
             "Upgrade",
@@ -71,6 +73,7 @@ public class Header1_1Impl extends HeaderImpl {
             SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE);
     }
 
+    @Override
     protected NameImpl getSupportedEnvelopeName() {
         return NameImpl.create(
             "SupportedEnvelope",
@@ -78,6 +81,7 @@ public class Header1_1Impl extends HeaderImpl {
             SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE);
     }
 
+    @Override
     public SOAPHeaderElement addNotUnderstoodHeaderElement(QName name)
         throws SOAPException {
         log.log(
@@ -87,11 +91,13 @@ public class Header1_1Impl extends HeaderImpl {
         throw new UnsupportedOperationException("Not supported by SOAP 1.1");
     }
 
+    @Override
     protected SOAPHeaderElement createHeaderElement(Name name) {
         return new HeaderElement1_1Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
+    @Override
     protected SOAPHeaderElement createHeaderElement(QName name) {
         return new HeaderElement1_1Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
index 8708ac933bb..7f256985bbc 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -41,6 +41,7 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderElementImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
 import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import org.w3c.dom.Element;
 
 public class HeaderElement1_1Impl extends HeaderElementImpl {
 
@@ -55,17 +56,24 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
         super(ownerDoc, qname);
     }
 
+    public HeaderElement1_1Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         HeaderElementImpl copy =
             new HeaderElement1_1Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
         return replaceElementWithSOAPElement(this,copy);
     }
 
+    @Override
     protected NameImpl getActorAttributeName() {
         return NameImpl.create("actor", null, NameImpl.SOAP11_NAMESPACE);
     }
 
     // role not supported by SOAP 1.1
+    @Override
     protected NameImpl getRoleAttributeName() {
         log.log(
             Level.SEVERE,
@@ -74,15 +82,18 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
         throw new UnsupportedOperationException("Role not supported by SOAP 1.1");
     }
 
+    @Override
     protected NameImpl getMustunderstandAttributeName() {
         return NameImpl.create("mustUnderstand", null, NameImpl.SOAP11_NAMESPACE);
     }
 
     // mustUnderstand attribute has literal value "1" or "0"
+    @Override
     protected String getMustunderstandLiteralValue(boolean mustUnderstand) {
         return (mustUnderstand == true ? "1" : "0");
     }
 
+    @Override
     protected boolean getMustunderstandAttributeValue(String mu) {
         if ("1".equals(mu) || "true".equalsIgnoreCase(mu))
             return true;
@@ -90,6 +101,7 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
     }
 
     // relay not supported by SOAP 1.1
+    @Override
     protected NameImpl getRelayAttributeName() {
         log.log(
             Level.SEVERE,
@@ -98,6 +110,7 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
         throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
     }
 
+    @Override
     protected String getRelayLiteralValue(boolean relayAttr) {
         log.log(
             Level.SEVERE,
@@ -106,6 +119,7 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
         throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
     }
 
+    @Override
     protected boolean getRelayAttributeValue(String mu) {
         log.log(
             Level.SEVERE,
@@ -114,6 +128,7 @@ public class HeaderElement1_1Impl extends HeaderElementImpl {
         throw new UnsupportedOperationException("Relay not supported by SOAP 1.1");
     }
 
+    @Override
     protected String getActorOrRole() {
         return getActor();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
index e52640fc399..e7e2ab5ee57 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -76,6 +76,7 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
             super(headers,ct,stat,reader);
     }
 
+    @Override
     public SOAPPart getSOAPPart() {
         if (soapPartImpl == null) {
             soapPartImpl = new SOAPPart1_1Impl(this);
@@ -83,10 +84,12 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
         return soapPartImpl;
     }
 
+    @Override
     protected boolean isCorrectSoapVersion(int contentTypeId) {
         return (contentTypeId & SOAP1_1_FLAG) != 0;
     }
 
+    @Override
     public String getAction() {
         log.log(
             Level.SEVERE,
@@ -95,6 +98,7 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
         throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
     }
 
+    @Override
     public void setAction(String type) {
         log.log(
             Level.SEVERE,
@@ -103,6 +107,7 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
         throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
     }
 
+    @Override
     public String getCharset() {
         log.log(
             Level.SEVERE,
@@ -111,6 +116,7 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
         throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
     }
 
+    @Override
     public void setCharset(String charset) {
         log.log(
             Level.SEVERE,
@@ -119,10 +125,12 @@ public class Message1_1Impl extends MessageImpl implements SOAPConstants {
         throw new UnsupportedOperationException("Operation not supported by SOAP 1.1");
     }
 
+    @Override
     protected String getExpectedContentType() {
         return isFastInfoset ? "application/fastinfoset" : "text/xml";
     }
 
+    @Override
    protected String getExpectedAcceptHeader() {
        String accept = "text/xml, text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
        return acceptFastInfoset ? ("application/fastinfoset, " + accept) : accept;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
index 13448095cff..d3b27135810 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -39,14 +39,17 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
 
 public class SOAPFactory1_1Impl extends SOAPFactoryImpl {
+    @Override
     protected SOAPDocumentImpl createDocument() {
         return (new SOAPPart1_1Impl()).getDocument();
     }
 
+    @Override
     public Detail createDetail() throws SOAPException {
         return new Detail1_1Impl(createDocument());
     }
 
+    @Override
     public SOAPFault createFault(String reasonText, QName faultCode)
         throws SOAPException {
         if (faultCode == null) {
@@ -55,14 +58,15 @@ public class SOAPFactory1_1Impl extends SOAPFactoryImpl {
         if (reasonText == null) {
             throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
         }
-        Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
+        Fault1_1Impl fault = new Fault1_1Impl(createDocument());
         fault.setFaultCode(faultCode);
         fault.setFaultString(reasonText);
         return fault;
     }
 
+    @Override
     public SOAPFault createFault() throws SOAPException {
-        Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
+        Fault1_1Impl fault = new Fault1_1Impl(createDocument());
         fault.setFaultCode(fault.getDefaultFaultCode());
         fault.setFaultString("Fault string, and possibly fault code, not set");
         return fault;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
index 01ce1b8b4c8..e43c5fca686 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -40,16 +40,19 @@ import com.sun.xml.internal.messaging.saaj.soap.MessageImpl;
 
 public class SOAPMessageFactory1_1Impl extends MessageFactoryImpl {
 
+    @Override
     public SOAPMessage createMessage() throws SOAPException {
         return new Message1_1Impl();
     }
 
+    @Override
     public SOAPMessage createMessage(boolean isFastInfoset,
         boolean acceptFastInfoset) throws SOAPException
     {
         return new Message1_1Impl(isFastInfoset, acceptFastInfoset);
     }
 
+    @Override
     public SOAPMessage createMessage(MimeHeaders headers, InputStream in) throws IOException, SOAPExceptionImpl {
 
         if (headers == null) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
index b2408ff3220..0e284bbb3c7 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -54,10 +54,12 @@ public class SOAPPart1_1Impl extends SOAPPartImpl implements SOAPConstants {
         super(message);
     }
 
+    @Override
     protected String getContentType() {
         return isFastInfoset() ? "application/fastinfoset" : "text/xml";
     }
 
+    @Override
     protected Envelope createEnvelopeFromSource() throws SOAPException {
         // Record the presence of xml declaration before the envelope gets
         // created.
@@ -80,11 +82,13 @@ public class SOAPPart1_1Impl extends SOAPPartImpl implements SOAPConstants {
         return envelope;
     }
 
+    @Override
     protected Envelope createEmptyEnvelope(String prefix)
         throws SOAPException {
         return new Envelope1_1Impl(getDocument(), prefix, true, true);
     }
 
+    @Override
     protected SOAPPartImpl duplicateType() {
         return new SOAPPart1_1Impl();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
index 1e57365b01c..5fb3436ebd6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
@@ -57,25 +57,30 @@ public class Body1_2Impl extends BodyImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected NameImpl getFaultName(String name) {
         return NameImpl.createFault1_2Name(name, null);
     }
 
+    @Override
     protected SOAPBodyElement createBodyElement(Name name) {
         return new BodyElement1_2Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
+    @Override
     protected SOAPBodyElement createBodyElement(QName name) {
         return new BodyElement1_2Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
 
+    @Override
     protected QName getDefaultFaultCode() {
         return SOAPConstants.SOAP_RECEIVER_FAULT;
     }
 
+    @Override
     public SOAPFault addFault() throws SOAPException {
         if (hasAnyChildElement()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -89,6 +94,7 @@ public class Body1_2Impl extends BodyImpl {
      * Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Body (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0401.ver1_2.no.encodingstyle.in.body");
         throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Body");
@@ -98,6 +104,7 @@ public class Body1_2Impl extends BodyImpl {
      * Override addAttribute of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Body (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -108,6 +115,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
@@ -118,6 +126,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     protected boolean isFault(SOAPElement child) {
         return (child.getElementName().getURI().equals(
                     SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE) &&
@@ -125,6 +134,7 @@ public class Body1_2Impl extends BodyImpl {
                     "Fault"));
     }
 
+    @Override
     protected SOAPFault createFaultElement() {
         return new Fault1_2Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(), getPrefix());
@@ -135,6 +145,7 @@ public class Body1_2Impl extends BodyImpl {
      * SOAP message MUST contain a single Fault element as the only
      * child element of the SOAP Body.
      */
+    @Override
     public SOAPBodyElement addBodyElement(Name name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -144,6 +155,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addBodyElement(name);
     }
 
+    @Override
     public SOAPBodyElement addBodyElement(QName name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -153,6 +165,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addBodyElement(name);
     }
 
+    @Override
     protected SOAPElement addElement(Name name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -162,6 +175,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addElement(name);
     }
 
+    @Override
     protected SOAPElement addElement(QName name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -171,6 +185,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addElement(name);
     }
 
+    @Override
     public SOAPElement addChildElement(Name name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
@@ -180,6 +195,7 @@ public class Body1_2Impl extends BodyImpl {
         return super.addChildElement(name);
     }
 
+    @Override
     public SOAPElement addChildElement(QName name) throws SOAPException {
         if (hasFault()) {
             log.severe("SAAJ0402.ver1_2.only.fault.allowed.in.body");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
index 8e9d9d8a215..6038bc55eb6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,6 +36,7 @@ import javax.xml.soap.SOAPElement;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.BodyElementImpl;
+import org.w3c.dom.Element;
 
 public class BodyElement1_2Impl extends BodyElementImpl {
 
@@ -47,6 +48,11 @@ public class BodyElement1_2Impl extends BodyElementImpl {
         super(ownerDoc, qname);
     }
 
+    public BodyElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         BodyElementImpl copy =
             new BodyElement1_2Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
index 455d6e4ee9d..a0cad1359ec 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
@@ -59,12 +59,14 @@ public class Detail1_2Impl extends DetailImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected DetailEntry createDetailEntry(Name name) {
         return new DetailEntry1_2Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
             name);
     }
 
+    @Override
     protected DetailEntry createDetailEntry(QName name) {
         return new DetailEntry1_2Impl(
             ((SOAPDocument) getOwnerDocument()).getDocument(),
@@ -75,11 +77,13 @@ public class Detail1_2Impl extends DetailImpl {
      * Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Detail (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0403.ver1_2.no.encodingStyle.in.detail");
         throw new SOAPExceptionImpl("EncodingStyle attribute cannot appear in Detail");
     }
 
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -89,6 +93,7 @@ public class Detail1_2Impl extends DetailImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
index 26f2b216e29..2f55421dc04 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,6 +36,7 @@ import javax.xml.soap.SOAPElement;
 
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.DetailEntryImpl;
+import org.w3c.dom.Element;
 
 public class DetailEntry1_2Impl extends DetailEntryImpl {
 
@@ -47,6 +48,11 @@ public class DetailEntry1_2Impl extends DetailEntryImpl {
         super(ownerDoc, qname);
     }
 
+    public DetailEntry1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         DetailEntryImpl copy =
             new DetailEntry1_2Impl((SOAPDocumentImpl) getOwnerDocument(), newName);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
index 075a848b91b..1d5a823b252 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
@@ -68,10 +68,12 @@ public class Envelope1_2Impl extends EnvelopeImpl {
             createBody);
     }
 
+    @Override
     protected NameImpl getBodyName(String prefix) {
         return NameImpl.createBody1_2Name(prefix);
     }
 
+    @Override
     protected NameImpl getHeaderName(String prefix) {
         return NameImpl.createHeader1_2Name(prefix);
     }
@@ -80,6 +82,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
      * Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Envelope (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0404.ver1_2.no.encodingStyle.in.envelope");
         throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Envelope");
@@ -89,6 +92,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
      * Override addAttribute of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Envelope (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -98,6 +102,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
@@ -112,6 +117,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
      * Override addChildElement method to ensure that no element
      * is added after body in SOAP 1.2.
      */
+    @Override
     public SOAPElement addChildElement(Name name) throws SOAPException {
         // check if body already exists
         if (getBody() != null) {
@@ -122,6 +128,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
         return super.addChildElement(name);
     }
 
+    @Override
     public SOAPElement addChildElement(QName name) throws SOAPException {
         // check if body already exists
         if (getBody() != null) {
@@ -142,6 +149,7 @@ public class Envelope1_2Impl extends EnvelopeImpl {
      *
      */
 
+    @Override
     public SOAPElement addTextNode(String text) throws SOAPException {
         log.log(
             Level.SEVERE,
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
index 3f206c13031..55ba06ed585 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
@@ -29,12 +29,10 @@
 */
 package com.sun.xml.internal.messaging.saaj.soap.ver1_2;
 
-import java.util.*;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.*;
 
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocument;
@@ -42,6 +40,14 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.*;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
 import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
 import org.w3c.dom.Element;
 
 
@@ -69,22 +75,30 @@ public class Fault1_2Impl extends FaultImpl {
         super(ownerDocument, NameImpl.createFault1_2Name(null, prefix));
     }
 
-    public Fault1_2Impl(Element domElement, SOAPDocumentImpl ownerDoc) {
+    public Fault1_2Impl(SOAPDocumentImpl ownerDocument) {
+        super(ownerDocument, NameImpl.createFault1_2Name(null, null));
+    }
+
+    public Fault1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected NameImpl getDetailName() {
         return NameImpl.createSOAP12Name("Detail", getPrefix());
     }
 
+    @Override
     protected NameImpl getFaultCodeName() {
         return NameImpl.createSOAP12Name("Code", getPrefix());
     }
 
+    @Override
     protected NameImpl getFaultStringName() {
         return getFaultReasonName();
     }
 
+    @Override
     protected NameImpl getFaultActorName() {
         return getFaultRoleName();
     }
@@ -109,17 +123,20 @@ public class Fault1_2Impl extends FaultImpl {
         return NameImpl.createXmlName("lang");
     }
 
+    @Override
     protected DetailImpl createDetail() {
         return new Detail1_2Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument());
     }
 
+    @Override
     protected FaultElementImpl createSOAPFaultElement(String localName) {
         return new FaultElement1_2Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        localName);
     }
 
+    @Override
     protected void checkIfStandardFaultCode(String faultCode, String uri)
         throws SOAPException {
         QName qname = new QName(uri, faultCode);
@@ -136,6 +153,7 @@ public class Fault1_2Impl extends FaultImpl {
         throw new SOAPExceptionImpl(qname + " is not a standard Code value");
     }
 
+    @Override
     protected void finallySetFaultCode(String faultcode) throws SOAPException {
         SOAPElement value = this.faultCodeElement.addChildElement(valueName);
         value.addTextNode(faultcode);
@@ -145,13 +163,14 @@ public class Fault1_2Impl extends FaultImpl {
         findFaultStringElement();
     }
 
-    public Iterator getFaultReasonTexts() throws SOAPException {
+    @Override
+    public Iterator<String> getFaultReasonTexts() throws SOAPException {
         // Fault Reason has similar semantics as faultstring
         if (this.faultStringElement == null)
             findReasonElement();
         Iterator eachTextElement =
             this.faultStringElement.getChildElements(textName);
-        List<String> texts = new ArrayList<String>();
+        List<String> texts = new ArrayList<>();
         while (eachTextElement.hasNext()) {
             SOAPElement textElement = (SOAPElement) eachTextElement.next();
             Locale thisLocale = getLocale(textElement);
@@ -168,6 +187,7 @@ public class Fault1_2Impl extends FaultImpl {
         return texts.iterator();
     }
 
+    @Override
     public void addFaultReasonText(String text, java.util.Locale locale)
         throws SOAPException {
 
@@ -214,6 +234,7 @@ public class Fault1_2Impl extends FaultImpl {
         }
     }
 
+    @Override
     public String getFaultReasonText(Locale locale) throws SOAPException {
 
         if (locale == null)
@@ -234,13 +255,14 @@ public class Fault1_2Impl extends FaultImpl {
         return null;
     }
 
-    public Iterator getFaultReasonLocales() throws SOAPException {
+    @Override
+    public Iterator<Locale> getFaultReasonLocales() throws SOAPException {
         // Fault Reason has similar semantics as faultstring
         if (this.faultStringElement == null)
             findReasonElement();
         Iterator eachTextElement =
             this.faultStringElement.getChildElements(textName);
-        List<Locale> localeSet = new ArrayList<Locale>();
+        List<Locale> localeSet = new ArrayList<>();
         while (eachTextElement.hasNext()) {
             SOAPElement textElement = (SOAPElement) eachTextElement.next();
             Locale thisLocale = getLocale(textElement);
@@ -257,6 +279,7 @@ public class Fault1_2Impl extends FaultImpl {
         return localeSet.iterator();
     }
 
+    @Override
     public Locale getFaultStringLocale() {
         Locale locale = null;
         try {
@@ -288,6 +311,7 @@ public class Fault1_2Impl extends FaultImpl {
         return null;
     }
 
+    @Override
     public String getFaultNode() {
         SOAPElement faultNode = findAndConvertChildElement(getFaultNodeName());
         if (faultNode == null) {
@@ -296,6 +320,7 @@ public class Fault1_2Impl extends FaultImpl {
         return faultNode.getValue();
     }
 
+    @Override
     public void setFaultNode(String uri) throws SOAPException {
         SOAPElement faultNode = findAndConvertChildElement(getFaultNodeName());
         if (faultNode != null) {
@@ -314,10 +339,12 @@ public class Fault1_2Impl extends FaultImpl {
         addNode(faultNode);
     }
 
+    @Override
     public String getFaultRole() {
         return getFaultActor();
     }
 
+    @Override
     public void setFaultRole(String uri) throws SOAPException {
         if (this.faultActorElement == null)
             findFaultActorElement();
@@ -333,6 +360,7 @@ public class Fault1_2Impl extends FaultImpl {
         addNode(this.faultActorElement);
     }
 
+    @Override
     public String getFaultCode() {
         if (this.faultCodeElement == null)
             findFaultCodeElement();
@@ -341,6 +369,7 @@ public class Fault1_2Impl extends FaultImpl {
         return ((SOAPElement) codeValues.next()).getValue();
     }
 
+    @Override
     public QName getFaultCodeAsQName() {
         String faultcode = getFaultCode();
         if (faultcode == null) {
@@ -355,6 +384,7 @@ public class Fault1_2Impl extends FaultImpl {
             (SOAPElement) valueElements.next());
     }
 
+    @Override
     public Name getFaultCodeAsName() {
         String faultcode = getFaultCode();
         if (faultcode == null) {
@@ -370,6 +400,7 @@ public class Fault1_2Impl extends FaultImpl {
                 (SOAPElement) valueElements.next()));
     }
 
+    @Override
     public String getFaultString() {
         String reason = null;
         try {
@@ -380,10 +411,12 @@ public class Fault1_2Impl extends FaultImpl {
         return reason;
     }
 
+    @Override
     public void setFaultString(String faultString) throws SOAPException {
         addFaultReasonText(faultString, Locale.getDefault());
     }
 
+    @Override
     public void setFaultString(
         String faultString,
         Locale locale)
@@ -391,6 +424,7 @@ public class Fault1_2Impl extends FaultImpl {
         addFaultReasonText(faultString, locale);
     }
 
+    @Override
     public void appendFaultSubcode(QName subcode) throws SOAPException {
         if (subcode == null) {
             return;
@@ -426,6 +460,7 @@ public class Fault1_2Impl extends FaultImpl {
         subcodeValueElement.addTextNode(prefix + ":" + subcode.getLocalPart());
     }
 
+    @Override
     public void removeAllFaultSubcodes() {
         if (this.faultCodeElement == null)
             findFaultCodeElement();
@@ -437,10 +472,11 @@ public class Fault1_2Impl extends FaultImpl {
         }
     }
 
-    public Iterator getFaultSubcodes() {
+    @Override
+    public Iterator<QName> getFaultSubcodes() {
         if (this.faultCodeElement == null)
             findFaultCodeElement();
-        final List<QName> subcodeList = new ArrayList<QName>();
+        final List<QName> subcodeList = new ArrayList<>();
         SOAPElement currentCodeElement = this.faultCodeElement;
         Iterator subcodeElements =
             currentCodeElement.getChildElements(subcodeName);
@@ -457,14 +493,17 @@ public class Fault1_2Impl extends FaultImpl {
         return new Iterator<QName>() {
             Iterator<QName> subCodeIter = subcodeList.iterator();
 
+            @Override
             public boolean hasNext() {
                 return subCodeIter.hasNext();
             }
 
+            @Override
             public QName next() {
                 return subCodeIter.next();
             }
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException(
                     "Method remove() not supported on SubCodes Iterator");
@@ -480,11 +519,13 @@ public class Fault1_2Impl extends FaultImpl {
      * Override setEncodingStyle of ElementImpl to restrict adding encodingStyle
      * attribute to SOAP Fault (SOAP 1.2 spec, part 1, section 5.1.1)
      */
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0407.ver1_2.no.encodingStyle.in.fault");
         throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Fault");
     }
 
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -494,6 +535,7 @@ public class Fault1_2Impl extends FaultImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
@@ -503,6 +545,7 @@ public class Fault1_2Impl extends FaultImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addTextNode(String text) throws SOAPException {
         log.log(
             Level.SEVERE,
@@ -511,6 +554,7 @@ public class Fault1_2Impl extends FaultImpl {
         throw new SOAPExceptionImpl("Adding text to SOAP 1.2 Fault is not legal");
     }
 
+    @Override
     public SOAPElement addChildElement(SOAPElement element)
         throws SOAPException {
         String localName = element.getLocalName();
@@ -533,6 +577,7 @@ public class Fault1_2Impl extends FaultImpl {
             return super.addChildElement(element);
     }
 
+    @Override
     protected boolean isStandardFaultElement(String localName) {
         if (localName.equalsIgnoreCase("code") ||
             localName.equalsIgnoreCase("reason") ||
@@ -544,22 +589,26 @@ public class Fault1_2Impl extends FaultImpl {
         return false;
     }
 
+    @Override
     protected QName getDefaultFaultCode() {
         return SOAPConstants.SOAP_SENDER_FAULT;
     }
 
+    @Override
      protected FaultElementImpl createSOAPFaultElement(QName qname) {
          return new FaultElement1_2Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        qname);
     }
 
+    @Override
     protected FaultElementImpl createSOAPFaultElement(Name qname) {
          return new FaultElement1_2Impl(
                        ((SOAPDocument) getOwnerDocument()).getDocument(),
                        (NameImpl)qname);
     }
 
+    @Override
      public void setFaultActor(String faultActor) throws SOAPException {
         this.setFaultRole(faultActor);
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
index a65f172d3c7..0e34cf01cfb 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -38,6 +38,7 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.FaultElementImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
 import com.sun.xml.internal.messaging.saaj.SOAPExceptionImpl;
+import org.w3c.dom.Element;
 
 public class FaultElement1_2Impl extends FaultElementImpl {
 
@@ -53,6 +54,11 @@ public class FaultElement1_2Impl extends FaultElementImpl {
         super(ownerDoc, NameImpl.createSOAP12Name(localName));
     }
 
+    public FaultElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     protected boolean isStandardFaultElement() {
         String localName = elementQName.getLocalPart();
         if (localName.equalsIgnoreCase("code") ||
@@ -64,6 +70,7 @@ public class FaultElement1_2Impl extends FaultElementImpl {
         return false;
     }
 
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         if (!isStandardFaultElement()) {
             FaultElement1_2Impl copy =
@@ -74,11 +81,13 @@ public class FaultElement1_2Impl extends FaultElementImpl {
         }
     }
 
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0408.ver1_2.no.encodingStyle.in.fault.child");
         throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on a Fault child element");
     }
 
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -88,6 +97,7 @@ public class FaultElement1_2Impl extends FaultElementImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
index ee9eeaac427..295158b0394 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
@@ -59,18 +59,22 @@ public class Header1_2Impl extends HeaderImpl {
         super(ownerDoc, domElement);
     }
 
+    @Override
     protected NameImpl getNotUnderstoodName() {
         return NameImpl.createNotUnderstood1_2Name(null);
     }
 
+    @Override
     protected NameImpl getUpgradeName() {
         return NameImpl.createUpgrade1_2Name(null);
     }
 
+    @Override
     protected NameImpl getSupportedEnvelopeName() {
         return NameImpl.createSupportedEnvelope1_2Name(null);
     }
 
+    @Override
     public SOAPHeaderElement addNotUnderstoodHeaderElement(final QName sourceName)
         throws SOAPException {
 
@@ -102,6 +106,7 @@ public class Header1_2Impl extends HeaderImpl {
         return notunderstoodHeaderElement;
     }
 
+    @Override
     public SOAPElement addTextNode(String text) throws SOAPException {
         log.log(
             Level.SEVERE,
@@ -110,6 +115,7 @@ public class Header1_2Impl extends HeaderImpl {
         throw new SOAPExceptionImpl("Adding text to SOAP 1.2 Header is not legal");
     }
 
+    @Override
     protected SOAPHeaderElement createHeaderElement(Name name)
         throws SOAPException {
         String uri = name.getURI();
@@ -122,6 +128,7 @@ public class Header1_2Impl extends HeaderImpl {
             name);
     }
 
+    @Override
     protected SOAPHeaderElement createHeaderElement(QName name)
         throws SOAPException {
         String uri = name.getNamespaceURI();
@@ -134,11 +141,13 @@ public class Header1_2Impl extends HeaderImpl {
             name);
     }
 
+    @Override
     public void setEncodingStyle(String encodingStyle) throws SOAPException {
         log.severe("SAAJ0409.ver1_2.no.encodingstyle.in.header");
         throw new SOAPExceptionImpl("encodingStyle attribute cannot appear on Header");
     }
 
+    @Override
     public SOAPElement addAttribute(Name name, String value)
         throws SOAPException {
         if (name.getLocalName().equals("encodingStyle")
@@ -149,6 +158,7 @@ public class Header1_2Impl extends HeaderImpl {
         return super.addAttribute(name, value);
     }
 
+    @Override
     public SOAPElement addAttribute(QName name, String value)
         throws SOAPException {
         if (name.getLocalPart().equals("encodingStyle")
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
index b2673a9f5fa..fdbcf0635a4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -37,6 +37,7 @@ import javax.xml.soap.SOAPException;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderElementImpl;
 import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
+import org.w3c.dom.Element;
 
 public class HeaderElement1_2Impl extends HeaderElementImpl {
 
@@ -47,51 +48,65 @@ public class HeaderElement1_2Impl extends HeaderElementImpl {
         super(ownerDoc, qname);
     }
 
+    public HeaderElement1_2Impl(SOAPDocumentImpl ownerDoc, Element domElement) {
+        super(ownerDoc, domElement);
+    }
+
+    @Override
     public SOAPElement setElementQName(QName newName) throws SOAPException {
         HeaderElementImpl copy =
             new HeaderElement1_2Impl((SOAPDocumentImpl)getOwnerDocument(), newName);
         return replaceElementWithSOAPElement(this,copy);
     }
 
+    @Override
     protected NameImpl getRoleAttributeName() {
         return NameImpl.create("role", null, NameImpl.SOAP12_NAMESPACE);
     }
 
     // Actor equivalent to Role in SOAP 1.2
+    @Override
     protected NameImpl getActorAttributeName() {
         return getRoleAttributeName();
     }
 
+    @Override
     protected NameImpl getMustunderstandAttributeName() {
         return NameImpl.create("mustUnderstand", null, NameImpl.SOAP12_NAMESPACE);
     }
 
     // mustUnderstand attribute has literal value "true" or "false"
+    @Override
     protected String getMustunderstandLiteralValue(boolean mustUnderstand) {
         return (mustUnderstand == true ? "true" : "false");
     }
 
+    @Override
     protected boolean getMustunderstandAttributeValue(String mu) {
         if (mu.equals("true") || mu.equals("1"))
             return true;
         return false;
     }
 
+    @Override
    protected NameImpl getRelayAttributeName() {
         return NameImpl.create("relay", null, NameImpl.SOAP12_NAMESPACE);
     }
 
     //relay attribute has literal value "true" or "false"
+    @Override
     protected String getRelayLiteralValue(boolean relay) {
         return (relay == true ? "true" : "false");
     }
 
+    @Override
     protected boolean getRelayAttributeValue(String relay) {
         if (relay.equals("true") || relay.equals("1"))
             return true;
         return false;
     }
 
+    @Override
     protected String getActorOrRole() {
         return getRole();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
index b63c8ed4f55..bf851c1299f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -69,6 +69,7 @@ public class Message1_2Impl extends MessageImpl implements SOAPConstants{
             super(headers,ct,stat,reader);
     }
 
+    @Override
     public SOAPPart getSOAPPart()  {
         if (soapPartImpl == null)
             soapPartImpl = new SOAPPart1_2Impl(this);
@@ -76,14 +77,17 @@ public class Message1_2Impl extends MessageImpl implements SOAPConstants{
         return soapPartImpl;
     }
 
+    @Override
     protected boolean isCorrectSoapVersion(int contentTypeId) {
         return (contentTypeId & SOAP1_2_FLAG) != 0;
     }
 
+    @Override
     protected String getExpectedContentType() {
         return isFastInfoset ? "application/soap+fastinfoset" : "application/soap+xml";
     }
 
+    @Override
    protected String getExpectedAcceptHeader() {
        String accept = "application/soap+xml, text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
        return acceptFastInfoset ? ("application/soap+fastinfoset, " + accept) : accept;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
index af01e129e19..4f6ce887508 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -39,14 +39,17 @@ import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
 import com.sun.xml.internal.messaging.saaj.soap.SOAPFactoryImpl;
 
 public class SOAPFactory1_2Impl extends SOAPFactoryImpl {
+    @Override
     protected SOAPDocumentImpl createDocument() {
         return (new SOAPPart1_2Impl()).getDocument();
     }
 
+    @Override
     public Detail createDetail() throws SOAPException {
         return new Detail1_2Impl(createDocument());
     }
 
+    @Override
     public SOAPFault createFault(String reasonText, QName faultCode)
         throws SOAPException {
          if (faultCode == null) {
@@ -55,14 +58,15 @@ public class SOAPFactory1_2Impl extends SOAPFactoryImpl {
         if (reasonText == null) {
             throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
         }
-        Fault1_2Impl fault = new Fault1_2Impl(createDocument(), null);
+        Fault1_2Impl fault = new Fault1_2Impl(createDocument());
         fault.setFaultCode(faultCode);
         fault.setFaultString(reasonText);
         return fault;
     }
 
+    @Override
     public SOAPFault createFault() throws SOAPException {
-        Fault1_2Impl fault = new Fault1_2Impl(createDocument(), null);
+        Fault1_2Impl fault = new Fault1_2Impl(createDocument());
         fault.setFaultCode(fault.getDefaultFaultCode());
         fault.setFaultString("Fault string, and possibly fault code, not set");
         return fault;
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
index ac1152121f2..2736d5d9843 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -40,16 +40,19 @@ import com.sun.xml.internal.messaging.saaj.soap.MessageImpl;
 
 public class SOAPMessageFactory1_2Impl extends MessageFactoryImpl {
 
+    @Override
     public SOAPMessage createMessage() throws SOAPException {
         return new Message1_2Impl();
     }
 
+    @Override
     public SOAPMessage createMessage(boolean isFastInfoset,
         boolean acceptFastInfoset) throws SOAPException
     {
         return new Message1_2Impl(isFastInfoset, acceptFastInfoset);
     }
 
+    @Override
     public SOAPMessage createMessage(MimeHeaders headers, InputStream in) throws IOException, SOAPExceptionImpl {
 
         if (headers == null) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
index 6f708b8e228..0331405b8ac 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -53,14 +53,17 @@ public class SOAPPart1_2Impl extends SOAPPartImpl implements SOAPConstants{
         super(message);
     }
 
+    @Override
     protected String getContentType() {
         return "application/soap+xml";
     }
 
+    @Override
     protected Envelope createEmptyEnvelope(String prefix) throws SOAPException {
         return new Envelope1_2Impl(getDocument(), prefix, true, true);
     }
 
+    @Override
     protected Envelope createEnvelopeFromSource() throws SOAPException {
         XMLDeclarationParser parser = lookForXmlDecl();
         Source tmp = source;
@@ -82,6 +85,7 @@ public class SOAPPart1_2Impl extends SOAPPartImpl implements SOAPConstants{
 
     }
 
+    @Override
     protected SOAPPartImpl duplicateType() {
         return new SOAPPart1_2Impl();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
index 5722f117296..4e11155b8f7 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -53,6 +53,7 @@ public class ByteInputStream extends ByteArrayInputStream {
         return count;
     }
 
+    @Override
     public void close() throws IOException {
         reset();
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
index df3508a6d60..fc9652e4f50 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -75,10 +75,12 @@ public class JAXMStreamSource extends StreamSource {
         this.reader = new CharArrayReader(cout.toCharArray(), 0, cout.size());
     }
 
+    @Override
     public InputStream getInputStream() {
         return in;
     }
 
+    @Override
     public Reader getReader() {
         return reader;
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
index cac1817e59f..cffc2c4d806 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -89,11 +89,13 @@ public class NamespaceContextIterator implements Iterator {
         }
     }
 
+    @Override
     public boolean hasNext() {
         findNext();
         return next != null;
     }
 
+    @Override
     public Object next() {
         return getNext();
     }
@@ -112,6 +114,7 @@ public class NamespaceContextIterator implements Iterator {
         return last;
     }
 
+    @Override
     public void remove() {
         if (last == null) {
             throw new IllegalStateException();
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
index 649e206e3a5..e56fee4d102 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -96,6 +96,7 @@ public class RejectDoctypeSaxFilter extends XMLFilterImpl implements XMLReader,
      * Override setProperty() to capture any LexicalHandler that is set for
      * forwarding of events.
      */
+    @Override
     public void setProperty(String name, Object value)
     throws SAXNotRecognizedException, SAXNotSupportedException {
         if (LEXICAL_HANDLER_PROP.equals(name)) {
@@ -109,38 +110,45 @@ public class RejectDoctypeSaxFilter extends XMLFilterImpl implements XMLReader,
     // Beginning of SAX LexicalHandler callbacks...
     //
 
+    @Override
     public void startDTD(String name, String publicId, String systemId)
     throws SAXException {
         throw new SAXException("Document Type Declaration is not allowed");
     }
 
+    @Override
     public void endDTD() throws SAXException {
     }
 
+    @Override
     public void startEntity(String name) throws SAXException {
         if (lexicalHandler != null) {
             lexicalHandler.startEntity(name);
         }
     }
 
+    @Override
     public void endEntity(String name) throws SAXException {
         if (lexicalHandler != null) {
             lexicalHandler.endEntity(name);
         }
     }
 
+    @Override
     public void startCDATA() throws SAXException {
         if (lexicalHandler != null) {
             lexicalHandler.startCDATA();
         }
     }
 
+    @Override
     public void endCDATA() throws SAXException {
         if (lexicalHandler != null) {
             lexicalHandler.endCDATA();
         }
     }
 
+    @Override
     public void comment(char[] ch, int start, int length) throws SAXException {
         if (lexicalHandler != null) {
             lexicalHandler.comment(ch, start, length);
@@ -151,6 +159,7 @@ public class RejectDoctypeSaxFilter extends XMLFilterImpl implements XMLReader,
     // End of SAX LexicalHandler callbacks
     //
 
+    @Override
     public void startElement(String namespaceURI, String localName,
     String qName, Attributes atts)   throws SAXException{
         if(atts != null ){
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
index bbb4c832327..563f38d8c73 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -46,44 +46,53 @@ public class TeeInputStream extends InputStream {
         this.source = source;
     }
 
+    @Override
     public int read() throws IOException {
         int result = source.read();
         copySink.write(result);
         return result;
     }
 
+    @Override
     public int available() throws IOException {
         return source.available();
     }
 
+    @Override
     public void close() throws IOException {
         source.close();
     }
 
+    @Override
     public synchronized void mark(int readlimit) {
         source.mark(readlimit);
     }
 
+    @Override
     public boolean markSupported() {
         return source.markSupported();
     }
 
+    @Override
     public int read(byte[] b, int off, int len) throws IOException {
         int result = source.read(b, off, len);
         copySink.write(b, off, len);
         return result;
     }
 
+    @Override
     public int read(byte[] b) throws IOException {
         int result = source.read(b);
         copySink.write(b);
         return result;
     }
 
+    @Override
     public synchronized void reset() throws IOException {
         source.reset();
     }
 
+    @Override
     public long skip(long n) throws IOException {
         return source.skip(n);
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java
index c8765a4667c..1bf8da3572d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/LazyEnvelopeStaxReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -59,11 +59,13 @@ public class LazyEnvelopeStaxReader extends com.sun.xml.internal.org.jvnet.staxe
         }
     }
 
+    @Override
     public Object getProperty(String name) throws IllegalArgumentException {
         if (usePayloadReaderDelegate) return payloadReader.getProperty(name);
         return super.getProperty(name);
     }
 
+    @Override
     public int next() throws XMLStreamException {
 //        boolean previouslyUsingPayloadReader = usePayloadReaderDelegate;
         //call checkReaderStatus to advance to payloadReader if needed
@@ -78,22 +80,26 @@ public class LazyEnvelopeStaxReader extends com.sun.xml.internal.org.jvnet.staxe
         return getEventType();
     }
 
+    @Override
     public void require(int type, String namespaceURI, String localName)
             throws XMLStreamException {
         if (usePayloadReaderDelegate) payloadReader.require(type, namespaceURI, localName);
         else super.require(type, namespaceURI, localName);
     }
 
+    @Override
     public String getElementText() throws XMLStreamException {
         if (usePayloadReaderDelegate) return payloadReader.getElementText();
         return super.getElementText();
     }
 
+    @Override
     public int nextTag() throws XMLStreamException {
         if (usePayloadReaderDelegate) return payloadReader.nextTag();
         return super.nextTag();
     }
 
+    @Override
     public boolean hasNext() throws XMLStreamException {
         checkReaderStatus(false);
         boolean hasNext;
@@ -139,116 +145,139 @@ public class LazyEnvelopeStaxReader extends com.sun.xml.internal.org.jvnet.staxe
         }
     }
 
+    @Override
     public void close() throws XMLStreamException {
         if (usePayloadReaderDelegate) payloadReader.close();
         else super.close();
     }
 
+    @Override
     public String getNamespaceURI(String prefix) {
         if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI(prefix);
         return super.getNamespaceURI(prefix);
     }
 
+    @Override
     public boolean isStartElement() {
         if (usePayloadReaderDelegate) return payloadReader.isStartElement();
         return super.isStartElement();
     }
 
+    @Override
     public boolean isEndElement() {
         if (usePayloadReaderDelegate) return payloadReader.isEndElement();
         return super.isEndElement();
     }
 
+    @Override
     public boolean isCharacters() {
         if (usePayloadReaderDelegate) return payloadReader.isCharacters();
         return super.isEndElement();
     }
 
+    @Override
     public boolean isWhiteSpace() {
         if (usePayloadReaderDelegate) return payloadReader.isWhiteSpace();
         return super.isWhiteSpace();
     }
 
+    @Override
     public String getAttributeValue(String namespaceURI, String localName) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeValue(namespaceURI, localName);
         return super.getAttributeValue(namespaceURI, localName);
     }
 
+    @Override
     public int getAttributeCount() {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeCount();
         return super.getAttributeCount();
     }
 
+    @Override
     public QName getAttributeName(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeName(index);
         return super.getAttributeName(index);
     }
 
+    @Override
     public String getAttributeNamespace(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeNamespace(index);
         return super.getAttributeNamespace(index);
     }
 
+    @Override
     public String getAttributeLocalName(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeLocalName(index);
         return super.getAttributeLocalName(index);
     }
 
+    @Override
     public String getAttributePrefix(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributePrefix(index);
         return super.getAttributePrefix(index);
     }
 
+    @Override
     public String getAttributeType(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeType(index);
         return super.getAttributeType(index);
     }
 
+    @Override
     public String getAttributeValue(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getAttributeValue(index);
         return super.getAttributeValue(index);
     }
 
+    @Override
     public boolean isAttributeSpecified(int index) {
         if (usePayloadReaderDelegate) return payloadReader.isAttributeSpecified(index);
         return super.isAttributeSpecified(index);
     }
 
+    @Override
     public int getNamespaceCount() {
         if (usePayloadReaderDelegate) return payloadReader.getNamespaceCount();
         return super.getNamespaceCount();
     }
 
+    @Override
     public String getNamespacePrefix(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getNamespacePrefix(index);
         return super.getNamespacePrefix(index);
     }
 
+    @Override
     public String getNamespaceURI(int index) {
         if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI(index);
         return super.getNamespaceURI(index);
     }
 
+    @Override
     public NamespaceContext getNamespaceContext() {
         if (usePayloadReaderDelegate) return payloadReader.getNamespaceContext();
         return super.getNamespaceContext();
     }
 
+    @Override
     public int getEventType() {
         if (usePayloadReaderDelegate) return payloadReader.getEventType();
         return super.getEventType();
     }
 
+    @Override
     public String getText() {
         if (usePayloadReaderDelegate) return payloadReader.getText();
         return super.getText();
     }
 
+    @Override
     public char[] getTextCharacters() {
         if (usePayloadReaderDelegate) return payloadReader.getTextCharacters();
         return super.getTextCharacters();
     }
 
+    @Override
     public int getTextCharacters(int sourceStart, char[] target,
             int targetStart, int length) throws XMLStreamException {
         if (usePayloadReaderDelegate) return payloadReader.getTextCharacters(sourceStart, target, targetStart,
@@ -256,81 +285,97 @@ public class LazyEnvelopeStaxReader extends com.sun.xml.internal.org.jvnet.staxe
         return super.getTextCharacters(sourceStart, target, targetStart, length);
     }
 
+    @Override
     public int getTextStart() {
         if (usePayloadReaderDelegate) return payloadReader.getTextStart();
         return super.getTextStart();
     }
 
+    @Override
     public int getTextLength() {
         if (usePayloadReaderDelegate) return payloadReader.getTextLength();
         return super.getTextLength();
     }
 
+    @Override
     public String getEncoding() {
         if (usePayloadReaderDelegate) return payloadReader.getEncoding();
         return super.getEncoding();
     }
 
+    @Override
     public boolean hasText() {
         if (usePayloadReaderDelegate) return payloadReader.hasText();
         return super.hasText();
     }
 
+    @Override
     public Location getLocation() {
         if (usePayloadReaderDelegate) return payloadReader.getLocation();
         return super.getLocation();
     }
 
+    @Override
     public QName getName() {
         if (usePayloadReaderDelegate) return payloadReader.getName();
         return super.getName();
     }
 
+    @Override
     public String getLocalName() {
         if (usePayloadReaderDelegate) return payloadReader.getLocalName();
         return super.getLocalName();
     }
 
+    @Override
     public boolean hasName() {
         if (usePayloadReaderDelegate) return payloadReader.hasName();
         return super.hasName();
     }
 
+    @Override
     public String getNamespaceURI() {
         if (usePayloadReaderDelegate) return payloadReader.getNamespaceURI();
         return super.getNamespaceURI();
     }
 
+    @Override
     public String getPrefix() {
         if (usePayloadReaderDelegate) return payloadReader.getPrefix();
         return super.getPrefix();
     }
 
+    @Override
     public String getVersion() {
         if (usePayloadReaderDelegate) return payloadReader.getVersion();
         return super.getVersion();
     }
 
+    @Override
     public boolean isStandalone() {
         if (usePayloadReaderDelegate) return payloadReader.isStandalone();
         return super.isStandalone();
     }
 
+    @Override
     public boolean standaloneSet() {
         if (usePayloadReaderDelegate) return payloadReader.standaloneSet();
         return super.standaloneSet();
     }
 
+    @Override
     public String getCharacterEncodingScheme() {
         if (usePayloadReaderDelegate) return payloadReader.getCharacterEncodingScheme();
         return super.getCharacterEncodingScheme();
     }
 
+    @Override
     public String getPITarget() {
         if (usePayloadReaderDelegate) return payloadReader.getPITarget();
         return super.getPITarget();
     }
 
+    @Override
     public String getPIData() {
         if (usePayloadReaderDelegate) return payloadReader.getPIData();
         return super.getPIData();
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java
index a53cb79a7a1..ce9c1755f4b 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriter.java
@@ -335,24 +335,30 @@ public class SaajStaxWriter implements XMLStreamWriter {
     @Override
     public NamespaceContext getNamespaceContext() {
         return new NamespaceContext() {
+            @Override
             public String getNamespaceURI(final String prefix) {
                 return currentElement.getNamespaceURI(prefix);
             }
+            @Override
             public String getPrefix(final String namespaceURI) {
                 return currentElement.lookupPrefix(namespaceURI);
             }
+            @Override
             public Iterator getPrefixes(final String namespaceURI) {
                 return new Iterator<String>() {
                     String prefix = getPrefix(namespaceURI);
+                    @Override
                     public boolean hasNext() {
                         return (prefix != null);
                     }
+                    @Override
                     public String next() {
                         if (!hasNext()) throw new java.util.NoSuchElementException();
                         String next = prefix;
                         prefix = null;
                         return next;
                     }
+                    @Override
                     public void remove() {}
                 };
             }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java
index 4048b296a48..b5745dc98d4 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/util/stax/SaajStaxWriterEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -67,6 +67,7 @@ public class SaajStaxWriterEx extends SaajStaxWriter implements XMLStreamWriterE
         super(msg, uri);
     }
 
+    @Override
     public void writeStartElement(String prefix, String ln, String ns) throws XMLStreamException {
         if (xopNS.equals(ns) && Include.equals(ln)) {
             state = State.xopInclude;
@@ -108,31 +109,41 @@ public class SaajStaxWriterEx extends SaajStaxWriter implements XMLStreamWriterE
     @Override
     public NamespaceContextEx getNamespaceContext() {
         return new NamespaceContextEx() {
+            @Override
             public String getNamespaceURI(String prefix) {
                 return currentElement.getNamespaceURI(prefix);
             }
+            @Override
             public String getPrefix(String namespaceURI) {
                 return currentElement.lookupPrefix(namespaceURI);
             }
+            @Override
             public Iterator getPrefixes(final String namespaceURI) {
                 return new Iterator<String>() {
                     String prefix = getPrefix(namespaceURI);
+                    @Override
                     public boolean hasNext() {
                         return (prefix != null);
                     }
+                    @Override
                     public String next() {
                         if (prefix == null) throw new java.util.NoSuchElementException();
                         String next = prefix;
                         prefix = null;
                         return next;
                     }
+                    @Override
                     public void remove() {}
                 };
             }
+            @Override
             public Iterator<Binding> iterator() {
                 return new Iterator<Binding>() {
+                    @Override
                     public boolean hasNext() { return false; }
+                    @Override
                     public Binding next() { return null; }
+                    @Override
                     public void remove() {}
                 };
             }
@@ -208,6 +219,7 @@ public class SaajStaxWriterEx extends SaajStaxWriter implements XMLStreamWriterE
         return hrefOrCid;
     }
 
+    @Override
     public AttachmentMarshaller getAttachmentMarshaller() {
         return new AttachmentMarshaller() {
             @Override
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java
index 80f7d3bb6ea..db5defcbfd8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java
@@ -25,6 +25,18 @@
 
 package com.sun.xml.internal.ws.api.message.saaj;
 
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.MessageHeaders;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.message.saaj.SAAJHeader;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPHeaderElement;
+import javax.xml.soap.SOAPMessage;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,21 +46,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPHeaderElement;
-import javax.xml.soap.SOAPMessage;
-
-import com.sun.xml.internal.messaging.saaj.soap.SOAPDocumentImpl;
-import com.sun.xml.internal.messaging.saaj.soap.impl.HeaderImpl;
-import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.WSBinding;
-import com.sun.xml.internal.ws.api.message.Header;
-import com.sun.xml.internal.ws.api.message.MessageHeaders;
-import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
-import com.sun.xml.internal.ws.message.saaj.SAAJHeader;
-
 public class SAAJMessageHeaders implements MessageHeaders {
     SOAPMessage sm;
     Map<SOAPHeaderElement, Header> nonSAAJHeaders;
@@ -236,12 +233,11 @@ public class SAAJMessageHeaders implements MessageHeaders {
         if (soapHeader == null) {
             return null;
         }
-        SOAPDocumentImpl soapDocument = ((HeaderImpl)soapHeader).getSoapDocument();
         SOAPHeaderElement headerElem = find(nsUri, localName);
         if (headerElem == null) {
             return null;
         }
-        headerElem = (SOAPHeaderElement) soapDocument.find(soapHeader.removeChild(headerElem));
+        headerElem = (SOAPHeaderElement) soapHeader.removeChild(headerElem);
 
         //it might have been a nonSAAJHeader - remove from that map
         removeNonSAAJHeader(headerElem);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
index 3ba900a13da..02d22f134f8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
@@ -35,6 +35,7 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -89,8 +90,14 @@ public abstract class SDDocumentSource {
      */
     public abstract URL getSystemId();
 
-    public static SDDocumentSource create(final Class<?> implClass, final String url) {
-        return create(url, implClass);
+    public static SDDocumentSource create(final Class<?> implClass, final String wsdlLocation) {
+        ClassLoader cl = implClass.getClassLoader();
+        URL url = cl.getResource(wsdlLocation);
+        if (url != null) {
+            return create(url);
+        } else {
+            return create(wsdlLocation, implClass);
+        }
     }
 
     /**
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
index 68cccd1611c..9aab8d71600 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,6 +28,7 @@ package com.sun.xml.internal.ws.api.streaming;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.streaming.XMLReaderException;
+import com.sun.xml.internal.ws.util.MrJarUtil;
 import com.sun.xml.internal.ws.util.xml.XmlUtil;
 import org.xml.sax.InputSource;
 
@@ -79,7 +80,7 @@ public abstract class XMLStreamReaderFactory {
 
                     // this system property can be used to disable the pooling altogether,
                     // in case someone hits an issue with pooling in the production system.
-                    if(!getProperty(XMLStreamReaderFactory.class.getName()+".noPool")) {
+                    if(!MrJarUtil.getNoPoolProperty(XMLStreamReaderFactory.class.getName())) {
                         f = Zephyr.newInstance(xif);
                     }
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
index fa52778a9f1..2b34c2c6808 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -30,6 +30,7 @@ import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.encoding.HasEncoding;
 import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
 import com.sun.xml.internal.ws.streaming.XMLReaderException;
+import com.sun.xml.internal.ws.util.MrJarUtil;
 import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
 
 import javax.xml.stream.XMLOutputFactory;
@@ -85,7 +86,7 @@ public abstract class XMLStreamWriterFactory {
 
             // this system property can be used to disable the pooling altogether,
             // in case someone hits an issue with pooling in the production system.
-            if (!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool")) {
+            if (!MrJarUtil.getNoPoolProperty(XMLStreamWriterFactory.class.getName())) {
                 try {
                     Class<?> clazz = xof.createXMLStreamWriter(new StringWriter()).getClass();
                     if (clazz.getName().startsWith("com.sun.xml.internal.stream.")) {
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
index ad6f52f342e..3b2df620a7f 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
@@ -1180,7 +1180,7 @@ public class RuntimeModeler {
                     if(p == null)
                         resRpcParams.put(resRpcParams.size()+10000, param);
                     else
-                        resRpcParams.put(param.getIndex(), param);
+                        resRpcParams.put(p.getIndex(), param);
                 }
             }else{
                 javaMethod.addParameter(param);
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java
index 1c6f1d6fdbd..a672ba5b294 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.policy.privateutil;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class LocalizationMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.policy.privateutil.Localization";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, LocalizationMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.policy.privateutil.Localization";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new LocalizationMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON", arg0, arg1);
     }
 
     /**
@@ -57,11 +55,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0017_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL_PLUS_REASON(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(Object arg0) {
-        return messageFactory.getMessage("WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED", arg0);
     }
 
     /**
@@ -69,11 +67,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(Object arg0) {
-        return localizer.localize(localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(arg0));
+        return LOCALIZER.localize(localizableWSP_0028_SERVICE_PROVIDER_COULD_NOT_BE_INSTANTIATED(arg0));
     }
 
     public static Localizable localizableWSP_0081_UNABLE_TO_INSERT_CHILD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0081_UNABLE_TO_INSERT_CHILD", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0081_UNABLE_TO_INSERT_CHILD", arg0, arg1);
     }
 
     /**
@@ -81,11 +79,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0081_UNABLE_TO_INSERT_CHILD(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0081_UNABLE_TO_INSERT_CHILD(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0081_UNABLE_TO_INSERT_CHILD(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0096_ERROR_WHILE_COMBINE(Object arg0) {
-        return messageFactory.getMessage("WSP_0096_ERROR_WHILE_COMBINE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0096_ERROR_WHILE_COMBINE", arg0);
     }
 
     /**
@@ -93,11 +91,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0096_ERROR_WHILE_COMBINE(Object arg0) {
-        return localizer.localize(localizableWSP_0096_ERROR_WHILE_COMBINE(arg0));
+        return LOCALIZER.localize(localizableWSP_0096_ERROR_WHILE_COMBINE(arg0));
     }
 
     public static Localizable localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(Object arg0) {
-        return messageFactory.getMessage("WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL", arg0);
     }
 
     /**
@@ -105,11 +103,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(Object arg0) {
-        return localizer.localize(localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(arg0));
+        return LOCALIZER.localize(localizableWSP_0018_UNABLE_TO_ACCESS_POLICY_SOURCE_MODEL(arg0));
     }
 
     public static Localizable localizableWSP_0090_UNEXPECTED_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0090_UNEXPECTED_ELEMENT", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0090_UNEXPECTED_ELEMENT", arg0, arg1);
     }
 
     /**
@@ -117,11 +115,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0090_UNEXPECTED_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0090_UNEXPECTED_ELEMENT(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0090_UNEXPECTED_ELEMENT(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL() {
-        return messageFactory.getMessage("WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL");
     }
 
     /**
@@ -129,11 +127,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL() {
-        return localizer.localize(localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL());
+        return LOCALIZER.localize(localizableWSP_0043_POLICY_MODEL_TRANSLATION_ERROR_INPUT_PARAM_NULL());
     }
 
     public static Localizable localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED() {
-        return messageFactory.getMessage("WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED");
+        return MESSAGE_FACTORY.getMessage("WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED");
     }
 
     /**
@@ -141,11 +139,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED() {
-        return localizer.localize(localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED());
+        return LOCALIZER.localize(localizableWSP_0055_NO_ALTERNATIVE_COMBINATIONS_CREATED());
     }
 
     public static Localizable localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED() {
-        return messageFactory.getMessage("WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED");
+        return MESSAGE_FACTORY.getMessage("WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED");
     }
 
     /**
@@ -153,11 +151,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED() {
-        return localizer.localize(localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED());
+        return LOCALIZER.localize(localizableWSP_0072_DIGEST_MUST_NOT_BE_NULL_WHEN_ALG_DEFINED());
     }
 
     public static Localizable localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL() {
-        return messageFactory.getMessage("WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL");
+        return MESSAGE_FACTORY.getMessage("WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL");
     }
 
     /**
@@ -165,11 +163,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL() {
-        return localizer.localize(localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL());
+        return LOCALIZER.localize(localizableWSP_0016_UNABLE_TO_CLONE_POLICY_SOURCE_MODEL());
     }
 
     public static Localizable localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED() {
-        return messageFactory.getMessage("WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED");
+        return MESSAGE_FACTORY.getMessage("WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED");
     }
 
     /**
@@ -177,11 +175,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED() {
-        return localizer.localize(localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED());
+        return LOCALIZER.localize(localizableWSP_0058_MULTIPLE_POLICY_IDS_NOT_ALLOWED());
     }
 
     public static Localizable localizableWSP_0061_METHOD_INVOCATION_FAILED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0061_METHOD_INVOCATION_FAILED", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0061_METHOD_INVOCATION_FAILED", arg0, arg1, arg2);
     }
 
     /**
@@ -189,11 +187,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0061_METHOD_INVOCATION_FAILED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0061_METHOD_INVOCATION_FAILED(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0061_METHOD_INVOCATION_FAILED(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST() {
-        return messageFactory.getMessage("WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST");
+        return MESSAGE_FACTORY.getMessage("WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST");
     }
 
     /**
@@ -201,11 +199,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0048_POLICY_ELEMENT_EXPECTED_FIRST() {
-        return localizer.localize(localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST());
+        return LOCALIZER.localize(localizableWSP_0048_POLICY_ELEMENT_EXPECTED_FIRST());
     }
 
     public static Localizable localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION() {
-        return messageFactory.getMessage("WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION");
+        return MESSAGE_FACTORY.getMessage("WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION");
     }
 
     /**
@@ -213,11 +211,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION() {
-        return localizer.localize(localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION());
+        return LOCALIZER.localize(localizableWSP_0068_FAILED_TO_UNMARSHALL_POLICY_EXPRESSION());
     }
 
     public static Localizable localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2);
     }
 
     /**
@@ -225,11 +223,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0029_SERVICE_PORT_OPERATION_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL() {
-        return messageFactory.getMessage("WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL");
     }
 
     /**
@@ -237,11 +235,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL() {
-        return localizer.localize(localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL());
+        return LOCALIZER.localize(localizableWSP_0080_IMPLEMENTATION_EXPECTED_NOT_NULL());
     }
 
     public static Localizable localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(Object arg0) {
-        return messageFactory.getMessage("WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE", arg0);
     }
 
     /**
@@ -249,11 +247,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(Object arg0) {
-        return localizer.localize(localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(arg0));
+        return LOCALIZER.localize(localizableWSP_0051_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_ASSERTION_RELATED_NODE_TYPE(arg0));
     }
 
     public static Localizable localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(Object arg0) {
-        return messageFactory.getMessage("WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE", arg0);
     }
 
     /**
@@ -261,11 +259,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(Object arg0) {
-        return localizer.localize(localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(arg0));
+        return LOCALIZER.localize(localizableWSP_0008_UNEXPECTED_CHILD_MODEL_TYPE(arg0));
     }
 
     public static Localizable localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(Object arg0) {
-        return messageFactory.getMessage("WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE", arg0);
     }
 
     /**
@@ -273,11 +271,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(Object arg0) {
-        return localizer.localize(localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(arg0));
+        return LOCALIZER.localize(localizableWSP_0023_UNEXPECTED_ERROR_WHILE_CLOSING_RESOURCE(arg0));
     }
 
     public static Localizable localizableWSP_0091_END_ELEMENT_NO_MATCH(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0091_END_ELEMENT_NO_MATCH", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0091_END_ELEMENT_NO_MATCH", arg0, arg1, arg2);
     }
 
     /**
@@ -285,11 +283,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0091_END_ELEMENT_NO_MATCH(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0091_END_ELEMENT_NO_MATCH(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0091_END_ELEMENT_NO_MATCH(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(Object arg0) {
-        return messageFactory.getMessage("WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE", arg0);
     }
 
     /**
@@ -297,11 +295,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(Object arg0) {
-        return localizer.localize(localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(arg0));
+        return LOCALIZER.localize(localizableWSP_0001_UNSUPPORTED_MODEL_NODE_TYPE(arg0));
     }
 
     public static Localizable localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE() {
-        return messageFactory.getMessage("WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE");
+        return MESSAGE_FACTORY.getMessage("WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE");
     }
 
     /**
@@ -309,11 +307,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE() {
-        return localizer.localize(localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE());
+        return LOCALIZER.localize(localizableWSP_0053_INVALID_CLIENT_SIDE_ALTERNATIVE());
     }
 
     public static Localizable localizableWSP_0087_UNKNOWN_EVENT(Object arg0) {
-        return messageFactory.getMessage("WSP_0087_UNKNOWN_EVENT", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0087_UNKNOWN_EVENT", arg0);
     }
 
     /**
@@ -321,11 +319,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0087_UNKNOWN_EVENT(Object arg0) {
-        return localizer.localize(localizableWSP_0087_UNKNOWN_EVENT(arg0));
+        return LOCALIZER.localize(localizableWSP_0087_UNKNOWN_EVENT(arg0));
     }
 
     public static Localizable localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(Object arg0) {
-        return messageFactory.getMessage("WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL", arg0);
     }
 
     /**
@@ -333,11 +331,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(Object arg0) {
-        return localizer.localize(localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(arg0));
+        return LOCALIZER.localize(localizableWSP_0065_INCONSISTENCY_IN_POLICY_SOURCE_MODEL(arg0));
     }
 
     public static Localizable localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0032_SERVICE_CAN_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0032_SERVICE_CAN_NOT_BE_NULL");
     }
 
     /**
@@ -345,11 +343,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0032_SERVICE_CAN_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0032_SERVICE_CAN_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0093_INVALID_URI(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0093_INVALID_URI", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0093_INVALID_URI", arg0, arg1);
     }
 
     /**
@@ -357,11 +355,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0093_INVALID_URI(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0093_INVALID_URI(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0093_INVALID_URI(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -369,11 +367,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0045_POLICY_MAP_KEY_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(Object arg0) {
-        return messageFactory.getMessage("WSP_0079_ERROR_WHILE_RFC2396_UNESCAPING", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0079_ERROR_WHILE_RFC2396_UNESCAPING", arg0);
     }
 
     /**
@@ -381,11 +379,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(Object arg0) {
-        return localizer.localize(localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(arg0));
+        return LOCALIZER.localize(localizableWSP_0079_ERROR_WHILE_RFC_2396_UNESCAPING(arg0));
     }
 
     public static Localizable localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY() {
-        return messageFactory.getMessage("WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY");
+        return MESSAGE_FACTORY.getMessage("WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY");
     }
 
     /**
@@ -393,11 +391,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY() {
-        return localizer.localize(localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY());
+        return LOCALIZER.localize(localizableWSP_0064_INITIAL_POLICY_COLLECTION_MUST_NOT_BE_EMPTY());
     }
 
     public static Localizable localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED() {
-        return messageFactory.getMessage("WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED");
+        return MESSAGE_FACTORY.getMessage("WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED");
     }
 
     /**
@@ -405,11 +403,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED() {
-        return localizer.localize(localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED());
+        return LOCALIZER.localize(localizableWSP_0044_POLICY_MAP_MUTATOR_ALREADY_CONNECTED());
     }
 
     public static Localizable localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD() {
-        return messageFactory.getMessage("WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD");
+        return MESSAGE_FACTORY.getMessage("WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD");
     }
 
     /**
@@ -417,11 +415,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD() {
-        return localizer.localize(localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD());
+        return LOCALIZER.localize(localizableWSP_0015_UNABLE_TO_INSTANTIATE_DIGEST_ALG_URI_FIELD());
     }
 
     public static Localizable localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET() {
-        return messageFactory.getMessage("WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET");
+        return MESSAGE_FACTORY.getMessage("WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET");
     }
 
     /**
@@ -429,11 +427,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET() {
-        return localizer.localize(localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET());
+        return LOCALIZER.localize(localizableWSP_0046_POLICY_MAP_KEY_HANDLER_NOT_SET());
     }
 
     public static Localizable localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI() {
-        return messageFactory.getMessage("WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI");
+        return MESSAGE_FACTORY.getMessage("WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI");
     }
 
     /**
@@ -441,11 +439,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI() {
-        return localizer.localize(localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI());
+        return LOCALIZER.localize(localizableWSP_0012_UNABLE_TO_UNMARSHALL_POLICY_MALFORMED_URI());
     }
 
     public static Localizable localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH", arg0, arg1);
     }
 
     /**
@@ -453,11 +451,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0003_UNMARSHALLING_FAILED_END_TAG_DOES_NOT_MATCH(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(Object arg0) {
-        return messageFactory.getMessage("WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND", arg0);
     }
 
     /**
@@ -465,11 +463,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(Object arg0) {
-        return localizer.localize(localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(arg0));
+        return LOCALIZER.localize(localizableWSP_0007_UNEXPECTED_MODEL_NODE_TYPE_FOUND(arg0));
     }
 
     public static Localizable localizableWSP_0086_FAILED_CREATE_READER(Object arg0) {
-        return messageFactory.getMessage("WSP_0086_FAILED_CREATE_READER", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0086_FAILED_CREATE_READER", arg0);
     }
 
     /**
@@ -477,11 +475,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0086_FAILED_CREATE_READER(Object arg0) {
-        return localizer.localize(localizableWSP_0086_FAILED_CREATE_READER(arg0));
+        return LOCALIZER.localize(localizableWSP_0086_FAILED_CREATE_READER(arg0));
     }
 
     public static Localizable localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(Object arg0) {
-        return messageFactory.getMessage("WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI", arg0);
     }
 
     /**
@@ -489,11 +487,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(Object arg0) {
-        return localizer.localize(localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(arg0));
+        return LOCALIZER.localize(localizableWSP_0077_ASSERTION_CREATOR_DOES_NOT_SUPPORT_ANY_URI(arg0));
     }
 
     public static Localizable localizableWSP_0082_NO_SUBJECT_TYPE() {
-        return messageFactory.getMessage("WSP_0082_NO_SUBJECT_TYPE");
+        return MESSAGE_FACTORY.getMessage("WSP_0082_NO_SUBJECT_TYPE");
     }
 
     /**
@@ -501,11 +499,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0082_NO_SUBJECT_TYPE() {
-        return localizer.localize(localizableWSP_0082_NO_SUBJECT_TYPE());
+        return LOCALIZER.localize(localizableWSP_0082_NO_SUBJECT_TYPE());
     }
 
     public static Localizable localizableWSP_0089_EXPECTED_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0089_EXPECTED_ELEMENT", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0089_EXPECTED_ELEMENT", arg0, arg1, arg2);
     }
 
     /**
@@ -513,11 +511,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0089_EXPECTED_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0089_EXPECTED_ELEMENT(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0089_EXPECTED_ELEMENT(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -525,11 +523,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0031_SERVICE_PARAM_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2, arg3);
+        return MESSAGE_FACTORY.getMessage("WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL", arg0, arg1, arg2, arg3);
     }
 
     /**
@@ -537,11 +535,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2, arg3));
+        return LOCALIZER.localize(localizableWSP_0030_SERVICE_PORT_OPERATION_FAULT_MSG_PARAM_MUST_NOT_BE_NULL(arg0, arg1, arg2, arg3));
     }
 
     public static Localizable localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND() {
-        return messageFactory.getMessage("WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND");
+        return MESSAGE_FACTORY.getMessage("WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND");
     }
 
     /**
@@ -549,11 +547,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND() {
-        return localizer.localize(localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND());
+        return LOCALIZER.localize(localizableWSP_0040_POLICY_REFERENCE_URI_ATTR_NOT_FOUND());
     }
 
     public static Localizable localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED() {
-        return messageFactory.getMessage("WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED");
+        return MESSAGE_FACTORY.getMessage("WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED");
     }
 
     /**
@@ -561,11 +559,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0034_REMOVE_OPERATION_NOT_SUPPORTED() {
-        return localizer.localize(localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED());
+        return LOCALIZER.localize(localizableWSP_0034_REMOVE_OPERATION_NOT_SUPPORTED());
     }
 
     public static Localizable localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE() {
-        return messageFactory.getMessage("WSP_0084_MESSAGE_TYPE_NO_MESSAGE");
+        return MESSAGE_FACTORY.getMessage("WSP_0084_MESSAGE_TYPE_NO_MESSAGE");
     }
 
     /**
@@ -573,11 +571,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0084_MESSAGE_TYPE_NO_MESSAGE() {
-        return localizer.localize(localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE());
+        return LOCALIZER.localize(localizableWSP_0084_MESSAGE_TYPE_NO_MESSAGE());
     }
 
     public static Localizable localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(Object arg0) {
-        return messageFactory.getMessage("WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE", arg0);
     }
 
     /**
@@ -585,11 +583,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(Object arg0) {
-        return localizer.localize(localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(arg0));
+        return LOCALIZER.localize(localizableWSP_0004_UNEXPECTED_VISIBILITY_ATTR_VALUE(arg0));
     }
 
     public static Localizable localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE", arg0, arg1, arg2);
     }
 
     /**
@@ -597,11 +595,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0074_CANNOT_CREATE_ASSERTION_BAD_TYPE(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(Object arg0) {
-        return messageFactory.getMessage("WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED", arg0);
     }
 
     /**
@@ -609,11 +607,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(Object arg0) {
-        return localizer.localize(localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(arg0));
+        return LOCALIZER.localize(localizableWSP_0052_NUMBER_OF_ALTERNATIVE_COMBINATIONS_CREATED(arg0));
     }
 
     public static Localizable localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL() {
-        return messageFactory.getMessage("WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL");
     }
 
     /**
@@ -621,11 +619,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL() {
-        return localizer.localize(localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL());
+        return LOCALIZER.localize(localizableWSP_0037_PRIVATE_CONSTRUCTOR_DOES_NOT_TAKE_NULL());
     }
 
     public static Localizable localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX() {
-        return messageFactory.getMessage("WSP_0067_ILLEGAL_CFG_FILE_SYNTAX");
+        return MESSAGE_FACTORY.getMessage("WSP_0067_ILLEGAL_CFG_FILE_SYNTAX");
     }
 
     /**
@@ -633,11 +631,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0067_ILLEGAL_CFG_FILE_SYNTAX() {
-        return localizer.localize(localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX());
+        return LOCALIZER.localize(localizableWSP_0067_ILLEGAL_CFG_FILE_SYNTAX());
     }
 
     public static Localizable localizableWSP_0085_MESSAGE_FAULT_NO_NAME() {
-        return messageFactory.getMessage("WSP_0085_MESSAGE_FAULT_NO_NAME");
+        return MESSAGE_FACTORY.getMessage("WSP_0085_MESSAGE_FAULT_NO_NAME");
     }
 
     /**
@@ -645,11 +643,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0085_MESSAGE_FAULT_NO_NAME() {
-        return localizer.localize(localizableWSP_0085_MESSAGE_FAULT_NO_NAME());
+        return LOCALIZER.localize(localizableWSP_0085_MESSAGE_FAULT_NO_NAME());
     }
 
     public static Localizable localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(Object arg0) {
-        return messageFactory.getMessage("WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE", arg0);
     }
 
     /**
@@ -657,11 +655,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(Object arg0) {
-        return localizer.localize(localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(arg0));
+        return LOCALIZER.localize(localizableWSP_0050_OPERATION_NOT_SUPPORTED_FOR_THIS_BUT_POLICY_REFERENCE_NODE_TYPE(arg0));
     }
 
     public static Localizable localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(Object arg0) {
-        return messageFactory.getMessage("WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF", arg0);
     }
 
     /**
@@ -669,11 +667,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(Object arg0) {
-        return localizer.localize(localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(arg0));
+        return LOCALIZER.localize(localizableWSP_0042_POLICY_REFERENCE_NODE_EXPECTED_INSTEAD_OF(arg0));
     }
 
     public static Localizable localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE() {
-        return messageFactory.getMessage("WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE");
+        return MESSAGE_FACTORY.getMessage("WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE");
     }
 
     /**
@@ -681,11 +679,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE() {
-        return localizer.localize(localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE());
+        return LOCALIZER.localize(localizableWSP_0014_UNABLE_TO_INSTANTIATE_READER_FOR_STORAGE());
     }
 
     public static Localizable localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP() {
-        return messageFactory.getMessage("WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP");
+        return MESSAGE_FACTORY.getMessage("WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP");
     }
 
     /**
@@ -693,11 +691,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP() {
-        return localizer.localize(localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP());
+        return LOCALIZER.localize(localizableWSP_0054_NO_MORE_ELEMS_IN_POLICY_MAP());
     }
 
     public static Localizable localizableWSP_0083_MESSAGE_TYPE_NULL() {
-        return messageFactory.getMessage("WSP_0083_MESSAGE_TYPE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0083_MESSAGE_TYPE_NULL");
     }
 
     /**
@@ -705,11 +703,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0083_MESSAGE_TYPE_NULL() {
-        return localizer.localize(localizableWSP_0083_MESSAGE_TYPE_NULL());
+        return LOCALIZER.localize(localizableWSP_0083_MESSAGE_TYPE_NULL());
     }
 
     public static Localizable localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED() {
-        return messageFactory.getMessage("WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED");
+        return MESSAGE_FACTORY.getMessage("WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED");
     }
 
     /**
@@ -717,11 +715,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED() {
-        return localizer.localize(localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED());
+        return LOCALIZER.localize(localizableWSP_0011_UNABLE_TO_UNMARSHALL_POLICY_XML_ELEM_EXPECTED());
     }
 
     public static Localizable localizableWSP_0025_SPI_FAIL_SERVICE_MSG(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0025_SPI_FAIL_SERVICE_MSG", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0025_SPI_FAIL_SERVICE_MSG", arg0, arg1);
     }
 
     /**
@@ -729,11 +727,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0025_SPI_FAIL_SERVICE_MSG(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0025_SPI_FAIL_SERVICE_MSG(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0025_SPI_FAIL_SERVICE_MSG(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0094_INVALID_URN() {
-        return messageFactory.getMessage("WSP_0094_INVALID_URN");
+        return MESSAGE_FACTORY.getMessage("WSP_0094_INVALID_URN");
     }
 
     /**
@@ -741,11 +739,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0094_INVALID_URN() {
-        return localizer.localize(localizableWSP_0094_INVALID_URN());
+        return LOCALIZER.localize(localizableWSP_0094_INVALID_URN());
     }
 
     public static Localizable localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED() {
-        return messageFactory.getMessage("WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED");
+        return MESSAGE_FACTORY.getMessage("WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED");
     }
 
     /**
@@ -753,11 +751,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED() {
-        return localizer.localize(localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED());
+        return LOCALIZER.localize(localizableWSP_0026_SINGLE_EMPTY_ALTERNATIVE_COMBINATION_CREATED());
     }
 
     public static Localizable localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0078_ASSERTION_CREATOR_DISCOVERED", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0078_ASSERTION_CREATOR_DISCOVERED", arg0, arg1);
     }
 
     /**
@@ -765,11 +763,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0078_ASSERTION_CREATOR_DISCOVERED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0078_ASSERTION_CREATOR_DISCOVERED(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT() {
-        return messageFactory.getMessage("WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT");
+        return MESSAGE_FACTORY.getMessage("WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT");
     }
 
     /**
@@ -777,11 +775,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT() {
-        return localizer.localize(localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT());
+        return LOCALIZER.localize(localizableWSP_0041_POLICY_REFERENCE_NODE_FOUND_WITH_NO_POLICY_REFERENCE_IN_IT());
     }
 
     public static Localizable localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -789,11 +787,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0039_POLICY_SRC_MODEL_INPUT_PARAMETER_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(Object arg0) {
-        return messageFactory.getMessage("WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR", arg0);
     }
 
     /**
@@ -801,11 +799,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(Object arg0) {
-        return localizer.localize(localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(arg0));
+        return LOCALIZER.localize(localizableWSP_0070_ERROR_REGISTERING_ASSERTION_CREATOR(arg0));
     }
 
     public static Localizable localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION() {
-        return messageFactory.getMessage("WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION");
+        return MESSAGE_FACTORY.getMessage("WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION");
     }
 
     /**
@@ -813,11 +811,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION() {
-        return localizer.localize(localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION());
+        return LOCALIZER.localize(localizableWSP_0036_PRIVATE_METHOD_DOES_NOT_ACCEPT_NULL_OR_EMPTY_COLLECTION());
     }
 
     public static Localizable localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("WSP_0027_SERVICE_PROVIDER_NOT_FOUND", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0027_SERVICE_PROVIDER_NOT_FOUND", arg0);
     }
 
     /**
@@ -825,11 +823,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0027_SERVICE_PROVIDER_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(arg0));
+        return LOCALIZER.localize(localizableWSP_0027_SERVICE_PROVIDER_NOT_FOUND(arg0));
     }
 
     public static Localizable localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED() {
-        return messageFactory.getMessage("WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED");
+        return MESSAGE_FACTORY.getMessage("WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED");
     }
 
     /**
@@ -837,11 +835,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED() {
-        return localizer.localize(localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED());
+        return LOCALIZER.localize(localizableWSP_0056_NEITHER_NULL_NOR_EMPTY_POLICY_COLLECTION_EXPECTED());
     }
 
     public static Localizable localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(Object arg0) {
-        return messageFactory.getMessage("WSP_0022_STORAGE_TYPE_NOT_SUPPORTED", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0022_STORAGE_TYPE_NOT_SUPPORTED", arg0);
     }
 
     /**
@@ -849,11 +847,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0022_STORAGE_TYPE_NOT_SUPPORTED(Object arg0) {
-        return localizer.localize(localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(arg0));
+        return LOCALIZER.localize(localizableWSP_0022_STORAGE_TYPE_NOT_SUPPORTED(arg0));
     }
 
     public static Localizable localizableWSP_0095_INVALID_BOOLEAN_VALUE(Object arg0) {
-        return messageFactory.getMessage("WSP_0095_INVALID_BOOLEAN_VALUE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0095_INVALID_BOOLEAN_VALUE", arg0);
     }
 
     /**
@@ -861,11 +859,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0095_INVALID_BOOLEAN_VALUE(Object arg0) {
-        return localizer.localize(localizableWSP_0095_INVALID_BOOLEAN_VALUE(arg0));
+        return LOCALIZER.localize(localizableWSP_0095_INVALID_BOOLEAN_VALUE(arg0));
     }
 
     public static Localizable localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION", arg0, arg1);
     }
 
     /**
@@ -873,11 +871,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0059_MULTIPLE_ATTRS_WITH_SAME_NAME_DETECTED_FOR_ASSERTION(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0047_POLICY_IS_NULL_RETURNING() {
-        return messageFactory.getMessage("WSP_0047_POLICY_IS_NULL_RETURNING");
+        return MESSAGE_FACTORY.getMessage("WSP_0047_POLICY_IS_NULL_RETURNING");
     }
 
     /**
@@ -885,11 +883,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0047_POLICY_IS_NULL_RETURNING() {
-        return localizer.localize(localizableWSP_0047_POLICY_IS_NULL_RETURNING());
+        return LOCALIZER.localize(localizableWSP_0047_POLICY_IS_NULL_RETURNING());
     }
 
     public static Localizable localizableWSP_0088_FAILED_PARSE(Object arg0) {
-        return messageFactory.getMessage("WSP_0088_FAILED_PARSE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0088_FAILED_PARSE", arg0);
     }
 
     /**
@@ -897,11 +895,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0088_FAILED_PARSE(Object arg0) {
-        return localizer.localize(localizableWSP_0088_FAILED_PARSE(arg0));
+        return LOCALIZER.localize(localizableWSP_0088_FAILED_PARSE(arg0));
     }
 
     public static Localizable localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(Object arg0) {
-        return messageFactory.getMessage("WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM", arg0);
     }
 
     /**
@@ -909,11 +907,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(Object arg0) {
-        return localizer.localize(localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(arg0));
+        return LOCALIZER.localize(localizableWSP_0005_UNEXPECTED_POLICY_ELEMENT_FOUND_IN_ASSERTION_PARAM(arg0));
     }
 
     public static Localizable localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE", arg0, arg1);
     }
 
     /**
@@ -921,11 +919,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0009_UNEXPECTED_CDATA_ON_SOURCE_MODEL_NODE(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG", arg0, arg1, arg2);
     }
 
     /**
@@ -933,11 +931,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0024_SPI_FAIL_SERVICE_URL_LINE_MSG(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED", arg0, arg1);
     }
 
     /**
@@ -945,11 +943,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0057_N_ALTERNATIVE_COMBINATIONS_M_POLICY_ALTERNATIVES_CREATED(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -957,11 +955,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0020_SUBJECT_PARAM_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE", arg0, arg1, arg2);
     }
 
     /**
@@ -969,11 +967,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0071_ERROR_MULTIPLE_ASSERTION_CREATORS_FOR_NAMESPACE(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -981,11 +979,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0038_POLICY_TO_ATTACH_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
     }
 
     /**
@@ -993,11 +991,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0033_SERVICE_AND_PORT_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(Object arg0) {
-        return messageFactory.getMessage("WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN", arg0);
     }
 
     /**
@@ -1005,11 +1003,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(Object arg0) {
-        return localizer.localize(localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(arg0));
+        return LOCALIZER.localize(localizableWSP_0060_POLICY_ELEMENT_TYPE_UNKNOWN(arg0));
     }
 
     public static Localizable localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT() {
-        return messageFactory.getMessage("WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT");
+        return MESSAGE_FACTORY.getMessage("WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT");
     }
 
     /**
@@ -1017,11 +1015,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT() {
-        return localizer.localize(localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT());
+        return LOCALIZER.localize(localizableWSP_0013_UNABLE_TO_SET_PARENT_MODEL_ON_ROOT());
     }
 
     public static Localizable localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(Object arg0) {
-        return messageFactory.getMessage("WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED", arg0);
     }
 
     /**
@@ -1029,11 +1027,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(Object arg0) {
-        return localizer.localize(localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(arg0));
+        return LOCALIZER.localize(localizableWSP_0019_SUBOPTIMAL_ALTERNATIVE_SELECTED(arg0));
     }
 
     public static Localizable localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED", arg0, arg1);
     }
 
     /**
@@ -1041,11 +1039,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0073_CREATE_CHILD_NODE_OPERATION_NOT_SUPPORTED(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(Object arg0) {
-        return messageFactory.getMessage("WSP_0002_UNRECOGNIZED_SCOPE_TYPE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0002_UNRECOGNIZED_SCOPE_TYPE", arg0);
     }
 
     /**
@@ -1053,11 +1051,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0002_UNRECOGNIZED_SCOPE_TYPE(Object arg0) {
-        return localizer.localize(localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(arg0));
+        return LOCALIZER.localize(localizableWSP_0002_UNRECOGNIZED_SCOPE_TYPE(arg0));
     }
 
     public static Localizable localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL");
     }
 
     /**
@@ -1065,11 +1063,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_0062_INPUT_PARAMS_MUST_NOT_BE_NULL());
     }
 
     public static Localizable localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION", arg0);
     }
 
     /**
@@ -1077,11 +1075,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(arg0));
+        return LOCALIZER.localize(localizableWSP_0063_ERROR_WHILE_CONSTRUCTING_EXCEPTION(arg0));
     }
 
     public static Localizable localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL", arg0, arg1);
     }
 
     /**
@@ -1089,11 +1087,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0021_SUBJECT_AND_POLICY_PARAM_MUST_NOT_BE_NULL(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_0075_PROBLEMATIC_ASSERTION_STATE", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("WSP_0075_PROBLEMATIC_ASSERTION_STATE", arg0, arg1);
     }
 
     /**
@@ -1101,11 +1099,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0075_PROBLEMATIC_ASSERTION_STATE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(arg0, arg1));
+        return LOCALIZER.localize(localizableWSP_0075_PROBLEMATIC_ASSERTION_STATE(arg0, arg1));
     }
 
     public static Localizable localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES() {
-        return messageFactory.getMessage("WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES");
+        return MESSAGE_FACTORY.getMessage("WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES");
     }
 
     /**
@@ -1113,11 +1111,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES() {
-        return localizer.localize(localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES());
+        return LOCALIZER.localize(localizableWSP_0006_UNEXPECTED_MULTIPLE_POLICY_NODES());
     }
 
     public static Localizable localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("WSP_0092_CHARACTER_DATA_UNEXPECTED", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("WSP_0092_CHARACTER_DATA_UNEXPECTED", arg0, arg1, arg2);
     }
 
     /**
@@ -1125,11 +1123,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0092_CHARACTER_DATA_UNEXPECTED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSP_0092_CHARACTER_DATA_UNEXPECTED(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(Object arg0) {
-        return messageFactory.getMessage("WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY", arg0);
     }
 
     /**
@@ -1137,11 +1135,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(Object arg0) {
-        return localizer.localize(localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(arg0));
+        return LOCALIZER.localize(localizableWSP_0069_EXCEPTION_WHILE_RETRIEVING_EFFECTIVE_POLICY_FOR_KEY(arg0));
     }
 
     public static Localizable localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(Object arg0) {
-        return messageFactory.getMessage("WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING", arg0);
     }
 
     /**
@@ -1149,11 +1147,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(Object arg0) {
-        return localizer.localize(localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(arg0));
+        return LOCALIZER.localize(localizableWSP_0010_UNEXPANDED_POLICY_REFERENCE_NODE_FOUND_REFERENCING(arg0));
     }
 
     public static Localizable localizableWSP_0035_RECONFIGURE_ALTERNATIVES(Object arg0) {
-        return messageFactory.getMessage("WSP_0035_RECONFIGURE_ALTERNATIVES", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0035_RECONFIGURE_ALTERNATIVES", arg0);
     }
 
     /**
@@ -1161,11 +1159,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0035_RECONFIGURE_ALTERNATIVES(Object arg0) {
-        return localizer.localize(localizableWSP_0035_RECONFIGURE_ALTERNATIVES(arg0));
+        return LOCALIZER.localize(localizableWSP_0035_RECONFIGURE_ALTERNATIVES(arg0));
     }
 
     public static Localizable localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(Object arg0) {
-        return messageFactory.getMessage("WSP_0066_ILLEGAL_PROVIDER_CLASSNAME", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0066_ILLEGAL_PROVIDER_CLASSNAME", arg0);
     }
 
     /**
@@ -1173,11 +1171,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0066_ILLEGAL_PROVIDER_CLASSNAME(Object arg0) {
-        return localizer.localize(localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(arg0));
+        return LOCALIZER.localize(localizableWSP_0066_ILLEGAL_PROVIDER_CLASSNAME(arg0));
     }
 
     public static Localizable localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(Object arg0) {
-        return messageFactory.getMessage("WSP_0076_NO_SERVICE_PROVIDERS_FOUND", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_0076_NO_SERVICE_PROVIDERS_FOUND", arg0);
     }
 
     /**
@@ -1185,11 +1183,11 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0076_NO_SERVICE_PROVIDERS_FOUND(Object arg0) {
-        return localizer.localize(localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(arg0));
+        return LOCALIZER.localize(localizableWSP_0076_NO_SERVICE_PROVIDERS_FOUND(arg0));
     }
 
     public static Localizable localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED() {
-        return messageFactory.getMessage("WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED");
+        return MESSAGE_FACTORY.getMessage("WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED");
     }
 
     /**
@@ -1197,7 +1195,18 @@ public final class LocalizationMessages {
      *
      */
     public static String WSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED() {
-        return localizer.localize(localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED());
+        return LOCALIZER.localize(localizableWSP_0049_PARENT_MODEL_CAN_NOT_BE_CHANGED());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java
index f77560163cb..bbd7c328bbd 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, 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
@@ -27,8 +27,6 @@ package com.sun.xml.internal.ws.policy.sourcemodel.attach;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
 import java.util.WeakHashMap;
 
 /**
@@ -36,9 +34,7 @@ import java.util.WeakHashMap;
  */
 abstract class ContextClassloaderLocal<V> {
 
-    private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
-
-    private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
+    private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<>();
 
     public V get() throws Error {
         ClassLoader tccl = getContextClassLoader();
@@ -60,25 +56,21 @@ abstract class ContextClassloaderLocal<V> {
         try {
             return initialValue();
         } catch (Exception e) {
-            throw new Error(format(FAILED_TO_CREATE_NEW_INSTANCE, getClass().getName()), e);
+            throw new Error(ContextClassloaderLocalMessages.FAILED_TO_CREATE_NEW_INSTANCE(getClass().getName()), e);
         }
     }
 
-    private static String format(String property, Object... args) {
-        String text = ResourceBundle.getBundle(ContextClassloaderLocal.class.getName()).getString(property);
-        return MessageFormat.format(text, args);
-    }
-
     private static ClassLoader getContextClassLoader() {
         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                    public ClassLoader run() {
-                        ClassLoader cl = null;
-                        try {
-                            cl = Thread.currentThread().getContextClassLoader();
-                        } catch (SecurityException ex) {
-                        }
-                        return cl;
-                    }
-                });
+            @Override
+            public ClassLoader run() {
+                ClassLoader cl = null;
+                try {
+                    cl = Thread.currentThread().getContextClassLoader();
+                } catch (SecurityException ex) {
+                }
+                return cl;
+            }
+        });
     }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java
new file mode 100644
index 00000000000..1b2322062c8
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocalMessages.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.ws.policy.sourcemodel.attach;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
+
+
+/**
+ * Defines string formatting method for each constant in the resource file
+ *
+ */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
+public final class ContextClassloaderLocalMessages {
+
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.policy.sourcemodel.attach.ContextClassloaderLocal";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ContextClassloaderLocalMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
+
+    public static Localizable localizableFAILED_TO_CREATE_NEW_INSTANCE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("FAILED_TO_CREATE_NEW_INSTANCE", arg0);
+    }
+
+    /**
+     * Failed to create new instance of {0}
+     *
+     */
+    public static String FAILED_TO_CREATE_NEW_INSTANCE(Object arg0) {
+        return LOCALIZER.localize(localizableFAILED_TO_CREATE_NEW_INSTANCE(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
+    }
+
+}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
index a1ae07c6944..e042a7efbe9 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,330 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class AddressingMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.addressing";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, AddressingMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() {
-        return messageFactory.getMessage("nonAnonymous.response.oneway");
-    }
-
-    /**
-     * Ignoring non-anonymous response for one-way message
-     *
-     */
-    public static String NON_ANONYMOUS_RESPONSE_ONEWAY() {
-        return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY());
-    }
-
-    public static Localizable localizableNULL_WSA_HEADERS() {
-        return messageFactory.getMessage("null.wsa.headers");
-    }
-
-    /**
-     * No WS-Addressing headers found processing the server inbound request
-     *
-     */
-    public static String NULL_WSA_HEADERS() {
-        return localizer.localize(localizableNULL_WSA_HEADERS());
-    }
-
-    public static Localizable localizableUNKNOWN_WSA_HEADER() {
-        return messageFactory.getMessage("unknown.wsa.header");
-    }
-
-    /**
-     * Unknown WS-Addressing header
-     *
-     */
-    public static String UNKNOWN_WSA_HEADER() {
-        return localizer.localize(localizableUNKNOWN_WSA_HEADER());
-    }
-
-    public static Localizable localizableNULL_ACTION() {
-        return messageFactory.getMessage("null.action");
-    }
-
-    /**
-     * Populating request Addressing headers and found null Action
-     *
-     */
-    public static String NULL_ACTION() {
-        return localizer.localize(localizableNULL_ACTION());
-    }
-
-    public static Localizable localizableINVALID_WSAW_ANONYMOUS(Object arg0) {
-        return messageFactory.getMessage("invalid.wsaw.anonymous", arg0);
-    }
-
-    /**
-     * Invalid value obtained from wsaw:Anonymous: "{0}"
-     *
-     */
-    public static String INVALID_WSAW_ANONYMOUS(Object arg0) {
-        return localizer.localize(localizableINVALID_WSAW_ANONYMOUS(arg0));
-    }
-
-    public static Localizable localizableNULL_SOAP_VERSION() {
-        return messageFactory.getMessage("null.soap.version");
-    }
-
-    /**
-     * Unexpected null SOAP version
-     *
-     */
-    public static String NULL_SOAP_VERSION() {
-        return localizer.localize(localizableNULL_SOAP_VERSION());
-    }
-
-    public static Localizable localizableWSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("wsdlBoundOperation.notFound", arg0);
-    }
-
-    /**
-     * Cannot find an operation in wsdl:binding for "{0}"
-     *
-     */
-    public static String WSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation
-     *
-     */
-    public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableNON_ANONYMOUS_RESPONSE() {
-        return messageFactory.getMessage("nonAnonymous.response");
-    }
-
-    /**
-     * Sending 202 and processing non-anonymous response
-     *
-     */
-    public static String NON_ANONYMOUS_RESPONSE() {
-        return localizer.localize(localizableNON_ANONYMOUS_RESPONSE());
-    }
-
-    public static Localizable localizableVALIDATION_SERVER_NULL_ACTION() {
-        return messageFactory.getMessage("validation.server.nullAction");
-    }
-
-    /**
-     * Validating inbound Addressing headers on server and found null Action
-     *
-     */
-    public static String VALIDATION_SERVER_NULL_ACTION() {
-        return localizer.localize(localizableVALIDATION_SERVER_NULL_ACTION());
-    }
-
-    public static Localizable localizableFAULT_TO_CANNOT_PARSE() {
-        return messageFactory.getMessage("faultTo.cannot.parse");
-    }
-
-    /**
-     * FaultTo header cannot be parsed
-     *
-     */
-    public static String FAULT_TO_CANNOT_PARSE() {
-        return localizer.localize(localizableFAULT_TO_CANNOT_PARSE());
-    }
-
-    public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() {
-        return messageFactory.getMessage("validation.client.nullAction");
-    }
-
-    /**
-     * Validating inbound Addressing headers on client and found null Action
-     *
-     */
-    public static String VALIDATION_CLIENT_NULL_ACTION() {
-        return localizer.localize(localizableVALIDATION_CLIENT_NULL_ACTION());
-    }
-
-    public static Localizable localizableNULL_MESSAGE() {
-        return messageFactory.getMessage("null.message");
-    }
-
-    /**
-     * Null message found when processing the server inbound request and WS-Addressing is required
-     *
-     */
-    public static String NULL_MESSAGE() {
-        return localizer.localize(localizableNULL_MESSAGE());
-    }
-
-    public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("action.not.supported.exception", arg0);
-    }
-
-    /**
-     * Action: "{0}" not supported
-     *
-     */
-    public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
-        return messageFactory.getMessage("nonAnonymous.response.nullHeaders", arg0);
-    }
-
-    /**
-     * No response headers found in non-anonymous response from "{0}"
-     *
-     */
-    public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
-        return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0));
-    }
-
-    public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
-        return messageFactory.getMessage("nonAnonymous.response.sending", arg0);
-    }
-
-    /**
-     * Sending non-anonymous reply to "{0}"
-     *
-     */
-    public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
-        return localizer.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0));
-    }
-
-    public static Localizable localizableREPLY_TO_CANNOT_PARSE() {
-        return messageFactory.getMessage("replyTo.cannot.parse");
-    }
-
-    /**
-     * ReplyTo header cannot be parsed
-     *
-     */
-    public static String REPLY_TO_CANNOT_PARSE() {
-        return localizer.localize(localizableREPLY_TO_CANNOT_PARSE());
-    }
-
-    public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.addressing.header.exception", arg0, arg1);
-    }
-
-    /**
-     * Invalid WS-Addressing header: "{0}",Reason: "{1}"
-     *
-     */
-    public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1));
-    }
-
-    public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() {
-        return messageFactory.getMessage("wsaw.anonymousProhibited");
-    }
-
-    /**
-     * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted
-     *
-     */
-    public static String WSAW_ANONYMOUS_PROHIBITED() {
-        return localizer.localize(localizableWSAW_ANONYMOUS_PROHIBITED());
-    }
-
-    public static Localizable localizableNULL_WSDL_PORT() {
-        return messageFactory.getMessage("null.wsdlPort");
-    }
-
-    /**
-     * Populating request Addressing headers and found null WSDLPort
-     *
-     */
-    public static String NULL_WSDL_PORT() {
-        return localizer.localize(localizableNULL_WSDL_PORT());
-    }
-
-    public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() {
-        return messageFactory.getMessage("addressing.should.be.enabled.");
-    }
-
-    /**
-     * Addressing is not enabled
-     *
-     */
-    public static String ADDRESSING_SHOULD_BE_ENABLED() {
-        return localizer.localize(localizableADDRESSING_SHOULD_BE_ENABLED());
-    }
-
-    public static Localizable localizableNULL_ADDRESSING_VERSION() {
-        return messageFactory.getMessage("null.addressing.version");
-    }
-
-    /**
-     * Unexpected null Addressing version
-     *
-     */
-    public static String NULL_ADDRESSING_VERSION() {
-        return localizer.localize(localizableNULL_ADDRESSING_VERSION());
-    }
-
-    public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("missing.header.exception", arg0);
-    }
-
-    /**
-     * Missing WS-Addressing header: "{0}"
-     *
-     */
-    public static String MISSING_HEADER_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableMISSING_HEADER_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableNULL_PACKET() {
-        return messageFactory.getMessage("null.packet");
-    }
-
-    /**
-     * Populating request Addressing headers and found null Packet
-     *
-     */
-    public static String NULL_PACKET() {
-        return localizer.localize(localizableNULL_PACKET());
-    }
-
-    public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wrong.addressing.version", arg0, arg1);
-    }
-
-    /**
-     * Expected "{0}" version of WS-Addressing but found "{1}"
-     *
-     */
-    public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new AddressingMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableADDRESSING_NOT_ENABLED(Object arg0) {
-        return messageFactory.getMessage("addressing.notEnabled", arg0);
+        return MESSAGE_FACTORY.getMessage("addressing.notEnabled", arg0);
     }
 
     /**
@@ -356,23 +54,35 @@ public final class AddressingMessages {
      *
      */
     public static String ADDRESSING_NOT_ENABLED(Object arg0) {
-        return localizer.localize(localizableADDRESSING_NOT_ENABLED(arg0));
+        return LOCALIZER.localize(localizableADDRESSING_NOT_ENABLED(arg0));
     }
 
-    public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
-        return messageFactory.getMessage("nonAnonymous.unknown.protocol", arg0);
+    public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() {
+        return MESSAGE_FACTORY.getMessage("wsaw.anonymousProhibited");
     }
 
     /**
-     * Unknown protocol: "{0}"
+     * Operation has "prohibited" value for wsaw:anonymous in the WSDL, Addressing must be disabled and SOAP message need to be hand-crafted
      *
      */
-    public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
-        return localizer.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0));
+    public static String WSAW_ANONYMOUS_PROHIBITED() {
+        return LOCALIZER.localize(localizableWSAW_ANONYMOUS_PROHIBITED());
+    }
+
+    public static Localizable localizableNULL_SOAP_VERSION() {
+        return MESSAGE_FACTORY.getMessage("null.soap.version");
+    }
+
+    /**
+     * Unexpected null SOAP version
+     *
+     */
+    public static String NULL_SOAP_VERSION() {
+        return LOCALIZER.localize(localizableNULL_SOAP_VERSION());
     }
 
     public static Localizable localizableNULL_HEADERS() {
-        return messageFactory.getMessage("null.headers");
+        return MESSAGE_FACTORY.getMessage("null.headers");
     }
 
     /**
@@ -380,11 +90,167 @@ public final class AddressingMessages {
      *
      */
     public static String NULL_HEADERS() {
-        return localizer.localize(localizableNULL_HEADERS());
+        return LOCALIZER.localize(localizableNULL_HEADERS());
+    }
+
+    public static Localizable localizableFAULT_TO_CANNOT_PARSE() {
+        return MESSAGE_FACTORY.getMessage("faultTo.cannot.parse");
+    }
+
+    /**
+     * FaultTo header cannot be parsed
+     *
+     */
+    public static String FAULT_TO_CANNOT_PARSE() {
+        return LOCALIZER.localize(localizableFAULT_TO_CANNOT_PARSE());
+    }
+
+    public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nonAnonymous.response.nullHeaders", arg0);
+    }
+
+    /**
+     * No response headers found in non-anonymous response from "{0}"
+     *
+     */
+    public static String NON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
+        return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(arg0));
+    }
+
+    public static Localizable localizableUNKNOWN_WSA_HEADER() {
+        return MESSAGE_FACTORY.getMessage("unknown.wsa.header");
+    }
+
+    /**
+     * Unknown WS-Addressing header
+     *
+     */
+    public static String UNKNOWN_WSA_HEADER() {
+        return LOCALIZER.localize(localizableUNKNOWN_WSA_HEADER());
+    }
+
+    public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.addressing.header.exception", arg0, arg1);
+    }
+
+    /**
+     * Invalid WS-Addressing header: "{0}",Reason: "{1}"
+     *
+     */
+    public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1));
+    }
+
+    public static Localizable localizableNULL_WSDL_PORT() {
+        return MESSAGE_FACTORY.getMessage("null.wsdlPort");
+    }
+
+    /**
+     * Populating request Addressing headers and found null WSDLPort
+     *
+     */
+    public static String NULL_WSDL_PORT() {
+        return LOCALIZER.localize(localizableNULL_WSDL_PORT());
+    }
+
+    public static Localizable localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nonAnonymous.unknown.protocol", arg0);
+    }
+
+    /**
+     * Unknown protocol: "{0}"
+     *
+     */
+    public static String NON_ANONYMOUS_UNKNOWN_PROTOCOL(Object arg0) {
+        return LOCALIZER.localize(localizableNON_ANONYMOUS_UNKNOWN_PROTOCOL(arg0));
+    }
+
+    public static Localizable localizableNON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nonAnonymous.response.sending", arg0);
+    }
+
+    /**
+     * Sending non-anonymous reply to "{0}"
+     *
+     */
+    public static String NON_ANONYMOUS_RESPONSE_SENDING(Object arg0) {
+        return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_SENDING(arg0));
+    }
+
+    public static Localizable localizableNON_ANONYMOUS_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("nonAnonymous.response");
+    }
+
+    /**
+     * Sending 202 and processing non-anonymous response
+     *
+     */
+    public static String NON_ANONYMOUS_RESPONSE() {
+        return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE());
+    }
+
+    public static Localizable localizableREPLY_TO_CANNOT_PARSE() {
+        return MESSAGE_FACTORY.getMessage("replyTo.cannot.parse");
+    }
+
+    /**
+     * ReplyTo header cannot be parsed
+     *
+     */
+    public static String REPLY_TO_CANNOT_PARSE() {
+        return LOCALIZER.localize(localizableREPLY_TO_CANNOT_PARSE());
+    }
+
+    public static Localizable localizableINVALID_WSAW_ANONYMOUS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.wsaw.anonymous", arg0);
+    }
+
+    /**
+     * Invalid value obtained from wsaw:Anonymous: "{0}"
+     *
+     */
+    public static String INVALID_WSAW_ANONYMOUS(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_WSAW_ANONYMOUS(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_CLIENT_NULL_ACTION() {
+        return MESSAGE_FACTORY.getMessage("validation.client.nullAction");
+    }
+
+    /**
+     * Validating inbound Addressing headers on client and found null Action
+     *
+     */
+    public static String VALIDATION_CLIENT_NULL_ACTION() {
+        return LOCALIZER.localize(localizableVALIDATION_CLIENT_NULL_ACTION());
+    }
+
+    public static Localizable localizableWSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlBoundOperation.notFound", arg0);
+    }
+
+    /**
+     * Cannot find an operation in wsdl:binding for "{0}"
+     *
+     */
+    public static String WSDL_BOUND_OPERATION_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWSDL_BOUND_OPERATION_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("missing.header.exception", arg0);
+    }
+
+    /**
+     * Missing WS-Addressing header: "{0}"
+     *
+     */
+    public static String MISSING_HEADER_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableMISSING_HEADER_EXCEPTION(arg0));
     }
 
     public static Localizable localizableNULL_BINDING() {
-        return messageFactory.getMessage("null.binding");
+        return MESSAGE_FACTORY.getMessage("null.binding");
     }
 
     /**
@@ -392,7 +258,150 @@ public final class AddressingMessages {
      *
      */
     public static String NULL_BINDING() {
-        return localizer.localize(localizableNULL_BINDING());
+        return LOCALIZER.localize(localizableNULL_BINDING());
+    }
+
+    public static Localizable localizableNULL_WSA_HEADERS() {
+        return MESSAGE_FACTORY.getMessage("null.wsa.headers");
+    }
+
+    /**
+     * No WS-Addressing headers found processing the server inbound request
+     *
+     */
+    public static String NULL_WSA_HEADERS() {
+        return LOCALIZER.localize(localizableNULL_WSA_HEADERS());
+    }
+
+    public static Localizable localizableNON_ANONYMOUS_RESPONSE_ONEWAY() {
+        return MESSAGE_FACTORY.getMessage("nonAnonymous.response.oneway");
+    }
+
+    /**
+     * Ignoring non-anonymous response for one-way message
+     *
+     */
+    public static String NON_ANONYMOUS_RESPONSE_ONEWAY() {
+        return LOCALIZER.localize(localizableNON_ANONYMOUS_RESPONSE_ONEWAY());
+    }
+
+    public static Localizable localizableVALIDATION_SERVER_NULL_ACTION() {
+        return MESSAGE_FACTORY.getMessage("validation.server.nullAction");
+    }
+
+    /**
+     * Validating inbound Addressing headers on server and found null Action
+     *
+     */
+    public static String VALIDATION_SERVER_NULL_ACTION() {
+        return LOCALIZER.localize(localizableVALIDATION_SERVER_NULL_ACTION());
+    }
+
+    public static Localizable localizableWRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wrong.addressing.version", arg0, arg1);
+    }
+
+    /**
+     * Expected "{0}" version of WS-Addressing but found "{1}"
+     *
+     */
+    public static String WRONG_ADDRESSING_VERSION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWRONG_ADDRESSING_VERSION(arg0, arg1));
+    }
+
+    public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("action.not.supported.exception", arg0);
+    }
+
+    /**
+     * Action: "{0}" not supported
+     *
+     */
+    public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableNULL_MESSAGE() {
+        return MESSAGE_FACTORY.getMessage("null.message");
+    }
+
+    /**
+     * Null message found when processing the server inbound request and WS-Addressing is required
+     *
+     */
+    public static String NULL_MESSAGE() {
+        return LOCALIZER.localize(localizableNULL_MESSAGE());
+    }
+
+    public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() {
+        return MESSAGE_FACTORY.getMessage("addressing.should.be.enabled.");
+    }
+
+    /**
+     * Addressing is not enabled
+     *
+     */
+    public static String ADDRESSING_SHOULD_BE_ENABLED() {
+        return LOCALIZER.localize(localizableADDRESSING_SHOULD_BE_ENABLED());
+    }
+
+    public static Localizable localizableNULL_PACKET() {
+        return MESSAGE_FACTORY.getMessage("null.packet");
+    }
+
+    /**
+     * Populating request Addressing headers and found null Packet
+     *
+     */
+    public static String NULL_PACKET() {
+        return LOCALIZER.localize(localizableNULL_PACKET());
+    }
+
+    public static Localizable localizableNULL_ADDRESSING_VERSION() {
+        return MESSAGE_FACTORY.getMessage("null.addressing.version");
+    }
+
+    /**
+     * Unexpected null Addressing version
+     *
+     */
+    public static String NULL_ADDRESSING_VERSION() {
+        return LOCALIZER.localize(localizableNULL_ADDRESSING_VERSION());
+    }
+
+    public static Localizable localizableNULL_ACTION() {
+        return MESSAGE_FACTORY.getMessage("null.action");
+    }
+
+    /**
+     * Populating request Addressing headers and found null Action
+     *
+     */
+    public static String NULL_ACTION() {
+        return LOCALIZER.localize(localizableNULL_ACTION());
+    }
+
+    public static Localizable localizableNON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("non.unique.operation.signature", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Operations in a port should have unique operation signature to successfuly identify a associated wsdl operation for a message. WSDL operation {0} and {1} have the same operation signature, wsa:Action "{2}" and request body block "{3}", Method dispatching may fail at runtime. Use unique wsa:Action for each operation
+     *
+     */
+    public static String NON_UNIQUE_OPERATION_SIGNATURE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableNON_UNIQUE_OPERATION_SIGNATURE(arg0, arg1, arg2, arg3));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java
index c044aca530e..4cd64ec6aff 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class BindingApiMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.bindingApi";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, BindingApiMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.bindingApi";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new BindingApiMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableBINDING_API_NO_FAULT_MESSAGE_NAME() {
-        return messageFactory.getMessage("binding.api.no.fault.message.name");
+        return MESSAGE_FACTORY.getMessage("binding.api.no.fault.message.name");
     }
 
     /**
@@ -56,7 +54,18 @@ public final class BindingApiMessages {
      *
      */
     public static String BINDING_API_NO_FAULT_MESSAGE_NAME() {
-        return localizer.localize(localizableBINDING_API_NO_FAULT_MESSAGE_NAME());
+        return LOCALIZER.localize(localizableBINDING_API_NO_FAULT_MESSAGE_NAME());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
index 21228d5ee5d..c7182a12c17 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,115 +25,40 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ClientMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.client";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ClientMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ClientMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("failed.to.parse", arg0, arg1);
+    public static Localizable localizableINVALID_WSDL_URL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.wsdl.url", arg0);
     }
 
     /**
-     * Failed to access the WSDL at: {0}. It failed with:
-     *  {1}.
+     * Invalid WSDL URL: {0}
      *
      */
-    public static String FAILED_TO_PARSE(Object arg0, Object arg1) {
-        return localizer.localize(localizableFAILED_TO_PARSE(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.binding.id", arg0, arg1);
-    }
-
-    /**
-     * Invalid binding id: {0}. Must be: {1}
-     *
-     */
-    public static String INVALID_BINDING_ID(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_BINDING_ID(arg0, arg1));
-    }
-
-    public static Localizable localizableEPR_WITHOUT_ADDRESSING_ON() {
-        return messageFactory.getMessage("epr.without.addressing.on");
-    }
-
-    /**
-     * EPR is specified without enabling WS-Addressing support.
-     *
-     */
-    public static String EPR_WITHOUT_ADDRESSING_ON() {
-        return localizer.localize(localizableEPR_WITHOUT_ADDRESSING_ON());
-    }
-
-    public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) {
-        return messageFactory.getMessage("invalid.service.no.wsdl", arg0);
-    }
-
-    /**
-     * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL
-     *
-     */
-    public static String INVALID_SERVICE_NO_WSDL(Object arg0) {
-        return localizer.localize(localizableINVALID_SERVICE_NO_WSDL(arg0));
-    }
-
-    public static Localizable localizableINVALID_SOAP_ROLE_NONE() {
-        return messageFactory.getMessage("invalid.soap.role.none");
-    }
-
-    /**
-     * Cannot set SOAP 1.2 role "none"
-     *
-     */
-    public static String INVALID_SOAP_ROLE_NONE() {
-        return localizer.localize(localizableINVALID_SOAP_ROLE_NONE());
-    }
-
-    public static Localizable localizableUNDEFINED_BINDING(Object arg0) {
-        return messageFactory.getMessage("undefined.binding", arg0);
-    }
-
-    /**
-     * Undefined binding: {0}
-     *
-     */
-    public static String UNDEFINED_BINDING(Object arg0) {
-        return localizer.localize(localizableUNDEFINED_BINDING(arg0));
-    }
-
-    public static Localizable localizableHTTP_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("http.not.found", arg0);
-    }
-
-    /**
-     * HTTP Status-Code 404: Not Found - {0}
-     *
-     */
-    public static String HTTP_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableHTTP_NOT_FOUND(arg0));
+    public static String INVALID_WSDL_URL(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_WSDL_URL(arg0));
     }
 
     public static Localizable localizableINVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.epr.port.name", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("invalid.epr.port.name", arg0, arg1);
     }
 
     /**
@@ -141,11 +66,35 @@ public final class ClientMessages {
      *
      */
     public static String INVALID_EPR_PORT_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1));
+        return LOCALIZER.localize(localizableINVALID_EPR_PORT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_SOAP_ROLE_NONE() {
+        return MESSAGE_FACTORY.getMessage("invalid.soap.role.none");
+    }
+
+    /**
+     * Cannot set SOAP 1.2 role "none"
+     *
+     */
+    public static String INVALID_SOAP_ROLE_NONE() {
+        return LOCALIZER.localize(localizableINVALID_SOAP_ROLE_NONE());
+    }
+
+    public static Localizable localizableEPR_WITHOUT_ADDRESSING_ON() {
+        return MESSAGE_FACTORY.getMessage("epr.without.addressing.on");
+    }
+
+    /**
+     * EPR is specified without enabling WS-Addressing support.
+     *
+     */
+    public static String EPR_WITHOUT_ADDRESSING_ON() {
+        return LOCALIZER.localize(localizableEPR_WITHOUT_ADDRESSING_ON());
     }
 
     public static Localizable localizableFAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("failed.to.parseWithMEX", arg0, arg1, arg2);
     }
 
     /**
@@ -156,11 +105,11 @@ public final class ClientMessages {
      *
      */
     public static String FAILED_TO_PARSE_WITH_MEX(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableFAILED_TO_PARSE_WITH_MEX(arg0, arg1, arg2));
     }
 
     public static Localizable localizableHTTP_STATUS_CODE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("http.status.code", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("http.status.code", arg0, arg1);
     }
 
     /**
@@ -168,155 +117,11 @@ public final class ClientMessages {
      *
      */
     public static String HTTP_STATUS_CODE(Object arg0, Object arg1) {
-        return localizer.localize(localizableHTTP_STATUS_CODE(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_ADDRESS(Object arg0) {
-        return messageFactory.getMessage("invalid.address", arg0);
-    }
-
-    /**
-     * Invalid address: {0}
-     *
-     */
-    public static String INVALID_ADDRESS(Object arg0) {
-        return localizer.localize(localizableINVALID_ADDRESS(arg0));
-    }
-
-    public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) {
-        return messageFactory.getMessage("undefined.portType", arg0);
-    }
-
-    /**
-     * Undefined port type: {0}
-     *
-     */
-    public static String UNDEFINED_PORT_TYPE(Object arg0) {
-        return localizer.localize(localizableUNDEFINED_PORT_TYPE(arg0));
-    }
-
-    public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) {
-        return messageFactory.getMessage("wsdl.contains.no.service", arg0);
-    }
-
-    /**
-     * WSDL {0} contains no service definition.
-     *
-     */
-    public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) {
-        return localizer.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0));
-    }
-
-    public static Localizable localizableINVALID_SOAP_ACTION() {
-        return messageFactory.getMessage("invalid.soap.action");
-    }
-
-    /**
-     * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it.
-     *
-     */
-    public static String INVALID_SOAP_ACTION() {
-        return localizer.localize(localizableINVALID_SOAP_ACTION());
-    }
-
-    public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) {
-        return messageFactory.getMessage("non.logical.handler.set", arg0);
-    }
-
-    /**
-     * Cannot set {0} on binding. Handler must be a LogicalHandler.
-     *
-     */
-    public static String NON_LOGICAL_HANDLER_SET(Object arg0) {
-        return localizer.localize(localizableNON_LOGICAL_HANDLER_SET(arg0));
-    }
-
-    public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) {
-        return messageFactory.getMessage("local.client.failed", arg0);
-    }
-
-    /**
-     * local transport error: {0}
-     *
-     */
-    public static String LOCAL_CLIENT_FAILED(Object arg0) {
-        return localizer.localize(localizableLOCAL_CLIENT_FAILED(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Invalid WSDL {0}, expected {1} found {2} at (line{3})
-     *
-     */
-    public static String RUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableWSDL_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("wsdl.not.found", arg0);
-    }
-
-    /**
-     * WSDL url {0} is not accessible.
-     *
-     */
-    public static String WSDL_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWSDL_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) {
-        return messageFactory.getMessage("http.client.failed", arg0);
-    }
-
-    /**
-     * HTTP transport error: {0}
-     *
-     */
-    public static String HTTP_CLIENT_FAILED(Object arg0) {
-        return localizer.localize(localizableHTTP_CLIENT_FAILED(arg0));
-    }
-
-    public static Localizable localizableINVALID_SERVICE_NAME_NULL(Object arg0) {
-        return messageFactory.getMessage("invalid.service.name.null", arg0);
-    }
-
-    /**
-     * {0} is not a valid service
-     *
-     */
-    public static String INVALID_SERVICE_NAME_NULL(Object arg0) {
-        return localizer.localize(localizableINVALID_SERVICE_NAME_NULL(arg0));
-    }
-
-    public static Localizable localizableINVALID_WSDL_URL(Object arg0) {
-        return messageFactory.getMessage("invalid.wsdl.url", arg0);
-    }
-
-    /**
-     * Invalid WSDL URL: {0}
-     *
-     */
-    public static String INVALID_WSDL_URL(Object arg0) {
-        return localizer.localize(localizableINVALID_WSDL_URL(arg0));
-    }
-
-    public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.port.name", arg0, arg1);
-    }
-
-    /**
-     * {0} is not a valid port. Valid ports are: {1}
-     *
-     */
-    public static String INVALID_PORT_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_PORT_NAME(arg0, arg1));
+        return LOCALIZER.localize(localizableHTTP_STATUS_CODE(arg0, arg1));
     }
 
     public static Localizable localizableINVALID_SERVICE_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.service.name", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("invalid.service.name", arg0, arg1);
     }
 
     /**
@@ -324,11 +129,96 @@ public final class ClientMessages {
      *
      */
     public static String INVALID_SERVICE_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_SERVICE_NAME(arg0, arg1));
+        return LOCALIZER.localize(localizableINVALID_SERVICE_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("runtime.wsdlparser.invalidWSDL", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Invalid WSDL {0}, expected {1} found {2} at (line{3})
+     *
+     */
+    public static String RUNTIME_WSDLPARSER_INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableRUNTIME_WSDLPARSER_INVALID_WSDL(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableNON_LOGICAL_HANDLER_SET(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("non.logical.handler.set", arg0);
+    }
+
+    /**
+     * Cannot set {0} on binding. Handler must be a LogicalHandler.
+     *
+     */
+    public static String NON_LOGICAL_HANDLER_SET(Object arg0) {
+        return LOCALIZER.localize(localizableNON_LOGICAL_HANDLER_SET(arg0));
+    }
+
+    public static Localizable localizableINVALID_PORT_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.port.name", arg0, arg1);
+    }
+
+    /**
+     * {0} is not a valid port. Valid ports are: {1}
+     *
+     */
+    public static String INVALID_PORT_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_PORT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_SOAP_ACTION() {
+        return MESSAGE_FACTORY.getMessage("invalid.soap.action");
+    }
+
+    /**
+     * A valid SOAPAction should be set in the RequestContext when Addressing is enabled, Use BindingProvider.SOAPACTION_URI_PROPERTY to set it.
+     *
+     */
+    public static String INVALID_SOAP_ACTION() {
+        return LOCALIZER.localize(localizableINVALID_SOAP_ACTION());
+    }
+
+    public static Localizable localizableINVALID_ADDRESS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.address", arg0);
+    }
+
+    /**
+     * Invalid address: {0}
+     *
+     */
+    public static String INVALID_ADDRESS(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_ADDRESS(arg0));
+    }
+
+    public static Localizable localizableFAILED_TO_PARSE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("failed.to.parse", arg0, arg1);
+    }
+
+    /**
+     * Failed to access the WSDL at: {0}. It failed with:
+     *  {1}.
+     *
+     */
+    public static String FAILED_TO_PARSE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableFAILED_TO_PARSE(arg0, arg1));
+    }
+
+    public static Localizable localizableHTTP_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("http.not.found", arg0);
+    }
+
+    /**
+     * HTTP Status-Code 404: Not Found - {0}
+     *
+     */
+    public static String HTTP_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableHTTP_NOT_FOUND(arg0));
     }
 
     public static Localizable localizableUNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("unsupported.operation", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("unsupported.operation", arg0, arg1, arg2);
     }
 
     /**
@@ -336,11 +226,47 @@ public final class ClientMessages {
      *
      */
     public static String UNSUPPORTED_OPERATION(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableUNSUPPORTED_OPERATION(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDL_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdl.not.found", arg0);
+    }
+
+    /**
+     * WSDL url {0} is not accessible.
+     *
+     */
+    public static String WSDL_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWSDL_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableINVALID_SERVICE_NAME_NULL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.service.name.null", arg0);
+    }
+
+    /**
+     * {0} is not a valid service
+     *
+     */
+    public static String INVALID_SERVICE_NAME_NULL(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_SERVICE_NAME_NULL(arg0));
+    }
+
+    public static Localizable localizableHTTP_CLIENT_FAILED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("http.client.failed", arg0);
+    }
+
+    /**
+     * HTTP transport error: {0}
+     *
+     */
+    public static String HTTP_CLIENT_FAILED(Object arg0) {
+        return LOCALIZER.localize(localizableHTTP_CLIENT_FAILED(arg0));
     }
 
     public static Localizable localizableFAILED_TO_PARSE_EPR(Object arg0) {
-        return messageFactory.getMessage("failed.to.parse.epr", arg0);
+        return MESSAGE_FACTORY.getMessage("failed.to.parse.epr", arg0);
     }
 
     /**
@@ -348,7 +274,90 @@ public final class ClientMessages {
      *
      */
     public static String FAILED_TO_PARSE_EPR(Object arg0) {
-        return localizer.localize(localizableFAILED_TO_PARSE_EPR(arg0));
+        return LOCALIZER.localize(localizableFAILED_TO_PARSE_EPR(arg0));
+    }
+
+    public static Localizable localizableLOCAL_CLIENT_FAILED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("local.client.failed", arg0);
+    }
+
+    /**
+     * local transport error: {0}
+     *
+     */
+    public static String LOCAL_CLIENT_FAILED(Object arg0) {
+        return LOCALIZER.localize(localizableLOCAL_CLIENT_FAILED(arg0));
+    }
+
+    public static Localizable localizableUNDEFINED_BINDING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("undefined.binding", arg0);
+    }
+
+    /**
+     * Undefined binding: {0}
+     *
+     */
+    public static String UNDEFINED_BINDING(Object arg0) {
+        return LOCALIZER.localize(localizableUNDEFINED_BINDING(arg0));
+    }
+
+    public static Localizable localizableINVALID_SERVICE_NO_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.service.no.wsdl", arg0);
+    }
+
+    /**
+     * No wsdl metadata for service: {0}, can't create proxy! Try creating Service by providing a WSDL URL
+     *
+     */
+    public static String INVALID_SERVICE_NO_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_SERVICE_NO_WSDL(arg0));
+    }
+
+    public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdl.contains.no.service", arg0);
+    }
+
+    /**
+     * WSDL {0} contains no service definition.
+     *
+     */
+    public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0));
+    }
+
+    public static Localizable localizableINVALID_BINDING_ID(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.binding.id", arg0, arg1);
+    }
+
+    /**
+     * Invalid binding id: {0}. Must be: {1}
+     *
+     */
+    public static String INVALID_BINDING_ID(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_BINDING_ID(arg0, arg1));
+    }
+
+    public static Localizable localizableUNDEFINED_PORT_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("undefined.portType", arg0);
+    }
+
+    /**
+     * Undefined port type: {0}
+     *
+     */
+    public static String UNDEFINED_PORT_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableUNDEFINED_PORT_TYPE(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java
index 4d5c7fab190..f6179248ec1 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,138 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class DispatchMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.dispatch";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, DispatchMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.nullarg.xmlhttp.request.method", arg0, arg1);
-    }
-
-    /**
-     * A XML/HTTP request using MessageContext.HTTP_REQUEST_METHOD equals {0} with a Null invocation Argument is not allowed. Must be: {1}
-     *
-     */
-    public static String INVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_NULLARG_URI() {
-        return messageFactory.getMessage("invalid.nullarg.uri");
-    }
-
-    /**
-     * Endpoint address URI is not allowed with a null argument
-     *
-     */
-    public static String INVALID_NULLARG_URI() {
-        return localizer.localize(localizableINVALID_NULLARG_URI());
-    }
-
-    public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.soapmessage.dispatch.msgmode", arg0, arg1);
-    }
-
-    /**
-     * Can not create Dispatch<SOAPMessage> of {0}. Must be {1}.
-     *
-     */
-    public static String INVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_RESPONSE_DESERIALIZATION() {
-        return messageFactory.getMessage("invalid.response.deserialization");
-    }
-
-    /**
-     * Failed to deserialize the response.
-     *
-     */
-    public static String INVALID_RESPONSE_DESERIALIZATION() {
-        return localizer.localize(localizableINVALID_RESPONSE_DESERIALIZATION());
-    }
-
-    public static Localizable localizableINVALID_QUERY_LEADING_CHAR(Object arg0) {
-        return messageFactory.getMessage("invalid.query.leading.char", arg0);
-    }
-
-    /**
-     * Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
-     *
-     */
-    public static String INVALID_QUERY_LEADING_CHAR(Object arg0) {
-        return localizer.localize(localizableINVALID_QUERY_LEADING_CHAR(arg0));
-    }
-
-    public static Localizable localizableINVALID_QUERY_STRING(Object arg0) {
-        return messageFactory.getMessage("invalid.query.string", arg0);
-    }
-
-    /**
-     * Unable to resolve endpoint address using the supplied query string: {0}.
-     *
-     */
-    public static String INVALID_QUERY_STRING(Object arg0) {
-        return localizer.localize(localizableINVALID_QUERY_STRING(arg0));
-    }
-
-    public static Localizable localizableDUPLICATE_PORT(Object arg0) {
-        return messageFactory.getMessage("duplicate.port", arg0);
-    }
-
-    /**
-     * WSDLPort {0} already exists. Can not create a port of the same QName.
-     *
-     */
-    public static String DUPLICATE_PORT(Object arg0) {
-        return localizer.localize(localizableDUPLICATE_PORT(arg0));
-    }
-
-    public static Localizable localizableINVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.datasource.dispatch.binding", arg0, arg1);
-    }
-
-    /**
-     * Can not create Dispatch<DataSource> with {0}. Must be: {1}
-     *
-     */
-    public static String INVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_DATASOURCE_DISPATCH_BINDING(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.datasource.dispatch.msgmode", arg0, arg1);
-    }
-
-    /**
-     * Can not create Dispatch<DataSource> of Service.Mode.PAYLOAD{0}. Must be: {1}
-     *
-     */
-    public static String INVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new DispatchMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableINVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.nullarg.soap.msgmode", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("invalid.nullarg.soap.msgmode", arg0, arg1);
     }
 
     /**
@@ -164,71 +54,23 @@ public final class DispatchMessages {
      *
      */
     public static String INVALID_NULLARG_SOAP_MSGMODE(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_NULLARG_SOAP_MSGMODE(arg0, arg1));
+        return LOCALIZER.localize(localizableINVALID_NULLARG_SOAP_MSGMODE(arg0, arg1));
     }
 
-    public static Localizable localizableINVALID_URI(Object arg0) {
-        return messageFactory.getMessage("invalid.uri", arg0);
+    public static Localizable localizableINVALID_QUERY_STRING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.query.string", arg0);
     }
 
     /**
-     * Endpoint String: {0} is and invalid URI.
+     * Unable to resolve endpoint address using the supplied query string: {0}.
      *
      */
-    public static String INVALID_URI(Object arg0) {
-        return localizer.localize(localizableINVALID_URI(arg0));
-    }
-
-    public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.soapmessage.dispatch.binding", arg0, arg1);
-    }
-
-    /**
-     * Can not create Dispatch<SOAPMessage> with {0} Binding. Must be: {1} Binding.
-     *
-     */
-    public static String INVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.uri.path.query", arg0, arg1);
-    }
-
-    /**
-     * Unable to construct a URI with this path info {0} and this query string {1}.
-     *
-     */
-    public static String INVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_URI_PATH_QUERY(arg0, arg1));
-    }
-
-    public static Localizable localizableINVALID_RESPONSE() {
-        return messageFactory.getMessage("invalid.response");
-    }
-
-    /**
-     * No response returned.
-     *
-     */
-    public static String INVALID_RESPONSE() {
-        return localizer.localize(localizableINVALID_RESPONSE());
-    }
-
-    public static Localizable localizableINVALID_URI_RESOLUTION(Object arg0) {
-        return messageFactory.getMessage("invalid.uri.resolution", arg0);
-    }
-
-    /**
-     * Unable to resolve endpoint address using the supplied path: {0}.
-     *
-     */
-    public static String INVALID_URI_RESOLUTION(Object arg0) {
-        return localizer.localize(localizableINVALID_URI_RESOLUTION(arg0));
+    public static String INVALID_QUERY_STRING(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_QUERY_STRING(arg0));
     }
 
     public static Localizable localizableINVALID_URI_DECODE() {
-        return messageFactory.getMessage("invalid.uri.decode");
+        return MESSAGE_FACTORY.getMessage("invalid.uri.decode");
     }
 
     /**
@@ -236,7 +78,174 @@ public final class DispatchMessages {
      *
      */
     public static String INVALID_URI_DECODE() {
-        return localizer.localize(localizableINVALID_URI_DECODE());
+        return LOCALIZER.localize(localizableINVALID_URI_DECODE());
+    }
+
+    public static Localizable localizableINVALID_URI_RESOLUTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.uri.resolution", arg0);
+    }
+
+    /**
+     * Unable to resolve endpoint address using the supplied path: {0}.
+     *
+     */
+    public static String INVALID_URI_RESOLUTION(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_URI_RESOLUTION(arg0));
+    }
+
+    public static Localizable localizableINVALID_NULLARG_URI() {
+        return MESSAGE_FACTORY.getMessage("invalid.nullarg.uri");
+    }
+
+    /**
+     * Endpoint address URI is not allowed with a null argument
+     *
+     */
+    public static String INVALID_NULLARG_URI() {
+        return LOCALIZER.localize(localizableINVALID_NULLARG_URI());
+    }
+
+    public static Localizable localizableINVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.uri.path.query", arg0, arg1);
+    }
+
+    /**
+     * Unable to construct a URI with this path info {0} and this query string {1}.
+     *
+     */
+    public static String INVALID_URI_PATH_QUERY(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_URI_PATH_QUERY(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_URI(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.uri", arg0);
+    }
+
+    /**
+     * Endpoint String: {0} is and invalid URI.
+     *
+     */
+    public static String INVALID_URI(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_URI(arg0));
+    }
+
+    public static Localizable localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.datasource.dispatch.msgmode", arg0, arg1);
+    }
+
+    /**
+     * Can not create Dispatch<DataSource> of Service.Mode.PAYLOAD{0}. Must be: {1}
+     *
+     */
+    public static String INVALID_DATASOURCE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_DATASOURCE_DISPATCH_MSGMODE(arg0, arg1));
+    }
+
+    public static Localizable localizableDUPLICATE_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("duplicate.port", arg0);
+    }
+
+    /**
+     * WSDLPort {0} already exists. Can not create a port of the same QName.
+     *
+     */
+    public static String DUPLICATE_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableDUPLICATE_PORT(arg0));
+    }
+
+    public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.soapmessage.dispatch.binding", arg0, arg1);
+    }
+
+    /**
+     * Can not create Dispatch<SOAPMessage> with {0} Binding. Must be: {1} Binding.
+     *
+     */
+    public static String INVALID_SOAPMESSAGE_DISPATCH_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_QUERY_LEADING_CHAR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.query.leading.char", arg0);
+    }
+
+    /**
+     * Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
+     *
+     */
+    public static String INVALID_QUERY_LEADING_CHAR(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_QUERY_LEADING_CHAR(arg0));
+    }
+
+    public static Localizable localizableINVALID_RESPONSE_DESERIALIZATION() {
+        return MESSAGE_FACTORY.getMessage("invalid.response.deserialization");
+    }
+
+    /**
+     * Failed to deserialize the response.
+     *
+     */
+    public static String INVALID_RESPONSE_DESERIALIZATION() {
+        return LOCALIZER.localize(localizableINVALID_RESPONSE_DESERIALIZATION());
+    }
+
+    public static Localizable localizableINVALID_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("invalid.response");
+    }
+
+    /**
+     * No response returned.
+     *
+     */
+    public static String INVALID_RESPONSE() {
+        return LOCALIZER.localize(localizableINVALID_RESPONSE());
+    }
+
+    public static Localizable localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.soapmessage.dispatch.msgmode", arg0, arg1);
+    }
+
+    /**
+     * Can not create Dispatch<SOAPMessage> of {0}. Must be {1}.
+     *
+     */
+    public static String INVALID_SOAPMESSAGE_DISPATCH_MSGMODE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_SOAPMESSAGE_DISPATCH_MSGMODE(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.datasource.dispatch.binding", arg0, arg1);
+    }
+
+    /**
+     * Can not create Dispatch<DataSource> with {0}. Must be: {1}
+     *
+     */
+    public static String INVALID_DATASOURCE_DISPATCH_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_DATASOURCE_DISPATCH_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.nullarg.xmlhttp.request.method", arg0, arg1);
+    }
+
+    /**
+     * A XML/HTTP request using MessageContext.HTTP_REQUEST_METHOD equals {0} with a Null invocation Argument is not allowed. Must be: {1}
+     *
+     */
+    public static String INVALID_NULLARG_XMLHTTP_REQUEST_METHOD(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_NULLARG_XMLHTTP_REQUEST_METHOD(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java
index ecbf83bbcb7..a4d394d8752 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,54 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class EncodingMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.encoding";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, EncodingMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableFAILED_TO_READ_RESPONSE(Object arg0) {
-        return messageFactory.getMessage("failed.to.read.response", arg0);
-    }
-
-    /**
-     * Failed to read a response: {0}
-     *
-     */
-    public static String FAILED_TO_READ_RESPONSE(Object arg0) {
-        return localizer.localize(localizableFAILED_TO_READ_RESPONSE(arg0));
-    }
-
-    public static Localizable localizableEXCEPTION_INCORRECT_TYPE(Object arg0) {
-        return messageFactory.getMessage("exception.incorrectType", arg0);
-    }
-
-    /**
-     * incorrect type. Expected java.lang.Exception, found {0}
-     *
-     */
-    public static String EXCEPTION_INCORRECT_TYPE(Object arg0) {
-        return localizer.localize(localizableEXCEPTION_INCORRECT_TYPE(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new EncodingMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableEXCEPTION_NOTFOUND(Object arg0) {
-        return messageFactory.getMessage("exception.notfound", arg0);
+        return MESSAGE_FACTORY.getMessage("exception.notfound", arg0);
     }
 
     /**
@@ -80,47 +54,11 @@ public final class EncodingMessages {
      *
      */
     public static String EXCEPTION_NOTFOUND(Object arg0) {
-        return localizer.localize(localizableEXCEPTION_NOTFOUND(arg0));
-    }
-
-    public static Localizable localizableXSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("xsd.unexpectedElementName", arg0, arg1);
-    }
-
-    /**
-     * unexpected element name: expected={0}, actual: {1}
-     *
-     */
-    public static String XSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableXSD_UNEXPECTED_ELEMENT_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableNESTED_DESERIALIZATION_ERROR(Object arg0) {
-        return messageFactory.getMessage("nestedDeserializationError", arg0);
-    }
-
-    /**
-     * deserialization error: {0}
-     *
-     */
-    public static String NESTED_DESERIALIZATION_ERROR(Object arg0) {
-        return localizer.localize(localizableNESTED_DESERIALIZATION_ERROR(arg0));
-    }
-
-    public static Localizable localizableNESTED_ENCODING_ERROR(Object arg0) {
-        return messageFactory.getMessage("nestedEncodingError", arg0);
-    }
-
-    /**
-     * encoding error: {0}
-     *
-     */
-    public static String NESTED_ENCODING_ERROR(Object arg0) {
-        return localizer.localize(localizableNESTED_ENCODING_ERROR(arg0));
+        return LOCALIZER.localize(localizableEXCEPTION_NOTFOUND(arg0));
     }
 
     public static Localizable localizableXSD_UNKNOWN_PREFIX(Object arg0) {
-        return messageFactory.getMessage("xsd.unknownPrefix", arg0);
+        return MESSAGE_FACTORY.getMessage("xsd.unknownPrefix", arg0);
     }
 
     /**
@@ -128,11 +66,59 @@ public final class EncodingMessages {
      *
      */
     public static String XSD_UNKNOWN_PREFIX(Object arg0) {
-        return localizer.localize(localizableXSD_UNKNOWN_PREFIX(arg0));
+        return LOCALIZER.localize(localizableXSD_UNKNOWN_PREFIX(arg0));
+    }
+
+    public static Localizable localizableNESTED_ENCODING_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nestedEncodingError", arg0);
+    }
+
+    /**
+     * encoding error: {0}
+     *
+     */
+    public static String NESTED_ENCODING_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableNESTED_ENCODING_ERROR(arg0));
+    }
+
+    public static Localizable localizableNESTED_DESERIALIZATION_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nestedDeserializationError", arg0);
+    }
+
+    /**
+     * deserialization error: {0}
+     *
+     */
+    public static String NESTED_DESERIALIZATION_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableNESTED_DESERIALIZATION_ERROR(arg0));
+    }
+
+    public static Localizable localizableXSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("xsd.unexpectedElementName", arg0, arg1);
+    }
+
+    /**
+     * unexpected element name: expected={0}, actual: {1}
+     *
+     */
+    public static String XSD_UNEXPECTED_ELEMENT_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableXSD_UNEXPECTED_ELEMENT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableFAILED_TO_READ_RESPONSE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("failed.to.read.response", arg0);
+    }
+
+    /**
+     * Failed to read a response: {0}
+     *
+     */
+    public static String FAILED_TO_READ_RESPONSE(Object arg0) {
+        return LOCALIZER.localize(localizableFAILED_TO_READ_RESPONSE(arg0));
     }
 
     public static Localizable localizableNESTED_SERIALIZATION_ERROR(Object arg0) {
-        return messageFactory.getMessage("nestedSerializationError", arg0);
+        return MESSAGE_FACTORY.getMessage("nestedSerializationError", arg0);
     }
 
     /**
@@ -140,11 +126,11 @@ public final class EncodingMessages {
      *
      */
     public static String NESTED_SERIALIZATION_ERROR(Object arg0) {
-        return localizer.localize(localizableNESTED_SERIALIZATION_ERROR(arg0));
+        return LOCALIZER.localize(localizableNESTED_SERIALIZATION_ERROR(arg0));
     }
 
     public static Localizable localizableNO_SUCH_CONTENT_ID(Object arg0) {
-        return messageFactory.getMessage("noSuchContentId", arg0);
+        return MESSAGE_FACTORY.getMessage("noSuchContentId", arg0);
     }
 
     /**
@@ -152,7 +138,30 @@ public final class EncodingMessages {
      *
      */
     public static String NO_SUCH_CONTENT_ID(Object arg0) {
-        return localizer.localize(localizableNO_SUCH_CONTENT_ID(arg0));
+        return LOCALIZER.localize(localizableNO_SUCH_CONTENT_ID(arg0));
+    }
+
+    public static Localizable localizableEXCEPTION_INCORRECT_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("exception.incorrectType", arg0);
+    }
+
+    /**
+     * incorrect type. Expected java.lang.Exception, found {0}
+     *
+     */
+    public static String EXCEPTION_INCORRECT_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableEXCEPTION_INCORRECT_TYPE(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java
index 2582b89b0c3..6c983def174 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,90 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class HandlerMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.handler";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, HandlerMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("handler.messageContext.invalid.class", arg0, arg1);
-    }
-
-    /**
-     * "{0}" is not an allowed value for the property "{1}"
-     *
-     */
-    public static String HANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
-        return localizer.localize(localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(arg0, arg1));
-    }
-
-    public static Localizable localizableCANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
-        return messageFactory.getMessage("cannot.extend.handler.directly", arg0);
-    }
-
-    /**
-     * Handler {0} must implement LogicalHandler or SOAPHandler.
-     *
-     */
-    public static String CANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
-        return localizer.localize(localizableCANNOT_EXTEND_HANDLER_DIRECTLY(arg0));
-    }
-
-    public static Localizable localizableHANDLER_NOT_VALID_TYPE(Object arg0) {
-        return messageFactory.getMessage("handler.not.valid.type", arg0);
-    }
-
-    /**
-     * {0} does not implement one of the handler interfaces.
-     *
-     */
-    public static String HANDLER_NOT_VALID_TYPE(Object arg0) {
-        return localizer.localize(localizableHANDLER_NOT_VALID_TYPE(arg0));
-    }
-
-    public static Localizable localizableCANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
-        return messageFactory.getMessage("cannot.instantiate.handler", arg0, arg1);
-    }
-
-    /**
-     * Unable to instantiate handler: {0} because: {1}
-     *
-     */
-    public static String CANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
-        return localizer.localize(localizableCANNOT_INSTANTIATE_HANDLER(arg0, arg1));
-    }
-
-    public static Localizable localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
-        return messageFactory.getMessage("handler.chain.contains.handler.only", arg0);
-    }
-
-    /**
-     * A HandlerChain can only contain Handler instances: {0}
-     *
-     */
-    public static String HANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
-        return localizer.localize(localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new HandlerMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableHANDLER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("handler.nestedError", arg0);
+        return MESSAGE_FACTORY.getMessage("handler.nestedError", arg0);
     }
 
     /**
@@ -116,11 +54,47 @@ public final class HandlerMessages {
      *
      */
     public static String HANDLER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableHANDLER_NESTED_ERROR(arg0));
+        return LOCALIZER.localize(localizableHANDLER_NESTED_ERROR(arg0));
+    }
+
+    public static Localizable localizableCANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("cannot.extend.handler.directly", arg0);
+    }
+
+    /**
+     * Handler {0} must implement LogicalHandler or SOAPHandler.
+     *
+     */
+    public static String CANNOT_EXTEND_HANDLER_DIRECTLY(Object arg0) {
+        return LOCALIZER.localize(localizableCANNOT_EXTEND_HANDLER_DIRECTLY(arg0));
+    }
+
+    public static Localizable localizableHANDLER_NOT_VALID_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("handler.not.valid.type", arg0);
+    }
+
+    /**
+     * {0} does not implement one of the handler interfaces.
+     *
+     */
+    public static String HANDLER_NOT_VALID_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableHANDLER_NOT_VALID_TYPE(arg0));
+    }
+
+    public static Localizable localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("handler.messageContext.invalid.class", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not an allowed value for the property "{1}"
+     *
+     */
+    public static String HANDLER_MESSAGE_CONTEXT_INVALID_CLASS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableHANDLER_MESSAGE_CONTEXT_INVALID_CLASS(arg0, arg1));
     }
 
     public static Localizable localizableHANDLER_PREDESTROY_IGNORE(Object arg0) {
-        return messageFactory.getMessage("handler.predestroy.ignore", arg0);
+        return MESSAGE_FACTORY.getMessage("handler.predestroy.ignore", arg0);
     }
 
     /**
@@ -128,7 +102,42 @@ public final class HandlerMessages {
      *
      */
     public static String HANDLER_PREDESTROY_IGNORE(Object arg0) {
-        return localizer.localize(localizableHANDLER_PREDESTROY_IGNORE(arg0));
+        return LOCALIZER.localize(localizableHANDLER_PREDESTROY_IGNORE(arg0));
+    }
+
+    public static Localizable localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("handler.chain.contains.handler.only", arg0);
+    }
+
+    /**
+     * A HandlerChain can only contain Handler instances: {0}
+     *
+     */
+    public static String HANDLER_CHAIN_CONTAINS_HANDLER_ONLY(Object arg0) {
+        return LOCALIZER.localize(localizableHANDLER_CHAIN_CONTAINS_HANDLER_ONLY(arg0));
+    }
+
+    public static Localizable localizableCANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("cannot.instantiate.handler", arg0, arg1);
+    }
+
+    /**
+     * Unable to instantiate handler: {0} because: {1}
+     *
+     */
+    public static String CANNOT_INSTANTIATE_HANDLER(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableCANNOT_INSTANTIATE_HANDLER(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java
index 0a21d3e9784..24f6efea9cb 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class HttpserverMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.httpserver";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, HttpserverMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.httpserver";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new HttpserverMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableUNEXPECTED_HTTP_METHOD(Object arg0) {
-        return messageFactory.getMessage("unexpected.http.method", arg0);
+        return MESSAGE_FACTORY.getMessage("unexpected.http.method", arg0);
     }
 
     /**
@@ -56,7 +54,18 @@ public final class HttpserverMessages {
      *
      */
     public static String UNEXPECTED_HTTP_METHOD(Object arg0) {
-        return localizer.localize(localizableUNEXPECTED_HTTP_METHOD(arg0));
+        return LOCALIZER.localize(localizableUNEXPECTED_HTTP_METHOD(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java
index ee61ddbfca8..e4102c24ddc 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ManagementMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ManagementMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.management";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ManagementMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.management";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ManagementMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(Object arg0) {
-        return messageFactory.getMessage("WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE", arg0);
+        return MESSAGE_FACTORY.getMessage("WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE", arg0);
     }
 
     /**
@@ -56,83 +54,11 @@ public final class ManagementMessages {
      *
      */
     public static String WSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(Object arg0) {
-        return localizer.localize(localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(arg0));
-    }
-
-    public static Localizable localizableWSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSM_1004_EXPECTED_XML_TAG", arg0, arg1);
-    }
-
-    /**
-     * WSM1004: Expected tag <{0}> but instead read <{1}>.
-     *
-     */
-    public static String WSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSM_1004_EXPECTED_XML_TAG(arg0, arg1));
-    }
-
-    public static Localizable localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
-        return messageFactory.getMessage("WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION");
-    }
-
-    /**
-     * WSM1007: Failed to create a ModelTranslator instance.
-     *
-     */
-    public static String WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
-        return localizer.localize(localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION());
-    }
-
-    public static Localizable localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
-        return messageFactory.getMessage("WSM_1002_EXPECTED_MANAGEMENT_ASSERTION", arg0);
-    }
-
-    /**
-     * WSM1002: Expected policy assertion {0} in this namespace.
-     *
-     */
-    public static String WSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
-        return localizer.localize(localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(arg0));
-    }
-
-    public static Localizable localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED() {
-        return messageFactory.getMessage("WSM_1006_CLIENT_MANAGEMENT_ENABLED");
-    }
-
-    /**
-     * WSM1006: The management property of the ManagedClient policy assertion is set to on. Clients cannot be managed and this setting will be ignored.
-     *
-     */
-    public static String WSM_1006_CLIENT_MANAGEMENT_ENABLED() {
-        return localizer.localize(localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED());
-    }
-
-    public static Localizable localizableWSM_1001_FAILED_ASSERTION(Object arg0) {
-        return messageFactory.getMessage("WSM_1001_FAILED_ASSERTION", arg0);
-    }
-
-    /**
-     * WSM1001: Failed to get policy assertion {0}.
-     *
-     */
-    public static String WSM_1001_FAILED_ASSERTION(Object arg0) {
-        return localizer.localize(localizableWSM_1001_FAILED_ASSERTION(arg0));
-    }
-
-    public static Localizable localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD() {
-        return messageFactory.getMessage("WSM_1005_EXPECTED_COMMUNICATION_CHILD");
-    }
-
-    /**
-     * WSM1005: Expected to find a CommunicationServerImplementation tag as child node of CommunicationServerImplementations.
-     *
-     */
-    public static String WSM_1005_EXPECTED_COMMUNICATION_CHILD() {
-        return localizer.localize(localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD());
+        return LOCALIZER.localize(localizableWSM_1008_EXPECTED_INTEGER_DISPOSE_DELAY_VALUE(arg0));
     }
 
     public static Localizable localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
-        return messageFactory.getMessage("WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID", arg0);
+        return MESSAGE_FACTORY.getMessage("WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID", arg0);
     }
 
     /**
@@ -140,7 +66,90 @@ public final class ManagementMessages {
      *
      */
     public static String WSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(Object arg0) {
-        return localizer.localize(localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(arg0));
+        return LOCALIZER.localize(localizableWSM_1003_MANAGEMENT_ASSERTION_MISSING_ID(arg0));
+    }
+
+    public static Localizable localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD() {
+        return MESSAGE_FACTORY.getMessage("WSM_1005_EXPECTED_COMMUNICATION_CHILD");
+    }
+
+    /**
+     * WSM1005: Expected to find a CommunicationServerImplementation tag as child node of CommunicationServerImplementations.
+     *
+     */
+    public static String WSM_1005_EXPECTED_COMMUNICATION_CHILD() {
+        return LOCALIZER.localize(localizableWSM_1005_EXPECTED_COMMUNICATION_CHILD());
+    }
+
+    public static Localizable localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED() {
+        return MESSAGE_FACTORY.getMessage("WSM_1006_CLIENT_MANAGEMENT_ENABLED");
+    }
+
+    /**
+     * WSM1006: The management property of the ManagedClient policy assertion is set to on. Clients cannot be managed and this setting will be ignored.
+     *
+     */
+    public static String WSM_1006_CLIENT_MANAGEMENT_ENABLED() {
+        return LOCALIZER.localize(localizableWSM_1006_CLIENT_MANAGEMENT_ENABLED());
+    }
+
+    public static Localizable localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSM_1002_EXPECTED_MANAGEMENT_ASSERTION", arg0);
+    }
+
+    /**
+     * WSM1002: Expected policy assertion {0} in this namespace.
+     *
+     */
+    public static String WSM_1002_EXPECTED_MANAGEMENT_ASSERTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSM_1002_EXPECTED_MANAGEMENT_ASSERTION(arg0));
+    }
+
+    public static Localizable localizableWSM_1001_FAILED_ASSERTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSM_1001_FAILED_ASSERTION", arg0);
+    }
+
+    /**
+     * WSM1001: Failed to get policy assertion {0}.
+     *
+     */
+    public static String WSM_1001_FAILED_ASSERTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSM_1001_FAILED_ASSERTION(arg0));
+    }
+
+    public static Localizable localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
+        return MESSAGE_FACTORY.getMessage("WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION");
+    }
+
+    /**
+     * WSM1007: Failed to create a ModelTranslator instance.
+     *
+     */
+    public static String WSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION() {
+        return LOCALIZER.localize(localizableWSM_1007_FAILED_MODEL_TRANSLATOR_INSTANTIATION());
+    }
+
+    public static Localizable localizableWSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("WSM_1004_EXPECTED_XML_TAG", arg0, arg1);
+    }
+
+    /**
+     * WSM1004: Expected tag <{0}> but instead read <{1}>.
+     *
+     */
+    public static String WSM_1004_EXPECTED_XML_TAG(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSM_1004_EXPECTED_XML_TAG(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
index 30708d38829..50b2cbfe545 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,330 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ModelerMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.modeler";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ModelerMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableNESTED_MODELER_ERROR(Object arg0) {
-        return messageFactory.getMessage("nestedModelerError", arg0);
-    }
-
-    /**
-     * runtime modeler error: {0}
-     *
-     */
-    public static String NESTED_MODELER_ERROR(Object arg0) {
-        return localizer.localize(localizableNESTED_MODELER_ERROR(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.wsfeature.no.ftrconstructor", arg0, arg1);
-    }
-
-    /**
-     * Annotation {0} is not recognizable, at least one constructor of {1} should be marked with @FeatureConstructor
-     *
-     */
-    public static String RUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.external.metadata.unable.to.read", arg0);
-    }
-
-    /**
-     * Unable to read metadata file {0}. Check configuration/deployment.
-     *
-     */
-    public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.webmethod.must.be.public", arg0);
-    }
-
-    /**
-     * @WebMethod is not allowed on a non-public method {0}
-     *
-     */
-    public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.wrapper.not.found", arg0);
-    }
-
-    /**
-     * Wrapper class {0} is not found. Have you run annotation processing to generate them?
-     *
-     */
-    public static String RUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.mtom.conflict", arg0, arg1);
-    }
-
-    /**
-     * Error in  @BindingType: MTOM Configuration in binding identifier {0} conflicts with feature @MTOM {1}
-     *
-     */
-    public static String RUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_MTOM_CONFLICT(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.external.metadata.generic", arg0);
-    }
-
-    /**
-     * An error occurred while processing external WS metadata; check configuration/deployment. Nested error: {0}.
-     *
-     */
-    public static String RUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.feature.conflict", arg0, arg1);
-    }
-
-    /**
-     * Feature {0} in implementation conflicts with {1} in WSDL configuration
-     *
-     */
-    public static String RUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_FEATURE_CONFLICT(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.invalid.soapbinding.parameterstyle", arg0, arg1);
-    }
-
-    /**
-     * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
-     *
-     */
-    public static String RUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.wsfeature.morethanone.ftrconstructor", arg0, arg1);
-    }
-
-    /**
-     * Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
-     *
-     */
-    public static String RUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(arg0, arg1));
-    }
-
-    public static Localizable localizableNOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("not.a.valid.bare.method", arg0, arg1);
-    }
-
-    /**
-     * SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
-     *
-     */
-    public static String NOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
-        return localizer.localize(localizableNOT_A_VALID_BARE_METHOD(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_NO_PACKAGE(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.no.package", arg0);
-    }
-
-    /**
-     * A @WebService.targetNamespace must be specified on classes with no package.  Class: {0}
-     *
-     */
-    public static String RUNTIME_MODELER_NO_PACKAGE(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_NO_PACKAGE(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.no.webservice.annotation", arg0);
-    }
-
-    /**
-     * A WebService annotation is not present on class: {0}
-     *
-     */
-    public static String RUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.addressing.responses.nosuchmethod", arg0);
-    }
-
-    /**
-     * JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 API. Use the endorsed standards override mechanism to load JAX-WS 2.2 API
-     *
-     */
-    public static String RUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.external.metadata.wrong.format", arg0);
-    }
-
-    /**
-     * Unable to read metadata from {0}. Is the format correct?
-     *
-     */
-    public static String RUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.oneway.operation.no.out.parameters", arg0, arg1);
-    }
-
-    /**
-     * oneway operation should not have OUT parameters class: {0} method: {1}
-     *
-     */
-    public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(arg0, arg1));
-    }
-
-    public static Localizable localizableUNABLE_TO_CREATE_JAXB_CONTEXT() {
-        return messageFactory.getMessage("unable.to.create.JAXBContext");
-    }
-
-    /**
-     * Unable to create JAXBContext
-     *
-     */
-    public static String UNABLE_TO_CREATE_JAXB_CONTEXT() {
-        return localizer.localize(localizableUNABLE_TO_CREATE_JAXB_CONTEXT());
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.no.operations", arg0);
-    }
-
-    /**
-     * The web service defined by the class {0} does not contain any valid WebMethods.
-     *
-     */
-    public static String RUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_NO_OPERATIONS(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.modeler.oneway.operation.no.checked.exceptions", arg0, arg1, arg2);
-    }
-
-    /**
-     * Oneway operation should not throw any checked exceptions class: {0} method: {1} throws: {2}
-     *
-     */
-    public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.webmethod.must.be.nonstatic", arg0);
-    }
-
-    /**
-     * @WebMethod is not allowed on a static method {0}
-     *
-     */
-    public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.method.not.found", arg0, arg1);
-    }
-
-    /**
-     * method: {0} could not be found on class: {1}
-     *
-     */
-    public static String RUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_METHOD_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.class.not.found", arg0);
-    }
-
-    /**
-     * class: {0} could not be found
-     *
-     */
-    public static String RUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.modeler.soapbinding.conflict", arg0, arg1, arg2);
-    }
-
-    /**
-     * SOAPBinding Style {0} for method {1} conflicts with global SOAPBinding Style {2}
-     *
-     */
-    public static String RUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.cannot.get.serviceName.from.interface", arg0);
-    }
-
-    /**
-     * The serviceName cannot be retrieved from an interface.  class {0}
-     *
-     */
-    public static String RUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.endpoint.interface.no.webservice", arg0);
-    }
-
-    /**
-     * The Endpoint Interface: {0} does not have WebService Annotation
-     *
-     */
-    public static String RUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelerMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.external.metadata.unsupported.schema", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.unsupported.schema", arg0, arg1);
     }
 
     /**
@@ -356,11 +54,59 @@ public final class ModelerMessages {
      *
      */
     public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(arg0, arg1));
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNSUPPORTED_SCHEMA(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.oneway.operation.no.checked.exceptions", arg0, arg1, arg2);
+    }
+
+    /**
+     * Oneway operation should not throw any checked exceptions class: {0} method: {1} throws: {2}
+     *
+     */
+    public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_CHECKED_EXCEPTIONS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_NO_PACKAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.no.package", arg0);
+    }
+
+    /**
+     * A @WebService.targetNamespace must be specified on classes with no package.  Class: {0}
+     *
+     */
+    public static String RUNTIME_MODELER_NO_PACKAGE(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_PACKAGE(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.unable.to.read", arg0);
+    }
+
+    /**
+     * Unable to read metadata file {0}. Check configuration/deployment.
+     *
+     */
+    public static String RUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_UNABLE_TO_READ(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.nonstatic", arg0);
+    }
+
+    /**
+     * @WebMethod is not allowed on a static method {0}
+     *
+     */
+    public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATIC(arg0));
     }
 
     public static Localizable localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtimemodeler.invalid.soapbindingOnMethod", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("runtimemodeler.invalid.soapbindingOnMethod", arg0, arg1, arg2);
     }
 
     /**
@@ -368,23 +114,143 @@ public final class ModelerMessages {
      *
      */
     public static String RUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableRUNTIMEMODELER_INVALID_SOAPBINDING_ON_METHOD(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.portname.servicename.namespace.mismatch", arg0, arg1);
+    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.wrong.format", arg0);
     }
 
     /**
-     * The namespace of the serviceName "{0}" and the namespace of the portName "{1}" must match
+     * Unable to read metadata from {0}. Is the format correct?
      *
      */
-    public static String RUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(arg0, arg1));
+    public static String RUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_WRONG_FORMAT(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.no.webservice.annotation", arg0);
+    }
+
+    /**
+     * A WebService annotation is not present on class: {0}
+     *
+     */
+    public static String RUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_WEBSERVICE_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.soapbinding.conflict", arg0, arg1, arg2);
+    }
+
+    /**
+     * SOAPBinding Style {0} for method {1} conflicts with global SOAPBinding Style {2}
+     *
+     */
+    public static String RUNTIME_MODELER_SOAPBINDING_CONFLICT(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_SOAPBINDING_CONFLICT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableNESTED_MODELER_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("nestedModelerError", arg0);
+    }
+
+    /**
+     * runtime modeler error: {0}
+     *
+     */
+    public static String NESTED_MODELER_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableNESTED_MODELER_ERROR(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.method.not.found", arg0, arg1);
+    }
+
+    /**
+     * method: {0} could not be found on class: {1}
+     *
+     */
+    public static String RUNTIME_MODELER_METHOD_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_METHOD_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableUNABLE_TO_CREATE_JAXB_CONTEXT() {
+        return MESSAGE_FACTORY.getMessage("unable.to.create.JAXBContext");
+    }
+
+    /**
+     * Unable to create JAXBContext
+     *
+     */
+    public static String UNABLE_TO_CREATE_JAXB_CONTEXT() {
+        return LOCALIZER.localize(localizableUNABLE_TO_CREATE_JAXB_CONTEXT());
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.no.operations", arg0);
+    }
+
+    /**
+     * The web service defined by the class {0} does not contain any valid WebMethods.
+     *
+     */
+    public static String RUNTIME_MODELER_NO_OPERATIONS(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_NO_OPERATIONS(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.wrapper.not.found", arg0);
+    }
+
+    /**
+     * Wrapper class {0} is not found. Have you run annotation processing to generate them?
+     *
+     */
+    public static String RUNTIME_MODELER_WRAPPER_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.invalid.soapbinding.parameterstyle", arg0, arg1);
+    }
+
+    /**
+     * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
+     *
+     */
+    public static String RUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.external.metadata.generic", arg0);
+    }
+
+    /**
+     * An error occurred while processing external WS metadata; check configuration/deployment. Nested error: {0}.
+     *
+     */
+    public static String RUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_EXTERNAL_METADATA_GENERIC(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.addressing.responses.nosuchmethod", arg0);
+    }
+
+    /**
+     * JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 or newer API. Use the standard override mechanism to load JAX-WS 2.2 or newer API.
+     *
+     */
+    public static String RUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_ADDRESSING_RESPONSES_NOSUCHMETHOD(arg0));
     }
 
     public static Localizable localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.modeler.wsfeature.illegal.ftrconstructor", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.illegal.ftrconstructor", arg0, arg1);
     }
 
     /**
@@ -392,11 +258,107 @@ public final class ModelerMessages {
      *
      */
     public static String RUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(arg0, arg1));
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.public", arg0);
+    }
+
+    /**
+     * @WebMethod is not allowed on a non-public method {0}
+     *
+     */
+    public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_PUBLIC(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.oneway.operation.no.out.parameters", arg0, arg1);
+    }
+
+    /**
+     * oneway operation should not have OUT parameters class: {0} method: {1}
+     *
+     */
+    public static String RUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_ONEWAY_OPERATION_NO_OUT_PARAMETERS(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.endpoint.interface.no.webservice", arg0);
+    }
+
+    /**
+     * The Endpoint Interface: {0} does not have WebService Annotation
+     *
+     */
+    public static String RUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.no.ftrconstructor", arg0, arg1);
+    }
+
+    /**
+     * Annotation {0} is not recognizable, at least one constructor of {1} should be marked with @FeatureConstructor
+     *
+     */
+    public static String RUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_NO_FTRCONSTRUCTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.mtom.conflict", arg0, arg1);
+    }
+
+    /**
+     * Error in  @BindingType: MTOM Configuration in binding identifier {0} conflicts with feature @MTOM {1}
+     *
+     */
+    public static String RUNTIME_MODELER_MTOM_CONFLICT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_MTOM_CONFLICT(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.class.not.found", arg0);
+    }
+
+    /**
+     * class: {0} could not be found
+     *
+     */
+    public static String RUNTIME_MODELER_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.wsfeature.morethanone.ftrconstructor", arg0, arg1);
+    }
+
+    /**
+     * Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
+     *
+     */
+    public static String RUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WSFEATURE_MORETHANONE_FTRCONSTRUCTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.feature.conflict", arg0, arg1);
+    }
+
+    /**
+     * Feature {0} in implementation conflicts with {1} in WSDL configuration
+     *
+     */
+    public static String RUNTIME_MODELER_FEATURE_CONFLICT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_FEATURE_CONFLICT(arg0, arg1));
     }
 
     public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
-        return messageFactory.getMessage("runtime.modeler.webmethod.must.be.nonstaticfinal", arg0);
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.webmethod.must.be.nonstaticfinal", arg0);
     }
 
     /**
@@ -404,7 +366,54 @@ public final class ModelerMessages {
      *
      */
     public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
-        return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(arg0));
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.cannot.get.serviceName.from.interface", arg0);
+    }
+
+    /**
+     * The serviceName cannot be retrieved from an interface.  class {0}
+     *
+     */
+    public static String RUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_CANNOT_GET_SERVICE_NAME_FROM_INTERFACE(arg0));
+    }
+
+    public static Localizable localizableNOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("not.a.valid.bare.method", arg0, arg1);
+    }
+
+    /**
+     * SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
+     *
+     */
+    public static String NOT_A_VALID_BARE_METHOD(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableNOT_A_VALID_BARE_METHOD(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.modeler.portname.servicename.namespace.mismatch", arg0, arg1);
+    }
+
+    /**
+     * The namespace of the serviceName "{0}" and the namespace of the portName "{1}" must match
+     *
+     */
+    public static String RUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_MODELER_PORTNAME_SERVICENAME_NAMESPACE_MISMATCH(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java
index bde32f27132..30e3facafc9 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/PolicyMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,138 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class PolicyMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.policy";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, PolicyMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
-        return messageFactory.getMessage("WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL");
-    }
-
-    /**
-     * WSP1007: Policy exception occurred when finishing WSDL parsing.
-     *
-     */
-    public static String WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
-        return localizer.localize(localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL());
-    }
-
-    public static Localizable localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
-        return messageFactory.getMessage("WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE");
-    }
-
-    /**
-     * WSP1002: Unable to marshall policy or it's reference. See original exception for more details.
-     *
-     */
-    public static String WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
-        return localizer.localize(localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE());
-    }
-
-    public static Localizable localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED", arg0, arg1);
-    }
-
-    /**
-     * WSP1015: Server side assertion validation failed for "{0}" assertion. Assertion was evaluated as "{1}".
-     *
-     */
-    public static String WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(arg0, arg1));
-    }
-
-    public static Localizable localizableWSP_1017_MAP_UPDATE_FAILED() {
-        return messageFactory.getMessage("WSP_1017_MAP_UPDATE_FAILED");
-    }
-
-    /**
-     * WSP1048: Policy map setup failed - exception occurred while trying to modify policy map content.
-     *
-     */
-    public static String WSP_1017_MAP_UPDATE_FAILED() {
-        return localizer.localize(localizableWSP_1017_MAP_UPDATE_FAILED());
-    }
-
-    public static Localizable localizableWSP_1010_NO_POLICIES_DEFINED() {
-        return messageFactory.getMessage("WSP_1010_NO_POLICIES_DEFINED");
-    }
-
-    /**
-     * WSP1010: No policies defined.
-     *
-     */
-    public static String WSP_1010_NO_POLICIES_DEFINED() {
-        return localizer.localize(localizableWSP_1010_NO_POLICIES_DEFINED());
-    }
-
-    public static Localizable localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
-        return messageFactory.getMessage("WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL", arg0);
-    }
-
-    /**
-     * WSP1008: Not marshalling policy, wsdl subject is null for "{0}".
-     *
-     */
-    public static String WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
-        return localizer.localize(localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(arg0));
-    }
-
-    public static Localizable localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
-        return messageFactory.getMessage("WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL");
-    }
-
-    /**
-     * WSP1009: Policy map was null, not marshalling any policies.
-     *
-     */
-    public static String WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
-        return localizer.localize(localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL());
-    }
-
-    public static Localizable localizableWSP_1020_DUPLICATE_ID(Object arg0) {
-        return messageFactory.getMessage("WSP_1020_DUPLICATE_ID", arg0);
-    }
-
-    /**
-     * WSP1020: Found two policies in one document with the same id: "{0}".
-     *
-     */
-    public static String WSP_1020_DUPLICATE_ID(Object arg0) {
-        return localizer.localize(localizableWSP_1020_DUPLICATE_ID(arg0));
-    }
-
-    public static Localizable localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME", arg0, arg1);
-    }
-
-    /**
-     * WSP1003: Unable to check element name for class "{0}" and WSDL name "{1}".
-     *
-     */
-    public static String WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new PolicyMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT", arg0);
+        return MESSAGE_FACTORY.getMessage("WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT", arg0);
     }
 
     /**
@@ -164,119 +54,11 @@ public final class PolicyMessages {
      *
      */
     public static String WSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(Object arg0) {
-        return localizer.localize(localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(arg0));
-    }
-
-    public static Localizable localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL");
-    }
-
-    /**
-     * WSP1006: Policy map extender can not be null.
-     *
-     */
-    public static String WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL());
-    }
-
-    public static Localizable localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
-        return messageFactory.getMessage("WSP_1018_FAILED_TO_MARSHALL_POLICY", arg0);
-    }
-
-    /**
-     * WSP1018: Failed to marshal policy "{0}".
-     *
-     */
-    public static String WSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
-        return localizer.localize(localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(arg0));
-    }
-
-    public static Localizable localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
-        return messageFactory.getMessage("WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST", arg0);
-    }
-
-    /**
-     * WSP1005: Failed to find policy referenced by URI "{0}".
-     *
-     */
-    public static String WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
-        return localizer.localize(localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(arg0));
-    }
-
-    public static Localizable localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
-        return messageFactory.getMessage("WSP_1016_POLICY_ID_NULL_OR_DUPLICATE", arg0);
-    }
-
-    /**
-     * WSP1016: The policy is not added because it has no ID or a policy with the same ID was already added: {0}.
-     *
-     */
-    public static String WSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
-        return localizer.localize(localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(arg0));
-    }
-
-    public static Localizable localizableWSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
-        return messageFactory.getMessage("WSP_1014_CAN_NOT_FIND_POLICY", arg0);
-    }
-
-    /**
-     * WSP1014: Can not find policy "{0}" that is referenced in from the WSDL. Please, check your policy references in the WSDL.
-     *
-     */
-    public static String WSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
-        return localizer.localize(localizableWSP_1014_CAN_NOT_FIND_POLICY(arg0));
-    }
-
-    public static Localizable localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
-        return messageFactory.getMessage("WSP_1012_FAILED_CONFIGURE_WSDL_MODEL");
-    }
-
-    /**
-     * WSP1012: Failed to configure wsdl model.
-     *
-     */
-    public static String WSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
-        return localizer.localize(localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL());
-    }
-
-    public static Localizable localizableWSP_1021_FAULT_NOT_BOUND(Object arg0) {
-        return messageFactory.getMessage("WSP_1021_FAULT_NOT_BOUND", arg0);
-    }
-
-    /**
-     * WSP1021: Fault "{0}" not bound. Check names in port and binding definitions.
-     *
-     */
-    public static String WSP_1021_FAULT_NOT_BOUND(Object arg0) {
-        return localizer.localize(localizableWSP_1021_FAULT_NOT_BOUND(arg0));
-    }
-
-    public static Localizable localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
-        return messageFactory.getMessage("WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT", arg0);
-    }
-
-    /**
-     * WSP1011: Failed to retrieve effective policy for subject: {0}.
-     *
-     */
-    public static String WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
-        return localizer.localize(localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(arg0));
-    }
-
-    public static Localizable localizableWSP_1019_CREATE_EMPTY_POLICY_MAP() {
-        return messageFactory.getMessage("WSP_1019_CREATE_EMPTY_POLICY_MAP");
-    }
-
-    /**
-     * WSP1019: Failed to find any configuration file. Creating new empty policy map.
-     *
-     */
-    public static String WSP_1019_CREATE_EMPTY_POLICY_MAP() {
-        return localizer.localize(localizableWSP_1019_CREATE_EMPTY_POLICY_MAP());
+        return LOCALIZER.localize(localizableWSP_1013_EXCEPTION_WHEN_READING_POLICY_ELEMENT(arg0));
     }
 
     public static Localizable localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
-        return messageFactory.getMessage("WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE");
+        return MESSAGE_FACTORY.getMessage("WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE");
     }
 
     /**
@@ -284,11 +66,155 @@ public final class PolicyMessages {
      *
      */
     public static String WSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE() {
-        return localizer.localize(localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE());
+        return LOCALIZER.localize(localizableWSP_1001_XML_EXCEPTION_WHEN_PROCESSING_POLICY_REFERENCE());
+    }
+
+    public static Localizable localizableWSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1014_CAN_NOT_FIND_POLICY", arg0);
+    }
+
+    /**
+     * WSP1014: Can not find policy "{0}" that is referenced in from the WSDL. Please, check your policy references in the WSDL.
+     *
+     */
+    public static String WSP_1014_CAN_NOT_FIND_POLICY(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1014_CAN_NOT_FIND_POLICY(arg0));
+    }
+
+    public static Localizable localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
+        return MESSAGE_FACTORY.getMessage("WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL");
+    }
+
+    /**
+     * WSP1009: Policy map was null, not marshalling any policies.
+     *
+     */
+    public static String WSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL() {
+        return LOCALIZER.localize(localizableWSP_1009_NOT_MARSHALLING_ANY_POLICIES_POLICY_MAP_IS_NULL());
+    }
+
+    public static Localizable localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT", arg0);
+    }
+
+    /**
+     * WSP1011: Failed to retrieve effective policy for subject: {0}.
+     *
+     */
+    public static String WSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1011_FAILED_TO_RETRIEVE_EFFECTIVE_POLICY_FOR_SUBJECT(arg0));
+    }
+
+    public static Localizable localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1016_POLICY_ID_NULL_OR_DUPLICATE", arg0);
+    }
+
+    /**
+     * WSP1016: The policy is not added because it has no ID or a policy with the same ID was already added: {0}.
+     *
+     */
+    public static String WSP_1016_POLICY_ID_NULL_OR_DUPLICATE(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1016_POLICY_ID_NULL_OR_DUPLICATE(arg0));
+    }
+
+    public static Localizable localizableWSP_1021_FAULT_NOT_BOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1021_FAULT_NOT_BOUND", arg0);
+    }
+
+    /**
+     * WSP1021: Fault "{0}" not bound. Check names in port and binding definitions.
+     *
+     */
+    public static String WSP_1021_FAULT_NOT_BOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1021_FAULT_NOT_BOUND(arg0));
+    }
+
+    public static Localizable localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME", arg0, arg1);
+    }
+
+    /**
+     * WSP1003: Unable to check element name for class "{0}" and WSDL name "{1}".
+     *
+     */
+    public static String WSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSP_1003_UNABLE_TO_CHECK_ELEMENT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSP_1019_CREATE_EMPTY_POLICY_MAP() {
+        return MESSAGE_FACTORY.getMessage("WSP_1019_CREATE_EMPTY_POLICY_MAP");
+    }
+
+    /**
+     * WSP1019: Failed to find any configuration file. Creating new empty policy map.
+     *
+     */
+    public static String WSP_1019_CREATE_EMPTY_POLICY_MAP() {
+        return LOCALIZER.localize(localizableWSP_1019_CREATE_EMPTY_POLICY_MAP());
+    }
+
+    public static Localizable localizableWSP_1020_DUPLICATE_ID(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1020_DUPLICATE_ID", arg0);
+    }
+
+    /**
+     * WSP1020: Found two policies in one document with the same id: "{0}".
+     *
+     */
+    public static String WSP_1020_DUPLICATE_ID(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1020_DUPLICATE_ID(arg0));
+    }
+
+    public static Localizable localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
+        return MESSAGE_FACTORY.getMessage("WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE");
+    }
+
+    /**
+     * WSP1002: Unable to marshall policy or it's reference. See original exception for more details.
+     *
+     */
+    public static String WSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE() {
+        return LOCALIZER.localize(localizableWSP_1002_UNABLE_TO_MARSHALL_POLICY_OR_POLICY_REFERENCE());
+    }
+
+    public static Localizable localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL", arg0);
+    }
+
+    /**
+     * WSP1008: Not marshalling policy, wsdl subject is null for "{0}".
+     *
+     */
+    public static String WSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1008_NOT_MARSHALLING_WSDL_SUBJ_NULL(arg0));
+    }
+
+    public static Localizable localizableWSP_1017_MAP_UPDATE_FAILED() {
+        return MESSAGE_FACTORY.getMessage("WSP_1017_MAP_UPDATE_FAILED");
+    }
+
+    /**
+     * WSP1048: Policy map setup failed - exception occurred while trying to modify policy map content.
+     *
+     */
+    public static String WSP_1017_MAP_UPDATE_FAILED() {
+        return LOCALIZER.localize(localizableWSP_1017_MAP_UPDATE_FAILED());
+    }
+
+    public static Localizable localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1018_FAILED_TO_MARSHALL_POLICY", arg0);
+    }
+
+    /**
+     * WSP1018: Failed to marshal policy "{0}".
+     *
+     */
+    public static String WSP_1018_FAILED_TO_MARSHALL_POLICY(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1018_FAILED_TO_MARSHALL_POLICY(arg0));
     }
 
     public static Localizable localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
-        return messageFactory.getMessage("WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL");
+        return MESSAGE_FACTORY.getMessage("WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL");
     }
 
     /**
@@ -296,7 +222,90 @@ public final class PolicyMessages {
      *
      */
     public static String WSP_1004_POLICY_URIS_CAN_NOT_BE_NULL() {
-        return localizer.localize(localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL());
+        return LOCALIZER.localize(localizableWSP_1004_POLICY_URIS_CAN_NOT_BE_NULL());
+    }
+
+    public static Localizable localizableWSP_1010_NO_POLICIES_DEFINED() {
+        return MESSAGE_FACTORY.getMessage("WSP_1010_NO_POLICIES_DEFINED");
+    }
+
+    /**
+     * WSP1010: No policies defined.
+     *
+     */
+    public static String WSP_1010_NO_POLICIES_DEFINED() {
+        return LOCALIZER.localize(localizableWSP_1010_NO_POLICIES_DEFINED());
+    }
+
+    public static Localizable localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
+        return MESSAGE_FACTORY.getMessage("WSP_1012_FAILED_CONFIGURE_WSDL_MODEL");
+    }
+
+    /**
+     * WSP1012: Failed to configure wsdl model.
+     *
+     */
+    public static String WSP_1012_FAILED_CONFIGURE_WSDL_MODEL() {
+        return LOCALIZER.localize(localizableWSP_1012_FAILED_CONFIGURE_WSDL_MODEL());
+    }
+
+    public static Localizable localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED", arg0, arg1);
+    }
+
+    /**
+     * WSP1015: Server side assertion validation failed for "{0}" assertion. Assertion was evaluated as "{1}".
+     *
+     */
+    public static String WSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSP_1015_SERVER_SIDE_ASSERTION_VALIDATION_FAILED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST", arg0);
+    }
+
+    /**
+     * WSP1005: Failed to find policy referenced by URI "{0}".
+     *
+     */
+    public static String WSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(Object arg0) {
+        return LOCALIZER.localize(localizableWSP_1005_POLICY_REFERENCE_DOES_NOT_EXIST(arg0));
+    }
+
+    public static Localizable localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
+        return MESSAGE_FACTORY.getMessage("WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL");
+    }
+
+    /**
+     * WSP1006: Policy map extender can not be null.
+     *
+     */
+    public static String WSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL() {
+        return LOCALIZER.localize(localizableWSP_1006_POLICY_MAP_EXTENDER_CAN_NOT_BE_NULL());
+    }
+
+    public static Localizable localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
+        return MESSAGE_FACTORY.getMessage("WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL");
+    }
+
+    /**
+     * WSP1007: Policy exception occurred when finishing WSDL parsing.
+     *
+     */
+    public static String WSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL() {
+        return LOCALIZER.localize(localizableWSP_1007_POLICY_EXCEPTION_WHILE_FINISHING_PARSING_WSDL());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
index 347dc7f1864..d20d7e2e18d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,54 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ProviderApiMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.providerApi";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ProviderApiMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableNULL_ADDRESS_SERVICE_ENDPOINT() {
-        return messageFactory.getMessage("null.address.service.endpoint");
-    }
-
-    /**
-     * Address in an EPR cannot be null, when serviceName or portName is null
-     *
-     */
-    public static String NULL_ADDRESS_SERVICE_ENDPOINT() {
-        return localizer.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
-    }
-
-    public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
-        return messageFactory.getMessage("no.wsdl.no.port", arg0);
-    }
-
-    /**
-     * WSDL Metadata not available to create the proxy, either Service instance or ServiceEndpointInterface {0} should have WSDL information
-     *
-     */
-    public static String NO_WSDL_NO_PORT(Object arg0) {
-        return localizer.localize(localizableNO_WSDL_NO_PORT(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ProviderApiMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableNULL_SERVICE() {
-        return messageFactory.getMessage("null.service");
+        return MESSAGE_FACTORY.getMessage("null.service");
     }
 
     /**
@@ -80,23 +54,23 @@ public final class ProviderApiMessages {
      *
      */
     public static String NULL_SERVICE() {
-        return localizer.localize(localizableNULL_SERVICE());
+        return LOCALIZER.localize(localizableNULL_SERVICE());
     }
 
-    public static Localizable localizableNULL_ADDRESS() {
-        return messageFactory.getMessage("null.address");
+    public static Localizable localizableNULL_ADDRESS_SERVICE_ENDPOINT() {
+        return MESSAGE_FACTORY.getMessage("null.address.service.endpoint");
     }
 
     /**
-     * Address in an EPR cannot be null
+     * Address in an EPR cannot be null, when serviceName or portName is null
      *
      */
-    public static String NULL_ADDRESS() {
-        return localizer.localize(localizableNULL_ADDRESS());
+    public static String NULL_ADDRESS_SERVICE_ENDPOINT() {
+        return LOCALIZER.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
     }
 
     public static Localizable localizableNULL_PORTNAME() {
-        return messageFactory.getMessage("null.portname");
+        return MESSAGE_FACTORY.getMessage("null.portname");
     }
 
     /**
@@ -104,35 +78,11 @@ public final class ProviderApiMessages {
      *
      */
     public static String NULL_PORTNAME() {
-        return localizer.localize(localizableNULL_PORTNAME());
-    }
-
-    public static Localizable localizableNOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("notfound.service.in.wsdl", arg0, arg1);
-    }
-
-    /**
-     * Service: {0} not found in WSDL: {1}
-     *
-     */
-    public static String NOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
-        return localizer.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
-    }
-
-    public static Localizable localizableNULL_EPR() {
-        return messageFactory.getMessage("null.epr");
-    }
-
-    /**
-     * EndpointReference is null
-     *
-     */
-    public static String NULL_EPR() {
-        return localizer.localize(localizableNULL_EPR());
+        return LOCALIZER.localize(localizableNULL_PORTNAME());
     }
 
     public static Localizable localizableNULL_WSDL() {
-        return messageFactory.getMessage("null.wsdl");
+        return MESSAGE_FACTORY.getMessage("null.wsdl");
     }
 
     /**
@@ -140,11 +90,23 @@ public final class ProviderApiMessages {
      *
      */
     public static String NULL_WSDL() {
-        return localizer.localize(localizableNULL_WSDL());
+        return LOCALIZER.localize(localizableNULL_WSDL());
+    }
+
+    public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("no.wsdl.no.port", arg0);
+    }
+
+    /**
+     * WSDL Metadata not available to create the proxy, either Service instance or ServiceEndpointInterface {0} should have WSDL information
+     *
+     */
+    public static String NO_WSDL_NO_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableNO_WSDL_NO_PORT(arg0));
     }
 
     public static Localizable localizableNOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("notfound.port.in.wsdl", arg0, arg1, arg2);
     }
 
     /**
@@ -152,11 +114,47 @@ public final class ProviderApiMessages {
      *
      */
     public static String NOTFOUND_PORT_IN_WSDL(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableNOTFOUND_PORT_IN_WSDL(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableNOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("notfound.service.in.wsdl", arg0, arg1);
+    }
+
+    /**
+     * Service: {0} not found in WSDL: {1}
+     *
+     */
+    public static String NOTFOUND_SERVICE_IN_WSDL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableNOTFOUND_SERVICE_IN_WSDL(arg0, arg1));
+    }
+
+    public static Localizable localizableNULL_EPR() {
+        return MESSAGE_FACTORY.getMessage("null.epr");
+    }
+
+    /**
+     * EndpointReference is null
+     *
+     */
+    public static String NULL_EPR() {
+        return LOCALIZER.localize(localizableNULL_EPR());
+    }
+
+    public static Localizable localizableNULL_ADDRESS() {
+        return MESSAGE_FACTORY.getMessage("null.address");
+    }
+
+    /**
+     * Address in an EPR cannot be null
+     *
+     */
+    public static String NULL_ADDRESS() {
+        return LOCALIZER.localize(localizableNULL_ADDRESS());
     }
 
     public static Localizable localizableERROR_WSDL(Object arg0) {
-        return messageFactory.getMessage("error.wsdl", arg0);
+        return MESSAGE_FACTORY.getMessage("error.wsdl", arg0);
     }
 
     /**
@@ -164,7 +162,18 @@ public final class ProviderApiMessages {
      *
      */
     public static String ERROR_WSDL(Object arg0) {
-        return localizer.localize(localizableERROR_WSDL(arg0));
+        return LOCALIZER.localize(localizableERROR_WSDL(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java
index c95550e9955..5e94841f005 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,66 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class SenderMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.sender";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, SenderMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
-        return messageFactory.getMessage("sender.request.illegalValueForContentNegotiation", arg0);
-    }
-
-    /**
-     * illegal value for content negotiation property "{0}"
-     *
-     */
-    public static String SENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
-        return localizer.localize(localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(arg0));
-    }
-
-    public static Localizable localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
-        return messageFactory.getMessage("sender.response.cannotDecodeFaultDetail");
-    }
-
-    /**
-     * fault detail cannot be decoded
-     *
-     */
-    public static String SENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
-        return localizer.localize(localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL());
-    }
-
-    public static Localizable localizableSENDER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("sender.nestedError", arg0);
-    }
-
-    /**
-     * sender error: {0}
-     *
-     */
-    public static String SENDER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableSENDER_NESTED_ERROR(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new SenderMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableSENDER_REQUEST_MESSAGE_NOT_READY() {
-        return messageFactory.getMessage("sender.request.messageNotReady");
+        return MESSAGE_FACTORY.getMessage("sender.request.messageNotReady");
     }
 
     /**
@@ -92,7 +54,54 @@ public final class SenderMessages {
      *
      */
     public static String SENDER_REQUEST_MESSAGE_NOT_READY() {
-        return localizer.localize(localizableSENDER_REQUEST_MESSAGE_NOT_READY());
+        return LOCALIZER.localize(localizableSENDER_REQUEST_MESSAGE_NOT_READY());
+    }
+
+    public static Localizable localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
+        return MESSAGE_FACTORY.getMessage("sender.response.cannotDecodeFaultDetail");
+    }
+
+    /**
+     * fault detail cannot be decoded
+     *
+     */
+    public static String SENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL() {
+        return LOCALIZER.localize(localizableSENDER_RESPONSE_CANNOT_DECODE_FAULT_DETAIL());
+    }
+
+    public static Localizable localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sender.request.illegalValueForContentNegotiation", arg0);
+    }
+
+    /**
+     * illegal value for content negotiation property "{0}"
+     *
+     */
+    public static String SENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(Object arg0) {
+        return LOCALIZER.localize(localizableSENDER_REQUEST_ILLEGAL_VALUE_FOR_CONTENT_NEGOTIATION(arg0));
+    }
+
+    public static Localizable localizableSENDER_NESTED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sender.nestedError", arg0);
+    }
+
+    /**
+     * sender error: {0}
+     *
+     */
+    public static String SENDER_NESTED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableSENDER_NESTED_ERROR(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
index 9059972ac0d..2c7f065fc93 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,276 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class ServerMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.server";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ServerMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.server";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ServerMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
+
+    public static Localizable localizableDUPLICATE_ABSTRACT_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("duplicate.abstract.wsdl", arg0);
+    }
+
+    /**
+     * Metadata has more than one WSDL that has PortType definition for the endpoint. WSDL={0} is one such WSDL.
+     *
+     */
+    public static String DUPLICATE_ABSTRACT_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizableDUPLICATE_ABSTRACT_WSDL(arg0));
+    }
+
+    public static Localizable localizableNOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("not.know.HttpContext.type", arg0, arg1, arg2);
+    }
+
+    /**
+     * Doesn''t support Endpoint.publish({0}). Known context types are {1}, and {2}
+     *
+     */
+    public static String NOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableNOT_KNOW_HTTP_CONTEXT_TYPE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableUNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("unsupported.contentType", arg0, arg1);
+    }
+
+    /**
+     * Unsupported Content-Type: {0} Supported ones are: {1}
+     *
+     */
+    public static String UNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableUNSUPPORTED_CONTENT_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.not.found", arg0);
+    }
+
+    /**
+     * {0} is not found in the WAR file. Package it in the WAR file or correct it in sun-jaxws.xml.
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableSOAPENCODER_ERR() {
+        return MESSAGE_FACTORY.getMessage("soapencoder.err");
+    }
+
+    /**
+     * Error in encoding SOAP Message
+     *
+     */
+    public static String SOAPENCODER_ERR() {
+        return LOCALIZER.localize(localizableSOAPENCODER_ERR());
+    }
+
+    public static Localizable localizableWSDL_REQUIRED() {
+        return MESSAGE_FACTORY.getMessage("wsdl.required");
+    }
+
+    /**
+     * wsdl is required
+     *
+     */
+    public static String WSDL_REQUIRED() {
+        return LOCALIZER.localize(localizableWSDL_REQUIRED());
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.noservice.in.wsdlmodel", arg0);
+    }
+
+    /**
+     * There is an error in processing the WSDL {0} and no valid services are found.
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(arg0));
+    }
+
+    public static Localizable localizableNULL_IMPLEMENTOR() {
+        return MESSAGE_FACTORY.getMessage("null.implementor");
+    }
+
+    /**
+     * Implementor cannot be null
+     *
+     */
+    public static String NULL_IMPLEMENTOR() {
+        return LOCALIZER.localize(localizableNULL_IMPLEMENTOR());
+    }
+
+    public static Localizable localizableSERVER_RT_ERR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("server.rt.err", arg0);
+    }
+
+    /**
+     * Server Runtime Error: {0}
+     *
+     */
+    public static String SERVER_RT_ERR(Object arg0) {
+        return LOCALIZER.localize(localizableSERVER_RT_ERR(arg0));
+    }
+
+    public static Localizable localizableWRONG_PARAMETER_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wrong.parameter.type", arg0);
+    }
+
+    /**
+     * Incorrect argument types for method "{0}"
+     *
+     */
+    public static String WRONG_PARAMETER_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableWRONG_PARAMETER_TYPE(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.incorrectserviceport", arg0, arg1, arg2);
+    }
+
+    /**
+     * could not get binding from WSDL! service: {0} or port {1} not found in the WSDL {2}.
+     * It could be because service and port names do not match WSDL''s wsdl:service and wsdl:port names:
+     *  1. service and port names are not there in deployment descriptor OR
+     *  2. Either there is a typo in deployment descriptor''s service and port names OR
+     *  3. The computed names from @WebService do not match wsdl:service and wsdl:port names
+     * Suggest doing the following:
+     *  1. Add/Correct entries for service and port names in deployment descriptor OR
+     *  2. Specify targetNamespace, serviceName, portName in @WebService on the endpoint class
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_XML_READER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.xmlReader", arg0);
+    }
+
+    /**
+     * error parsing runtime descriptor: {0}
+     *
+     */
+    public static String RUNTIME_PARSER_XML_READER(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_XML_READER(arg0));
+    }
+
+    public static Localizable localizableDD_MTOM_CONFLICT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("dd.mtom.conflict", arg0, arg1);
+    }
+
+    /**
+     * Error in Deployment Descriptor : MTOM Configuration in binding {0} conflicts with enable-mtom attribute value {1}
+     *
+     */
+    public static String DD_MTOM_CONFLICT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableDD_MTOM_CONFLICT(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.invalid.attribute.value", arg0, arg1);
+    }
+
+    /**
+     * invalid attribute value "{1}" in runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.saxparser.exception", arg0, arg1);
+    }
+
+    /**
+     * {0}
+     * {1}
+     *
+     */
+    public static String RUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_SAXPARSER_EXCEPTION(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER() {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.invalidVersionNumber");
+    }
+
+    /**
+     * unsupported runtime descriptor version: {2}
+     *
+     */
+    public static String RUNTIME_PARSER_INVALID_VERSION_NUMBER() {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER());
+    }
+
+    public static Localizable localizableWRONG_TNS_FOR_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wrong.tns.for.port", arg0);
+    }
+
+    /**
+     * Port namespace {0} doesn't match Service namespace {1}
+     *
+     */
+    public static String WRONG_TNS_FOR_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableWRONG_TNS_FOR_PORT(arg0));
+    }
+
+    public static Localizable localizableANNOTATION_ONLY_ONCE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("annotation.only.once", arg0);
+    }
+
+    /**
+     * Only one method should have the annotation "{0}"
+     *
+     */
+    public static String ANNOTATION_ONLY_ONCE(Object arg0) {
+        return LOCALIZER.localize(localizableANNOTATION_ONLY_ONCE(arg0));
+    }
+
+    public static Localizable localizableSTATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("stateful.cookie.header.incorrect", arg0, arg1);
+    }
+
+    /**
+     * Invalid/expired {0} header value: {1}
+     *
+     */
+    public static String STATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableSTATEFUL_COOKIE_HEADER_INCORRECT(arg0, arg1));
+    }
+
+    public static Localizable localizableSERVICE_NAME_REQUIRED() {
+        return MESSAGE_FACTORY.getMessage("service.name.required");
+    }
+
+    /**
+     * Service QName is not found
+     *
+     */
+    public static String SERVICE_NAME_REQUIRED() {
+        return LOCALIZER.localize(localizableSERVICE_NAME_REQUIRED());
     }
 
     public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.parser.wsdl.incorrectservice", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.incorrectservice", arg0, arg1);
     }
 
     /**
@@ -65,559 +311,11 @@ public final class ServerMessages {
      *
      */
     public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
-        return messageFactory.getMessage("runtime.parser.missing.attribute.no.line");
-    }
-
-    /**
-     * missing attribute "{2}" in element "{1}" of runtime descriptor
-     *
-     */
-    public static String RUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
-        return localizer.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE());
-    }
-
-    public static Localizable localizableSTATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("stateful.cookie.header.incorrect", arg0, arg1);
-    }
-
-    /**
-     * Invalid/expired {0} header value: {1}
-     *
-     */
-    public static String STATEFUL_COOKIE_HEADER_INCORRECT(Object arg0, Object arg1) {
-        return localizer.localize(localizableSTATEFUL_COOKIE_HEADER_INCORRECT(arg0, arg1));
-    }
-
-    public static Localizable localizableNOT_IMPLEMENT_PROVIDER(Object arg0) {
-        return messageFactory.getMessage("not.implement.provider", arg0);
-    }
-
-    /**
-     * "{0}" doesn't implement Provider
-     *
-     */
-    public static String NOT_IMPLEMENT_PROVIDER(Object arg0) {
-        return localizer.localize(localizableNOT_IMPLEMENT_PROVIDER(arg0));
-    }
-
-    public static Localizable localizableSTATEFUL_REQURES_ADDRESSING(Object arg0) {
-        return messageFactory.getMessage("stateful.requres.addressing", arg0);
-    }
-
-    /**
-     * Stateful web service {0} requires the WS-Addressing support to be enabled. Perhaps you are missing @Addressing
-     *
-     */
-    public static String STATEFUL_REQURES_ADDRESSING(Object arg0) {
-        return localizer.localize(localizableSTATEFUL_REQURES_ADDRESSING(arg0));
-    }
-
-    public static Localizable localizableSOAPDECODER_ERR() {
-        return messageFactory.getMessage("soapdecoder.err");
-    }
-
-    /**
-     * Error in decoding SOAP Message
-     *
-     */
-    public static String SOAPDECODER_ERR() {
-        return localizer.localize(localizableSOAPDECODER_ERR());
-    }
-
-    public static Localizable localizableGENERATE_NON_STANDARD_WSDL() {
-        return messageFactory.getMessage("generate.non.standard.wsdl");
-    }
-
-    /**
-     * Generating non-standard WSDL for the specified binding
-     *
-     */
-    public static String GENERATE_NON_STANDARD_WSDL() {
-        return localizer.localize(localizableGENERATE_NON_STANDARD_WSDL());
-    }
-
-    public static Localizable localizableDISPATCH_CANNOT_FIND_METHOD(Object arg0) {
-        return messageFactory.getMessage("dispatch.cannotFindMethod", arg0);
-    }
-
-    /**
-     * Cannot find dispatch method for {0}
-     *
-     */
-    public static String DISPATCH_CANNOT_FIND_METHOD(Object arg0) {
-        return localizer.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0));
-    }
-
-    public static Localizable localizableNO_CONTENT_TYPE() {
-        return messageFactory.getMessage("no.contentType");
-    }
-
-    /**
-     * Request doesn't have a Content-Type
-     *
-     */
-    public static String NO_CONTENT_TYPE() {
-        return localizer.localize(localizableNO_CONTENT_TYPE());
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER() {
-        return messageFactory.getMessage("runtime.parser.invalidVersionNumber");
-    }
-
-    /**
-     * unsupported runtime descriptor version: {2}
-     *
-     */
-    public static String RUNTIME_PARSER_INVALID_VERSION_NUMBER() {
-        return localizer.localize(localizableRUNTIME_PARSER_INVALID_VERSION_NUMBER());
-    }
-
-    public static Localizable localizablePROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("provider.invalid.parameterType", arg0, arg1);
-    }
-
-    /**
-     * "{0}" implements Provider but its type parameter {1} is incorrect
-     *
-     */
-    public static String PROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizablePROVIDER_INVALID_PARAMETER_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableWRONG_NO_PARAMETERS(Object arg0) {
-        return messageFactory.getMessage("wrong.no.parameters", arg0);
-    }
-
-    /**
-     * Incorrect no of arguments for method "{0}"
-     *
-     */
-    public static String WRONG_NO_PARAMETERS(Object arg0) {
-        return localizer.localize(localizableWRONG_NO_PARAMETERS(arg0));
-    }
-
-    public static Localizable localizableANNOTATION_ONLY_ONCE(Object arg0) {
-        return messageFactory.getMessage("annotation.only.once", arg0);
-    }
-
-    /**
-     * Only one method should have the annotation "{0}"
-     *
-     */
-    public static String ANNOTATION_ONLY_ONCE(Object arg0) {
-        return localizer.localize(localizableANNOTATION_ONLY_ONCE(arg0));
-    }
-
-    public static Localizable localizableALREADY_HTTPS_SERVER(Object arg0) {
-        return messageFactory.getMessage("already.https.server", arg0);
-    }
-
-    /**
-     * There is already a HTTPS server at : {0}
-     *
-     */
-    public static String ALREADY_HTTPS_SERVER(Object arg0) {
-        return localizer.localize(localizableALREADY_HTTPS_SERVER(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_XML_READER(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.xmlReader", arg0);
-    }
-
-    /**
-     * error parsing runtime descriptor: {0}
-     *
-     */
-    public static String RUNTIME_PARSER_XML_READER(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_XML_READER(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.parser.wsdl.incorrectserviceport", arg0, arg1, arg2);
-    }
-
-    /**
-     * could not get binding from WSDL! service: {0} or port {1} not found in the WSDL {2}.
-     * It could be because service and port names do not match WSDL''s wsdl:service and wsdl:port names:
-     *  1. service and port names are not there in deployment descriptor OR
-     *  2. Either there is a typo in deployment descriptor''s service and port names OR
-     *  3. The computed names from @WebService do not match wsdl:service and wsdl:port names
-     * Suggest doing the following:
-     *  1. Add/Correct entries for service and port names in deployment descriptor OR
-     *  2. Specify targetNamespace, serviceName, portName in @WebService on the endpoint class
-     *
-     */
-    public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableSERVER_RT_ERR(Object arg0) {
-        return messageFactory.getMessage("server.rt.err", arg0);
-    }
-
-    /**
-     * Server Runtime Error: {0}
-     *
-     */
-    public static String SERVER_RT_ERR(Object arg0) {
-        return localizer.localize(localizableSERVER_RT_ERR(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.parser.invalidAttributeValue", arg0, arg1, arg2);
-    }
-
-    /**
-     * invalid value for attribute "{2}" of element "{1}" in runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableNO_CURRENT_PACKET() {
-        return messageFactory.getMessage("no.current.packet");
-    }
-
-    /**
-     * This thread is not currently processing any web service request.
-     *
-     */
-    public static String NO_CURRENT_PACKET() {
-        return localizer.localize(localizableNO_CURRENT_PACKET());
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.unexpectedContent", arg0);
-    }
-
-    /**
-     * unexpected content in runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(arg0));
-    }
-
-    public static Localizable localizableSTATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
-        return messageFactory.getMessage("stateful.cookie.header.required", arg0);
-    }
-
-    /**
-     * This is a stateful web service and {0} header is required.
-     *
-     */
-    public static String STATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
-        return localizer.localize(localizableSTATEFUL_COOKIE_HEADER_REQUIRED(arg0));
-    }
-
-    public static Localizable localizableNULL_IMPLEMENTOR() {
-        return messageFactory.getMessage("null.implementor");
-    }
-
-    /**
-     * Implementor cannot be null
-     *
-     */
-    public static String NULL_IMPLEMENTOR() {
-        return localizer.localize(localizableNULL_IMPLEMENTOR());
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WSDL(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.wsdl", arg0);
-    }
-
-    /**
-     * exception during WSDL parsing: {0}
-     *
-     */
-    public static String RUNTIME_PARSER_WSDL(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL(arg0));
-    }
-
-    public static Localizable localizableSOAPENCODER_ERR() {
-        return messageFactory.getMessage("soapencoder.err");
-    }
-
-    /**
-     * Error in encoding SOAP Message
-     *
-     */
-    public static String SOAPENCODER_ERR() {
-        return localizer.localize(localizableSOAPENCODER_ERR());
-    }
-
-    public static Localizable localizableWSDL_REQUIRED() {
-        return messageFactory.getMessage("wsdl.required");
-    }
-
-    /**
-     * wsdl is required
-     *
-     */
-    public static String WSDL_REQUIRED() {
-        return localizer.localize(localizableWSDL_REQUIRED());
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.wsdl.noservice.in.wsdlmodel", arg0);
-    }
-
-    /**
-     * There is an error in processing the WSDL {0} and no valid services are found.
-     *
-     */
-    public static String RUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(arg0));
-    }
-
-    public static Localizable localizablePORT_NAME_REQUIRED() {
-        return messageFactory.getMessage("port.name.required");
-    }
-
-    /**
-     * Port QName is not found
-     *
-     */
-    public static String PORT_NAME_REQUIRED() {
-        return localizer.localize(localizablePORT_NAME_REQUIRED());
-    }
-
-    public static Localizable localizableWRONG_TNS_FOR_PORT(Object arg0) {
-        return messageFactory.getMessage("wrong.tns.for.port", arg0);
-    }
-
-    /**
-     * Port namespace {0} doesn't match Service namespace {1}
-     *
-     */
-    public static String WRONG_TNS_FOR_PORT(Object arg0) {
-        return localizer.localize(localizableWRONG_TNS_FOR_PORT(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.parser.wsdl.multiplebinding", arg0, arg1, arg2);
-    }
-
-    /**
-     * multiple bindings found for binding ID {0} for service {1} in WSDL {2}
-     *
-     */
-    public static String RUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableNOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("not.know.HttpContext.type", arg0, arg1, arg2);
-    }
-
-    /**
-     * Doesn''t support Endpoint.publish({0}). Known context types are {1}, and {2}
-     *
-     */
-    public static String NOT_KNOW_HTTP_CONTEXT_TYPE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableNOT_KNOW_HTTP_CONTEXT_TYPE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableNON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("non.unique.dispatch.qname", arg0, arg1);
-    }
-
-    /**
-     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. Methods {0} have the same request body block {1}. Method dispatching may fail, runtime will try to dispatch using SOAPAction. Another option is to enable AddressingFeature to enabled runtime to uniquely identify WSDL operation using wsa:Action header.
-     *
-     */
-    public static String NON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableNON_UNIQUE_DISPATCH_QNAME(arg0, arg1));
-    }
-
-    public static Localizable localizableALREADY_HTTP_SERVER(Object arg0) {
-        return messageFactory.getMessage("already.http.server", arg0);
-    }
-
-    /**
-     * There is already a HTTP server at : {0}# {0} - probably URL/port of a server
-     *
-     */
-    public static String ALREADY_HTTP_SERVER(Object arg0) {
-        return localizer.localize(localizableALREADY_HTTP_SERVER(arg0));
-    }
-
-    public static Localizable localizableCAN_NOT_GENERATE_WSDL(Object arg0) {
-        return messageFactory.getMessage("can.not.generate.wsdl", arg0);
-    }
-
-    /**
-     * Cannot generate WSDL for binding "{0}"
-     *
-     */
-    public static String CAN_NOT_GENERATE_WSDL(Object arg0) {
-        return localizer.localize(localizableCAN_NOT_GENERATE_WSDL(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.parser.invalid.attribute.value", arg0, arg1);
-    }
-
-    /**
-     * invalid attribute value "{1}" in runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.parser.wrong.element", arg0, arg1, arg2);
-    }
-
-    /**
-     * found element "{1}", expected "{2}" in runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtimemodeler.invalidannotationOnImpl", arg0, arg1, arg2);
-    }
-
-    /**
-     * Invalid annotation: {0} on endpoint implementation class "{1}" - will be ignored. "{1}" is annotated with @WebService(endpointInterface="{2}"}, it must not be annotated with {0}, to fix it - put this annotation on the SEI {2}.
-     *
-     */
-    public static String RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableSERVICE_NAME_REQUIRED() {
-        return messageFactory.getMessage("service.name.required");
-    }
-
-    /**
-     * Service QName is not found
-     *
-     */
-    public static String SERVICE_NAME_REQUIRED() {
-        return localizer.localize(localizableSERVICE_NAME_REQUIRED());
-    }
-
-    public static Localizable localizablePROVIDER_NOT_PARAMETERIZED(Object arg0) {
-        return messageFactory.getMessage("provider.not.parameterized", arg0);
-    }
-
-    /**
-     * "{0}" implements Provider but doesn't specify the type parameter
-     *
-     */
-    public static String PROVIDER_NOT_PARAMETERIZED(Object arg0) {
-        return localizer.localize(localizablePROVIDER_NOT_PARAMETERIZED(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_WSDL_PATCHER() {
-        return messageFactory.getMessage("runtime.wsdl.patcher");
-    }
-
-    /**
-     * error while patching WSDL related document
-     *
-     */
-    public static String RUNTIME_WSDL_PATCHER() {
-        return localizer.localize(localizableRUNTIME_WSDL_PATCHER());
-    }
-
-    public static Localizable localizableRUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.saxparser.exception", arg0, arg1);
-    }
-
-    /**
-     * {0}
-     * {1}
-     *
-     */
-    public static String RUNTIME_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_SAXPARSER_EXCEPTION(arg0, arg1));
-    }
-
-    public static Localizable localizableWRONG_PARAMETER_TYPE(Object arg0) {
-        return messageFactory.getMessage("wrong.parameter.type", arg0);
-    }
-
-    /**
-     * Incorrect argument types for method "{0}"
-     *
-     */
-    public static String WRONG_PARAMETER_TYPE(Object arg0) {
-        return localizer.localize(localizableWRONG_PARAMETER_TYPE(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.wsdl.not.found", arg0);
-    }
-
-    /**
-     * {0} is not found in the WAR file. Package it in the WAR file or correct it in sun-jaxws.xml.
-     *
-     */
-    public static String RUNTIME_PARSER_WSDL_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_WSDL_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("runtime.parser.classNotFound", arg0);
-    }
-
-    /**
-     * class not found in runtime descriptor: {0}
-     *
-     */
-    public static String RUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableRUNTIME_PARSER_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableUNSUPPORTED_CHARSET(Object arg0) {
-        return messageFactory.getMessage("unsupported.charset", arg0);
-    }
-
-    /**
-     * Unsupported charset "{0}" in the received message''s Content-Type
-     *
-     */
-    public static String UNSUPPORTED_CHARSET(Object arg0) {
-        return localizer.localize(localizableUNSUPPORTED_CHARSET(arg0));
-    }
-
-    public static Localizable localizableSTATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
-        return messageFactory.getMessage("static.resource.injection.only", arg0, arg1);
-    }
-
-    /**
-     * Static resource {0} cannot be injected to non-static "{1}"
-     *
-     */
-    public static String STATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
-        return localizer.localize(localizableSTATIC_RESOURCE_INJECTION_ONLY(arg0, arg1));
-    }
-
-    public static Localizable localizableNOT_ZERO_PARAMETERS(Object arg0) {
-        return messageFactory.getMessage("not.zero.parameters", arg0);
-    }
-
-    /**
-     * Method "{0}" shouldn''t have any arguments
-     *
-     */
-    public static String NOT_ZERO_PARAMETERS(Object arg0) {
-        return localizer.localize(localizableNOT_ZERO_PARAMETERS(arg0));
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(arg0, arg1));
     }
 
     public static Localizable localizableDUPLICATE_PRIMARY_WSDL(Object arg0) {
-        return messageFactory.getMessage("duplicate.primary.wsdl", arg0);
+        return MESSAGE_FACTORY.getMessage("duplicate.primary.wsdl", arg0);
     }
 
     /**
@@ -625,59 +323,35 @@ public final class ServerMessages {
      *
      */
     public static String DUPLICATE_PRIMARY_WSDL(Object arg0) {
-        return localizer.localize(localizableDUPLICATE_PRIMARY_WSDL(arg0));
+        return LOCALIZER.localize(localizableDUPLICATE_PRIMARY_WSDL(arg0));
     }
 
-    public static Localizable localizableDUPLICATE_ABSTRACT_WSDL(Object arg0) {
-        return messageFactory.getMessage("duplicate.abstract.wsdl", arg0);
+    public static Localizable localizableGENERATE_NON_STANDARD_WSDL() {
+        return MESSAGE_FACTORY.getMessage("generate.non.standard.wsdl");
     }
 
     /**
-     * Metadata has more than one WSDL that has PortType definition for the endpoint. WSDL={0} is one such WSDL.
+     * Generating non-standard WSDL for the specified binding
      *
      */
-    public static String DUPLICATE_ABSTRACT_WSDL(Object arg0) {
-        return localizer.localize(localizableDUPLICATE_ABSTRACT_WSDL(arg0));
+    public static String GENERATE_NON_STANDARD_WSDL() {
+        return LOCALIZER.localize(localizableGENERATE_NON_STANDARD_WSDL());
     }
 
-    public static Localizable localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
-        return messageFactory.getMessage("stateful.invalid.webservice.context", arg0);
+    public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.missing.attribute.no.line");
     }
 
     /**
-     * Not a WebServiceContext from JAX-WS RI: {0}
+     * missing attribute "{2}" in element "{1}" of runtime descriptor
      *
      */
-    public static String STATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
-        return localizer.localize(localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(arg0));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("runtime.parser.invalidElement", arg0, arg1);
-    }
-
-    /**
-     * invalid element "{1}" in runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizableRUNTIME_PARSER_INVALID_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("runtime.parser.missing.attribute", arg0, arg1, arg2);
-    }
-
-    /**
-     * missing attribute "{2}" in element "{1}" of runtime descriptor (line {0})
-     *
-     */
-    public static String RUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(arg0, arg1, arg2));
+    public static String RUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE());
     }
 
     public static Localizable localizableWRONG_FIELD_TYPE(Object arg0) {
-        return messageFactory.getMessage("wrong.field.type", arg0);
+        return MESSAGE_FACTORY.getMessage("wrong.field.type", arg0);
     }
 
     /**
@@ -685,35 +359,11 @@ public final class ServerMessages {
      *
      */
     public static String WRONG_FIELD_TYPE(Object arg0) {
-        return localizer.localize(localizableWRONG_FIELD_TYPE(arg0));
-    }
-
-    public static Localizable localizableDUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
-        return messageFactory.getMessage("duplicate.portKnownHeader", arg0);
-    }
-
-    /**
-     * Received SOAP message contains duplicate header: {0} for a bound parameter
-     *
-     */
-    public static String DUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
-        return localizer.localize(localizableDUPLICATE_PORT_KNOWN_HEADER(arg0));
-    }
-
-    public static Localizable localizableUNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("unsupported.contentType", arg0, arg1);
-    }
-
-    /**
-     * Unsupported Content-Type: {0} Supported ones are: {1}
-     *
-     */
-    public static String UNSUPPORTED_CONTENT_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableUNSUPPORTED_CONTENT_TYPE(arg0, arg1));
+        return LOCALIZER.localize(localizableWRONG_FIELD_TYPE(arg0));
     }
 
     public static Localizable localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("failed.to.instantiate.instanceResolver", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("failed.to.instantiate.instanceResolver", arg0, arg1, arg2);
     }
 
     /**
@@ -721,19 +371,378 @@ public final class ServerMessages {
      *
      */
     public static String FAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableFAILED_TO_INSTANTIATE_INSTANCE_RESOLVER(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableDD_MTOM_CONFLICT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("dd.mtom.conflict", arg0, arg1);
+    public static Localizable localizablePROVIDER_NOT_PARAMETERIZED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("provider.not.parameterized", arg0);
     }
 
     /**
-     * Error in Deployment Descriptor : MTOM Configuration in binding {0} conflicts with enable-mtom attribute value {1}
+     * "{0}" implements Provider but doesn't specify the type parameter
      *
      */
-    public static String DD_MTOM_CONFLICT(Object arg0, Object arg1) {
-        return localizer.localize(localizableDD_MTOM_CONFLICT(arg0, arg1));
+    public static String PROVIDER_NOT_PARAMETERIZED(Object arg0) {
+        return LOCALIZER.localize(localizablePROVIDER_NOT_PARAMETERIZED(arg0));
+    }
+
+    public static Localizable localizableDISPATCH_CANNOT_FIND_METHOD(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("dispatch.cannotFindMethod", arg0);
+    }
+
+    /**
+     * Cannot find dispatch method for {0}
+     *
+     */
+    public static String DISPATCH_CANNOT_FIND_METHOD(Object arg0) {
+        return LOCALIZER.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wrong.element", arg0, arg1, arg2);
+    }
+
+    /**
+     * found element "{1}", expected "{2}" in runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableUNSUPPORTED_CHARSET(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("unsupported.charset", arg0);
+    }
+
+    /**
+     * Unsupported charset "{0}" in the received message''s Content-Type
+     *
+     */
+    public static String UNSUPPORTED_CHARSET(Object arg0) {
+        return LOCALIZER.localize(localizableUNSUPPORTED_CHARSET(arg0));
+    }
+
+    public static Localizable localizableSTATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("stateful.cookie.header.required", arg0);
+    }
+
+    /**
+     * This is a stateful web service and {0} header is required.
+     *
+     */
+    public static String STATEFUL_COOKIE_HEADER_REQUIRED(Object arg0) {
+        return LOCALIZER.localize(localizableSTATEFUL_COOKIE_HEADER_REQUIRED(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_WSDL_PATCHER() {
+        return MESSAGE_FACTORY.getMessage("runtime.wsdl.patcher");
+    }
+
+    /**
+     * error while patching WSDL related document
+     *
+     */
+    public static String RUNTIME_WSDL_PATCHER() {
+        return LOCALIZER.localize(localizableRUNTIME_WSDL_PATCHER());
+    }
+
+    public static Localizable localizableSTATEFUL_REQURES_ADDRESSING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("stateful.requres.addressing", arg0);
+    }
+
+    /**
+     * Stateful web service {0} requires the WS-Addressing support to be enabled. Perhaps you are missing @Addressing
+     *
+     */
+    public static String STATEFUL_REQURES_ADDRESSING(Object arg0) {
+        return LOCALIZER.localize(localizableSTATEFUL_REQURES_ADDRESSING(arg0));
+    }
+
+    public static Localizable localizableNON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("non.unique.dispatch.qname", arg0, arg1);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. Methods {0} have the same request body block {1}. Method dispatching may fail, runtime will try to dispatch using SOAPAction. Another option is to enable AddressingFeature to enabled runtime to uniquely identify WSDL operation using wsa:Action header.
+     *
+     */
+    public static String NON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableNON_UNIQUE_DISPATCH_QNAME(arg0, arg1));
+    }
+
+    public static Localizable localizableALREADY_HTTP_SERVER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("already.http.server", arg0);
+    }
+
+    /**
+     * There is already a HTTP server at : {0}# {0} - probably URL/port of a server
+     *
+     */
+    public static String ALREADY_HTTP_SERVER(Object arg0) {
+        return LOCALIZER.localize(localizableALREADY_HTTP_SERVER(arg0));
+    }
+
+    public static Localizable localizableWRONG_NO_PARAMETERS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wrong.no.parameters", arg0);
+    }
+
+    /**
+     * Incorrect no of arguments for method "{0}"
+     *
+     */
+    public static String WRONG_NO_PARAMETERS(Object arg0) {
+        return LOCALIZER.localize(localizableWRONG_NO_PARAMETERS(arg0));
+    }
+
+    public static Localizable localizableNOT_ZERO_PARAMETERS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("not.zero.parameters", arg0);
+    }
+
+    /**
+     * Method "{0}" shouldn''t have any arguments
+     *
+     */
+    public static String NOT_ZERO_PARAMETERS(Object arg0) {
+        return LOCALIZER.localize(localizableNOT_ZERO_PARAMETERS(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.invalidAttributeValue", arg0, arg1, arg2);
+    }
+
+    /**
+     * invalid value for attribute "{2}" of element "{1}" in runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ATTRIBUTE_VALUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.missing.attribute", arg0, arg1, arg2);
+    }
+
+    /**
+     * missing attribute "{2}" in element "{1}" of runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_MISSING_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_MISSING_ATTRIBUTE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.unexpectedContent", arg0);
+    }
+
+    /**
+     * unexpected content in runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_UNEXPECTED_CONTENT(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_UNEXPECTED_CONTENT(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.classNotFound", arg0);
+    }
+
+    /**
+     * class not found in runtime descriptor: {0}
+     *
+     */
+    public static String RUNTIME_PARSER_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("stateful.invalid.webservice.context", arg0);
+    }
+
+    /**
+     * Not a WebServiceContext from JAX-WS RI: {0}
+     *
+     */
+    public static String STATEFUL_INVALID_WEBSERVICE_CONTEXT(Object arg0) {
+        return LOCALIZER.localize(localizableSTATEFUL_INVALID_WEBSERVICE_CONTEXT(arg0));
+    }
+
+    public static Localizable localizableNO_CURRENT_PACKET() {
+        return MESSAGE_FACTORY.getMessage("no.current.packet");
+    }
+
+    /**
+     * This thread is not currently processing any web service request.
+     *
+     */
+    public static String NO_CURRENT_PACKET() {
+        return LOCALIZER.localize(localizableNO_CURRENT_PACKET());
+    }
+
+    public static Localizable localizableDUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("duplicate.portKnownHeader", arg0);
+    }
+
+    /**
+     * Received SOAP message contains duplicate header: {0} for a bound parameter
+     *
+     */
+    public static String DUPLICATE_PORT_KNOWN_HEADER(Object arg0) {
+        return LOCALIZER.localize(localizableDUPLICATE_PORT_KNOWN_HEADER(arg0));
+    }
+
+    public static Localizable localizableSTATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("static.resource.injection.only", arg0, arg1);
+    }
+
+    /**
+     * Static resource {0} cannot be injected to non-static "{1}"
+     *
+     */
+    public static String STATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableSTATIC_RESOURCE_INJECTION_ONLY(arg0, arg1));
+    }
+
+    public static Localizable localizableCAN_NOT_GENERATE_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("can.not.generate.wsdl", arg0);
+    }
+
+    /**
+     * Cannot generate WSDL for binding "{0}"
+     *
+     */
+    public static String CAN_NOT_GENERATE_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizableCAN_NOT_GENERATE_WSDL(arg0));
+    }
+
+    public static Localizable localizableALREADY_HTTPS_SERVER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("already.https.server", arg0);
+    }
+
+    /**
+     * There is already a HTTPS server at : {0}
+     *
+     */
+    public static String ALREADY_HTTPS_SERVER(Object arg0) {
+        return LOCALIZER.localize(localizableALREADY_HTTPS_SERVER(arg0));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.invalidElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element "{1}" in runtime descriptor (line {0})
+     *
+     */
+    public static String RUNTIME_PARSER_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_INVALID_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl.multiplebinding", arg0, arg1, arg2);
+    }
+
+    /**
+     * multiple bindings found for binding ID {0} for service {1} in WSDL {2}
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_MULTIPLEBINDING(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("runtimemodeler.invalidannotationOnImpl", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid annotation: {0} on endpoint implementation class "{1}" - will be ignored. "{1}" is annotated with @WebService(endpointInterface="{2}"}, it must not be annotated with {0}, to fix it - put this annotation on the SEI {2}.
+     *
+     */
+    public static String RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizablePROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("provider.invalid.parameterType", arg0, arg1);
+    }
+
+    /**
+     * "{0}" implements Provider but its type parameter {1} is incorrect
+     *
+     */
+    public static String PROVIDER_INVALID_PARAMETER_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePROVIDER_INVALID_PARAMETER_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableRUNTIME_PARSER_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("runtime.parser.wsdl", arg0);
+    }
+
+    /**
+     * exception during WSDL parsing: {0}
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizableRUNTIME_PARSER_WSDL(arg0));
+    }
+
+    public static Localizable localizableNO_CONTENT_TYPE() {
+        return MESSAGE_FACTORY.getMessage("no.contentType");
+    }
+
+    /**
+     * Request doesn't have a Content-Type
+     *
+     */
+    public static String NO_CONTENT_TYPE() {
+        return LOCALIZER.localize(localizableNO_CONTENT_TYPE());
+    }
+
+    public static Localizable localizableNOT_IMPLEMENT_PROVIDER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("not.implement.provider", arg0);
+    }
+
+    /**
+     * "{0}" doesn't implement Provider
+     *
+     */
+    public static String NOT_IMPLEMENT_PROVIDER(Object arg0) {
+        return LOCALIZER.localize(localizableNOT_IMPLEMENT_PROVIDER(arg0));
+    }
+
+    public static Localizable localizableSOAPDECODER_ERR() {
+        return MESSAGE_FACTORY.getMessage("soapdecoder.err");
+    }
+
+    /**
+     * Error in decoding SOAP Message
+     *
+     */
+    public static String SOAPDECODER_ERR() {
+        return LOCALIZER.localize(localizableSOAPDECODER_ERR());
+    }
+
+    public static Localizable localizablePORT_NAME_REQUIRED() {
+        return MESSAGE_FACTORY.getMessage("port.name.required");
+    }
+
+    /**
+     * Port QName is not found
+     *
+     */
+    public static String PORT_NAME_REQUIRED() {
+        return LOCALIZER.localize(localizablePORT_NAME_REQUIRED());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java
index 2710db48539..961660cb6be 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class SoapMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.soap";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, SoapMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.soap";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new SoapMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableSOAP_FAULT_CREATE_ERR(Object arg0) {
-        return messageFactory.getMessage("soap.fault.create.err", arg0);
+        return MESSAGE_FACTORY.getMessage("soap.fault.create.err", arg0);
     }
 
     /**
@@ -56,47 +54,11 @@ public final class SoapMessages {
      *
      */
     public static String SOAP_FAULT_CREATE_ERR(Object arg0) {
-        return localizer.localize(localizableSOAP_FAULT_CREATE_ERR(arg0));
-    }
-
-    public static Localizable localizableSOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
-        return messageFactory.getMessage("soap.msg.factory.create.err", arg0);
-    }
-
-    /**
-     * Couldn''t create SOAP message factory due to exception: {0}
-     *
-     */
-    public static String SOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
-        return localizer.localize(localizableSOAP_MSG_FACTORY_CREATE_ERR(arg0));
-    }
-
-    public static Localizable localizableSOAP_MSG_CREATE_ERR(Object arg0) {
-        return messageFactory.getMessage("soap.msg.create.err", arg0);
-    }
-
-    /**
-     * Couldn''t create SOAP message due to exception: {0}
-     *
-     */
-    public static String SOAP_MSG_CREATE_ERR(Object arg0) {
-        return localizer.localize(localizableSOAP_MSG_CREATE_ERR(arg0));
-    }
-
-    public static Localizable localizableSOAP_FACTORY_CREATE_ERR(Object arg0) {
-        return messageFactory.getMessage("soap.factory.create.err", arg0);
-    }
-
-    /**
-     * Couldn''t create SOAP factory due to exception: {0}
-     *
-     */
-    public static String SOAP_FACTORY_CREATE_ERR(Object arg0) {
-        return localizer.localize(localizableSOAP_FACTORY_CREATE_ERR(arg0));
+        return LOCALIZER.localize(localizableSOAP_FAULT_CREATE_ERR(arg0));
     }
 
     public static Localizable localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
-        return messageFactory.getMessage("soap.protocol.invalidFaultCode", arg0);
+        return MESSAGE_FACTORY.getMessage("soap.protocol.invalidFaultCode", arg0);
     }
 
     /**
@@ -104,11 +66,11 @@ public final class SoapMessages {
      *
      */
     public static String SOAP_PROTOCOL_INVALID_FAULT_CODE(Object arg0) {
-        return localizer.localize(localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(arg0));
+        return LOCALIZER.localize(localizableSOAP_PROTOCOL_INVALID_FAULT_CODE(arg0));
     }
 
     public static Localizable localizableSOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("soap.version.mismatch.err", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("soap.version.mismatch.err", arg0, arg1);
     }
 
     /**
@@ -116,7 +78,54 @@ public final class SoapMessages {
      *
      */
     public static String SOAP_VERSION_MISMATCH_ERR(Object arg0, Object arg1) {
-        return localizer.localize(localizableSOAP_VERSION_MISMATCH_ERR(arg0, arg1));
+        return LOCALIZER.localize(localizableSOAP_VERSION_MISMATCH_ERR(arg0, arg1));
+    }
+
+    public static Localizable localizableSOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("soap.msg.factory.create.err", arg0);
+    }
+
+    /**
+     * Couldn''t create SOAP message factory due to exception: {0}
+     *
+     */
+    public static String SOAP_MSG_FACTORY_CREATE_ERR(Object arg0) {
+        return LOCALIZER.localize(localizableSOAP_MSG_FACTORY_CREATE_ERR(arg0));
+    }
+
+    public static Localizable localizableSOAP_MSG_CREATE_ERR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("soap.msg.create.err", arg0);
+    }
+
+    /**
+     * Couldn''t create SOAP message due to exception: {0}
+     *
+     */
+    public static String SOAP_MSG_CREATE_ERR(Object arg0) {
+        return LOCALIZER.localize(localizableSOAP_MSG_CREATE_ERR(arg0));
+    }
+
+    public static Localizable localizableSOAP_FACTORY_CREATE_ERR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("soap.factory.create.err", arg0);
+    }
+
+    /**
+     * Couldn''t create SOAP factory due to exception: {0}
+     *
+     */
+    public static String SOAP_FACTORY_CREATE_ERR(Object arg0) {
+        return LOCALIZER.localize(localizableSOAP_FACTORY_CREATE_ERR(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java
index 65ce3fefe26..da66bb6465e 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,258 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class StreamingMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.streaming";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, StreamingMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableFASTINFOSET_DECODING_NOT_ACCEPTED() {
-        return messageFactory.getMessage("fastinfoset.decodingNotAccepted");
-    }
-
-    /**
-     * Fast Infoset decoding is not accepted
-     *
-     */
-    public static String FASTINFOSET_DECODING_NOT_ACCEPTED() {
-        return localizer.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
-    }
-
-    public static Localizable localizableSTAX_CANT_CREATE() {
-        return messageFactory.getMessage("stax.cantCreate");
-    }
-
-    /**
-     * Unable to create StAX reader or writer
-     *
-     */
-    public static String STAX_CANT_CREATE() {
-        return localizer.localize(localizableSTAX_CANT_CREATE());
-    }
-
-    public static Localizable localizableSTREAMING_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("streaming.ioException", arg0);
-    }
-
-    /**
-     * XML parsing error: {0}
-     *
-     */
-    public static String STREAMING_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
-        return messageFactory.getMessage("sourcereader.invalidSource", arg0);
-    }
-
-    /**
-     * Unable to create reader from source "{0}"
-     *
-     */
-    public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
-        return localizer.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("xmlreader.unexpectedState", arg0, arg1);
-    }
-
-    /**
-     * unexpected XML reader state. expected: {0} but found: {1}
-     *
-     */
-    public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
-    }
-
-    public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
-        return messageFactory.getMessage("woodstox.cant.load", arg0);
-    }
-
-    /**
-     * Unable to load Woodstox class {0}
-     *
-     */
-    public static String WOODSTOX_CANT_LOAD(Object arg0) {
-        return localizer.localize(localizableWOODSTOX_CANT_LOAD(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlreader.ioException", arg0);
-    }
-
-    /**
-     * XML reader error: {0}
-     *
-     */
-    public static String XMLREADER_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
-        return messageFactory.getMessage("fastinfoset.noImplementation");
-    }
-
-    /**
-     * Unable to locate compatible implementation of Fast Infoset in classpath
-     *
-     */
-    public static String FASTINFOSET_NO_IMPLEMENTATION() {
-        return localizer.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
-    }
-
-    public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
-    }
-
-    /**
-     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
-     *
-     */
-    public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.ioException", arg0);
-    }
-
-    /**
-     * XML writer error: {0}
-     *
-     */
-    public static String XMLWRITER_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
-        return messageFactory.getMessage("xmlreader.unexpectedCharacterContent", arg0);
-    }
-
-    /**
-     * XML reader error: unexpected character content: "{0}"
-     *
-     */
-    public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
-    }
-
-    public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("streaming.parseException", arg0);
-    }
-
-    /**
-     * XML parsing error: {0}
-     *
-     */
-    public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.noPrefixForURI", arg0);
-    }
-
-    /**
-     * XML writer error: no prefix for URI: "{0}"
-     *
-     */
-    public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("xmlreader.nestedError", arg0);
-    }
-
-    /**
-     * XML reader error: {0}
-     *
-     */
-    public static String XMLREADER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableXMLREADER_NESTED_ERROR(arg0));
-    }
-
-    public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("invalid.property.value.long", arg0, arg1, arg2);
-    }
-
-    /**
-     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
-     *
-     */
-    public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
-        return messageFactory.getMessage("staxreader.xmlstreamexception", arg0);
-    }
-
-    /**
-     * XML stream reader exception: {0}
-     *
-     */
-    public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
-        return localizer.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
-    }
-
-    public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
-        return messageFactory.getMessage("xmlwriter.nestedError", arg0);
-    }
-
-    /**
-     * XML writer error: {0}
-     *
-     */
-    public static String XMLWRITER_NESTED_ERROR(Object arg0) {
-        return localizer.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
-        return messageFactory.getMessage("xmlreader.illegalStateEncountered", arg0);
-    }
-
-    /**
-     * XML reader internal error: illegal state ({0})
-     *
-     */
-    public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
-        return localizer.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
-    }
-
-    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
-        return messageFactory.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
-    }
-
-    /**
-     * unexpected XML tag. expected: {0} but found: {1}
-     *
-     */
-    public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new StreamingMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.message", arg0, arg1, arg2);
     }
 
     /**
@@ -284,23 +54,11 @@ public final class StreamingMessages {
      *
      */
     public static String XMLREADER_UNEXPECTED_STATE_MESSAGE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableXMLREADER_PARSE_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("xmlreader.parseException", arg0);
-    }
-
-    /**
-     * XML parsing error: {0}
-     *
-     */
-    public static String XMLREADER_PARSE_EXCEPTION(Object arg0) {
-        return localizer.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE_MESSAGE(arg0, arg1, arg2));
     }
 
     public static Localizable localizableXMLRECORDER_RECORDING_ENDED() {
-        return messageFactory.getMessage("xmlrecorder.recording.ended");
+        return MESSAGE_FACTORY.getMessage("xmlrecorder.recording.ended");
     }
 
     /**
@@ -308,7 +66,258 @@ public final class StreamingMessages {
      *
      */
     public static String XMLRECORDER_RECORDING_ENDED() {
-        return localizer.localize(localizableXMLRECORDER_RECORDING_ENDED());
+        return LOCALIZER.localize(localizableXMLRECORDER_RECORDING_ENDED());
+    }
+
+    public static Localizable localizableXMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState.tag", arg0, arg1);
+    }
+
+    /**
+     * unexpected XML tag. expected: {0} but found: {1}
+     *
+     */
+    public static String XMLREADER_UNEXPECTED_STATE_TAG(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE_TAG(arg0, arg1));
+    }
+
+    public static Localizable localizableFASTINFOSET_NO_IMPLEMENTATION() {
+        return MESSAGE_FACTORY.getMessage("fastinfoset.noImplementation");
+    }
+
+    /**
+     * Unable to locate compatible implementation of Fast Infoset in classpath
+     *
+     */
+    public static String FASTINFOSET_NO_IMPLEMENTATION() {
+        return LOCALIZER.localize(localizableFASTINFOSET_NO_IMPLEMENTATION());
+    }
+
+    public static Localizable localizableXMLREADER_NESTED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.nestedError", arg0);
+    }
+
+    /**
+     * XML reader error: {0}
+     *
+     */
+    public static String XMLREADER_NESTED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_NESTED_ERROR(arg0));
+    }
+
+    public static Localizable localizableWOODSTOX_CANT_LOAD(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("woodstox.cant.load", arg0);
+    }
+
+    /**
+     * Unable to load Woodstox class {0}
+     *
+     */
+    public static String WOODSTOX_CANT_LOAD(Object arg0) {
+        return LOCALIZER.localize(localizableWOODSTOX_CANT_LOAD(arg0));
+    }
+
+    public static Localizable localizableSOURCEREADER_INVALID_SOURCE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sourcereader.invalidSource", arg0);
+    }
+
+    /**
+     * Unable to create reader from source "{0}"
+     *
+     */
+    public static String SOURCEREADER_INVALID_SOURCE(Object arg0) {
+        return LOCALIZER.localize(localizableSOURCEREADER_INVALID_SOURCE(arg0));
+    }
+
+    public static Localizable localizableINVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("invalid.property.value.integer", arg0, arg1, arg2);
+    }
+
+    /**
+     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid integer. Using default value "{2}".
+     *
+     */
+    public static String INVALID_PROPERTY_VALUE_INTEGER(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableINVALID_PROPERTY_VALUE_INTEGER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableXMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.noPrefixForURI", arg0);
+    }
+
+    /**
+     * XML writer error: no prefix for URI: "{0}"
+     *
+     */
+    public static String XMLWRITER_NO_PREFIX_FOR_URI(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_NO_PREFIX_FOR_URI(arg0));
+    }
+
+    public static Localizable localizableSTREAMING_PARSE_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("streaming.parseException", arg0);
+    }
+
+    /**
+     * XML parsing error: {0}
+     *
+     */
+    public static String STREAMING_PARSE_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTREAMING_PARSE_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableXMLREADER_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.ioException", arg0);
+    }
+
+    /**
+     * XML reader error: {0}
+     *
+     */
+    public static String XMLREADER_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_IO_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableFASTINFOSET_DECODING_NOT_ACCEPTED() {
+        return MESSAGE_FACTORY.getMessage("fastinfoset.decodingNotAccepted");
+    }
+
+    /**
+     * Fast Infoset decoding is not accepted
+     *
+     */
+    public static String FASTINFOSET_DECODING_NOT_ACCEPTED() {
+        return LOCALIZER.localize(localizableFASTINFOSET_DECODING_NOT_ACCEPTED());
+    }
+
+    public static Localizable localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.illegalStateEncountered", arg0);
+    }
+
+    /**
+     * XML reader internal error: illegal state ({0})
+     *
+     */
+    public static String XMLREADER_ILLEGAL_STATE_ENCOUNTERED(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_ILLEGAL_STATE_ENCOUNTERED(arg0));
+    }
+
+    public static Localizable localizableSTAX_CANT_CREATE() {
+        return MESSAGE_FACTORY.getMessage("stax.cantCreate");
+    }
+
+    /**
+     * Unable to create StAX reader or writer
+     *
+     */
+    public static String STAX_CANT_CREATE() {
+        return LOCALIZER.localize(localizableSTAX_CANT_CREATE());
+    }
+
+    public static Localizable localizableSTAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("staxreader.xmlstreamexception", arg0);
+    }
+
+    /**
+     * XML stream reader exception: {0}
+     *
+     */
+    public static String STAXREADER_XMLSTREAMEXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTAXREADER_XMLSTREAMEXCEPTION(arg0));
+    }
+
+    public static Localizable localizableXMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedState", arg0, arg1);
+    }
+
+    /**
+     * unexpected XML reader state. expected: {0} but found: {1}
+     *
+     */
+    public static String XMLREADER_UNEXPECTED_STATE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_STATE(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("invalid.property.value.long", arg0, arg1, arg2);
+    }
+
+    /**
+     * Ignoring system property "{0}" as value "{1}" is invalid, property value must be a valid long. Using default value "{2}".
+     *
+     */
+    public static String INVALID_PROPERTY_VALUE_LONG(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableINVALID_PROPERTY_VALUE_LONG(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableSTREAMING_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("streaming.ioException", arg0);
+    }
+
+    /**
+     * XML parsing error: {0}
+     *
+     */
+    public static String STREAMING_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableSTREAMING_IO_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.unexpectedCharacterContent", arg0);
+    }
+
+    /**
+     * XML reader error: unexpected character content: "{0}"
+     *
+     */
+    public static String XMLREADER_UNEXPECTED_CHARACTER_CONTENT(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_UNEXPECTED_CHARACTER_CONTENT(arg0));
+    }
+
+    public static Localizable localizableXMLWRITER_NESTED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.nestedError", arg0);
+    }
+
+    /**
+     * XML writer error: {0}
+     *
+     */
+    public static String XMLWRITER_NESTED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_NESTED_ERROR(arg0));
+    }
+
+    public static Localizable localizableXMLWRITER_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlwriter.ioException", arg0);
+    }
+
+    /**
+     * XML writer error: {0}
+     *
+     */
+    public static String XMLWRITER_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLWRITER_IO_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableXMLREADER_PARSE_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xmlreader.parseException", arg0);
+    }
+
+    /**
+     * XML parsing error: {0}
+     *
+     */
+    public static String XMLREADER_PARSE_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizableXMLREADER_PARSE_EXCEPTION(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java
index e1842a79f19..ab5786c75ee 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,90 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class TubelineassemblyMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.tubelineassembly";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, TubelineassemblyMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE", arg0, arg1);
-    }
-
-    /**
-     * MASM0019: Illegal logging level value "{1}" stored in the {0} message logging system property. Using default logging level.
-     *
-     */
-    public static String MASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(arg0, arg1));
-    }
-
-    public static Localizable localizableMASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
-        return messageFactory.getMessage("MASM0009_CANNOT_FORM_VALID_URL", arg0);
-    }
-
-    /**
-     * MASM0009: Cannot form a valid URL from the resource name "{0}". For more details see the nested exception.
-     *
-     */
-    public static String MASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
-        return localizer.localize(localizableMASM_0009_CANNOT_FORM_VALID_URL(arg0));
-    }
-
-    public static Localizable localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
-        return messageFactory.getMessage("MASM0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE", arg0);
-    }
-
-    /**
-     * MASM0005: No default tubeline is defined in the default [ {0} ] configuration file
-     *
-     */
-    public static String MASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
-        return localizer.localize(localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(arg0));
-    }
-
-    public static Localizable localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
-        return messageFactory.getMessage("MASM0003_DEFAULT_CFG_FILE_NOT_LOADED", arg0);
-    }
-
-    /**
-     * MASM0003: Default [ {0} ] configuration file was not loaded
-     *
-     */
-    public static String MASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
-        return localizer.localize(localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(arg0));
-    }
-
-    public static Localizable localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE", arg0, arg1);
-    }
-
-    /**
-     * MASM0018: Message logging {0} system property detected to be set to value {1}
-     *
-     */
-    public static String MASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new TubelineassemblyMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("MASM0001_DEFAULT_CFG_FILE_NOT_FOUND", arg0);
+        return MESSAGE_FACTORY.getMessage("MASM0001_DEFAULT_CFG_FILE_NOT_FOUND", arg0);
     }
 
     /**
@@ -116,155 +54,11 @@ public final class TubelineassemblyMessages {
      *
      */
     public static String MASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
-        return messageFactory.getMessage("MASM0020_ERROR_CREATING_URI_FROM_GENERATED_STRING", arg0);
-    }
-
-    /**
-     * MASM0020: Unable to create a new URI instance for generated endpoint URI string [ {0} ]
-     *
-     */
-    public static String MASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
-        return localizer.localize(localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(arg0));
-    }
-
-    public static Localizable localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
-        return messageFactory.getMessage("MASM0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY", arg0);
-    }
-
-    /**
-     * MASM0016: Unable to instantiate Tube factory class [ {0} ]
-     *
-     */
-    public static String MASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
-        return localizer.localize(localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(arg0));
-    }
-
-    public static Localizable localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0012_LOADING_VIA_SERVLET_CONTEXT", arg0, arg1);
-    }
-
-    /**
-     * MASM0012: Trying to load [ {0} ] via servlet context [ {1} ]
-     *
-     */
-    public static String MASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(arg0, arg1));
-    }
-
-    public static Localizable localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
-        return messageFactory.getMessage("MASM0010_ERROR_READING_CFG_FILE_FROM_LOCATION", arg0);
-    }
-
-    /**
-     * MASM0010: Unable to unmarshall metro config file from location [ {0} ]
-     *
-     */
-    public static String MASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
-        return localizer.localize(localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(arg0));
-    }
-
-    public static Localizable localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
-        return messageFactory.getMessage("MASM0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE", arg0);
-    }
-
-    /**
-     * MASM0004: No <tubelines> section found in the default [ {0} ] configuration file
-     *
-     */
-    public static String MASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
-        return localizer.localize(localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(arg0));
-    }
-
-    public static Localizable localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
-        return messageFactory.getMessage("MASM0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD", arg0);
-    }
-
-    /**
-     * MASM0013: Unable to invoke {0} method on servlet context instance
-     *
-     */
-    public static String MASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
-        return localizer.localize(localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(arg0));
-    }
-
-    public static Localizable localizableMASM_0007_APP_CFG_FILE_NOT_FOUND() {
-        return messageFactory.getMessage("MASM0007_APP_CFG_FILE_NOT_FOUND");
-    }
-
-    /**
-     * MASM0007: No application metro.xml configuration file found.
-     *
-     */
-    public static String MASM_0007_APP_CFG_FILE_NOT_FOUND() {
-        return localizer.localize(localizableMASM_0007_APP_CFG_FILE_NOT_FOUND());
-    }
-
-    public static Localizable localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0002_DEFAULT_CFG_FILE_LOCATED", arg0, arg1);
-    }
-
-    /**
-     * MASM0002: Default [ {0} ] configuration file located at [ {1} ]
-     *
-     */
-    public static String MASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(arg0, arg1));
-    }
-
-    public static Localizable localizableMASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
-        return messageFactory.getMessage("MASM0014_UNABLE_TO_LOAD_CLASS", arg0);
-    }
-
-    /**
-     * MASM0014: Unable to load [ {0} ] class
-     *
-     */
-    public static String MASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
-        return localizer.localize(localizableMASM_0014_UNABLE_TO_LOAD_CLASS(arg0));
-    }
-
-    public static Localizable localizableMASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
-        return messageFactory.getMessage("MASM0006_APP_CFG_FILE_LOCATED", arg0);
-    }
-
-    /**
-     * MASM0006: Application metro.xml configuration file located at [ {0} ]
-     *
-     */
-    public static String MASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
-        return localizer.localize(localizableMASM_0006_APP_CFG_FILE_LOCATED(arg0));
-    }
-
-    public static Localizable localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
-        return messageFactory.getMessage("MASM0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS", arg0);
-    }
-
-    /**
-     * MASM0017: Unable to load Tube factory class [ {0} ]
-     *
-     */
-    public static String MASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
-        return localizer.localize(localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(arg0));
-    }
-
-    public static Localizable localizableMASM_0008_INVALID_URI_REFERENCE(Object arg0) {
-        return messageFactory.getMessage("MASM0008_INVALID_URI_REFERENCE", arg0);
-    }
-
-    /**
-     * MASM0008: Invalid URI reference [ {0} ]
-     *
-     */
-    public static String MASM_0008_INVALID_URI_REFERENCE(Object arg0) {
-        return localizer.localize(localizableMASM_0008_INVALID_URI_REFERENCE(arg0));
+        return LOCALIZER.localize(localizableMASM_0001_DEFAULT_CFG_FILE_NOT_FOUND(arg0));
     }
 
     public static Localizable localizableMASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0011_LOADING_RESOURCE", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("MASM0011_LOADING_RESOURCE", arg0, arg1);
     }
 
     /**
@@ -272,11 +66,95 @@ public final class TubelineassemblyMessages {
      *
      */
     public static String MASM_0011_LOADING_RESOURCE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0011_LOADING_RESOURCE(arg0, arg1));
+        return LOCALIZER.localize(localizableMASM_0011_LOADING_RESOURCE(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("MASM0012_LOADING_VIA_SERVLET_CONTEXT", arg0, arg1);
+    }
+
+    /**
+     * MASM0012: Trying to load [ {0} ] via servlet context [ {1} ]
+     *
+     */
+    public static String MASM_0012_LOADING_VIA_SERVLET_CONTEXT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMASM_0012_LOADING_VIA_SERVLET_CONTEXT(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("MASM0002_DEFAULT_CFG_FILE_LOCATED", arg0, arg1);
+    }
+
+    /**
+     * MASM0002: Default [ {0} ] configuration file located at [ {1} ]
+     *
+     */
+    public static String MASM_0002_DEFAULT_CFG_FILE_LOCATED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMASM_0002_DEFAULT_CFG_FILE_LOCATED(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0007_APP_CFG_FILE_NOT_FOUND() {
+        return MESSAGE_FACTORY.getMessage("MASM0007_APP_CFG_FILE_NOT_FOUND");
+    }
+
+    /**
+     * MASM0007: No application metro.xml configuration file found.
+     *
+     */
+    public static String MASM_0007_APP_CFG_FILE_NOT_FOUND() {
+        return LOCALIZER.localize(localizableMASM_0007_APP_CFG_FILE_NOT_FOUND());
+    }
+
+    public static Localizable localizableMASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0006_APP_CFG_FILE_LOCATED", arg0);
+    }
+
+    /**
+     * MASM0006: Application metro.xml configuration file located at [ {0} ]
+     *
+     */
+    public static String MASM_0006_APP_CFG_FILE_LOCATED(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0006_APP_CFG_FILE_LOCATED(arg0));
+    }
+
+    public static Localizable localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("MASM0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE", arg0, arg1);
+    }
+
+    /**
+     * MASM0018: Message logging {0} system property detected to be set to value {1}
+     *
+     */
+    public static String MASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMASM_0018_MSG_LOGGING_SYSTEM_PROPERTY_SET_TO_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0003_DEFAULT_CFG_FILE_NOT_LOADED", arg0);
+    }
+
+    /**
+     * MASM0003: Default [ {0} ] configuration file was not loaded
+     *
+     */
+    public static String MASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0003_DEFAULT_CFG_FILE_NOT_LOADED(arg0));
+    }
+
+    public static Localizable localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE", arg0);
+    }
+
+    /**
+     * MASM0004: No <tubelines> section found in the default [ {0} ] configuration file
+     *
+     */
+    public static String MASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0004_NO_TUBELINES_SECTION_IN_DEFAULT_CFG_FILE(arg0));
     }
 
     public static Localizable localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("MASM0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("MASM0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE", arg0, arg1);
     }
 
     /**
@@ -284,7 +162,138 @@ public final class TubelineassemblyMessages {
      *
      */
     public static String MASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(arg0, arg1));
+        return LOCALIZER.localize(localizableMASM_0015_CLASS_DOES_NOT_IMPLEMENT_INTERFACE(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0020_ERROR_CREATING_URI_FROM_GENERATED_STRING", arg0);
+    }
+
+    /**
+     * MASM0020: Unable to create a new URI instance for generated endpoint URI string [ {0} ]
+     *
+     */
+    public static String MASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0020_ERROR_CREATING_URI_FROM_GENERATED_STRING(arg0));
+    }
+
+    public static Localizable localizableMASM_0008_INVALID_URI_REFERENCE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0008_INVALID_URI_REFERENCE", arg0);
+    }
+
+    /**
+     * MASM0008: Invalid URI reference [ {0} ]
+     *
+     */
+    public static String MASM_0008_INVALID_URI_REFERENCE(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0008_INVALID_URI_REFERENCE(arg0));
+    }
+
+    public static Localizable localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY", arg0);
+    }
+
+    /**
+     * MASM0016: Unable to instantiate Tube factory class [ {0} ]
+     *
+     */
+    public static String MASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0016_UNABLE_TO_INSTANTIATE_TUBE_FACTORY(arg0));
+    }
+
+    public static Localizable localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0010_ERROR_READING_CFG_FILE_FROM_LOCATION", arg0);
+    }
+
+    /**
+     * MASM0010: Unable to unmarshall metro config file from location [ {0} ]
+     *
+     */
+    public static String MASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0010_ERROR_READING_CFG_FILE_FROM_LOCATION(arg0));
+    }
+
+    public static Localizable localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE", arg0);
+    }
+
+    /**
+     * MASM0005: No default tubeline is defined in the default [ {0} ] configuration file
+     *
+     */
+    public static String MASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0005_NO_DEFAULT_TUBELINE_IN_DEFAULT_CFG_FILE(arg0));
+    }
+
+    public static Localizable localizableMASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0014_UNABLE_TO_LOAD_CLASS", arg0);
+    }
+
+    /**
+     * MASM0014: Unable to load [ {0} ] class
+     *
+     */
+    public static String MASM_0014_UNABLE_TO_LOAD_CLASS(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0014_UNABLE_TO_LOAD_CLASS(arg0));
+    }
+
+    public static Localizable localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD", arg0);
+    }
+
+    /**
+     * MASM0013: Unable to invoke {0} method on servlet context instance
+     *
+     */
+    public static String MASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0013_ERROR_INVOKING_SERVLET_CONTEXT_METHOD(arg0));
+    }
+
+    public static Localizable localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("MASM0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE", arg0, arg1);
+    }
+
+    /**
+     * MASM0019: Illegal logging level value "{1}" stored in the {0} message logging system property. Using default logging level.
+     *
+     */
+    public static String MASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMASM_0019_MSG_LOGGING_SYSTEM_PROPERTY_ILLEGAL_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0009_CANNOT_FORM_VALID_URL", arg0);
+    }
+
+    /**
+     * MASM0009: Cannot form a valid URL from the resource name "{0}". For more details see the nested exception.
+     *
+     */
+    public static String MASM_0009_CANNOT_FORM_VALID_URL(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0009_CANNOT_FORM_VALID_URL(arg0));
+    }
+
+    public static Localizable localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("MASM0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS", arg0);
+    }
+
+    /**
+     * MASM0017: Unable to load Tube factory class [ {0} ]
+     *
+     */
+    public static String MASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(Object arg0) {
+        return LOCALIZER.localize(localizableMASM_0017_UNABLE_TO_LOAD_TUBE_FACTORY_CLASS(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java
index d62c0d8ffa7..574ad6f8ab8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,114 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class UtilMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.util";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, UtilMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableUTIL_LOCATION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("util.location", arg0, arg1);
-    }
-
-    /**
-     * at line {0} of {1}
-     *
-     */
-    public static String UTIL_LOCATION(Object arg0, Object arg1) {
-        return localizer.localize(localizableUTIL_LOCATION(arg0, arg1));
-    }
-
-    public static Localizable localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("util.failed.to.parse.handlerchain.file", arg0, arg1);
-    }
-
-    /**
-     * Could not parse handler chain file {1} for class {0}
-     *
-     */
-    public static String UTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
-    }
-
-    public static Localizable localizableUTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("util.parser.wrong.element", arg0, arg1, arg2);
-    }
-
-    /**
-     * found element "{1}", expected "{2}" in handler chain configuration (line {0})
-     *
-     */
-    public static String UTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableUTIL_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableUTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("util.handler.class.not.found", arg0);
-    }
-
-    /**
-     * "Class: {0} could not be found"
-     *
-     */
-    public static String UTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableUTIL_HANDLER_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
-        return messageFactory.getMessage("util.handler.endpoint.interface.no.webservice", arg0);
-    }
-
-    /**
-     * "The Endpoint Interface: {0} does not have WebService Annotation"
-     *
-     */
-    public static String UTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
-        return localizer.localize(localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
-    }
-
-    public static Localizable localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("util.handler.no.webservice.annotation", arg0);
-    }
-
-    /**
-     * "A WebService annotation is not present on class: {0}"
-     *
-     */
-    public static String UTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(arg0));
-    }
-
-    public static Localizable localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("util.failed.to.find.handlerchain.file", arg0, arg1);
-    }
-
-    /**
-     * Could not find handler chain file {1} for class {0}
-     *
-     */
-    public static String UTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new UtilMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
-        return messageFactory.getMessage("util.handler.cannot.combine.soapmessagehandlers");
+        return MESSAGE_FACTORY.getMessage("util.handler.cannot.combine.soapmessagehandlers");
     }
 
     /**
@@ -140,7 +54,102 @@ public final class UtilMessages {
      *
      */
     public static String UTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS() {
-        return localizer.localize(localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS());
+        return LOCALIZER.localize(localizableUTIL_HANDLER_CANNOT_COMBINE_SOAPMESSAGEHANDLERS());
+    }
+
+    public static Localizable localizableUTIL_LOCATION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("util.location", arg0, arg1);
+    }
+
+    /**
+     * at line {0} of {1}
+     *
+     */
+    public static String UTIL_LOCATION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableUTIL_LOCATION(arg0, arg1));
+    }
+
+    public static Localizable localizableUTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("util.handler.class.not.found", arg0);
+    }
+
+    /**
+     * "Class: {0} could not be found"
+     *
+     */
+    public static String UTIL_HANDLER_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableUTIL_HANDLER_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("util.handler.no.webservice.annotation", arg0);
+    }
+
+    /**
+     * "A WebService annotation is not present on class: {0}"
+     *
+     */
+    public static String UTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return LOCALIZER.localize(localizableUTIL_HANDLER_NO_WEBSERVICE_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("util.handler.endpoint.interface.no.webservice", arg0);
+    }
+
+    /**
+     * "The Endpoint Interface: {0} does not have WebService Annotation"
+     *
+     */
+    public static String UTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(Object arg0) {
+        return LOCALIZER.localize(localizableUTIL_HANDLER_ENDPOINT_INTERFACE_NO_WEBSERVICE(arg0));
+    }
+
+    public static Localizable localizableUTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("util.parser.wrong.element", arg0, arg1, arg2);
+    }
+
+    /**
+     * found element "{1}", expected "{2}" in handler chain configuration (line {0})
+     *
+     */
+    public static String UTIL_PARSER_WRONG_ELEMENT(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableUTIL_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("util.failed.to.parse.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Could not parse handler chain file {1} for class {0}
+     *
+     */
+    public static String UTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableUTIL_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("util.failed.to.find.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Could not find handler chain file {1} for class {0}
+     *
+     */
+    public static String UTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableUTIL_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
index a431885f204..d6bcbcecfde 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,30 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class WsdlmodelMessages {
-    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsdlmodel";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WsdlmodelMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsdlmodel";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsdlmodelMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("wsdl.portaddress.epraddress.not.match", arg0, arg1, arg2);
     }
 
     /**
@@ -56,11 +54,11 @@ public final class WsdlmodelMessages {
      *
      */
     public static String WSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSDL_PORTADDRESS_EPRADDRESS_NOT_MATCH(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
-        return messageFactory.getMessage("wsdl.import.should.be.wsdl", arg0);
+        return MESSAGE_FACTORY.getMessage("wsdl.import.should.be.wsdl", arg0);
     }
 
     /**
@@ -69,11 +67,11 @@ public final class WsdlmodelMessages {
      *
      */
     public static String WSDL_IMPORT_SHOULD_BE_WSDL(Object arg0) {
-        return localizer.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
+        return LOCALIZER.localize(localizableWSDL_IMPORT_SHOULD_BE_WSDL(arg0));
     }
 
     public static Localizable localizableMEX_METADATA_SYSTEMID_NULL() {
-        return messageFactory.getMessage("Mex.metadata.systemid.null");
+        return MESSAGE_FACTORY.getMessage("Mex.metadata.systemid.null");
     }
 
     /**
@@ -81,7 +79,18 @@ public final class WsdlmodelMessages {
      *
      */
     public static String MEX_METADATA_SYSTEMID_NULL() {
-        return localizer.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+        return LOCALIZER.localize(localizableMEX_METADATA_SYSTEMID_NULL());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
index efcdcb72944..51b07ab0c74 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,426 +25,52 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class WsservletMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.wsservlet";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WsservletMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsservletMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
-        return messageFactory.getMessage("error.wsdlPublisher.cannotReadConfiguration");
+    public static Localizable localizableWSSERVLET_23_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET23.diag.cause.1");
     }
 
     /**
-     * WSSERVLET46: cannot read configuration
+     * The request generated no response from the service
      *
      */
-    public static String ERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
-        return localizer.localize(localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION());
+    public static String WSSERVLET_23_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_23_DIAG_CAUSE_1());
     }
 
-    public static Localizable localizableWSSERVLET_22_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET22.diag.check.1");
+    public static Localizable localizableWSSERVLET_30_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET30.diag.check.1");
     }
 
     /**
-     * Set endpoint with stub.setTargetEndpoint property
+     * This could be due to a number of causes. Check the server log file for exceptions.
      *
      */
-    public static String WSSERVLET_22_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_22_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_2() {
-        return messageFactory.getMessage("WSSERVLET33.diag.cause.2");
-    }
-
-    /**
-     * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
-     *
-     */
-    public static String WSSERVLET_33_DIAG_CAUSE_2() {
-        return localizer.localize(localizableWSSERVLET_33_DIAG_CAUSE_2());
-    }
-
-    public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET33.diag.cause.1");
-    }
-
-    /**
-     * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
-     *
-     */
-    public static String WSSERVLET_33_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_33_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
-        return messageFactory.getMessage("error.implementorRegistry.duplicateName", arg0);
-    }
-
-    /**
-     * WSSERVLET42: duplicate port name: {0}
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(arg0));
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("error.implementorRegistry.fileNotFound", arg0);
-    }
-
-    /**
-     * WSSERVLET45: file not found: {0}
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
-        return messageFactory.getMessage("servlet.trace.invokingImplementor", arg0);
-    }
-
-    /**
-     * WSSERVLET21: invoking implementor: {0}
-     *
-     */
-    public static String SERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
-        return localizer.localize(localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_17_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET17.diag.cause.1");
-    }
-
-    /**
-     * Two or more endpoints with the same name where found in the jaxrpc-ri.xml runtime descriptor
-     *
-     */
-    public static String WSSERVLET_17_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_17_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_2() {
-        return messageFactory.getMessage("html.nonRootPage.body2");
-    }
-
-    /**
-     * <p>Invalid request URI.</p><p>Please check your deployment information.</p>
-     *
-     */
-    public static String HTML_NON_ROOT_PAGE_BODY_2() {
-        return localizer.localize(localizableHTML_NON_ROOT_PAGE_BODY_2());
-    }
-
-    public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_1() {
-        return messageFactory.getMessage("html.nonRootPage.body1");
-    }
-
-    /**
-     * <p>A Web Service is installed at this URL.</p>
-     *
-     */
-    public static String HTML_NON_ROOT_PAGE_BODY_1() {
-        return localizer.localize(localizableHTML_NON_ROOT_PAGE_BODY_1());
-    }
-
-    public static Localizable localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
-        return messageFactory.getMessage("publisher.info.applyingTransformation", arg0);
-    }
-
-    /**
-     * WSSERVLET31: applying transformation with actual address: {0}
-     *
-     */
-    public static String PUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
-        return localizer.localize(localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_29_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET29.diag.check.1");
-    }
-
-    /**
-     * Is the port valid? Unzip the war file and make sure the tie and serializers are present
-     *
-     */
-    public static String WSSERVLET_29_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_29_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
-        return messageFactory.getMessage("servlet.trace.gotRequestForEndpoint", arg0);
-    }
-
-    /**
-     * WSSERVLET19: got request for endpoint: {0}
-     *
-     */
-    public static String SERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
-        return localizer.localize(localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(arg0));
-    }
-
-    public static Localizable localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
-        return messageFactory.getMessage("error.servlet.init.config.parameter.missing", arg0);
-    }
-
-    /**
-     * WSSERVLET47: cannot find configuration parameter: "{0}"
-     *
-     */
-    public static String ERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(arg0));
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
-        return messageFactory.getMessage("error.implementorFactory.servantInitFailed", arg0);
-    }
-
-    /**
-     * WSSERVLET44: failed to initialize the service implementor for port "{0}"
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_13_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET13.diag.check.1");
-    }
-
-    /**
-     * Normal web service shutdown
-     *
-     */
-    public static String WSSERVLET_13_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_13_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_31_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET31.diag.cause.1");
-    }
-
-    /**
-     * Transformation being applied
-     *
-     */
-    public static String WSSERVLET_31_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_31_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_3() {
-        return messageFactory.getMessage("WSSERVLET50.diag.check.3");
-    }
-
-    /**
-     * Check the server.xml file in the domain directory for failures
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CHECK_3() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_3());
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
-        return messageFactory.getMessage("error.implementorFactory.noInputStream");
-    }
-
-    /**
-     * WSSERVLET37: no configuration specified
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM());
-    }
-
-    public static Localizable localizableWSSERVLET_24_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET24.diag.cause.1");
-    }
-
-    /**
-     * SOAPFault message is being returned to the client.
-     *
-     */
-    public static String WSSERVLET_24_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_24_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_2() {
-        return messageFactory.getMessage("WSSERVLET50.diag.check.2");
-    }
-
-    /**
-     * Verify that Application server deployment descriptors are correct in the service war file
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CHECK_2() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_2());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET50.diag.check.1");
-    }
-
-    /**
-     * Verify that sun-jaxws.xml and web.xml are correct in the service war file
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_43_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET43.diag.check.1");
-    }
-
-    /**
-     * Make sure web service is available and public. Examine exception for more details
-     *
-     */
-    public static String WSSERVLET_43_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_43_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_15_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET15.diag.cause.1");
-    }
-
-    /**
-     * Web Services servlet shutdown.
-     *
-     */
-    public static String WSSERVLET_15_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_15_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_27_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET27.diag.check.1");
-    }
-
-    /**
-     * Remove the implicit URL
-     *
-     */
-    public static String WSSERVLET_27_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_27_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
-        return messageFactory.getMessage("error.implementorRegistry.unknownName", arg0);
-    }
-
-    /**
-     * WSSERVLET38: unknown port name: {0}
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(arg0));
-    }
-
-    public static Localizable localizableSERVLET_HTML_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("servlet.html.notFound", arg0);
-    }
-
-    /**
-     * <h1>404 Not Found: {0}</h1>
-     *
-     */
-    public static String SERVLET_HTML_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableSERVLET_HTML_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableHTML_ROOT_PAGE_TITLE() {
-        return messageFactory.getMessage("html.rootPage.title");
-    }
-
-    /**
-     * Web Service
-     *
-     */
-    public static String HTML_ROOT_PAGE_TITLE() {
-        return localizer.localize(localizableHTML_ROOT_PAGE_TITLE());
-    }
-
-    public static Localizable localizableWSSERVLET_20_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET20.diag.check.1");
-    }
-
-    /**
-     * Unzip the war, are the tie and serializer classes found?
-     *
-     */
-    public static String WSSERVLET_20_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_20_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableJAXRPCSERVLET_11_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("JAXRPCSERVLET11.diag.cause.1");
-    }
-
-    /**
-     * WSRuntimeInfoParser could not parse sun-jaxws.xml runtime descriptor
-     *
-     */
-    public static String JAXRPCSERVLET_11_DIAG_CAUSE_1() {
-        return localizer.localize(localizableJAXRPCSERVLET_11_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_11_DIAG_CHECK_2() {
-        return messageFactory.getMessage("WSSERVLET11.diag.check.2");
-    }
-
-    /**
-     * Please check the jaxrpc-ri.xml file to make sure it is present in the war file
-     *
-     */
-    public static String WSSERVLET_11_DIAG_CHECK_2() {
-        return localizer.localize(localizableWSSERVLET_11_DIAG_CHECK_2());
-    }
-
-    public static Localizable localizableWSSERVLET_11_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET11.diag.check.1");
-    }
-
-    /**
-     * Please check the sun-jaxws.xml file to make sure it is correct
-     *
-     */
-    public static String WSSERVLET_11_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_11_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_22_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET22.diag.cause.1");
-    }
-
-    /**
-     * A request was invoked with no endpoint
-     *
-     */
-    public static String WSSERVLET_22_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_22_DIAG_CAUSE_1());
+    public static String WSSERVLET_30_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_30_DIAG_CHECK_1());
     }
 
     public static Localizable localizableWSSERVLET_34_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET34.diag.check.1");
+        return MESSAGE_FACTORY.getMessage("WSSERVLET34.diag.check.1");
     }
 
     /**
@@ -452,71 +78,143 @@ public final class WsservletMessages {
      *
      */
     public static String WSSERVLET_34_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_34_DIAG_CHECK_1());
+        return LOCALIZER.localize(localizableWSSERVLET_34_DIAG_CHECK_1());
     }
 
-    public static Localizable localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
-        return messageFactory.getMessage("error.servlet.noImplementorForPort", arg0);
+    public static Localizable localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
+        return MESSAGE_FACTORY.getMessage("servlet.faultstring.invalidContentType");
     }
 
     /**
-     * WSSERVLET52: no implementor registered for port: {0}
+     * WSSERVLET64: Invalid Content-Type, text/xml required
      *
      */
-    public static String ERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(arg0));
+    public static String SERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
+        return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE());
     }
 
-    public static Localizable localizableWSSERVLET_64_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET64.diag.check.1");
+    public static Localizable localizableWSSERVLET_27_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET27.diag.cause.1");
     }
 
     /**
-     * Make sure the client request is using text/xml
+     * Implicit URLS are not supported in this release
      *
      */
-    public static String WSSERVLET_64_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_64_DIAG_CHECK_1());
+    public static String WSSERVLET_27_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_27_DIAG_CAUSE_1());
     }
 
-    public static Localizable localizableWSSERVLET_18_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET18.diag.check.1");
+    public static Localizable localizableHTML_WSDL_PAGE_NO_WSDL() {
+        return MESSAGE_FACTORY.getMessage("html.wsdlPage.noWsdl");
     }
 
     /**
-     * This may or may not be intentional. If not examine client program for errors.
+     * <p>No WSDL document available for publishing.</p><p>Please check your deployment information.</p>
      *
      */
-    public static String WSSERVLET_18_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_18_DIAG_CHECK_1());
+    public static String HTML_WSDL_PAGE_NO_WSDL() {
+        return LOCALIZER.localize(localizableHTML_WSDL_PAGE_NO_WSDL());
     }
 
-    public static Localizable localizableWSSERVLET_29_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET29.diag.cause.1");
+    public static Localizable localizableWSSERVLET_19_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET19.diag.check.1");
     }
 
     /**
-     * A port is specified, but a corresponding service implementation is not found
+     * Informational message only. Normal operation.
      *
      */
-    public static String WSSERVLET_29_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_29_DIAG_CAUSE_1());
+    public static String WSSERVLET_19_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_19_DIAG_CHECK_1());
     }
 
-    public static Localizable localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE() {
-        return messageFactory.getMessage("servlet.error.noResponseMessage");
+    public static Localizable localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("servlet.trace.writingFaultResponse");
     }
 
     /**
-     * WSSERVLET23: no response message
+     * WSSERVLET24: writing fault response
      *
      */
-    public static String SERVLET_ERROR_NO_RESPONSE_MESSAGE() {
-        return localizer.localize(localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE());
+    public static String SERVLET_TRACE_WRITING_FAULT_RESPONSE() {
+        return LOCALIZER.localize(localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE());
+    }
+
+    public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
+        return MESSAGE_FACTORY.getMessage("servlet.warning.duplicateEndpointName");
+    }
+
+    /**
+     * WSSERVLET17: duplicate endpoint name
+     *
+     */
+    public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
+        return LOCALIZER.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME());
+    }
+
+    public static Localizable localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("trace.servlet.handingRequestOverToImplementor", arg0);
+    }
+
+    /**
+     * WSSERVLET59: handing request over to implementor: {0}
+     *
+     */
+    public static String TRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
+        return LOCALIZER.localize(localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_11_DIAG_CHECK_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET11.diag.check.2");
+    }
+
+    /**
+     * Please check the jaxrpc-ri.xml file to make sure it is present in the war file
+     *
+     */
+    public static String WSSERVLET_11_DIAG_CHECK_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_11_DIAG_CHECK_2());
+    }
+
+    public static Localizable localizableWSSERVLET_65_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET65.diag.check.1");
+    }
+
+    /**
+     * Add SOAPAction and appropriate value
+     *
+     */
+    public static String WSSERVLET_65_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_65_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_11_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET11.diag.check.1");
+    }
+
+    /**
+     * Please check the sun-jaxws.xml file to make sure it is correct
+     *
+     */
+    public static String WSSERVLET_11_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_11_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_15_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET15.diag.check.1");
+    }
+
+    /**
+     * Normal Web service undeployment. Undeployment complete.
+     *
+     */
+    public static String WSSERVLET_15_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_15_DIAG_CHECK_1());
     }
 
     public static Localizable localizableMESSAGE_TOO_LONG(Object arg0) {
-        return messageFactory.getMessage("message.too.long", arg0);
+        return MESSAGE_FACTORY.getMessage("message.too.long", arg0);
     }
 
     /**
@@ -526,1151 +224,11 @@ public final class WsservletMessages {
      *
      */
     public static String MESSAGE_TOO_LONG(Object arg0) {
-        return localizer.localize(localizableMESSAGE_TOO_LONG(arg0));
-    }
-
-    public static Localizable localizableLISTENER_INFO_INITIALIZE() {
-        return messageFactory.getMessage("listener.info.initialize");
-    }
-
-    /**
-     * WSSERVLET12: JAX-WS context listener initializing
-     *
-     */
-    public static String LISTENER_INFO_INITIALIZE() {
-        return localizer.localize(localizableLISTENER_INFO_INITIALIZE());
-    }
-
-    public static Localizable localizableSERVLET_HTML_NO_INFO_AVAILABLE() {
-        return messageFactory.getMessage("servlet.html.noInfoAvailable");
-    }
-
-    /**
-     * <p>No JAX-WS context information available.</p>
-     *
-     */
-    public static String SERVLET_HTML_NO_INFO_AVAILABLE() {
-        return localizer.localize(localizableSERVLET_HTML_NO_INFO_AVAILABLE());
-    }
-
-    public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("servlet.html.information.table", arg0, arg1);
-    }
-
-    /**
-     * <table border="0"><tr><td>Address:</td><td>{0}</td></tr><tr><td>WSDL:</td><td><a href="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Implementation class:</td><td>{1}</td></tr></table>
-     *
-     */
-    public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
-        return localizer.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1));
-    }
-
-    public static Localizable localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE() {
-        return messageFactory.getMessage("servlet.trace.writingFaultResponse");
-    }
-
-    /**
-     * WSSERVLET24: writing fault response
-     *
-     */
-    public static String SERVLET_TRACE_WRITING_FAULT_RESPONSE() {
-        return localizer.localize(localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE());
-    }
-
-    public static Localizable localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
-        return messageFactory.getMessage("servlet.error.noImplementorForEndpoint", arg0);
-    }
-
-    /**
-     * WSSERVLET20: no implementor for endpoint: {0}
-     *
-     */
-    public static String SERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
-        return localizer.localize(localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_13_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET13.diag.cause.1");
-    }
-
-    /**
-     * Context listener shutdown
-     *
-     */
-    public static String WSSERVLET_13_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_13_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_3() {
-        return messageFactory.getMessage("WSSERVLET50.diag.cause.3");
-    }
-
-    /**
-     * There may some Application Server initialization problems
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CAUSE_3() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_3());
-    }
-
-    public static Localizable localizableWSSERVLET_32_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET32.diag.check.1");
-    }
-
-    /**
-     * Normal Operation.
-     *
-     */
-    public static String WSSERVLET_32_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_32_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_2() {
-        return messageFactory.getMessage("WSSERVLET50.diag.cause.2");
-    }
-
-    /**
-     * Application server deployment descriptors may be incorrect
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CAUSE_2() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_2());
-    }
-
-    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET50.diag.cause.1");
-    }
-
-    /**
-     * WS runtime sun-jaxws.xml or web.xml may be incorrect
-     *
-     */
-    public static String WSSERVLET_50_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_50_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_25_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET25.diag.check.1");
-    }
-
-    /**
-     * Tracing message, normal response.
-     *
-     */
-    public static String WSSERVLET_25_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_25_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_43_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET43.diag.cause.1");
-    }
-
-    /**
-     * Instantiation of the web service failed.
-     *
-     */
-    public static String WSSERVLET_43_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_43_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_27_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET27.diag.cause.1");
-    }
-
-    /**
-     * Implicit URLS are not supported in this release
-     *
-     */
-    public static String WSSERVLET_27_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_27_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
-        return messageFactory.getMessage("error.servlet.caughtThrowableInInit", arg0);
-    }
-
-    /**
-     * WSSERVLET50: caught throwable during servlet initialization: {0}
-     *
-     */
-    public static String ERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(arg0));
-    }
-
-    public static Localizable localizableSERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("servlet.html.endpoint.table", arg0, arg1);
-    }
-
-    /**
-     * <table border="0"><tr><td>Service Name:</td><td>{0}</td></tr><tr><td>Port Name:</td><td>{1}</td></tr></table>
-     *
-     */
-    public static String SERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
-        return localizer.localize(localizableSERVLET_HTML_ENDPOINT_TABLE(arg0, arg1));
-    }
-
-    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
-        return messageFactory.getMessage("error.servlet.caughtThrowableWhileRecovering", arg0);
-    }
-
-    /**
-     * WSSERVLET51: caught throwable while recovering from a previous exception: {0}
-     *
-     */
-    public static String ERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(arg0));
-    }
-
-    public static Localizable localizableNO_SUNJAXWS_XML(Object arg0) {
-        return messageFactory.getMessage("no.sunjaxws.xml", arg0);
-    }
-
-    /**
-     * Runtime descriptor "{0}" is missing
-     *
-     */
-    public static String NO_SUNJAXWS_XML(Object arg0) {
-        return localizer.localize(localizableNO_SUNJAXWS_XML(arg0));
-    }
-
-    public static Localizable localizableSERVLET_HTML_TITLE_2() {
-        return messageFactory.getMessage("servlet.html.title2");
-    }
-
-    /**
-     * <h1>Web Services</h1>
-     *
-     */
-    public static String SERVLET_HTML_TITLE_2() {
-        return localizer.localize(localizableSERVLET_HTML_TITLE_2());
-    }
-
-    public static Localizable localizableLISTENER_INFO_DESTROY() {
-        return messageFactory.getMessage("listener.info.destroy");
-    }
-
-    /**
-     * WSSERVLET13: JAX-WS context listener destroyed
-     *
-     */
-    public static String LISTENER_INFO_DESTROY() {
-        return localizer.localize(localizableLISTENER_INFO_DESTROY());
-    }
-
-    public static Localizable localizableEXCEPTION_TEMPLATE_CREATION_FAILED() {
-        return messageFactory.getMessage("exception.templateCreationFailed");
-    }
-
-    /**
-     * WSSERVLET35: failed to create a template object
-     *
-     */
-    public static String EXCEPTION_TEMPLATE_CREATION_FAILED() {
-        return localizer.localize(localizableEXCEPTION_TEMPLATE_CREATION_FAILED());
-    }
-
-    public static Localizable localizableWSSERVLET_20_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET20.diag.cause.1");
-    }
-
-    /**
-     * Implementation for this service can not be found
-     *
-     */
-    public static String WSSERVLET_20_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_20_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE() {
-        return messageFactory.getMessage("trace.servlet.writingFaultResponse");
-    }
-
-    /**
-     * WSSERVLET61: writing fault response
-     *
-     */
-    public static String TRACE_SERVLET_WRITING_FAULT_RESPONSE() {
-        return localizer.localize(localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE());
-    }
-
-    public static Localizable localizableWSSERVLET_23_DIAG_CHECK_2() {
-        return messageFactory.getMessage("WSSERVLET23.diag.check.2");
-    }
-
-    /**
-     * The request may be malformed and be accepted by the service, yet did not generate a response
-     *
-     */
-    public static String WSSERVLET_23_DIAG_CHECK_2() {
-        return localizer.localize(localizableWSSERVLET_23_DIAG_CHECK_2());
-    }
-
-    public static Localizable localizableWSSERVLET_23_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET23.diag.check.1");
-    }
-
-    /**
-     * If a response was expected, check that a request message was actually sent
-     *
-     */
-    public static String WSSERVLET_23_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_23_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
-        return messageFactory.getMessage("servlet.warning.missingContextInformation");
-    }
-
-    /**
-     * WSSERVLET16: missing context information
-     *
-     */
-    public static String SERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
-        return localizer.localize(localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION());
-    }
-
-    public static Localizable localizableWSSERVLET_16_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET16.diag.check.1");
-    }
-
-    /**
-     * Unjar the service war file; check to see that the jaxrpc-ri-runtime.xml file is present
-     *
-     */
-    public static String WSSERVLET_16_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_16_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_34_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET34.diag.cause.1");
-    }
-
-    /**
-     * The location patching on the wsdl failed when attempting to transform.
-     *
-     */
-    public static String WSSERVLET_34_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_34_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableHTML_NON_ROOT_PAGE_TITLE() {
-        return messageFactory.getMessage("html.nonRootPage.title");
-    }
-
-    /**
-     * Web Service
-     *
-     */
-    public static String HTML_NON_ROOT_PAGE_TITLE() {
-        return localizer.localize(localizableHTML_NON_ROOT_PAGE_TITLE());
-    }
-
-    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION() {
-        return messageFactory.getMessage("servlet.html.columnHeader.information");
-    }
-
-    /**
-     * Information
-     *
-     */
-    public static String SERVLET_HTML_COLUMN_HEADER_INFORMATION() {
-        return localizer.localize(localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION());
-    }
-
-    public static Localizable localizableWSSERVLET_18_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET18.diag.cause.1");
-    }
-
-    /**
-     * Message sent by client is empty
-     *
-     */
-    public static String WSSERVLET_18_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_18_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_64_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET64.diag.cause.1");
-    }
-
-    /**
-     * Web service requests must be a content type text/xml: WSI BP 1.0
-     *
-     */
-    public static String WSSERVLET_64_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_64_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableINFO_SERVLET_INITIALIZING() {
-        return messageFactory.getMessage("info.servlet.initializing");
-    }
-
-    /**
-     * WSSERVLET56: JAX-WS servlet: init
-     *
-     */
-    public static String INFO_SERVLET_INITIALIZING() {
-        return localizer.localize(localizableINFO_SERVLET_INITIALIZING());
-    }
-
-    public static Localizable localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
-        return messageFactory.getMessage("servlet.info.emptyRequestMessage");
-    }
-
-    /**
-     * WSSERVLET18: got empty request message
-     *
-     */
-    public static String SERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
-        return localizer.localize(localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE());
-    }
-
-    public static Localizable localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
-        return messageFactory.getMessage("servlet.error.noEndpointSpecified");
-    }
-
-    /**
-     * WSSERVLET22: no endpoint specified
-     *
-     */
-    public static String SERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
-        return localizer.localize(localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED());
-    }
-
-    public static Localizable localizableWSSERVLET_11_DIAG_CAUSE_2() {
-        return messageFactory.getMessage("WSSERVLET11.diag.cause.2");
-    }
-
-    /**
-     * The sun-jaxws.xml runtime deployment descriptor may be missing
-     *
-     */
-    public static String WSSERVLET_11_DIAG_CAUSE_2() {
-        return localizer.localize(localizableWSSERVLET_11_DIAG_CAUSE_2());
-    }
-
-    public static Localizable localizableWSSERVLET_30_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET30.diag.check.1");
-    }
-
-    /**
-     * This could be due to a number of causes. Check the server log file for exceptions.
-     *
-     */
-    public static String WSSERVLET_30_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_30_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER() {
-        return messageFactory.getMessage("exception.cannotCreateTransformer");
-    }
-
-    /**
-     * WSSERVLET33: cannot create transformer
-     *
-     */
-    public static String EXCEPTION_CANNOT_CREATE_TRANSFORMER() {
-        return localizer.localize(localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER());
-    }
-
-    public static Localizable localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
-        return messageFactory.getMessage("servlet.faultstring.invalidSOAPAction");
-    }
-
-    /**
-     * WSSERVLET65: Invalid Header SOAPAction required
-     *
-     */
-    public static String SERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
-        return localizer.localize(localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION());
-    }
-
-    public static Localizable localizableWSSERVLET_14_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET14.diag.check.1");
-    }
-
-    /**
-     * Normal Web Service deployment. Deployment of service complete.
-     *
-     */
-    public static String WSSERVLET_14_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_14_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_32_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET32.diag.cause.1");
-    }
-
-    /**
-     * WSDL being generated
-     *
-     */
-    public static String WSSERVLET_32_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_32_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_25_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET25.diag.cause.1");
-    }
-
-    /**
-     * SOAPMessage response is being returned to client
-     *
-     */
-    public static String WSSERVLET_25_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_25_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_44_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET44.diag.check.1");
-    }
-
-    /**
-     * Check the exception for more details. Make sure all the configuration files are correct.
-     *
-     */
-    public static String WSSERVLET_44_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_44_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_28_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET28.diag.check.1");
-    }
-
-    /**
-     * Set target endpoint with stub.setTargetEndpoint() property.
-     *
-     */
-    public static String WSSERVLET_28_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_28_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableSERVLET_INFO_INITIALIZE() {
-        return messageFactory.getMessage("servlet.info.initialize");
-    }
-
-    /**
-     * WSSERVLET14: JAX-WS servlet initializing
-     *
-     */
-    public static String SERVLET_INFO_INITIALIZE() {
-        return localizer.localize(localizableSERVLET_INFO_INITIALIZE());
-    }
-
-    public static Localizable localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("error.servlet.init.config.fileNotFound", arg0);
-    }
-
-    /**
-     * WSSERVLET48: config file: "{0}" not found
-     *
-     */
-    public static String ERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableHTML_WSDL_PAGE_TITLE() {
-        return messageFactory.getMessage("html.wsdlPage.title");
-    }
-
-    /**
-     * Web Service
-     *
-     */
-    public static String HTML_WSDL_PAGE_TITLE() {
-        return localizer.localize(localizableHTML_WSDL_PAGE_TITLE());
-    }
-
-    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
-        return messageFactory.getMessage("servlet.html.columnHeader.portName");
-    }
-
-    /**
-     * Endpoint
-     *
-     */
-    public static String SERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
-        return localizer.localize(localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME());
-    }
-
-    public static Localizable localizableHTML_ROOT_PAGE_BODY_2_B() {
-        return messageFactory.getMessage("html.rootPage.body2b");
-    }
-
-    /**
-     * </p>
-     *
-     */
-    public static String HTML_ROOT_PAGE_BODY_2_B() {
-        return localizer.localize(localizableHTML_ROOT_PAGE_BODY_2_B());
-    }
-
-    public static Localizable localizableHTML_ROOT_PAGE_BODY_2_A() {
-        return messageFactory.getMessage("html.rootPage.body2a");
-    }
-
-    /**
-     * <p>It supports the following ports:
-     *
-     */
-    public static String HTML_ROOT_PAGE_BODY_2_A() {
-        return localizer.localize(localizableHTML_ROOT_PAGE_BODY_2_A());
-    }
-
-    public static Localizable localizableWSSERVLET_21_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET21.diag.check.1");
-    }
-
-    /**
-     * Normal web service invocation.
-     *
-     */
-    public static String WSSERVLET_21_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_21_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableERROR_SERVLET_NO_PORT_SPECIFIED() {
-        return messageFactory.getMessage("error.servlet.noPortSpecified");
-    }
-
-    /**
-     * WSSERVLET53: no port specified in HTTP POST request URL
-     *
-     */
-    public static String ERROR_SERVLET_NO_PORT_SPECIFIED() {
-        return localizer.localize(localizableERROR_SERVLET_NO_PORT_SPECIFIED());
-    }
-
-    public static Localizable localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
-        return messageFactory.getMessage("info.servlet.gotEmptyRequestMessage");
-    }
-
-    /**
-     * WSSERVLET55: got empty request message
-     *
-     */
-    public static String INFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
-        return localizer.localize(localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE());
-    }
-
-    public static Localizable localizableWSSERVLET_51_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET51.diag.check.1");
-    }
-
-    /**
-     * Check the server.xml log file for exception information
-     *
-     */
-    public static String WSSERVLET_51_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_51_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_23_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET23.diag.cause.1");
-    }
-
-    /**
-     * The request generated no response from the service
-     *
-     */
-    public static String WSSERVLET_23_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_23_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_16_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET16.diag.cause.1");
-    }
-
-    /**
-     * The jaxrpc-ri.xml file may be missing from the war file
-     *
-     */
-    public static String WSSERVLET_16_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_16_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_35_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET35.diag.check.1");
-    }
-
-    /**
-     * An exception was thrown during creation of the template. View exception and stacktrace for more details.
-     *
-     */
-    public static String WSSERVLET_35_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_35_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_65_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET65.diag.check.1");
-    }
-
-    /**
-     * Add SOAPAction and appropriate value
-     *
-     */
-    public static String WSSERVLET_65_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_65_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
-        return messageFactory.getMessage("trace.servlet.handingRequestOverToImplementor", arg0);
-    }
-
-    /**
-     * WSSERVLET59: handing request over to implementor: {0}
-     *
-     */
-    public static String TRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(Object arg0) {
-        return localizer.localize(localizableTRACE_SERVLET_HANDING_REQUEST_OVER_TO_IMPLEMENTOR(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_19_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET19.diag.check.1");
-    }
-
-    /**
-     * Informational message only. Normal operation.
-     *
-     */
-    public static String WSSERVLET_19_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_19_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizablePUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
-        return messageFactory.getMessage("publisher.info.generatingWSDL", arg0);
-    }
-
-    /**
-     * WSSERVLET32: generating WSDL for endpoint: {0}
-     *
-     */
-    public static String PUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
-        return localizer.localize(localizablePUBLISHER_INFO_GENERATING_WSDL(arg0));
-    }
-
-    public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
-        return messageFactory.getMessage("servlet.warning.duplicateEndpointUrlPattern", arg0);
-    }
-
-    /**
-     * WSSERVLET26: duplicate URL pattern in endpoint: {0}
-     *
-     */
-    public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
-        return localizer.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_49_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET49.diag.check.1");
-    }
-
-    /**
-     * Check the server.xml log file for exception information
-     *
-     */
-    public static String WSSERVLET_49_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_49_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
-        return messageFactory.getMessage("error.implementorRegistry.cannotReadConfiguration");
-    }
-
-    /**
-     * WSSERVLET39: cannot read configuration
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION());
-    }
-
-    public static Localizable localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
-        return messageFactory.getMessage("trace.servlet.gotResponseFromImplementor", arg0);
-    }
-
-    /**
-     * WSSERVLET60: got response from implementor: {0}
-     *
-     */
-    public static String TRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
-        return localizer.localize(localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(arg0));
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
-        return messageFactory.getMessage("error.implementorRegistry.incompleteInformation");
-    }
-
-    /**
-     * WSSERVLET41: configuration information is incomplete
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION());
-    }
-
-    public static Localizable localizableWSSERVLET_12_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET12.diag.check.1");
-    }
-
-    /**
-     * Normal web service startup
-     *
-     */
-    public static String WSSERVLET_12_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_12_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_30_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET30.diag.cause.1");
-    }
-
-    /**
-     * There was a server error processing the request
-     *
-     */
-    public static String WSSERVLET_30_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_30_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableHTML_WSDL_PAGE_NO_WSDL() {
-        return messageFactory.getMessage("html.wsdlPage.noWsdl");
-    }
-
-    /**
-     * <p>No WSDL document available for publishing.</p><p>Please check your deployment information.</p>
-     *
-     */
-    public static String HTML_WSDL_PAGE_NO_WSDL() {
-        return localizer.localize(localizableHTML_WSDL_PAGE_NO_WSDL());
-    }
-
-    public static Localizable localizableWSSERVLET_14_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET14.diag.cause.1");
-    }
-
-    /**
-     * Web Services servlet starting up.
-     *
-     */
-    public static String WSSERVLET_14_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_14_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableINFO_SERVLET_DESTROYING() {
-        return messageFactory.getMessage("info.servlet.destroying");
-    }
-
-    /**
-     * WSSERVLET57: JAX-WS servlet: destroy
-     *
-     */
-    public static String INFO_SERVLET_DESTROYING() {
-        return localizer.localize(localizableINFO_SERVLET_DESTROYING());
-    }
-
-    public static Localizable localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
-        return messageFactory.getMessage("error.servlet.noResponseWasProduced");
-    }
-
-    /**
-     * WSSERVLET54: no response was produced (internal error)
-     *
-     */
-    public static String ERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
-        return localizer.localize(localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED());
-    }
-
-    public static Localizable localizableWSSERVLET_26_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET26.diag.check.1");
-    }
-
-    /**
-     * This may cause a problem, please remove duplicate endpoints
-     *
-     */
-    public static String WSSERVLET_26_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_26_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableSERVLET_HTML_TITLE() {
-        return messageFactory.getMessage("servlet.html.title");
-    }
-
-    /**
-     * Web Services
-     *
-     */
-    public static String SERVLET_HTML_TITLE() {
-        return localizer.localize(localizableSERVLET_HTML_TITLE());
-    }
-
-    public static Localizable localizableWSSERVLET_44_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET44.diag.cause.1");
-    }
-
-    /**
-     * The web service was instantiated, however, it could not be initialized
-     *
-     */
-    public static String WSSERVLET_44_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_44_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_63_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET63.diag.check.1");
-    }
-
-    /**
-     * Make sure that your HTTP client is using POST requests, not GET requests
-     *
-     */
-    public static String WSSERVLET_63_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_63_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_28_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET28.diag.cause.1");
-    }
-
-    /**
-     * Target endpoint is null
-     *
-     */
-    public static String WSSERVLET_28_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_28_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
-        return messageFactory.getMessage("error.implementorFactory.noConfiguration");
-    }
-
-    /**
-     * WSSERVLET36: no configuration specified
-     *
-     */
-    public static String ERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION());
-    }
-
-    public static Localizable localizableHTML_ROOT_PAGE_BODY_4() {
-        return messageFactory.getMessage("html.rootPage.body4");
-    }
-
-    /**
-     * <p>This endpoint is incorrectly configured. Please check the location and contents of the configuration file.</p>
-     *
-     */
-    public static String HTML_ROOT_PAGE_BODY_4() {
-        return localizer.localize(localizableHTML_ROOT_PAGE_BODY_4());
-    }
-
-    public static Localizable localizableHTML_ROOT_PAGE_BODY_1() {
-        return messageFactory.getMessage("html.rootPage.body1");
-    }
-
-    /**
-     * <p>A Web Service is installed at this URL.</p>
-     *
-     */
-    public static String HTML_ROOT_PAGE_BODY_1() {
-        return localizer.localize(localizableHTML_ROOT_PAGE_BODY_1());
-    }
-
-    public static Localizable localizableEXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
-        return messageFactory.getMessage("exception.transformationFailed", arg0);
-    }
-
-    /**
-     * WSSERVLET34: transformation failed : {0}
-     *
-     */
-    public static String EXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
-        return localizer.localize(localizableEXCEPTION_TRANSFORMATION_FAILED(arg0));
-    }
-
-    public static Localizable localizableSERVLET_HTML_METHOD() {
-        return messageFactory.getMessage("servlet.html.method");
-    }
-
-    /**
-     * WSSERVLET63: must use Post for this type of request
-     *
-     */
-    public static String SERVLET_HTML_METHOD() {
-        return localizer.localize(localizableSERVLET_HTML_METHOD());
-    }
-
-    public static Localizable localizableSERVLET_FAULTSTRING_MISSING_PORT() {
-        return messageFactory.getMessage("servlet.faultstring.missingPort");
-    }
-
-    /**
-     * WSSERVLET28: Missing port information
-     *
-     */
-    public static String SERVLET_FAULTSTRING_MISSING_PORT() {
-        return localizer.localize(localizableSERVLET_FAULTSTRING_MISSING_PORT());
-    }
-
-    public static Localizable localizableWSSERVLET_21_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET21.diag.cause.1");
-    }
-
-    /**
-     * The Web service is being invoked
-     *
-     */
-    public static String WSSERVLET_21_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_21_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
-        return messageFactory.getMessage("servlet.trace.writingSuccessResponse");
-    }
-
-    /**
-     * WSSERVLET25: writing success response
-     *
-     */
-    public static String SERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
-        return localizer.localize(localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE());
-    }
-
-    public static Localizable localizableWSSERVLET_33_DIAG_CHECK_2() {
-        return messageFactory.getMessage("WSSERVLET33.diag.check.2");
-    }
-
-    /**
-     * There maybe a transformation engine may not be supported or compatible. Check the server.xml file for exceptions.
-     *
-     */
-    public static String WSSERVLET_33_DIAG_CHECK_2() {
-        return localizer.localize(localizableWSSERVLET_33_DIAG_CHECK_2());
-    }
-
-    public static Localizable localizableWSSERVLET_33_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET33.diag.check.1");
-    }
-
-    /**
-     * There maybe a transformation engine being used that is not compatible. Make sure you are using the correct transformer and version.
-     *
-     */
-    public static String WSSERVLET_33_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_33_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_51_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET51.diag.cause.1");
-    }
-
-    /**
-     * Service processing of the request generated an exception; while attempting to return a SOAPPFaultMessage a throwable was again generated
-     *
-     */
-    public static String WSSERVLET_51_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_51_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_24_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET24.diag.check.1");
-    }
-
-    /**
-     * Tracing message fault recorded.
-     *
-     */
-    public static String WSSERVLET_24_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_24_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_17_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET17.diag.check.1");
-    }
-
-    /**
-     * Note that this may cause problems with service deployment
-     *
-     */
-    public static String WSSERVLET_17_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_17_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableWSSERVLET_35_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET35.diag.cause.1");
-    }
-
-    /**
-     * A XSLT stylesheet template is create for the wsdl location patching using transformation. Template create failed.
-     *
-     */
-    public static String WSSERVLET_35_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_35_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_19_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET19.diag.cause.1");
-    }
-
-    /**
-     * Client request for this endpoint arrived
-     *
-     */
-    public static String WSSERVLET_19_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_19_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableWSSERVLET_65_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET65.diag.cause.1");
-    }
-
-    /**
-     * SOAP Action is required
-     *
-     */
-    public static String WSSERVLET_65_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_65_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableLISTENER_PARSING_FAILED(Object arg0) {
-        return messageFactory.getMessage("listener.parsingFailed", arg0);
-    }
-
-    /**
-     * WSSERVLET11: failed to parse runtime descriptor: {0}
-     *
-     */
-    public static String LISTENER_PARSING_FAILED(Object arg0) {
-        return localizer.localize(localizableLISTENER_PARSING_FAILED(arg0));
-    }
-
-    public static Localizable localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
-        return messageFactory.getMessage("servlet.warning.ignoringImplicitUrlPattern", arg0);
-    }
-
-    /**
-     * WSSERVLET27: unsupported implicit URL pattern in endpoint: {0}
-     *
-     */
-    public static String SERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
-        return localizer.localize(localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_49_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET49.diag.cause.1");
-    }
-
-    /**
-     * Service processing of the request generated an exception; while attempting to return a SOAPFaultMessage a throwable was again generated
-     *
-     */
-    public static String WSSERVLET_49_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_49_DIAG_CAUSE_1());
+        return LOCALIZER.localize(localizableMESSAGE_TOO_LONG(arg0));
     }
 
     public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
-        return messageFactory.getMessage("error.implementorFactory.newInstanceFailed", arg0);
+        return MESSAGE_FACTORY.getMessage("error.implementorFactory.newInstanceFailed", arg0);
     }
 
     /**
@@ -1678,191 +236,83 @@ public final class WsservletMessages {
      *
      */
     public static String ERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(arg0));
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NEW_INSTANCE_FAILED(arg0));
     }
 
-    public static Localizable localizableWSSERVLET_12_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET12.diag.cause.1");
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.cannotReadConfiguration");
     }
 
     /**
-     * Context listener starting
+     * WSSERVLET39: cannot read configuration
      *
      */
-    public static String WSSERVLET_12_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_12_DIAG_CAUSE_1());
+    public static String ERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION() {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CANNOT_READ_CONFIGURATION());
     }
 
-    public static Localizable localizableWSSERVLET_31_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET31.diag.check.1");
+    public static Localizable localizableWSSERVLET_35_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET35.diag.cause.1");
     }
 
     /**
-     * Normal operation
+     * A XSLT stylesheet template is create for the wsdl location patching using transformation. Template create failed.
      *
      */
-    public static String WSSERVLET_31_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_31_DIAG_CHECK_1());
+    public static String WSSERVLET_35_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_35_DIAG_CAUSE_1());
     }
 
-    public static Localizable localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
-        return messageFactory.getMessage("servlet.faultstring.invalidContentType");
+    public static Localizable localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.init.config.fileNotFound", arg0);
     }
 
     /**
-     * WSSERVLET64: Invalid Content-Type, text/xml required
+     * WSSERVLET48: config file: "{0}" not found
      *
      */
-    public static String SERVLET_FAULTSTRING_INVALID_CONTENT_TYPE() {
-        return localizer.localize(localizableSERVLET_FAULTSTRING_INVALID_CONTENT_TYPE());
+    public static String ERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_INIT_CONFIG_FILE_NOT_FOUND(arg0));
     }
 
-    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
-        return messageFactory.getMessage("error.servlet.caughtThrowable", arg0);
+    public static Localizable localizableWSSERVLET_34_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET34.diag.cause.1");
     }
 
     /**
-     * WSSERVLET49: caught throwable: {0}
+     * The location patching on the wsdl failed when attempting to transform.
      *
      */
-    public static String ERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
-        return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE(arg0));
+    public static String WSSERVLET_34_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_34_DIAG_CAUSE_1());
     }
 
-    public static Localizable localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
-        return messageFactory.getMessage("trace.servlet.writingSuccessResponse");
+    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowableInInit", arg0);
     }
 
     /**
-     * WSSERVLET62: writing success response
+     * WSSERVLET50: caught throwable during servlet initialization: {0}
      *
      */
-    public static String TRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
-        return localizer.localize(localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE());
+    public static String ERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(arg0));
     }
 
-    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("error.implementorRegistry.classNotFound", arg0);
+    public static Localizable localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE() {
+        return MESSAGE_FACTORY.getMessage("servlet.error.noResponseMessage");
     }
 
     /**
-     * WSSERVLET40: class not found: {0}
+     * WSSERVLET23: no response message
      *
      */
-    public static String ERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_15_DIAG_CHECK_1() {
-        return messageFactory.getMessage("WSSERVLET15.diag.check.1");
-    }
-
-    /**
-     * Normal Web service undeployment. Undeployment complete.
-     *
-     */
-    public static String WSSERVLET_15_DIAG_CHECK_1() {
-        return localizer.localize(localizableWSSERVLET_15_DIAG_CHECK_1());
-    }
-
-    public static Localizable localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("servlet.faultstring.portNotFound", arg0);
-    }
-
-    /**
-     * WSSERVLET29: Port not found ({0})
-     *
-     */
-    public static String SERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableSERVLET_INFO_DESTROY() {
-        return messageFactory.getMessage("servlet.info.destroy");
-    }
-
-    /**
-     * WSSERVLET15: JAX-WS servlet destroyed
-     *
-     */
-    public static String SERVLET_INFO_DESTROY() {
-        return localizer.localize(localizableSERVLET_INFO_DESTROY());
-    }
-
-    public static Localizable localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
-        return messageFactory.getMessage("servlet.faultstring.internalServerError", arg0);
-    }
-
-    /**
-     * WSSERVLET30: Internal server error ({0})
-     *
-     */
-    public static String SERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
-        return localizer.localize(localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(arg0));
-    }
-
-    public static Localizable localizableWSSERVLET_26_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET26.diag.cause.1");
-    }
-
-    /**
-     * The endpoint URL is a duplicate
-     *
-     */
-    public static String WSSERVLET_26_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_26_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_STATUS() {
-        return messageFactory.getMessage("servlet.html.columnHeader.status");
-    }
-
-    /**
-     * Status
-     *
-     */
-    public static String SERVLET_HTML_COLUMN_HEADER_STATUS() {
-        return localizer.localize(localizableSERVLET_HTML_COLUMN_HEADER_STATUS());
-    }
-
-    public static Localizable localizableWSSERVLET_63_DIAG_CAUSE_1() {
-        return messageFactory.getMessage("WSSERVLET63.diag.cause.1");
-    }
-
-    /**
-     * Web service requests must use HTTP POST method: WSI BP 1.0
-     *
-     */
-    public static String WSSERVLET_63_DIAG_CAUSE_1() {
-        return localizer.localize(localizableWSSERVLET_63_DIAG_CAUSE_1());
-    }
-
-    public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
-        return messageFactory.getMessage("servlet.warning.duplicateEndpointName");
-    }
-
-    /**
-     * WSSERVLET17: duplicate endpoint name
-     *
-     */
-    public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_NAME() {
-        return localizer.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_NAME());
-    }
-
-    public static Localizable localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
-        return messageFactory.getMessage("trace.servlet.requestForPortNamed", arg0);
-    }
-
-    /**
-     * WSSERVLET58: got request for port: {0}
-     *
-     */
-    public static String TRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
-        return localizer.localize(localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(arg0));
+    public static String SERVLET_ERROR_NO_RESPONSE_MESSAGE() {
+        return LOCALIZER.localize(localizableSERVLET_ERROR_NO_RESPONSE_MESSAGE());
     }
 
     public static Localizable localizableSERVLET_NO_ADDRESS_AVAILABLE(Object arg0) {
-        return messageFactory.getMessage("servlet.no.address.available", arg0);
+        return MESSAGE_FACTORY.getMessage("servlet.no.address.available", arg0);
     }
 
     /**
@@ -1870,7 +320,1566 @@ public final class WsservletMessages {
      *
      */
     public static String SERVLET_NO_ADDRESS_AVAILABLE(Object arg0) {
-        return localizer.localize(localizableSERVLET_NO_ADDRESS_AVAILABLE(arg0));
+        return LOCALIZER.localize(localizableSERVLET_NO_ADDRESS_AVAILABLE(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_31_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET31.diag.cause.1");
+    }
+
+    /**
+     * Transformation being applied
+     *
+     */
+    public static String WSSERVLET_31_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_31_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_30_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET30.diag.cause.1");
+    }
+
+    /**
+     * There was a server error processing the request
+     *
+     */
+    public static String WSSERVLET_30_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_30_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableINFO_SERVLET_DESTROYING() {
+        return MESSAGE_FACTORY.getMessage("info.servlet.destroying");
+    }
+
+    /**
+     * WSSERVLET57: JAX-WS servlet: destroy
+     *
+     */
+    public static String INFO_SERVLET_DESTROYING() {
+        return LOCALIZER.localize(localizableINFO_SERVLET_DESTROYING());
+    }
+
+    public static Localizable localizableWSSERVLET_22_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET22.diag.cause.1");
+    }
+
+    /**
+     * A request was invoked with no endpoint
+     *
+     */
+    public static String WSSERVLET_22_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_22_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_26_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET26.diag.cause.1");
+    }
+
+    /**
+     * The endpoint URL is a duplicate
+     *
+     */
+    public static String WSSERVLET_26_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_26_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableSERVLET_HTML_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.html.notFound", arg0);
+    }
+
+    /**
+     * <h1>404 Not Found: {0}</h1>
+     *
+     */
+    public static String SERVLET_HTML_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_HTML_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableNO_SUNJAXWS_XML(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("no.sunjaxws.xml", arg0);
+    }
+
+    /**
+     * Runtime descriptor "{0}" is missing
+     *
+     */
+    public static String NO_SUNJAXWS_XML(Object arg0) {
+        return LOCALIZER.localize(localizableNO_SUNJAXWS_XML(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_18_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET18.diag.check.1");
+    }
+
+    /**
+     * This may or may not be intentional. If not examine client program for errors.
+     *
+     */
+    public static String WSSERVLET_18_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_18_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_24_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET24.diag.cause.1");
+    }
+
+    /**
+     * SOAPFault message is being returned to the client.
+     *
+     */
+    public static String WSSERVLET_24_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_24_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_51_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET51.diag.cause.1");
+    }
+
+    /**
+     * Service processing of the request generated an exception; while attempting to return a SOAPPFaultMessage a throwable was again generated
+     *
+     */
+    public static String WSSERVLET_51_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_51_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableERROR_SERVLET_NO_PORT_SPECIFIED() {
+        return MESSAGE_FACTORY.getMessage("error.servlet.noPortSpecified");
+    }
+
+    /**
+     * WSSERVLET53: no port specified in HTTP POST request URL
+     *
+     */
+    public static String ERROR_SERVLET_NO_PORT_SPECIFIED() {
+        return LOCALIZER.localize(localizableERROR_SERVLET_NO_PORT_SPECIFIED());
+    }
+
+    public static Localizable localizableWSSERVLET_43_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET43.diag.cause.1");
+    }
+
+    /**
+     * Instantiation of the web service failed.
+     *
+     */
+    public static String WSSERVLET_43_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_43_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("trace.servlet.writingSuccessResponse");
+    }
+
+    /**
+     * WSSERVLET62: writing success response
+     *
+     */
+    public static String TRACE_SERVLET_WRITING_SUCCESS_RESPONSE() {
+        return LOCALIZER.localize(localizableTRACE_SERVLET_WRITING_SUCCESS_RESPONSE());
+    }
+
+    public static Localizable localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
+        return MESSAGE_FACTORY.getMessage("info.servlet.gotEmptyRequestMessage");
+    }
+
+    /**
+     * WSSERVLET55: got empty request message
+     *
+     */
+    public static String INFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE() {
+        return LOCALIZER.localize(localizableINFO_SERVLET_GOT_EMPTY_REQUEST_MESSAGE());
+    }
+
+    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowableWhileRecovering", arg0);
+    }
+
+    /**
+     * WSSERVLET51: caught throwable while recovering from a previous exception: {0}
+     *
+     */
+    public static String ERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_12_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET12.diag.check.1");
+    }
+
+    /**
+     * Normal web service startup
+     *
+     */
+    public static String WSSERVLET_12_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_12_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_16_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET16.diag.check.1");
+    }
+
+    /**
+     * Unjar the service war file; check to see that the jaxrpc-ri-runtime.xml file is present
+     *
+     */
+    public static String WSSERVLET_16_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_16_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
+        return MESSAGE_FACTORY.getMessage("servlet.info.emptyRequestMessage");
+    }
+
+    /**
+     * WSSERVLET18: got empty request message
+     *
+     */
+    public static String SERVLET_INFO_EMPTY_REQUEST_MESSAGE() {
+        return LOCALIZER.localize(localizableSERVLET_INFO_EMPTY_REQUEST_MESSAGE());
+    }
+
+    public static Localizable localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.warning.ignoringImplicitUrlPattern", arg0);
+    }
+
+    /**
+     * WSSERVLET27: unsupported implicit URL pattern in endpoint: {0}
+     *
+     */
+    public static String SERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_WARNING_IGNORING_IMPLICIT_URL_PATTERN(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_14_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET14.diag.check.1");
+    }
+
+    /**
+     * Normal Web Service deployment. Deployment of service complete.
+     *
+     */
+    public static String WSSERVLET_14_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_14_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_20_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET20.diag.cause.1");
+    }
+
+    /**
+     * Implementation for this service can not be found
+     *
+     */
+    public static String WSSERVLET_20_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_20_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_14_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET14.diag.cause.1");
+    }
+
+    /**
+     * Web Services servlet starting up.
+     *
+     */
+    public static String WSSERVLET_14_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_14_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_28_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET28.diag.check.1");
+    }
+
+    /**
+     * Set target endpoint with stub.setTargetEndpoint() property.
+     *
+     */
+    public static String WSSERVLET_28_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_28_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_26_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET26.diag.check.1");
+    }
+
+    /**
+     * This may cause a problem, please remove duplicate endpoints
+     *
+     */
+    public static String WSSERVLET_26_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_26_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableHTML_ROOT_PAGE_TITLE() {
+        return MESSAGE_FACTORY.getMessage("html.rootPage.title");
+    }
+
+    /**
+     * Web Service
+     *
+     */
+    public static String HTML_ROOT_PAGE_TITLE() {
+        return LOCALIZER.localize(localizableHTML_ROOT_PAGE_TITLE());
+    }
+
+    public static Localizable localizableWSSERVLET_18_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET18.diag.cause.1");
+    }
+
+    /**
+     * Message sent by client is empty
+     *
+     */
+    public static String WSSERVLET_18_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_18_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_63_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET63.diag.cause.1");
+    }
+
+    /**
+     * Web service requests must use HTTP POST method: WSI BP 1.0
+     *
+     */
+    public static String WSSERVLET_63_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_63_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableHTML_NON_ROOT_PAGE_TITLE() {
+        return MESSAGE_FACTORY.getMessage("html.nonRootPage.title");
+    }
+
+    /**
+     * Web Service
+     *
+     */
+    public static String HTML_NON_ROOT_PAGE_TITLE() {
+        return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_TITLE());
+    }
+
+    public static Localizable localizableSERVLET_INFO_DESTROY() {
+        return MESSAGE_FACTORY.getMessage("servlet.info.destroy");
+    }
+
+    /**
+     * WSSERVLET15: JAX-WS servlet destroyed
+     *
+     */
+    public static String SERVLET_INFO_DESTROY() {
+        return LOCALIZER.localize(localizableSERVLET_INFO_DESTROY());
+    }
+
+    public static Localizable localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
+        return MESSAGE_FACTORY.getMessage("servlet.faultstring.invalidSOAPAction");
+    }
+
+    /**
+     * WSSERVLET65: Invalid Header SOAPAction required
+     *
+     */
+    public static String SERVLET_FAULTSTRING_INVALID_SOAP_ACTION() {
+        return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INVALID_SOAP_ACTION());
+    }
+
+    public static Localizable localizableWSSERVLET_16_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET16.diag.cause.1");
+    }
+
+    /**
+     * The jaxrpc-ri.xml file may be missing from the war file
+     *
+     */
+    public static String WSSERVLET_16_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_16_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_63_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET63.diag.check.1");
+    }
+
+    /**
+     * Make sure that your HTTP client is using POST requests, not GET requests
+     *
+     */
+    public static String WSSERVLET_63_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_63_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableEXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("exception.transformationFailed", arg0);
+    }
+
+    /**
+     * WSSERVLET34: transformation failed : {0}
+     *
+     */
+    public static String EXCEPTION_TRANSFORMATION_FAILED(Object arg0) {
+        return LOCALIZER.localize(localizableEXCEPTION_TRANSFORMATION_FAILED(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_28_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET28.diag.cause.1");
+    }
+
+    /**
+     * Target endpoint is null
+     *
+     */
+    public static String WSSERVLET_28_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_28_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_20_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET20.diag.check.1");
+    }
+
+    /**
+     * Unzip the war, are the tie and serializer classes found?
+     *
+     */
+    public static String WSSERVLET_20_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_20_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.noImplementorForPort", arg0);
+    }
+
+    /**
+     * WSSERVLET52: no implementor registered for port: {0}
+     *
+     */
+    public static String ERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_NO_IMPLEMENTOR_FOR_PORT(arg0));
+    }
+
+    public static Localizable localizablePUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("publisher.info.generatingWSDL", arg0);
+    }
+
+    /**
+     * WSSERVLET32: generating WSDL for endpoint: {0}
+     *
+     */
+    public static String PUBLISHER_INFO_GENERATING_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizablePUBLISHER_INFO_GENERATING_WSDL(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_22_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET22.diag.check.1");
+    }
+
+    /**
+     * Set endpoint with stub.setTargetEndpoint property
+     *
+     */
+    public static String WSSERVLET_22_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_22_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_24_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET24.diag.check.1");
+    }
+
+    /**
+     * Tracing message fault recorded.
+     *
+     */
+    public static String WSSERVLET_24_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_24_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_12_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET12.diag.cause.1");
+    }
+
+    /**
+     * Context listener starting
+     *
+     */
+    public static String WSSERVLET_12_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_12_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_65_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET65.diag.cause.1");
+    }
+
+    /**
+     * SOAP Action is required
+     *
+     */
+    public static String WSSERVLET_65_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_65_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.trace.invokingImplementor", arg0);
+    }
+
+    /**
+     * WSSERVLET21: invoking implementor: {0}
+     *
+     */
+    public static String SERVLET_TRACE_INVOKING_IMPLEMENTOR(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_TRACE_INVOKING_IMPLEMENTOR(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_21_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET21.diag.cause.1");
+    }
+
+    /**
+     * The Web service is being invoked
+     *
+     */
+    public static String WSSERVLET_21_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_21_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("trace.servlet.requestForPortNamed", arg0);
+    }
+
+    /**
+     * WSSERVLET58: got request for port: {0}
+     *
+     */
+    public static String TRACE_SERVLET_REQUEST_FOR_PORT_NAMED(Object arg0) {
+        return LOCALIZER.localize(localizableTRACE_SERVLET_REQUEST_FOR_PORT_NAMED(arg0));
+    }
+
+    public static Localizable localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("publisher.info.applyingTransformation", arg0);
+    }
+
+    /**
+     * WSSERVLET31: applying transformation with actual address: {0}
+     *
+     */
+    public static String PUBLISHER_INFO_APPLYING_TRANSFORMATION(Object arg0) {
+        return LOCALIZER.localize(localizablePUBLISHER_INFO_APPLYING_TRANSFORMATION(arg0));
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.implementorFactory.servantInitFailed", arg0);
+    }
+
+    /**
+     * WSSERVLET44: failed to initialize the service implementor for port "{0}"
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_SERVANT_INIT_FAILED(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_17_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET17.diag.check.1");
+    }
+
+    /**
+     * Note that this may cause problems with service deployment
+     *
+     */
+    public static String WSSERVLET_17_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_17_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.caughtThrowable", arg0);
+    }
+
+    /**
+     * WSSERVLET49: caught throwable: {0}
+     *
+     */
+    public static String ERROR_SERVLET_CAUGHT_THROWABLE(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_25_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET25.diag.cause.1");
+    }
+
+    /**
+     * SOAPMessage response is being returned to client
+     *
+     */
+    public static String WSSERVLET_25_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_25_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableSERVLET_HTML_METHOD() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.method");
+    }
+
+    /**
+     * WSSERVLET63: must use Post for this type of request
+     *
+     */
+    public static String SERVLET_HTML_METHOD() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_METHOD());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
+        return MESSAGE_FACTORY.getMessage("error.implementorFactory.noInputStream");
+    }
+
+    /**
+     * WSSERVLET37: no configuration specified
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM() {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_INPUT_STREAM());
+    }
+
+    public static Localizable localizableWSSERVLET_51_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET51.diag.check.1");
+    }
+
+    /**
+     * Check the server.xml log file for exception information
+     *
+     */
+    public static String WSSERVLET_51_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_51_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.unknownName", arg0);
+    }
+
+    /**
+     * WSSERVLET38: unknown port name: {0}
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_UNKNOWN_NAME(arg0));
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.incompleteInformation");
+    }
+
+    /**
+     * WSSERVLET41: configuration information is incomplete
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION() {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_INCOMPLETE_INFORMATION());
+    }
+
+    public static Localizable localizableWSSERVLET_13_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET13.diag.check.1");
+    }
+
+    /**
+     * Normal web service shutdown
+     *
+     */
+    public static String WSSERVLET_13_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_13_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_32_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET32.diag.check.1");
+    }
+
+    /**
+     * Normal Operation.
+     *
+     */
+    public static String WSSERVLET_32_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_32_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableSERVLET_HTML_TITLE_2() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.title2");
+    }
+
+    /**
+     * <h1>Web Services</h1>
+     *
+     */
+    public static String SERVLET_HTML_TITLE_2() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_TITLE_2());
+    }
+
+    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.columnHeader.portName");
+    }
+
+    /**
+     * Endpoint
+     *
+     */
+    public static String SERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_COLUMN_HEADER_PORT_NAME());
+    }
+
+    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_STATUS() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.columnHeader.status");
+    }
+
+    /**
+     * Status
+     *
+     */
+    public static String SERVLET_HTML_COLUMN_HEADER_STATUS() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_COLUMN_HEADER_STATUS());
+    }
+
+    public static Localizable localizableWSSERVLET_43_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET43.diag.check.1");
+    }
+
+    /**
+     * Make sure web service is available and public. Examine exception for more details
+     *
+     */
+    public static String WSSERVLET_43_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_43_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableINFO_SERVLET_INITIALIZING() {
+        return MESSAGE_FACTORY.getMessage("info.servlet.initializing");
+    }
+
+    /**
+     * WSSERVLET56: JAX-WS servlet: init
+     *
+     */
+    public static String INFO_SERVLET_INITIALIZING() {
+        return LOCALIZER.localize(localizableINFO_SERVLET_INITIALIZING());
+    }
+
+    public static Localizable localizableWSSERVLET_32_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET32.diag.cause.1");
+    }
+
+    /**
+     * WSDL being generated
+     *
+     */
+    public static String WSSERVLET_32_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_32_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableJAXRPCSERVLET_11_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("JAXRPCSERVLET11.diag.cause.1");
+    }
+
+    /**
+     * WSRuntimeInfoParser could not parse sun-jaxws.xml runtime descriptor
+     *
+     */
+    public static String JAXRPCSERVLET_11_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableJAXRPCSERVLET_11_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.cause.1");
+    }
+
+    /**
+     * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
+     *
+     */
+    public static String WSSERVLET_33_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_44_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET44.diag.check.1");
+    }
+
+    /**
+     * Check the exception for more details. Make sure all the configuration files are correct.
+     *
+     */
+    public static String WSSERVLET_44_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_44_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_33_DIAG_CAUSE_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.cause.2");
+    }
+
+    /**
+     * When publishing the service wsdl, the http location is patched with the deployed location/endpoint using XSLT transformation. The transformer could not be created to do the transformation.
+     *
+     */
+    public static String WSSERVLET_33_DIAG_CAUSE_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CAUSE_2());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
+        return MESSAGE_FACTORY.getMessage("error.implementorFactory.noConfiguration");
+    }
+
+    /**
+     * WSSERVLET36: no configuration specified
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION() {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_FACTORY_NO_CONFIGURATION());
+    }
+
+    public static Localizable localizableWSSERVLET_44_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET44.diag.cause.1");
+    }
+
+    /**
+     * The web service was instantiated, however, it could not be initialized
+     *
+     */
+    public static String WSSERVLET_44_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_44_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableHTML_WSDL_PAGE_TITLE() {
+        return MESSAGE_FACTORY.getMessage("html.wsdlPage.title");
+    }
+
+    /**
+     * Web Service
+     *
+     */
+    public static String HTML_WSDL_PAGE_TITLE() {
+        return LOCALIZER.localize(localizableHTML_WSDL_PAGE_TITLE());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.duplicateName", arg0);
+    }
+
+    /**
+     * WSSERVLET42: duplicate port name: {0}
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_DUPLICATE_NAME(arg0));
+    }
+
+    public static Localizable localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.warning.duplicateEndpointUrlPattern", arg0);
+    }
+
+    /**
+     * WSSERVLET26: duplicate URL pattern in endpoint: {0}
+     *
+     */
+    public static String SERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_WARNING_DUPLICATE_ENDPOINT_URL_PATTERN(arg0));
+    }
+
+    public static Localizable localizableSERVLET_HTML_NO_INFO_AVAILABLE() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.noInfoAvailable");
+    }
+
+    /**
+     * <p>No JAX-WS context information available.</p>
+     *
+     */
+    public static String SERVLET_HTML_NO_INFO_AVAILABLE() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_NO_INFO_AVAILABLE());
+    }
+
+    public static Localizable localizableWSSERVLET_49_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET49.diag.cause.1");
+    }
+
+    /**
+     * Service processing of the request generated an exception; while attempting to return a SOAPFaultMessage a throwable was again generated
+     *
+     */
+    public static String WSSERVLET_49_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_49_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_33_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.check.1");
+    }
+
+    /**
+     * There maybe a transformation engine being used that is not compatible. Make sure you are using the correct transformer and version.
+     *
+     */
+    public static String WSSERVLET_33_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_35_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET35.diag.check.1");
+    }
+
+    /**
+     * An exception was thrown during creation of the template. View exception and stacktrace for more details.
+     *
+     */
+    public static String WSSERVLET_35_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_35_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_33_DIAG_CHECK_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET33.diag.check.2");
+    }
+
+    /**
+     * There maybe a transformation engine may not be supported or compatible. Check the server.xml file for exceptions.
+     *
+     */
+    public static String WSSERVLET_33_DIAG_CHECK_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_33_DIAG_CHECK_2());
+    }
+
+    public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("servlet.html.information.table", arg0, arg1);
+    }
+
+    /**
+     * <table border="0"><tr><td>Address:</td><td>{0}</td></tr><tr><td>WSDL:</td><td><a href="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Implementation class:</td><td>{1}</td></tr></table>
+     *
+     */
+    public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1));
+    }
+
+    public static Localizable localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
+        return MESSAGE_FACTORY.getMessage("error.wsdlPublisher.cannotReadConfiguration");
+    }
+
+    /**
+     * WSSERVLET46: cannot read configuration
+     *
+     */
+    public static String ERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION() {
+        return LOCALIZER.localize(localizableERROR_WSDL_PUBLISHER_CANNOT_READ_CONFIGURATION());
+    }
+
+    public static Localizable localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER() {
+        return MESSAGE_FACTORY.getMessage("exception.cannotCreateTransformer");
+    }
+
+    /**
+     * WSSERVLET33: cannot create transformer
+     *
+     */
+    public static String EXCEPTION_CANNOT_CREATE_TRANSFORMER() {
+        return LOCALIZER.localize(localizableEXCEPTION_CANNOT_CREATE_TRANSFORMER());
+    }
+
+    public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_2() {
+        return MESSAGE_FACTORY.getMessage("html.nonRootPage.body2");
+    }
+
+    /**
+     * <p>Invalid request URI.</p><p>Please check your deployment information.</p>
+     *
+     */
+    public static String HTML_NON_ROOT_PAGE_BODY_2() {
+        return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_BODY_2());
+    }
+
+    public static Localizable localizableLISTENER_PARSING_FAILED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("listener.parsingFailed", arg0);
+    }
+
+    /**
+     * WSSERVLET11: failed to parse runtime descriptor: {0}
+     *
+     */
+    public static String LISTENER_PARSING_FAILED(Object arg0) {
+        return LOCALIZER.localize(localizableLISTENER_PARSING_FAILED(arg0));
+    }
+
+    public static Localizable localizableLISTENER_INFO_DESTROY() {
+        return MESSAGE_FACTORY.getMessage("listener.info.destroy");
+    }
+
+    /**
+     * WSSERVLET13: JAX-WS context listener destroyed
+     *
+     */
+    public static String LISTENER_INFO_DESTROY() {
+        return LOCALIZER.localize(localizableLISTENER_INFO_DESTROY());
+    }
+
+    public static Localizable localizableHTML_NON_ROOT_PAGE_BODY_1() {
+        return MESSAGE_FACTORY.getMessage("html.nonRootPage.body1");
+    }
+
+    /**
+     * <p>A Web Service is installed at this URL.</p>
+     *
+     */
+    public static String HTML_NON_ROOT_PAGE_BODY_1() {
+        return LOCALIZER.localize(localizableHTML_NON_ROOT_PAGE_BODY_1());
+    }
+
+    public static Localizable localizableSERVLET_INFO_INITIALIZE() {
+        return MESSAGE_FACTORY.getMessage("servlet.info.initialize");
+    }
+
+    /**
+     * WSSERVLET14: JAX-WS servlet initializing
+     *
+     */
+    public static String SERVLET_INFO_INITIALIZE() {
+        return LOCALIZER.localize(localizableSERVLET_INFO_INITIALIZE());
+    }
+
+    public static Localizable localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
+        return MESSAGE_FACTORY.getMessage("servlet.warning.missingContextInformation");
+    }
+
+    /**
+     * WSSERVLET16: missing context information
+     *
+     */
+    public static String SERVLET_WARNING_MISSING_CONTEXT_INFORMATION() {
+        return LOCALIZER.localize(localizableSERVLET_WARNING_MISSING_CONTEXT_INFORMATION());
+    }
+
+    public static Localizable localizableWSSERVLET_64_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET64.diag.check.1");
+    }
+
+    /**
+     * Make sure the client request is using text/xml
+     *
+     */
+    public static String WSSERVLET_64_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_64_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.faultstring.portNotFound", arg0);
+    }
+
+    /**
+     * WSSERVLET29: Port not found ({0})
+     *
+     */
+    public static String SERVLET_FAULTSTRING_PORT_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_PORT_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_49_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET49.diag.check.1");
+    }
+
+    /**
+     * Check the server.xml log file for exception information
+     *
+     */
+    public static String WSSERVLET_49_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_49_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("servlet.trace.writingSuccessResponse");
+    }
+
+    /**
+     * WSSERVLET25: writing success response
+     *
+     */
+    public static String SERVLET_TRACE_WRITING_SUCCESS_RESPONSE() {
+        return LOCALIZER.localize(localizableSERVLET_TRACE_WRITING_SUCCESS_RESPONSE());
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.2");
+    }
+
+    /**
+     * Verify that Application server deployment descriptors are correct in the service war file
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CHECK_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_2());
+    }
+
+    public static Localizable localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.faultstring.internalServerError", arg0);
+    }
+
+    /**
+     * WSSERVLET30: Internal server error ({0})
+     *
+     */
+    public static String SERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_INTERNAL_SERVER_ERROR(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.1");
+    }
+
+    /**
+     * Verify that sun-jaxws.xml and web.xml are correct in the service war file
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_31_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET31.diag.check.1");
+    }
+
+    /**
+     * Normal operation
+     *
+     */
+    public static String WSSERVLET_31_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_31_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableEXCEPTION_TEMPLATE_CREATION_FAILED() {
+        return MESSAGE_FACTORY.getMessage("exception.templateCreationFailed");
+    }
+
+    /**
+     * WSSERVLET35: failed to create a template object
+     *
+     */
+    public static String EXCEPTION_TEMPLATE_CREATION_FAILED() {
+        return LOCALIZER.localize(localizableEXCEPTION_TEMPLATE_CREATION_FAILED());
+    }
+
+    public static Localizable localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.error.noImplementorForEndpoint", arg0);
+    }
+
+    /**
+     * WSSERVLET20: no implementor for endpoint: {0}
+     *
+     */
+    public static String SERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_ERROR_NO_IMPLEMENTOR_FOR_ENDPOINT(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CHECK_3() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.check.3");
+    }
+
+    /**
+     * Check the server.xml file in the domain directory for failures
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CHECK_3() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CHECK_3());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.fileNotFound", arg0);
+    }
+
+    /**
+     * WSSERVLET45: file not found: {0}
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_FILE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_13_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET13.diag.cause.1");
+    }
+
+    /**
+     * Context listener shutdown
+     *
+     */
+    public static String WSSERVLET_13_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_13_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_27_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET27.diag.check.1");
+    }
+
+    /**
+     * Remove the implicit URL
+     *
+     */
+    public static String WSSERVLET_27_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_27_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableHTML_ROOT_PAGE_BODY_2_B() {
+        return MESSAGE_FACTORY.getMessage("html.rootPage.body2b");
+    }
+
+    /**
+     * </p>
+     *
+     */
+    public static String HTML_ROOT_PAGE_BODY_2_B() {
+        return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_2_B());
+    }
+
+    public static Localizable localizableWSSERVLET_15_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET15.diag.cause.1");
+    }
+
+    /**
+     * Web Services servlet shutdown.
+     *
+     */
+    public static String WSSERVLET_15_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_15_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_29_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET29.diag.check.1");
+    }
+
+    /**
+     * Is the port valid? Unzip the war file and make sure the tie and serializers are present
+     *
+     */
+    public static String WSSERVLET_29_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_29_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.servlet.init.config.parameter.missing", arg0);
+    }
+
+    /**
+     * WSSERVLET47: cannot find configuration parameter: "{0}"
+     *
+     */
+    public static String ERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_SERVLET_INIT_CONFIG_PARAMETER_MISSING(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_25_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET25.diag.check.1");
+    }
+
+    /**
+     * Tracing message, normal response.
+     *
+     */
+    public static String WSSERVLET_25_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_25_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_64_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET64.diag.cause.1");
+    }
+
+    /**
+     * Web service requests must be a content type text/xml: WSI BP 1.0
+     *
+     */
+    public static String WSSERVLET_64_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_64_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableHTML_ROOT_PAGE_BODY_2_A() {
+        return MESSAGE_FACTORY.getMessage("html.rootPage.body2a");
+    }
+
+    /**
+     * <p>It supports the following ports:
+     *
+     */
+    public static String HTML_ROOT_PAGE_BODY_2_A() {
+        return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_2_A());
+    }
+
+    public static Localizable localizableWSSERVLET_19_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET19.diag.cause.1");
+    }
+
+    /**
+     * Client request for this endpoint arrived
+     *
+     */
+    public static String WSSERVLET_19_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_19_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableHTML_ROOT_PAGE_BODY_4() {
+        return MESSAGE_FACTORY.getMessage("html.rootPage.body4");
+    }
+
+    /**
+     * <p>This endpoint is incorrectly configured. Please check the location and contents of the configuration file.</p>
+     *
+     */
+    public static String HTML_ROOT_PAGE_BODY_4() {
+        return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_4());
+    }
+
+    public static Localizable localizableSERVLET_FAULTSTRING_MISSING_PORT() {
+        return MESSAGE_FACTORY.getMessage("servlet.faultstring.missingPort");
+    }
+
+    /**
+     * WSSERVLET28: Missing port information
+     *
+     */
+    public static String SERVLET_FAULTSTRING_MISSING_PORT() {
+        return LOCALIZER.localize(localizableSERVLET_FAULTSTRING_MISSING_PORT());
+    }
+
+    public static Localizable localizableHTML_ROOT_PAGE_BODY_1() {
+        return MESSAGE_FACTORY.getMessage("html.rootPage.body1");
+    }
+
+    /**
+     * <p>A Web Service is installed at this URL.</p>
+     *
+     */
+    public static String HTML_ROOT_PAGE_BODY_1() {
+        return LOCALIZER.localize(localizableHTML_ROOT_PAGE_BODY_1());
+    }
+
+    public static Localizable localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE() {
+        return MESSAGE_FACTORY.getMessage("trace.servlet.writingFaultResponse");
+    }
+
+    /**
+     * WSSERVLET61: writing fault response
+     *
+     */
+    public static String TRACE_SERVLET_WRITING_FAULT_RESPONSE() {
+        return LOCALIZER.localize(localizableTRACE_SERVLET_WRITING_FAULT_RESPONSE());
+    }
+
+    public static Localizable localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("trace.servlet.gotResponseFromImplementor", arg0);
+    }
+
+    /**
+     * WSSERVLET60: got response from implementor: {0}
+     *
+     */
+    public static String TRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(Object arg0) {
+        return LOCALIZER.localize(localizableTRACE_SERVLET_GOT_RESPONSE_FROM_IMPLEMENTOR(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_17_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET17.diag.cause.1");
+    }
+
+    /**
+     * Two or more endpoints with the same name where found in the jaxrpc-ri.xml runtime descriptor
+     *
+     */
+    public static String WSSERVLET_17_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_17_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.cause.1");
+    }
+
+    /**
+     * WS runtime sun-jaxws.xml or web.xml may be incorrect
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableSERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("servlet.html.endpoint.table", arg0, arg1);
+    }
+
+    /**
+     * <table border="0"><tr><td>Service Name:</td><td>{0}</td></tr><tr><td>Port Name:</td><td>{1}</td></tr></table>
+     *
+     */
+    public static String SERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableSERVLET_HTML_ENDPOINT_TABLE(arg0, arg1));
+    }
+
+    public static Localizable localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("servlet.trace.gotRequestForEndpoint", arg0);
+    }
+
+    /**
+     * WSSERVLET19: got request for endpoint: {0}
+     *
+     */
+    public static String SERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(Object arg0) {
+        return LOCALIZER.localize(localizableSERVLET_TRACE_GOT_REQUEST_FOR_ENDPOINT(arg0));
+    }
+
+    public static Localizable localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.columnHeader.information");
+    }
+
+    /**
+     * Information
+     *
+     */
+    public static String SERVLET_HTML_COLUMN_HEADER_INFORMATION() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_COLUMN_HEADER_INFORMATION());
+    }
+
+    public static Localizable localizableLISTENER_INFO_INITIALIZE() {
+        return MESSAGE_FACTORY.getMessage("listener.info.initialize");
+    }
+
+    /**
+     * WSSERVLET12: JAX-WS context listener initializing
+     *
+     */
+    public static String LISTENER_INFO_INITIALIZE() {
+        return LOCALIZER.localize(localizableLISTENER_INFO_INITIALIZE());
+    }
+
+    public static Localizable localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
+        return MESSAGE_FACTORY.getMessage("error.servlet.noResponseWasProduced");
+    }
+
+    /**
+     * WSSERVLET54: no response was produced (internal error)
+     *
+     */
+    public static String ERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED() {
+        return LOCALIZER.localize(localizableERROR_SERVLET_NO_RESPONSE_WAS_PRODUCED());
+    }
+
+    public static Localizable localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
+        return MESSAGE_FACTORY.getMessage("servlet.error.noEndpointSpecified");
+    }
+
+    /**
+     * WSSERVLET22: no endpoint specified
+     *
+     */
+    public static String SERVLET_ERROR_NO_ENDPOINT_SPECIFIED() {
+        return LOCALIZER.localize(localizableSERVLET_ERROR_NO_ENDPOINT_SPECIFIED());
+    }
+
+    public static Localizable localizableSERVLET_HTML_TITLE() {
+        return MESSAGE_FACTORY.getMessage("servlet.html.title");
+    }
+
+    /**
+     * Web Services
+     *
+     */
+    public static String SERVLET_HTML_TITLE() {
+        return LOCALIZER.localize(localizableSERVLET_HTML_TITLE());
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.cause.2");
+    }
+
+    /**
+     * Application server deployment descriptors may be incorrect
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CAUSE_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CAUSE_2());
+    }
+
+    public static Localizable localizableWSSERVLET_50_DIAG_CAUSE_3() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET50.diag.cause.3");
+    }
+
+    /**
+     * There may some Application Server initialization problems
+     *
+     */
+    public static String WSSERVLET_50_DIAG_CAUSE_3() {
+        return LOCALIZER.localize(localizableWSSERVLET_50_DIAG_CAUSE_3());
+    }
+
+    public static Localizable localizableWSSERVLET_21_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET21.diag.check.1");
+    }
+
+    /**
+     * Normal web service invocation.
+     *
+     */
+    public static String WSSERVLET_21_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_21_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("error.implementorRegistry.classNotFound", arg0);
+    }
+
+    /**
+     * WSSERVLET40: class not found: {0}
+     *
+     */
+    public static String ERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableERROR_IMPLEMENTOR_REGISTRY_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWSSERVLET_29_DIAG_CAUSE_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET29.diag.cause.1");
+    }
+
+    /**
+     * A port is specified, but a corresponding service implementation is not found
+     *
+     */
+    public static String WSSERVLET_29_DIAG_CAUSE_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_29_DIAG_CAUSE_1());
+    }
+
+    public static Localizable localizableWSSERVLET_11_DIAG_CAUSE_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET11.diag.cause.2");
+    }
+
+    /**
+     * The sun-jaxws.xml runtime deployment descriptor may be missing
+     *
+     */
+    public static String WSSERVLET_11_DIAG_CAUSE_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_11_DIAG_CAUSE_2());
+    }
+
+    public static Localizable localizableWSSERVLET_23_DIAG_CHECK_1() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET23.diag.check.1");
+    }
+
+    /**
+     * If a response was expected, check that a request message was actually sent
+     *
+     */
+    public static String WSSERVLET_23_DIAG_CHECK_1() {
+        return LOCALIZER.localize(localizableWSSERVLET_23_DIAG_CHECK_1());
+    }
+
+    public static Localizable localizableWSSERVLET_23_DIAG_CHECK_2() {
+        return MESSAGE_FACTORY.getMessage("WSSERVLET23.diag.check.2");
+    }
+
+    /**
+     * The request may be malformed and be accepted by the service, yet did not generate a response
+     *
+     */
+    public static String WSSERVLET_23_DIAG_CHECK_2() {
+        return LOCALIZER.localize(localizableWSSERVLET_23_DIAG_CHECK_2());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
index 3680416d951..318387a336b 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,150 +25,28 @@
 
 package com.sun.xml.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import javax.annotation.Generated;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
  * Defines string formatting method for each constant in the resource file
  *
  */
+@Generated("com.sun.istack.internal.maven.ResourceGenMojo")
 public final class XmlmessageMessages {
+
     private final static String BUNDLE_NAME = "com.sun.xml.internal.ws.resources.xmlmessage";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, XmlmessageMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableXML_NULL_HEADERS() {
-        return messageFactory.getMessage("xml.null.headers");
-    }
-
-    /**
-     * Invalid argument. MimeHeaders=null
-     *
-     */
-    public static String XML_NULL_HEADERS() {
-        return localizer.localize(localizableXML_NULL_HEADERS());
-    }
-
-    public static Localizable localizableXML_SET_PAYLOAD_ERR() {
-        return messageFactory.getMessage("xml.set.payload.err");
-    }
-
-    /**
-     * Couldn't set Payload in XMLMessage
-     *
-     */
-    public static String XML_SET_PAYLOAD_ERR() {
-        return localizer.localize(localizableXML_SET_PAYLOAD_ERR());
-    }
-
-    public static Localizable localizableXML_CONTENT_TYPE_MUSTBE_MULTIPART() {
-        return messageFactory.getMessage("xml.content-type.mustbe.multipart");
-    }
-
-    /**
-     * Content-Type needs to be Multipart/Related and with type=text/xml
-     *
-     */
-    public static String XML_CONTENT_TYPE_MUSTBE_MULTIPART() {
-        return localizer.localize(localizableXML_CONTENT_TYPE_MUSTBE_MULTIPART());
-    }
-
-    public static Localizable localizableXML_UNKNOWN_CONTENT_TYPE() {
-        return messageFactory.getMessage("xml.unknown.Content-Type");
-    }
-
-    /**
-     * Unrecognized Content-Type
-     *
-     */
-    public static String XML_UNKNOWN_CONTENT_TYPE() {
-        return localizer.localize(localizableXML_UNKNOWN_CONTENT_TYPE());
-    }
-
-    public static Localizable localizableXML_GET_DS_ERR() {
-        return messageFactory.getMessage("xml.get.ds.err");
-    }
-
-    /**
-     * Couldn't get DataSource
-     *
-     */
-    public static String XML_GET_DS_ERR() {
-        return localizer.localize(localizableXML_GET_DS_ERR());
-    }
-
-    public static Localizable localizableXML_CONTENT_TYPE_PARSE_ERR() {
-        return messageFactory.getMessage("xml.Content-Type.parse.err");
-    }
-
-    /**
-     * Error while parsing MimeHeaders for Content-Type
-     *
-     */
-    public static String XML_CONTENT_TYPE_PARSE_ERR() {
-        return localizer.localize(localizableXML_CONTENT_TYPE_PARSE_ERR());
-    }
-
-    public static Localizable localizableXML_GET_SOURCE_ERR() {
-        return messageFactory.getMessage("xml.get.source.err");
-    }
-
-    /**
-     * Couldn't return Source
-     *
-     */
-    public static String XML_GET_SOURCE_ERR() {
-        return localizer.localize(localizableXML_GET_SOURCE_ERR());
-    }
-
-    public static Localizable localizableXML_CANNOT_INTERNALIZE_MESSAGE() {
-        return messageFactory.getMessage("xml.cannot.internalize.message");
-    }
-
-    /**
-     * Cannot create XMLMessage
-     *
-     */
-    public static String XML_CANNOT_INTERNALIZE_MESSAGE() {
-        return localizer.localize(localizableXML_CANNOT_INTERNALIZE_MESSAGE());
-    }
-
-    public static Localizable localizableXML_NO_CONTENT_TYPE() {
-        return messageFactory.getMessage("xml.no.Content-Type");
-    }
-
-    /**
-     * MimeHeaders doesn't contain Content-Type header
-     *
-     */
-    public static String XML_NO_CONTENT_TYPE() {
-        return localizer.localize(localizableXML_NO_CONTENT_TYPE());
-    }
-
-    public static Localizable localizableXML_ROOT_PART_INVALID_CONTENT_TYPE(Object arg0) {
-        return messageFactory.getMessage("xml.root.part.invalid.Content-Type", arg0);
-    }
-
-    /**
-     * Bad Content-Type for Root Part : {0}
-     *
-     */
-    public static String XML_ROOT_PART_INVALID_CONTENT_TYPE(Object arg0) {
-        return localizer.localize(localizableXML_ROOT_PART_INVALID_CONTENT_TYPE(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new XmlmessageMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableXML_INVALID_CONTENT_TYPE(Object arg0) {
-        return messageFactory.getMessage("xml.invalid.content-type", arg0);
+        return MESSAGE_FACTORY.getMessage("xml.invalid.content-type", arg0);
     }
 
     /**
@@ -176,7 +54,138 @@ public final class XmlmessageMessages {
      *
      */
     public static String XML_INVALID_CONTENT_TYPE(Object arg0) {
-        return localizer.localize(localizableXML_INVALID_CONTENT_TYPE(arg0));
+        return LOCALIZER.localize(localizableXML_INVALID_CONTENT_TYPE(arg0));
+    }
+
+    public static Localizable localizableXML_GET_SOURCE_ERR() {
+        return MESSAGE_FACTORY.getMessage("xml.get.source.err");
+    }
+
+    /**
+     * Couldn't return Source
+     *
+     */
+    public static String XML_GET_SOURCE_ERR() {
+        return LOCALIZER.localize(localizableXML_GET_SOURCE_ERR());
+    }
+
+    public static Localizable localizableXML_UNKNOWN_CONTENT_TYPE() {
+        return MESSAGE_FACTORY.getMessage("xml.unknown.Content-Type");
+    }
+
+    /**
+     * Unrecognized Content-Type
+     *
+     */
+    public static String XML_UNKNOWN_CONTENT_TYPE() {
+        return LOCALIZER.localize(localizableXML_UNKNOWN_CONTENT_TYPE());
+    }
+
+    public static Localizable localizableXML_SET_PAYLOAD_ERR() {
+        return MESSAGE_FACTORY.getMessage("xml.set.payload.err");
+    }
+
+    /**
+     * Couldn't set Payload in XMLMessage
+     *
+     */
+    public static String XML_SET_PAYLOAD_ERR() {
+        return LOCALIZER.localize(localizableXML_SET_PAYLOAD_ERR());
+    }
+
+    public static Localizable localizableXML_ROOT_PART_INVALID_CONTENT_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("xml.root.part.invalid.Content-Type", arg0);
+    }
+
+    /**
+     * Bad Content-Type for Root Part : {0}
+     *
+     */
+    public static String XML_ROOT_PART_INVALID_CONTENT_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableXML_ROOT_PART_INVALID_CONTENT_TYPE(arg0));
+    }
+
+    public static Localizable localizableXML_GET_DS_ERR() {
+        return MESSAGE_FACTORY.getMessage("xml.get.ds.err");
+    }
+
+    /**
+     * Couldn't get DataSource
+     *
+     */
+    public static String XML_GET_DS_ERR() {
+        return LOCALIZER.localize(localizableXML_GET_DS_ERR());
+    }
+
+    public static Localizable localizableXML_CANNOT_INTERNALIZE_MESSAGE() {
+        return MESSAGE_FACTORY.getMessage("xml.cannot.internalize.message");
+    }
+
+    /**
+     * Cannot create XMLMessage
+     *
+     */
+    public static String XML_CANNOT_INTERNALIZE_MESSAGE() {
+        return LOCALIZER.localize(localizableXML_CANNOT_INTERNALIZE_MESSAGE());
+    }
+
+    public static Localizable localizableXML_CONTENT_TYPE_PARSE_ERR() {
+        return MESSAGE_FACTORY.getMessage("xml.Content-Type.parse.err");
+    }
+
+    /**
+     * Error while parsing MimeHeaders for Content-Type
+     *
+     */
+    public static String XML_CONTENT_TYPE_PARSE_ERR() {
+        return LOCALIZER.localize(localizableXML_CONTENT_TYPE_PARSE_ERR());
+    }
+
+    public static Localizable localizableXML_NULL_HEADERS() {
+        return MESSAGE_FACTORY.getMessage("xml.null.headers");
+    }
+
+    /**
+     * Invalid argument. MimeHeaders=null
+     *
+     */
+    public static String XML_NULL_HEADERS() {
+        return LOCALIZER.localize(localizableXML_NULL_HEADERS());
+    }
+
+    public static Localizable localizableXML_NO_CONTENT_TYPE() {
+        return MESSAGE_FACTORY.getMessage("xml.no.Content-Type");
+    }
+
+    /**
+     * MimeHeaders doesn't contain Content-Type header
+     *
+     */
+    public static String XML_NO_CONTENT_TYPE() {
+        return LOCALIZER.localize(localizableXML_NO_CONTENT_TYPE());
+    }
+
+    public static Localizable localizableXML_CONTENT_TYPE_MUSTBE_MULTIPART() {
+        return MESSAGE_FACTORY.getMessage("xml.content-type.mustbe.multipart");
+    }
+
+    /**
+     * Content-Type needs to be Multipart/Related and with type=text/xml
+     *
+     */
+    public static String XML_CONTENT_TYPE_MUSTBE_MULTIPART() {
+        return LOCALIZER.localize(localizableXML_CONTENT_TYPE_MUSTBE_MULTIPART());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
index 545570e86c2..fff23f10b6a 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -51,8 +51,8 @@ runtime.modeler.mtom.conflict = Error in  @BindingType: MTOM Configuration in bi
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= Feature {0} in implementation conflicts with {1} in WSDL configuration
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 API. \
-  Use the endorsed standards override mechanism to load JAX-WS 2.2 API
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 or newer API. \
+  Use the standard override mechanism to load JAX-WS 2.2 or newer API.
 runtime.modeler.wsfeature.no.ftrconstructor=Annotation {0} is not recognizable, at least one constructor of {1} should be marked with @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=Annotation {0} is illegal, In {1} @FeatureConstructor value doesn't match the constructor parameters
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties
index 52c9c712b24..c2d5374723c 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = Fehler bei @BindingType: MTOM-Konfiguration in B
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= Feature {0} in Implementierung ist nicht mit {1} in WSDL-Konfiguration vereinbar
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API wird aus {0} geladen, die JAX-WS-Laufzeitumgebung erfordert jedoch JAX-WS 2.2 API. Verwenden Sie das "Endorsed Standards Override Mechanism"-Verfahren, um JAX-WS 2.2 API zu laden
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1-API wird aus {0} geladen, die JAX-WS-Laufzeit erfordert jedoch JAX-WS 2.2 oder eine neuere API. Verwenden Sie das Standard-Override-Verfahren, um JAX-WS 2.2 oder eine neuere API zu laden.
 runtime.modeler.wsfeature.no.ftrconstructor=Annotation {0} kann nicht erkannt werden, mindestens ein Konstruktor von {1} muss mit @FeatureConstructor markiert werden
 runtime.modeler.wsfeature.morethanone.ftrconstructor=Annotation {0} ist unzul\u00E4ssig. Nur ein Konstruktor von {1} kann als @FeatureConstructor markiert werden
 runtime.modeler.wsfeature.illegal.ftrconstructor=Annotation {0} ist unzul\u00E4ssig. In {1} stimmt der @FeatureConstructor-Wert nicht mit den Konstruktorparametern \u00FCberein
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties
index 0317823ef75..26ee36aade8 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_es.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = Error en @BindingType: la configuraci\u00F3n de
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= La funci\u00F3n {0} de la implantaci\u00F3n entra en conflicto con {1} en la configuraci\u00F3n de WSDL
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = La API de JAX-WS 2.1 se ha cargado desde {0}, pero JAX-WS en tiempo de ejecuci\u00F3n necesita la API JAX-WS 2.2. Utilice el mecanismo de sustituci\u00F3n de est\u00E1ndares aprobado para cargar la API JAX-WS 2.2
+runtime.modeler.addressing.responses.nosuchmethod = La API de JAX-WS 2.1 se ha cargado desde {0}, pero JAX-WS en tiempo de ejecuci\u00F3n necesita la API de JAX-WS 2.2 o una versi\u00F3n posterior. Utilice el mecanismo de sustituci\u00F3n de est\u00E1ndares para cargar la API de JAX-WS 2.2 o una versi\u00F3n posterior.
 runtime.modeler.wsfeature.no.ftrconstructor=La anotaci\u00F3n {0} no es reconocible. Al menos un constructor de {1} se deber\u00EDa marcar con @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=La anotaci\u00F3n {0} no es v\u00E1lida. S\u00F3lo un constructor de {1} se puede marcar como @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=La anotaci\u00F3n {0} no es v\u00E1lida. En {1}, el valor de @FeatureConstructor no coincide con los par\u00E1metros del constructor
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties
index 980e2dbb19b..4487ad86139 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_fr.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = Erreur dans @BindingType : la configuration MTOM
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= La fonctionnalit\u00E9 {0} dans l''impl\u00E9mentation est en conflit avec {1} dans la configuration WSDL
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = L''API JAX-WS 2.1 est charg\u00E9 \u00E0 partir de {0}, mais le runtime JAX-WS exige l''API JAX-WS 2.2. Utilisez le m\u00E9canisme Endorsed Standards Override Mechanism pour charger l''API JAX-WS 2.2
+runtime.modeler.addressing.responses.nosuchmethod = L''API JAX-WS 2.1 est charg\u00E9e \u00E0 partir de {0}, mais le runtime JAX-WS exige l''API JAX-WS 2.2 ou une version plus r\u00E9cente. Utilisez le m\u00E9canisme Standard Override Mechanism pour charger l''API JAX-WS 2.2 ou une version plus r\u00E9cente.
 runtime.modeler.wsfeature.no.ftrconstructor=L''annotation {0} n''est pas reconnaissable, au moins un constructeur de {1} doit \u00EAtre marqu\u00E9 avec @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=L''annotation {0} est interdite, seul un constructeur de {1} peut \u00EAtre marqu\u00E9 comme @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=L''annotation {0} est interdite ; dans {1}, la valeur @FeatureConstructor ne correspond pas aux param\u00E8tres constructeur
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties
index c8bc8c4c9b0..e1c32e6c4bf 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_it.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = Errore in @BindingType: la configurazione MTOM n
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= La funzione {0} nell''implementazione \u00E8 in conflitto con {1} nella configurazione WSDL
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = L''API JAX-WS 2.1 viene caricata da {0} ma il runtime JAX-WS richiede l''API JAX-WS 2.2. Usare il meccanismo Endorsed Standards Override Mechanism per caricare l''API JAX-WS 2.2
+runtime.modeler.addressing.responses.nosuchmethod = L''API JAX-WS 2.1 viene caricata da {0} ma il runtime JAX-WS richiede l''API JAX-WS 2.2 o versione successiva. Usare il meccanismo di sostituzione standard per caricare l''API JAX-WS 2.2 o versione successiva.
 runtime.modeler.wsfeature.no.ftrconstructor=L''annotazione {0} non \u00E8 riconoscibile. Almeno un costruttore di {1} deve essere contrassegnato con @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=L''annotazione {0} non \u00E8 valida. Solo un costruttore di {1} pu\u00F2 essere contrassegnato come @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=L''annotazione {0} non \u00E8 valida. Il valore {1} @FeatureConstructor non corrisponde ai parametri del costruttore
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties
index 94495904454..5e495b64f6b 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = @BindingType\u306E\u30A8\u30E9\u30FC: \u30D0\u30
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= \u5B9F\u88C5\u306E\u6A5F\u80FD{0}\u304CWSDL\u69CB\u6210\u306E{1}\u3068\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API\u306F{0}\u304B\u3089\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u304C\u3001JAX-WS\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u306FJAX-WS 2.2 API\u304C\u5FC5\u8981\u3067\u3059\u3002JAX-WS 2.2 API\u3092\u30ED\u30FC\u30C9\u3059\u308B\u306B\u306F\u3001Endorsed Standards Override Mechanism\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API\u306F{0}\u304B\u3089\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u304C\u3001JAX-WS\u30E9\u30F3\u30BF\u30A4\u30E0\u306B\u306FJAX-WS 2.2\u4EE5\u4E0A\u306EAPI\u304C\u5FC5\u8981\u3067\u3059\u3002JAX-WS 2.2\u4EE5\u4E0A\u306EAPI\u3092\u30ED\u30FC\u30C9\u3059\u308B\u306B\u306F\u3001Standards Override Mechanism\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 runtime.modeler.wsfeature.no.ftrconstructor=\u6CE8\u91C8{0}\u3092\u8A8D\u8B58\u3067\u304D\u307E\u305B\u3093\u3002{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u5C11\u306A\u304F\u3068\u30821\u3064\u304C@FeatureConstructor\u3067\u30DE\u30FC\u30AF\u3055\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 runtime.modeler.wsfeature.morethanone.ftrconstructor=\u6CE8\u91C8{0}\u304C\u4E0D\u6B63\u3067\u3059\u3002@FeatureConstructor\u3068\u3057\u3066\u30DE\u30FC\u30AF\u3067\u304D\u308B{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306F\u30011\u3064\u306E\u307F\u3067\u3059
 runtime.modeler.wsfeature.illegal.ftrconstructor=\u6CE8\u91C8{0}\u304C\u4E0D\u6B63\u3067\u3059\u3002{1}\u3067\u3001@FeatureConstructor\u306E\u5024\u304C\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties
index f51d783a1b1..0912cd30b48 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_ko.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = @BindingType\uC5D0 \uC624\uB958 \uBC1C\uC0DD: \u
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= \uAD6C\uD604\uC758 {0} \uAE30\uB2A5\uC774 WSDL \uAD6C\uC131\uC758 {1}\uACFC(\uC640) \uCDA9\uB3CC\uD569\uB2C8\uB2E4.
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API\uAC00 {0}\uC5D0\uC11C \uB85C\uB4DC\uB418\uC5C8\uC9C0\uB9CC JAX-WS \uB7F0\uD0C0\uC784\uC5D0 JAX-WS 2.2 API\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. \uC778\uC99D\uB41C \uD45C\uC900 \uBB34\uD6A8\uD654 \uBC29\uC2DD\uC744 \uC0AC\uC6A9\uD558\uC5EC AX-WS 2.2 API\uB97C \uB85C\uB4DC\uD558\uC2ED\uC2DC\uC624.
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API\uAC00 {0}\uC5D0\uC11C \uB85C\uB4DC\uB418\uC5C8\uC9C0\uB9CC JAX-WS \uB7F0\uD0C0\uC784\uC5D0 JAX-WS 2.2 \uC774\uC0C1 API\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. \uD45C\uC900 \uBB34\uD6A8\uD654 \uBC29\uC2DD\uC744 \uC0AC\uC6A9\uD558\uC5EC JAX-WS 2.2 \uC774\uC0C1 API\uB97C \uB85C\uB4DC\uD558\uC2ED\uC2DC\uC624.
 runtime.modeler.wsfeature.no.ftrconstructor={0} \uC8FC\uC11D\uC744 \uC778\uC2DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD558\uB098 \uC774\uC0C1\uC758 {1} \uC0DD\uC131\uC790\uAC00 @FeatureConstructor\uB85C \uD45C\uC2DC\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
 runtime.modeler.wsfeature.morethanone.ftrconstructor={0} \uC8FC\uC11D\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uD558\uB098\uC758 {1} \uC0DD\uC131\uC790\uB9CC @FeatureConstructor\uB85C \uD45C\uC2DC\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 runtime.modeler.wsfeature.illegal.ftrconstructor={0} \uC8FC\uC11D\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4. {1}\uC5D0\uC11C @FeatureConstructor \uAC12\uC774 \uC0DD\uC131\uC790 \uB9E4\uAC1C\uBCC0\uC218\uC640 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties
index d6bfc767594..57d9f50b2b3 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_pt_BR.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = Erro em @BindingType: a Configura\u00E7\u00E3o d
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= O recurso {0} na implementa\u00E7\u00E3o est\u00E1 em conflito com {1} na configura\u00E7\u00E3o do WSDL
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = A API de JAX-WS 2.1 foi carregada de {0}, mas o runtime de JAX-WS requer a API JAX-WS 2.2. Use o mecanismo de substitui\u00E7\u00E3o de padr\u00F5es endossados para carregar a API de JAX-WS 2.2
+runtime.modeler.addressing.responses.nosuchmethod = A API de JAX-WS 2.1 foi carregada de {0}, mas o runtime de JAX-WS requer a API JAX-WS 2.2 ou mais recente. Use o mecanismo de substitui\u00E7\u00E3o de padr\u00F5es para carregar a API de JAX-WS 2.2 ou mais recente.
 runtime.modeler.wsfeature.no.ftrconstructor=A anota\u00E7\u00E3o {0} n\u00E3o \u00E9 reconhec\u00EDvel, pelo menos um construtor de {1} deve ser marcado com @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=A anota\u00E7\u00E3o {0} \u00E9 inv\u00E1lida. Somente um construtor de {1} pode ser marcado como @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=A anota\u00E7\u00E3o {0} \u00E9 inv\u00E1lida. No {1} o valor de @FeatureConstructor n\u00E3o corresponde aos par\u00E2metros do construtor
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties
index be9b1b7e9a3..56a8d496f6d 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = @BindingType \u4E2D\u51FA\u9519: \u7ED1\u5B9A\u6
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= \u5B9E\u73B0\u4E2D\u7684\u529F\u80FD{0}\u4E0E WSDL \u914D\u7F6E\u4E2D\u7684{1}\u53D1\u751F\u51B2\u7A81
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API \u5DF2\u4ECE{0}\u4E2D\u52A0\u8F7D, \u4F46 JAX-WS \u8FD0\u884C\u65F6\u9700\u8981 JAX-WS 2.2 API\u3002\u8BF7\u4F7F\u7528\u6388\u6743\u6807\u51C6\u8986\u76D6\u673A\u5236\u6765\u52A0\u8F7D JAX-WS 2.2 API
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API \u5DF2\u4ECE {0} \u4E2D\u52A0\u8F7D, \u4F46 JAX-WS \u8FD0\u884C\u65F6\u9700\u8981 JAX-WS 2.2 \u6216\u66F4\u65B0\u7684 API\u3002\u8BF7\u4F7F\u7528\u6807\u51C6\u8986\u76D6\u673A\u5236\u6765\u52A0\u8F7D JAX-WS 2.2 \u6216\u66F4\u65B0\u7684 API\u3002
 runtime.modeler.wsfeature.no.ftrconstructor=\u65E0\u6CD5\u8BC6\u522B\u6CE8\u91CA{0}, \u5E94\u4F7F\u7528 @FeatureConstructor \u81F3\u5C11\u6807\u8BB0{1}\u7684\u4E00\u4E2A\u6784\u9020\u5668
 runtime.modeler.wsfeature.morethanone.ftrconstructor=\u6CE8\u91CA{0}\u662F\u975E\u6CD5\u7684, \u53EA\u80FD\u5C06{1}\u7684\u4E00\u4E2A\u6784\u9020\u5668\u6807\u8BB0\u4E3A @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=\u6CE8\u91CA{0}\u662F\u975E\u6CD5\u7684, \u5728{1}\u4E2D, @FeatureConstructor \u503C\u4E0E\u6784\u9020\u5668\u53C2\u6570\u4E0D\u5339\u914D
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties
index 055d6da0d57..372512643f1 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/resources/modeler_zh_TW.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2017, 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
@@ -47,7 +47,7 @@ runtime.modeler.mtom.conflict = @BindingType \u767C\u751F\u932F\u8AA4: \u9023\u7
 # {0} - feature class name, {1} - feature class name
 runtime.modeler.feature.conflict= \u5BE6\u884C\u4E2D\u7684\u529F\u80FD {0} \u8207 WSDL \u7D44\u614B\u4E2D\u7684 {1} \u767C\u751F\u885D\u7A81
 # {0} - absolute class location
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API \u5DF2\u5F9E {0} \u8F09\u5165, \u4F46 JAX-WS \u7A0B\u5F0F\u5BE6\u969B\u57F7\u884C\u9700\u8981 JAX-WS 2.2 API. \u8ACB\u4F7F\u7528\u8A8D\u53EF\u7684\u6A19\u6E96\u8986\u5BEB\u6A5F\u5236\u4F86\u8F09\u5165 JAX-WS 2.2 API
+runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API \u5F9E {0} \u8F09\u5165\uFF0C\u4F46\u662F JAX-WS \u7A0B\u5F0F\u5BE6\u969B\u57F7\u884C\u9700\u8981 JAX-WS 2.2 \u6216\u66F4\u65B0\u7248\u672C\u7684 API\u3002\u8ACB\u4F7F\u7528\u6A19\u6E96\u8986\u5BEB\u6A5F\u5236\u4F86\u8F09\u5165 JAX-WS 2.2 \u6216\u66F4\u65B0\u7248\u672C\u7684 API\u3002
 runtime.modeler.wsfeature.no.ftrconstructor=\u8A3B\u89E3 {0} \u7121\u6CD5\u8FA8\u8B58, \u81F3\u5C11\u4E00\u500B {1} \u7684\u5EFA\u69CB\u5B50\u61C9\u6A19\u793A @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=\u8A3B\u89E3 {0} \u7121\u6548, \u53EA\u80FD\u6709\u4E00\u500B {1} \u7684\u5EFA\u69CB\u5B50\u6A19\u793A\u70BA @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=\u8A3B\u89E3 {0} \u7121\u6548, \u5728 {1} \u4E2D, @FeatureConstructor \u503C\u8207\u5EFA\u69CB\u5B50\u53C3\u6578\u4E0D\u7B26
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
index 53d37f3dee8..df549c0249c 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -45,6 +45,7 @@ import javax.xml.ws.Provider;
 import javax.xml.ws.Service;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.logging.Logger;
 
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java
new file mode 100644
index 00000000000..7b6b5c2b649
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/MrJarUtil.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2017, 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.xml.internal.ws.util;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Utility class used as a JEP 238 multi release jar versioned class.
+ *
+ * Version for {@code runtime >= 9}.
+ */
+public class MrJarUtil {
+
+    /**
+     * Get property used for disabling instance pooling of xml readers / writers.
+     *
+     * @param baseName Name of a {@linkplain com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory} class or
+     *                 {@linkplain com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory} class.
+     *
+     * @return true if *.noPool system property is not set or is set to true.
+     */
+    public static boolean getNoPoolProperty(String baseName) {
+        return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+            @Override
+            public Boolean run() {
+                String noPool = System.getProperty(baseName + ".noPool");
+                return noPool == null || Boolean.parseBoolean(noPool);
+            }
+        });
+    }
+}
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java
index 3c6e544167f..dd426f491d0 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/Pool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -30,8 +30,10 @@ import com.sun.xml.internal.ws.api.pipe.TubeCloner;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
+
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.lang.ref.WeakReference;
+import java.lang.ref.SoftReference;
+
 
 /**
  * General-purpose object pool.
@@ -50,7 +52,7 @@ import java.lang.ref.WeakReference;
 public abstract class Pool<T> {
 
     // volatile since multiple threads may access queue reference
-    private volatile WeakReference<ConcurrentLinkedQueue<T>> queue;
+    private volatile SoftReference<ConcurrentLinkedQueue<T>> queue;
 
     /**
      * Gets a new object from the pool.
@@ -69,7 +71,7 @@ public abstract class Pool<T> {
     }
 
     private ConcurrentLinkedQueue<T> getQueue() {
-        WeakReference<ConcurrentLinkedQueue<T>> q = queue;
+        SoftReference<ConcurrentLinkedQueue<T>> q = queue;
         if (q != null) {
             ConcurrentLinkedQueue<T> d = q.get();
             if (d != null)
@@ -78,7 +80,7 @@ public abstract class Pool<T> {
 
         // overwrite the queue
         ConcurrentLinkedQueue<T> d = new ConcurrentLinkedQueue<T>();
-        queue = new WeakReference<ConcurrentLinkedQueue<T>>(d);
+        queue = new SoftReference<ConcurrentLinkedQueue<T>>(d);
 
         return d;
     }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
index c2ec0fc4013..e7977c05e77 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -45,7 +45,7 @@ import javax.xml.ws.WebServiceException;
  * @author WS Development Team
  */
 public abstract class JAXWSExceptionBase
-    extends WebServiceException implements Localizable {
+    extends WebServiceException implements Localizable, LocalizableMessageFactory.ResourceBundleSupplier {
 
     //Don't worry about previous  serialVersionUID = 4818235090198755494L;, this class was not serializable before.
     private static final long serialVersionUID = 1L;
@@ -53,12 +53,14 @@ public abstract class JAXWSExceptionBase
     private transient Localizable msg;
 
     /**
-     * @deprecated
-     *      Should use the localizable constructor instead.
+     * @param key
+     * @param args
+     * @deprecated Should use the localizable constructor instead.
      */
+    @Deprecated
     protected JAXWSExceptionBase(String key, Object... args) {
         super(findNestedException(args));
-        this.msg = new LocalizableMessage(getDefaultResourceBundleName(), key, args);
+        this.msg = new LocalizableMessage(getDefaultResourceBundleName(), this, key, args);
     }
 
 
@@ -68,6 +70,7 @@ public abstract class JAXWSExceptionBase
 
     /**
      * Creates a new exception that wraps the specified exception.
+     * @param throwable
      */
     protected JAXWSExceptionBase(Throwable throwable) {
         this(new NullLocalizable(throwable.toString()),throwable);
@@ -127,8 +130,7 @@ public abstract class JAXWSExceptionBase
                 args[i] = in.readObject();
             }
         }
-        msg = new LocalizableMessageFactory(resourceBundleName, this::getResourceBundle)
-                        .getMessage(key,args);
+        msg = new LocalizableMessageFactory(resourceBundleName).getMessage(key,args);
     }
 
     private static Throwable findNestedException(Object[] args) {
@@ -141,6 +143,7 @@ public abstract class JAXWSExceptionBase
         return null;
     }
 
+    @Override
     public String getMessage() {
         Localizer localizer = new Localizer();
         return localizer.localize(this);
@@ -149,31 +152,31 @@ public abstract class JAXWSExceptionBase
     /**
      * Gets the default resource bundle name for this kind of exception.
      * Used for {@link #JAXWSExceptionBase(String, Object[])}.
+     * @return
      */
     protected abstract String getDefaultResourceBundleName();
 
-    /*
-     * Returns the ResourceBundle in this module.
-     *
-     * Subclasses in a different module has to override this method.
-     */
+//
+// Localizable delegation
+//
+    @Override
+    public final String getKey() {
+        return msg.getKey();
+    }
+
+    @Override
+    public final Object[] getArguments() {
+        return msg.getArguments();
+    }
+
+    @Override
+    public final String getResourceBundleName() {
+        return msg.getResourceBundleName();
+    }
+
     @Override
     public ResourceBundle getResourceBundle(Locale locale) {
         return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
     }
 
-//
-// Localizable delegation
-//
-    public final String getKey() {
-        return msg.getKey();
-    }
-
-    public final Object[] getArguments() {
-        return msg.getArguments();
-    }
-
-    public final String getResourceBundleName() {
-        return msg.getResourceBundleName();
-    }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
index 234d05eae54..783eab51dcb 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -483,7 +483,7 @@ public abstract class AbstractSchemaValidationTube extends AbstractFilterTubeImp
         assert docs.size() > 1;
 
         final StringBuilder sb = new StringBuilder("<xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'");
-        if (!"".equals(tns)) {
+        if (tns != null && !("".equals(tns)) && !("null".equals(tns))) {
             sb.append(" targetNamespace='").append(tns).append("'");
         }
         sb.append(">\n");
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties
index 82452acb3d7..88eace686b6 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/util/version.properties
@@ -26,4 +26,4 @@
 build-id=2.3.0-SNAPSHOT
 build-version=JAX-WS RI 2.3.0-SNAPSHOT
 major-version=2.3.0
-svn-revision=e8c5e9697d9b27d83ff35d767939b2f55e667621
+svn-revision=3012ef421cf43774943c57736dac2207aeea9f07
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java
index 5b90f85e2dc..4770665d8f3 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/AttachmentPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -26,7 +26,6 @@
 package javax.xml.soap;
 
 import java.io.InputStream;
-import java.io.Reader;
 import java.util.Iterator;
 
 import javax.activation.DataHandler;
@@ -499,7 +498,7 @@ public abstract class AttachmentPart {
      * @return  an {@code Iterator} object with all of the Mime
      *          headers for this {@code AttachmentPart} object
      */
-    public abstract Iterator getAllMimeHeaders();
+    public abstract Iterator<MimeHeader> getAllMimeHeaders();
 
     /**
      * Retrieves all {@code MimeHeader} objects that match a name in
@@ -510,7 +509,7 @@ public abstract class AttachmentPart {
      * @return  all of the MIME headers that match one of the names in the
      *           given array as an {@code Iterator} object
      */
-    public abstract Iterator getMatchingMimeHeaders(String[] names);
+    public abstract Iterator<MimeHeader> getMatchingMimeHeaders(String[] names);
 
     /**
      * Retrieves all {@code MimeHeader} objects whose name does
@@ -523,5 +522,5 @@ public abstract class AttachmentPart {
      *           given array.  The nonmatching MIME headers are returned as an
      *           {@code Iterator} object.
      */
-    public abstract Iterator getNonMatchingMimeHeaders(String[] names);
+    public abstract Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names);
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java
index 78ad9f323dc..8b823e1aeeb 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Detail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -68,6 +68,9 @@ public interface Detail extends SOAPFaultElement {
      * @param name a {@code Name} object identifying the
      *         new {@code DetailEntry} object
      *
+     * @return the new {@code DetailEntry} object that was
+     *         created
+     *
      * @exception SOAPException thrown when there is a problem in adding a
      * DetailEntry object to this Detail object.
      *
@@ -83,6 +86,9 @@ public interface Detail extends SOAPFaultElement {
      * @param qname a {@code QName} object identifying the
      *         new {@code DetailEntry} object
      *
+     * @return the new {@code DetailEntry} object that was
+     *         created
+     *
      * @exception SOAPException thrown when there is a problem in adding a
      * DetailEntry object to this Detail object.
      *
@@ -97,5 +103,5 @@ public interface Detail extends SOAPFaultElement {
      * @return an {@code Iterator} object over the {@code DetailEntry}
      *             objects in this {@code Detail} object
      */
-    public Iterator getDetailEntries();
+    public Iterator<DetailEntry> getDetailEntries();
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java
index d84d6b77255..85046ca9a3a 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/MimeHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -42,14 +42,14 @@ import java.util.Vector;
  * @since 1.6
  */
 public class MimeHeaders {
-    private Vector headers;
+    private Vector<MimeHeader> headers;
 
    /**
     * Constructs a default {@code MimeHeaders} object initialized with
     * an empty {@code Vector} object.
     */
     public MimeHeaders() {
-        headers = new Vector();
+        headers = new Vector<>();
     }
 
     /**
@@ -62,10 +62,10 @@ public class MimeHeaders {
      * @see #setHeader
      */
     public String[] getHeader(String name) {
-        Vector values = new Vector();
+        Vector<String> values = new Vector<>();
 
         for(int i = 0; i < headers.size(); i++) {
-            MimeHeader hdr = (MimeHeader) headers.elementAt(i);
+            MimeHeader hdr = headers.elementAt(i);
             if (hdr.getName().equalsIgnoreCase(name)
                 && hdr.getValue() != null)
                 values.addElement(hdr.getValue());
@@ -103,7 +103,7 @@ public class MimeHeaders {
             throw new IllegalArgumentException("Illegal MimeHeader name");
 
         for(int i = 0; i < headers.size(); i++) {
-            MimeHeader hdr = (MimeHeader) headers.elementAt(i);
+            MimeHeader hdr = headers.elementAt(i);
             if (hdr.getName().equalsIgnoreCase(name)) {
                 if (!found) {
                     headers.setElementAt(new MimeHeader(hdr.getName(),
@@ -141,7 +141,7 @@ public class MimeHeaders {
         int pos = headers.size();
 
         for(int i = pos - 1 ; i >= 0; i--) {
-            MimeHeader hdr = (MimeHeader) headers.elementAt(i);
+            MimeHeader hdr = headers.elementAt(i);
             if (hdr.getName().equalsIgnoreCase(name)) {
                 headers.insertElementAt(new MimeHeader(name, value),
                                         i+1);
@@ -160,7 +160,7 @@ public class MimeHeaders {
      */
     public void removeHeader(String name) {
         for(int i = 0; i < headers.size(); i++) {
-            MimeHeader hdr = (MimeHeader) headers.elementAt(i);
+            MimeHeader hdr = headers.elementAt(i);
             if (hdr.getName().equalsIgnoreCase(name))
                 headers.removeElementAt(i--);
         }
@@ -180,26 +180,26 @@ public class MimeHeaders {
      * @return  an {@code Iterator} object over this {@code MimeHeaders}
      *          object's list of {@code MimeHeader} objects
      */
-    public Iterator getAllHeaders() {
+    public Iterator<MimeHeader> getAllHeaders() {
         return headers.iterator();
     }
 
-    class MatchingIterator implements Iterator {
-        private boolean match;
-        private Iterator iterator;
-        private String[] names;
-        private Object nextHeader;
+    static class MatchingIterator implements Iterator<MimeHeader> {
+        private final boolean match;
+        private final Iterator<MimeHeader> iterator;
+        private final String[] names;
+        private MimeHeader nextHeader;
 
-        MatchingIterator(String[] names, boolean match) {
+        MatchingIterator(String[] names, boolean match, Iterator<MimeHeader> i) {
             this.match = match;
             this.names = names;
-            this.iterator = headers.iterator();
+            this.iterator = i;
         }
 
-        private Object nextMatch() {
+        private MimeHeader nextMatch() {
         next:
             while (iterator.hasNext()) {
-                MimeHeader hdr = (MimeHeader) iterator.next();
+                MimeHeader hdr = iterator.next();
 
                 if (names == null)
                     return match ? null : hdr;
@@ -217,17 +217,19 @@ public class MimeHeaders {
         }
 
 
+        @Override
         public boolean hasNext() {
             if (nextHeader == null)
                 nextHeader = nextMatch();
             return nextHeader != null;
         }
 
-        public Object next() {
+        @Override
+        public MimeHeader next() {
             // hasNext should've prefetched the header for us,
             // return it.
             if (nextHeader != null) {
-                Object ret = nextHeader;
+                MimeHeader ret = nextHeader;
                 nextHeader = null;
                 return ret;
             }
@@ -236,6 +238,7 @@ public class MimeHeaders {
             return null;
         }
 
+        @Override
         public void remove() {
             iterator.remove();
         }
@@ -251,8 +254,8 @@ public class MimeHeaders {
      * @return  an {@code Iterator} object over the {@code MimeHeader}
      *          objects whose name matches one of the names in the given list
      */
-    public Iterator getMatchingHeaders(String[] names) {
-        return new MatchingIterator(names, true);
+    public Iterator<MimeHeader> getMatchingHeaders(String[] names) {
+        return new MatchingIterator(names, true, headers.iterator());
     }
 
     /**
@@ -264,7 +267,7 @@ public class MimeHeaders {
      * @return  an {@code Iterator} object over the {@code MimeHeader}
      *          objects whose name does not match one of the names in the given list
      */
-    public Iterator getNonMatchingHeaders(String[] names) {
-        return new MatchingIterator(names, false);
+    public Iterator<MimeHeader> getNonMatchingHeaders(String[] names) {
+        return new MatchingIterator(names, false, headers.iterator());
     }
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java
index 221255e422d..164658fb663 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -27,7 +27,7 @@ package javax.xml.soap;
 
 /**
  * A representation of a node (element) in an XML document.
- * This interface extnends the standard DOM Node interface with methods for
+ * This interface extends the standard DOM Node interface with methods for
  * getting and setting the value of a node, for
  * getting and setting the parent of a node, and for removing a node.
  *
@@ -59,6 +59,7 @@ public interface Node extends org.w3c.dom.Node {
      * there are no children in which case a child {@code Text} node will be
      * created.
      *
+     * @param value {@code value} to set on the {@code Text} node
      * @exception IllegalStateException if the node is not a {@code Text}
      *              node and either has more than one child node or has a child
      *              node that is not a {@code Text} node.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java
index 4734e5689d1..109bc02e3ba 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SAAJMetaFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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,7 +29,7 @@ package javax.xml.soap;
 * The access point for the implementation classes of the factories defined in the
 * SAAJ API. The {@code newInstance} methods defined on factories {@link SOAPFactory} and
 * {@link MessageFactory} in SAAJ 1.3 defer to instances of this class to do the actual object creation.
-* The implementations of {@code newInstance()} methods (in SOAPFactory and MessageFactory)
+* The implementations of {@code newInstance()} methods (in {@link SOAPFactory} and {@link MessageFactory})
 * that existed in SAAJ 1.2 have been updated to also delegate to the SAAJMetaFactory when the SAAJ 1.2
 * defined lookup fails to locate the Factory implementation class name.
 *
@@ -94,7 +94,7 @@ public abstract class SAAJMetaFactory {
 
             } catch (Exception e) {
                 throw new SOAPException(
-                    "Unable to create SAAJ meta-factory" + e.getMessage());
+                    "Unable to create SAAJ meta-factory: " + e.getMessage());
             }
     }
 
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java
index 76ef0fb8ce7..c773003d6c5 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -277,7 +277,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @see SOAPElement#getAllAttributesAsQNames()
      * @return an iterator over the names of the attributes
      */
-    public Iterator getAllAttributes();
+    public Iterator<Name> getAllAttributes();
 
     /**
      * Returns an {@code Iterator} over all of the attributes
@@ -290,7 +290,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @see SOAPElement#getAllAttributes()
      * @since 1.6, SAAJ 1.3
      */
-    public Iterator getAllAttributesAsQNames();
+    public Iterator<QName> getAllAttributesAsQNames();
 
 
     /**
@@ -312,7 +312,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return an iterator over the namespace prefixes in this
      *         {@code SOAPElement} object
      */
-    public Iterator getNamespacePrefixes();
+    public Iterator<String> getNamespacePrefixes();
 
     /**
      * Returns an {@code Iterator} over the namespace prefix
@@ -325,7 +325,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      *
      * @since 1.6, SAAJ 1.2
      */
-    public Iterator getVisibleNamespacePrefixes();
+    public Iterator<String> getVisibleNamespacePrefixes();
 
     /**
      * Creates a {@code QName} whose namespace URI is the one associated
@@ -429,7 +429,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * {@link Node}s of this element. This includes {@code javax.xml.soap.Text}
      * objects as well as {@code SOAPElement} objects.
      * <p>
-     * Calling this method may cause child {@code Element},
+     * Calling this method must cause child {@code Element},
      * {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
      * replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
      * {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -444,14 +444,14 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @return an iterator with the content of this {@code SOAPElement}
      *         object
      */
-    public Iterator getChildElements();
+    public Iterator<Node> getChildElements();
 
     /**
      * Returns an {@code Iterator} over all the immediate child
      * {@link Node}s of this element with the specified name. All of these
      * children will be {@code SOAPElement} nodes.
      * <p>
-     * Calling this method may cause child {@code Element},
+     * Calling this method must cause child {@code Element},
      * {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
      * replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
      * {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -471,14 +471,14 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      *         specified name
      * @see SOAPElement#getChildElements(javax.xml.namespace.QName)
      */
-    public Iterator getChildElements(Name name);
+    public Iterator<Node> getChildElements(Name name);
 
     /**
      * Returns an {@code Iterator} over all the immediate child
      * {@link Node}s of this element with the specified qname. All of these
      * children will be {@code SOAPElement} nodes.
      * <p>
-     * Calling this method may cause child {@code Element},
+     * Calling this method must cause child {@code Element},
      * {@code SOAPElement} and {@code org.w3c.dom.Text} nodes to be
      * replaced by {@code SOAPElement}, {@code SOAPHeaderElement},
      * {@code SOAPBodyElement} or {@code javax.xml.soap.Text} nodes as
@@ -499,7 +499,7 @@ public interface SOAPElement extends Node, org.w3c.dom.Element {
      * @see SOAPElement#getChildElements(Name)
      * @since 1.6, SAAJ 1.3
      */
-    public Iterator getChildElements(QName qname);
+    public Iterator<Node> getChildElements(QName qname);
 
     /**
      * Sets the encoding style for this {@code SOAPElement} object
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java
index 40b1b5e3af1..9be7c2cc301 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPElementFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -103,6 +103,9 @@ public class SOAPElementFactory {
      * @param uri a {@code String} giving the URI of the
      *            namespace to which the new element belongs
      *
+     * @return the new {@code SOAPElement} object that was
+     *         created
+     *
      * @exception SOAPException if there is an error in creating the
      *            {@code SOAPElement} object
      *
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
index 5d76bf0d289..4e10e63af48 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -83,6 +83,9 @@ public class SOAPException extends Exception {
     /**
      * Constructs a {@code SOAPException} object initialized
      * with the given {@code Throwable} object.
+     *
+     * @param cause a {@code Throwable} object that is to
+     *        be embedded in this {@code SOAPException} object
      */
     public SOAPException(Throwable cause) {
         super(cause.toString());
@@ -103,6 +106,7 @@ public class SOAPException extends Exception {
      *         message of the embedded {@code Throwable} object,
      *         if there is one
      */
+    @Override
     public String getMessage() {
         String message = super.getMessage();
         if (message == null && cause != null) {
@@ -121,6 +125,7 @@ public class SOAPException extends Exception {
      *         if there is none
      */
 
+    @Override
     public Throwable getCause() {
         return cause;
     }
@@ -151,6 +156,7 @@ public class SOAPException extends Exception {
      * @throws IllegalStateException if the cause for this {@code SOAPException} object
      *         has already been initialized
      */
+    @Override
     public synchronized Throwable initCause(Throwable cause) {
         if (this.cause != null) {
             throw new IllegalStateException("Can't override cause");
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java
index 8509bda21f1..14397cf8276 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -150,6 +150,8 @@ public abstract class SOAPFactory {
      * @param prefix the prefix for this {@code SOAPElement}
      * @param uri a {@code String} giving the URI of the
      *            namespace to which the new element belongs
+     * @return the new {@code SOAPElement} object that was
+     *         created
      *
      * @exception SOAPException if there is an error in creating the
      *            {@code SOAPElement} object
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java
index dd99c64841e..6ec2d3e774c 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPFault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -162,7 +162,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *
      * @since 1.6, SAAJ 1.3
      */
-    public Iterator getFaultSubcodes();
+    public Iterator<QName> getFaultSubcodes();
 
     /**
      * Removes any Subcodes that may be contained by this
@@ -381,7 +381,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *
      * @since 1.6, SAAJ 1.3
      */
-    public Iterator getFaultReasonLocales() throws SOAPException;
+    public Iterator<Locale> getFaultReasonLocales() throws SOAPException;
 
     /**
      * Returns an {@code Iterator} over a sequence of
@@ -397,7 +397,7 @@ public interface SOAPFault extends SOAPBodyElement {
      *
      * @since 1.6, SAAJ 1.3
      */
-    public Iterator getFaultReasonTexts() throws SOAPException;
+    public Iterator<String> getFaultReasonTexts() throws SOAPException;
 
     /**
      * Returns the Reason Text associated with the given {@code Locale}.
@@ -468,6 +468,8 @@ public interface SOAPFault extends SOAPBodyElement {
      * this {@code SOAPFault} object. The Node element
      * is optional in SOAP 1.2.
      *
+     * @param uri - the URI of the Node
+     *
      * @exception SOAPException  if there was an error in setting the
      *            Node for this  {@code SOAPFault} object.
      * @exception UnsupportedOperationException if this message does not
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java
index e555c3b5f4f..494cb21b073 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -118,7 +118,7 @@ public interface SOAPHeader extends SOAPElement {
      *
      * @since 1.6, SAAJ 1.2
      */
-    public Iterator examineMustUnderstandHeaderElements(String actor);
+    public Iterator<SOAPHeaderElement> examineMustUnderstandHeaderElements(String actor);
 
     /**
      * Returns an {@code Iterator} over all the {@code SOAPHeaderElement} objects
@@ -144,7 +144,7 @@ public interface SOAPHeader extends SOAPElement {
      * @see #extractHeaderElements
      * @see SOAPConstants#URI_SOAP_ACTOR_NEXT
      */
-    public Iterator examineHeaderElements(String actor);
+    public Iterator<SOAPHeaderElement> examineHeaderElements(String actor);
 
     /**
      * Returns an {@code Iterator} over all the {@code SOAPHeaderElement} objects
@@ -168,7 +168,7 @@ public interface SOAPHeader extends SOAPElement {
      * @see #examineHeaderElements
      * @see SOAPConstants#URI_SOAP_ACTOR_NEXT
      */
-    public Iterator extractHeaderElements(String actor);
+    public Iterator<SOAPHeaderElement> extractHeaderElements(String actor);
 
     /**
      * Creates a new NotUnderstood {@code SOAPHeaderElement} object initialized
@@ -188,18 +188,18 @@ public interface SOAPHeader extends SOAPElement {
 
     /**
      * Creates a new Upgrade {@code SOAPHeaderElement} object initialized
-     * with the specified List of supported SOAP URIs and adds it to this
-     * {@code SOAPHeader} object.
+     * with the specified String Iterator of supported SOAP URIs and adds
+     * it to this {@code SOAPHeader} object.
      * This operation is supported on both SOAP 1.1 and SOAP 1.2 header.
      *
-     * @param supportedSOAPURIs an {@code Iterator} object with the URIs of SOAP
+     * @param supportedSOAPURIs an URI Strings {@code Iterator} of SOAP
      *          versions supported.
      * @return the new {@code SOAPHeaderElement} object that was
      *          inserted into this {@code SOAPHeader} object
      * @exception SOAPException if a SOAP error occurs.
      * @since 1.6, SAAJ 1.3
      */
-    public SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSOAPURIs)
+    public SOAPHeaderElement addUpgradeHeaderElement(Iterator<String> supportedSOAPURIs)
         throws SOAPException;
 
     /**
@@ -243,7 +243,7 @@ public interface SOAPHeader extends SOAPElement {
      *
      * @since 1.6, SAAJ 1.2
      */
-    public Iterator examineAllHeaderElements();
+    public Iterator<SOAPHeaderElement> examineAllHeaderElements();
 
     /**
      * Returns an {@code Iterator} over all the {@code SOAPHeaderElement} objects
@@ -258,6 +258,6 @@ public interface SOAPHeader extends SOAPElement {
      *
      * @since 1.6, SAAJ 1.2
      */
-    public Iterator extractAllHeaderElements();
+    public Iterator<SOAPHeaderElement> extractAllHeaderElements();
 
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java
index d0476a65cb9..daa6e5b64fe 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -205,7 +205,7 @@ public abstract class SOAPMessage {
      *
      * @return an iterator over all the attachments in this message
      */
-    public abstract Iterator getAttachments();
+    public abstract Iterator<AttachmentPart> getAttachments();
 
     /**
      * Retrieves all the {@code AttachmentPart} objects that have header
@@ -217,7 +217,7 @@ public abstract class SOAPMessage {
      * @return an iterator over all attachments that have a header that matches
      * one of the given headers
      */
-    public abstract Iterator getAttachments(MimeHeaders headers);
+    public abstract Iterator<AttachmentPart> getAttachments(MimeHeaders headers);
 
     /**
      * Removes all the {@code AttachmentPart} objects that have header
@@ -266,12 +266,14 @@ public abstract class SOAPMessage {
      * object. An {@code AttachmentPart} object must be created before
      * it can be added to a message.
      *
-     * @param AttachmentPart
-     *           an {@code AttachmentPart} object that is to become part
+     * @param attachmentPart
+     *           an {@code attachmentPart} object that is to become part
      *           of this {@code SOAPMessage} object
      * @exception IllegalArgumentException
+     *               if there was a problem with the specified {@code attachmentPart}
+     *               object
      */
-    public abstract void addAttachmentPart(AttachmentPart AttachmentPart);
+    public abstract void addAttachmentPart(AttachmentPart attachmentPart);
 
     /**
      * Creates a new empty {@code AttachmentPart} object. Note that the
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java
index 099a2e9caba..811a8702585 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/SOAPPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, 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
@@ -213,7 +213,7 @@ public abstract class SOAPPart implements org.w3c.dom.Document, Node {
      * @return  an {@code Iterator} object with all of the Mime
      *          headers for this {@code SOAPPart} object
      */
-    public abstract Iterator getAllMimeHeaders();
+    public abstract Iterator<MimeHeader> getAllMimeHeaders();
 
     /**
      * Retrieves all {@code MimeHeader} objects that match a name in
@@ -224,7 +224,7 @@ public abstract class SOAPPart implements org.w3c.dom.Document, Node {
      * @return  all of the MIME headers that match one of the names in the
      *           given array, returned as an {@code Iterator} object
      */
-    public abstract Iterator getMatchingMimeHeaders(String[] names);
+    public abstract Iterator<MimeHeader> getMatchingMimeHeaders(String[] names);
 
     /**
      * Retrieves all {@code MimeHeader} objects whose name does
@@ -237,7 +237,7 @@ public abstract class SOAPPart implements org.w3c.dom.Document, Node {
      *           given array.  The nonmatching MIME headers are returned as an
      *           {@code Iterator} object.
      */
-    public abstract Iterator getNonMatchingMimeHeaders(String[] names);
+    public abstract Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names);
 
     /**
      * Sets the content of the {@code SOAPEnvelope} object with the data
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java
index ebd4bdc3a95..ae78cd883a9 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/ServiceLoaderUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -46,8 +46,7 @@ class ServiceLoaderUtil {
             ServiceLoader<P> serviceLoader = ServiceLoader.load(spiClass);
 
             for (P impl : serviceLoader) {
-                logger.fine("ServiceProvider loading Facility used; returning object [" +
-                        impl.getClass().getName() + "]");
+                logger.log(Level.FINE, "ServiceProvider loading Facility used; returning object [{0}]", impl.getClass().getName());
 
                 return impl;
             }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java
index 678635a67f9..51d856f646d 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/soap/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,7 @@
 
 /**
  * Provides the API for creating and building SOAP messages. This package
- * is defined in the <i>SOAP with Attachments API for Java<sup><font size="-2">TM</font></sup>
- * (SAAJ) 1.4</i> specification.
+ * is defined in the <i>SOAP with Attachments API for Java&trade; (SAAJ) 1.4</i> specification.
  *
  * <p> The API in the <code>javax.xml.soap</code> package allows you to do the following:
  *
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java
index 445f651c893..a54fd50c070 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Action.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -129,12 +129,16 @@ public @interface Action {
     /**
      * Explicit value of the WS-Addressing {@code Action} message addressing property for the {@code input}
      * message of the operation.
+     *
+     * @return {@code Action} message addressing property for the {@code input} message
      */
     String input() default "";
 
     /**
      * Explicit value of the WS-Addressing {@code Action} message addressing property for the {@code output}
      * message of the operation.
+     *
+     * @return {@code Action} message addressing property for the {@code output} message
      */
     String output() default "";
 
@@ -143,6 +147,8 @@ public @interface Action {
      * message(s) of the operation. Each exception that is mapped to a fault and requires an explicit WS-Addressing
      * {@code Action} message addressing property, needs to be specified as a value in this property
      * using {@link FaultAction} annotation.
+     *
+     * @return {@code Action} message addressing property for the {@code fault} message(s)
      */
     FaultAction[] fault() default { };
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java
index dd9c9a547a1..7b887cd1d0e 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/AsyncHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,6 +29,7 @@ package javax.xml.ws;
  * clients that wish to receive callback notification of the completion of
  * service endpoint operations invoked asynchronously.
  *
+ * @param <T> The type of the message or payload
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface AsyncHandler<T> {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java
index 2dd90644670..607d067cb9c 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -164,6 +164,7 @@ public interface BindingProvider {
      * this {@code BindingProvider} instance.  The instance
      * returned will be of type {@code clazz}.
      *
+     * @param <T> the type of {@code EndpointReference}
      * @param clazz Specifies the type of {@code EndpointReference}
      * that MUST be returned.
 
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java
index 00e7b69cc6a..ff823800514 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/BindingType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -30,13 +30,15 @@ import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.SOAPBinding;
 
 /**
  *  The {@code BindingType} annotation is used to
  *  specify the binding to use for a web service
  *  endpoint implementation class.
  *  <p>
- *  This annotation may be overriden programmatically or via
+ *  This annotation may be overridden programmatically or via
  *  deployment descriptors, depending on the platform in use.
  *
  *  @since 1.6, JAX-WS 2.0
@@ -47,12 +49,11 @@ import java.lang.annotation.RetentionPolicy;
 @Documented
 public @interface BindingType {
      /**
-      * A binding identifier (a URI).
-      * If not specified, the default is the SOAP 1.1 / HTTP binding.
-      * <p>
-      * See the {@code SOAPBinding} and {@code HTTPBinding}
+      * A binding identifier (a URI). If not specified, the default is the SOAP 1.1 / HTTP binding.<br>
+      * See the {@link SOAPBinding} and {@link HTTPBinding}
       * for the definition of the standard binding identifiers.
       *
+      * @return A binding identifier (a URI)
       * @see javax.xml.ws.Binding
       * @see javax.xml.ws.soap.SOAPBinding#SOAP11HTTP_BINDING
       * @see javax.xml.ws.soap.SOAPBinding#SOAP12HTTP_BINDING
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java
index 8bef4ee4cf5..f15163ec569 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Dispatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -27,12 +27,14 @@ package javax.xml.ws;
 
 import java.util.concurrent.Future;
 
+
 /** The {@code Dispatch} interface provides support
  *  for the dynamic invocation of a service endpoint operations. The
  *  {@code javax.xml.ws.Service}
  *  class acts as a factory for the creation of {@code Dispatch}
  *  instances.
  *
+ * @param <T> The type of the message or payload
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface Dispatch<T> extends BindingProvider {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java
index f588409759e..78b8a72ea85 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Endpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -81,7 +81,6 @@ public abstract class Endpoint {
      **/
     public static final String WSDL_PORT = "javax.xml.ws.wsdl.port";
 
-
     /**
      * Creates an endpoint with the specified implementor object. If there is
      * a binding specified via a BindingType annotation then it MUST be used else
@@ -272,7 +271,6 @@ public abstract class Endpoint {
         return Provider.provider().createAndPublishEndpoint(address, implementor, features);
     }
 
-
     /**
      * Publishes this endpoint at the provided server context.
      * A server context encapsulates the server infrastructure
@@ -406,7 +404,6 @@ public abstract class Endpoint {
      **/
     public abstract void setExecutor(java.util.concurrent.Executor executor);
 
-
     /**
      * Returns the property bag for this {@code Endpoint} instance.
      *
@@ -450,11 +447,11 @@ public abstract class Endpoint {
      **/
     public abstract EndpointReference getEndpointReference(Element... referenceParameters);
 
-
     /**
      * Returns the {@code EndpointReference} associated with
      * this {@code Endpoint} instance.
      *
+     * @param <T> The type of EndpointReference.
      * @param clazz Specifies the type of EndpointReference  that MUST be returned.
      * @param referenceParameters Reference parameters to be associated with the
      * returned {@code EndpointReference} instance.
@@ -478,7 +475,7 @@ public abstract class Endpoint {
             Element... referenceParameters);
 
     /**
-     * By settng a {@code EndpointContext}, JAX-WS runtime knows about
+     * By setting a {@code EndpointContext}, JAX-WS runtime knows about
      * addresses of other endpoints in an application. If multiple endpoints
      * share different ports of a WSDL, then the multiple port addresses
      * are patched when the WSDL is accessed.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java
index 163cfbdfd61..46d2317a5eb 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/EndpointReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -88,6 +88,10 @@ public abstract class EndpointReference {
     //
     //Default constructor to be only called by derived types.
     //
+
+    /**
+     * Default constructor.
+     */
     protected EndpointReference(){}
 
     /**
@@ -150,6 +154,7 @@ public abstract class EndpointReference {
      * method can be used to manually configure handlers for this port.
      *
      *
+     * @param <T> Service endpoint interface
      * @param serviceEndpointInterface Service endpoint interface
      * @param features  An array of {@code WebServiceFeatures} to configure on the
      *                proxy.  Supported features not in the {@code features
@@ -183,7 +188,10 @@ public abstract class EndpointReference {
 
     /**
      * Displays EPR infoset for debugging convenience.
+     *
+     * @return a string representation of the object
      */
+    @Override
     public String toString() {
         StringWriter w = new StringWriter();
         writeTo(new StreamResult(w));
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java
index 7fd4eff7f7e..9b654837a4a 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/FaultAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -153,12 +153,16 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 public @interface FaultAction {
     /**
-     * Name of the exception class
+     * Name of the exception class.
+     *
+     * @return the name of the exception class
      */
     Class<? extends Exception> className();
 
     /**
-     * Value of WS-Addressing {@code Action} message addressing property for the exception
+     * Value of WS-Addressing {@code Action} message addressing property for the exception.
+     *
+     * @return WS-Addressing {@code Action} message addressing property for the exception
      */
     String value() default "";
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java
index 9b489750d4d..f2f77dba0f1 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Holder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -30,6 +30,7 @@ import java.io.Serializable;
 /**
  * Holds a value of type {@code T}.
  *
+ * @param <T> Type of the value in the holder.
  * @since 1.6, JAX-WS 2.0
  */
 public final class Holder<T> implements Serializable {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java
index e9772efc0dc..a9b8dc26120 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Provider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -38,6 +38,7 @@ package javax.xml.ws;
  *  the {@code Provider} instance will receive entire protocol messages
  *  or just message payloads.
  *
+ * @param <T> The type of the request
  *  @since 1.6, JAX-WS 2.0
  *
  *  @see javax.xml.transform.Source
@@ -46,7 +47,7 @@ package javax.xml.ws;
 **/
 public interface Provider<T> {
 
-  /** Invokes an operation occording to the contents of the request
+  /** Invokes an operation according to the contents of the request
    *  message.
    *
    *  @param  request The request message or message payload.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java
index becf6057842..9466f5fae47 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RequestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -49,22 +49,26 @@ import java.lang.annotation.RetentionPolicy;
 public @interface RequestWrapper {
     /**
      * Element's local name.
+     * @return local name
      */
     public String localName() default "";
 
     /**
      * Element's namespace name.
+     * @return target namespace name
      */
     public String targetNamespace() default "";
 
     /**
      * Request wrapper bean name.
+     * @return bean name
      */
     public String className() default "";
 
     /**
      * wsdl:part name for the wrapper part
      *
+     * @return wsdl:part name
      * @since 1.7, JAX-WS 2.2
      */
     public String partName() default "";
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java
index d50de4830f6..24f38c0140c 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/RespectBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -63,6 +63,8 @@ import javax.xml.ws.spi.WebServiceFeatureAnnotation;
 public @interface RespectBinding {
     /**
      * Specifies if this feature is enabled or disabled.
+     *
+     * @return {@code true} if this feature is enabled, {@code false} otherwise
      */
     boolean enabled() default true;
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java
index 2b91ad51793..294b555c71d 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -36,9 +36,10 @@ import java.util.concurrent.Future;
  *  to check the status of the request. The {@code get(...)} methods may
  *  throw the standard
  *  set of exceptions and their cause may be a {@code RemoteException} or a
- *  {@link WebServiceException} that represents the error that occured during the
+ *  {@link WebServiceException} that represents the error that occurred during the
  *  asynchronous method invocation.</p>
  *
+ * @param <T> The type of the response
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface Response<T> extends Future<T> {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java
index 77e7fc26999..9c139cc99f3 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -49,22 +49,26 @@ public @interface ResponseWrapper {
 
     /**
      * Element's local name.
+     * @return local name
      */
     public String localName() default "";
 
     /**
      * Element's namespace name.
+     * @return target namespace name
      */
     public String targetNamespace() default "";
 
     /**
      * Response wrapper bean name.
+     * @return bean name
      */
     public String className() default "";
 
     /**
      * wsdl:part name for the wrapper part
      *
+     * @return wsdl:part name
      * @since 1.7, JAX-WS 2.2
      */
     public String partName() default "";
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java
index 7ce118698d1..1c1267429ca 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/Service.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -71,14 +71,48 @@ public class Service {
      * access to entire protocol message, {@code PAYLOAD} to protocol message
      * payload only.
      **/
-    public enum Mode { MESSAGE, PAYLOAD }
+    public enum Mode {
 
+        /**
+         * Message mode.
+         */
+        MESSAGE,
+
+        /**
+         * Payload mode.
+         */
+        PAYLOAD }
+
+    /**
+     * Creates a {@code Service}.
+     *
+     * The specified WSDL document location and service qualified name MUST
+     * uniquely identify a {@code wsdl:service} element.
+     *
+     * @param wsdlDocumentLocation {@code URL} for the WSDL document location
+     *                             for the service
+     * @param serviceName {@code QName} for the service
+     */
     protected Service(java.net.URL wsdlDocumentLocation, QName serviceName) {
         delegate = Provider.provider().createServiceDelegate(wsdlDocumentLocation,
                 serviceName,
                 this.getClass());
     }
 
+    /**
+     * Creates a {@code Service}. The created instance is
+     * configured with the web service features.
+     *
+     * The specified WSDL document location and service qualified name MUST
+     * uniquely identify a {@code wsdl:service} element.
+     *
+     * @param wsdlDocumentLocation {@code URL} for the WSDL document location
+     *                             for the service
+     * @param serviceName {@code QName} for the service
+     * @param features Web Service features that must be configured on
+     *        the service. If the provider doesn't understand a feature,
+     *        it must throw a WebServiceException.
+     */
     protected Service(java.net.URL wsdlDocumentLocation, QName serviceName, WebServiceFeature ... features) {
         delegate = Provider.provider().createServiceDelegate(wsdlDocumentLocation,
                 serviceName,
@@ -93,6 +127,7 @@ public class Service {
      * specifies the service endpoint interface that is supported by
      * the created dynamic proxy instance.
      *
+     * @param <T> Service endpoint interface.
      * @param portName  Qualified name of the service endpoint in
      *                  the WSDL service description.
      * @param serviceEndpointInterface Service endpoint interface
@@ -126,6 +161,7 @@ public class Service {
      * specifies the service endpoint interface that is supported by
      * the created dynamic proxy instance.
      *
+     * @param <T> Service endpoint interface.
      * @param portName  Qualified name of the service endpoint in
      *                  the WSDL service description.
      * @param serviceEndpointInterface Service endpoint interface
@@ -170,6 +206,7 @@ public class Service {
      * binding (and a port) and configuring the proxy accordingly.
      * The returned proxy should not be reconfigured by the client.
      *
+     * @param <T> Service endpoint interface.
      * @param serviceEndpointInterface Service endpoint interface.
      * @return Object instance that supports the
      *                  specified service endpoint interface.
@@ -198,6 +235,7 @@ public class Service {
      * binding (and a port) and configuring the proxy accordingly.
      * The returned proxy should not be reconfigured by the client.
      *
+     * @param <T> Service endpoint interface.
      * @param serviceEndpointInterface Service endpoint interface.
      * @param features  A list of WebServiceFeatures to configure on the
      *                proxy.  Supported features not in the {@code features
@@ -267,6 +305,7 @@ public class Service {
      * {@code serviceEndpointInterface} and the WSDL
      * associated with this {@code Service} instance.
      *
+     * @param <T> Service endpoint interface.
      * @param endpointReference  The {@code EndpointReference}
      * for the target service endpoint that will be invoked by the
      * returned proxy.
@@ -328,6 +367,7 @@ public class Service {
      * Creates a {@code Dispatch} instance for use with objects of
      * the client's choosing.
      *
+     * @param <T> The type of the message or payload
      * @param portName  Qualified name for the target service endpoint
      * @param type The class of object used for messages or message
      * payloads. Implementations are required to support
@@ -357,6 +397,7 @@ public class Service {
      * Creates a {@code Dispatch} instance for use with objects of
      * the client's choosing.
      *
+     * @param <T> The type of the message or payload
      * @param portName  Qualified name for the target service endpoint
      * @param type The class of object used for messages or message
      * payloads. Implementations are required to support
@@ -419,6 +460,7 @@ public class Service {
      * where the {@code portName} is retrieved from the
      * WSDL or {@code EndpointReference} metadata.
      *
+     * @param <T> The type of the message or payload
      * @param endpointReference  The {@code EndpointReference}
      * for the target service endpoint that will be invoked by the
      * returned {@code Dispatch} object.
@@ -698,6 +740,7 @@ public class Service {
      * @param wsdlDocumentLocation {@code URL} for the WSDL document location
      *                             for the service
      * @param serviceName {@code QName} for the service
+     * @return Service instance
      * @throws WebServiceException If any error in creation of the
      *                    specified service.
      **/
@@ -720,6 +763,7 @@ public class Service {
      * @param features Web Service features that must be configured on
      *        the service. If the provider doesn't understand a feature,
      *        it must throw a WebServiceException.
+     * @return Service instance configured with requested web service features
      * @throws WebServiceException If any error in creation of the
      *                    specified service.
      * @since 1.7, JAX-WS 2.2
@@ -734,6 +778,7 @@ public class Service {
      * Creates a {@code Service} instance.
      *
      * @param serviceName {@code QName} for the service
+     * @return Service instance
      * @throws WebServiceException If any error in creation of the
      *                    specified service
      */
@@ -749,6 +794,7 @@ public class Service {
      * @param features Web Service features that must be configured on
      *        the service. If the provider doesn't understand a feature,
      *        it must throw a WebServiceException.
+     * @return Service instance configured with requested web service features
      * @throws WebServiceException If any error in creation of the
      *                    specified service
      *
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java
index 5d0cb135918..de20e4479d9 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/ServiceMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,8 @@ public @interface ServiceMode {
    * wishes to work with protocol message payloads only. {@code MESSAGE} indicates
    * that the {@code Provider} implementation wishes to work with entire protocol
    * messages.
-  **/
+   *
+   * @return Service mode.
+   **/
   public Service.Mode value() default Service.Mode.PAYLOAD;
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java
index f51d570643d..9978f0b1519 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -51,6 +51,8 @@ import java.lang.annotation.RetentionPolicy;
 public @interface WebEndpoint {
   /**
    *  The local name of the endpoint.
+   *
+   * @return ocal name of the endpoint
   **/
   String name() default "";
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java
index a37e4e84ee5..1bbd5d5bfa7 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -46,18 +46,24 @@ import java.lang.annotation.RetentionPolicy;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface WebServiceClient {
-  /**
-   *  The local name of the Web service.
-  **/
-  String name() default "";
+    /**
+     * The local name of the Web service.
+     *
+     * @return local name
+     */
+    String name() default "";
 
-  /**
-   *  The namespace for the Web service.
-  **/
-  String targetNamespace() default "";
+    /**
+     * The namespace for the Web service.
+     *
+     * @return target namespace name
+     */
+    String targetNamespace() default "";
 
-  /**
-   *  The location of the WSDL document for the service (a URL).
-  **/
-  String wsdlLocation() default "";
+    /**
+     * The location of the WSDL document for the service (a URL).
+     *
+     * @return location of the WSDL document (a URL)
+     */
+    String wsdlLocation() default "";
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java
index 0af63723568..77c4775eeb8 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -128,6 +128,7 @@ public interface WebServiceContext {
      * Returns the {@code EndpointReference} associated with
      * this endpoint.
      *
+     * @param <T> The type of {@code EndpointReference}.
      * @param clazz The type of {@code EndpointReference} that
      * MUST be returned.
      * @param referenceParameters Reference parameters to be associated with the
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java
index 8f4c6875d6c..745f03f8534 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -66,9 +66,10 @@ public abstract class WebServiceFeature {
     */
    protected boolean enabled = false;
 
-
-   protected WebServiceFeature(){}
-
+    /**
+     * Default constructor.
+     */
+    protected WebServiceFeature() {}
 
    /**
     * Returns {@code true} if this feature is enabled.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java
index c2d48d2f5b9..67e39cd6554 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -42,21 +42,29 @@ import java.lang.annotation.RetentionPolicy;
 public @interface WebServiceProvider {
     /**
      * Location of the WSDL description for the service.
+     *
+     * @return location of the WSDL description
      */
     String wsdlLocation() default "";
 
     /**
      * Service name.
+     *
+     * @return service name
      */
     String serviceName() default "";
 
     /**
      * Target namespace for the service
+     *
+     * @return target namespace
      */
     String targetNamespace() default "";
 
     /**
      * Port name.
+     *
+     * @return port name
      */
     String portName() default "";
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java
index 477133fb039..3111ce4dbec 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -30,8 +30,10 @@ import javax.xml.ws.spi.WebServiceFeatureAnnotation;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import javax.annotation.Resource;
 
 /**
  * The {@code WebServiceRef} annotation is used to
@@ -72,16 +74,17 @@ import java.lang.annotation.RetentionPolicy;
  * annotation annotated with the {@code WebServiceFeatureAnnotation}
  * that is specified with {@code WebServiceRef}, an ERROR MUST be given.
  *
- * @see javax.annotation.Resource
+ * @see Resource
  * @see WebServiceFeatureAnnotation
  *
  * @since 1.6, JAX-WS 2.0
  *
-**/
+ **/
 
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Repeatable(WebServiceRefs.class)
 public @interface WebServiceRef {
     /**
      * The JNDI name of the resource.  For field annotations,
@@ -92,6 +95,8 @@ public @interface WebServiceRef {
      *
      * The JNDI name can be absolute(with any logical namespace) or relative
      * to JNDI {@code java:comp/env} namespace.
+     *
+     * @return absolute or relative JNDI name
      */
     String name() default "";
 
@@ -101,6 +106,8 @@ public @interface WebServiceRef {
      * the default is the type of the JavaBeans property.
      * For class annotations, there is no default and this MUST be
      * specified.
+     *
+     * @return type of the resource
      */
     Class<?> type() default Object.class;
 
@@ -119,6 +126,8 @@ public @interface WebServiceRef {
      * form or type of mapped name, nor the ability to use mapped names.
      * The mapped name is product-dependent and often installation-dependent.
      * No use of a mapped name is portable.
+     *
+     * @return product specific resource name
      */
     String mappedName() default "";
 
@@ -126,16 +135,20 @@ public @interface WebServiceRef {
      * The service class, always a type extending
      * {@code javax.xml.ws.Service}. This element MUST be specified
      * whenever the type of the reference is a service endpoint interface.
+     *
+     * @return the service class extending {@code javax.xml.ws.Service}
      */
-    // 2.1 has Class value() default Object.class;
-    // Fixing this raw Class type correctly in 2.2 API. This shouldn't cause
-    // any compatibility issues for applications.
+     // 2.1 has Class value() default Object.class;
+     // Fixing this raw Class type correctly in 2.2 API. This shouldn't cause
+     // any compatibility issues for applications.
     Class<? extends Service> value() default Service.class;
 
     /**
      * A URL pointing to the WSDL document for the web service.
      * If not specified, the WSDL location specified by annotations
      * on the resource type is used instead.
+     *
+     * @return a URL pointing to the WSDL document
      */
     String wsdlLocation() default "";
 
@@ -143,6 +156,7 @@ public @interface WebServiceRef {
      * A portable JNDI lookup name that resolves to the target
      * web service reference.
      *
+     * @return portable JNDI lookup name
      * @since 1.7, JAX-WS 2.2
      */
     String lookup() default "";
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java
index fd29f4f5219..0cba6457f67 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/WebServiceRefs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -78,6 +78,8 @@ import static java.lang.annotation.RetentionPolicy.*;
 public @interface WebServiceRefs {
    /**
     * Array used for multiple web service reference declarations.
+    *
+    * @return multiple web service reference declarations
     */
    WebServiceRef[] value();
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java
index 045413ec8c3..25a7dbeaa59 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -26,11 +26,11 @@
 package javax.xml.ws.handler;
 
 import javax.xml.ws.ProtocolException;
-import javax.xml.ws.handler.MessageContext;
 
 /** The {@code Handler} interface
  *  is the base interface for JAX-WS handlers.
  *
+ * @param <C> message context
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface Handler<C extends MessageContext> {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java
index 8c713a819c1..c13712a0ffe 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/LogicalHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,6 +28,7 @@ package javax.xml.ws.handler;
 /** The {@code LogicalHandler} extends
  *  Handler to provide typesafety for the message context parameter.
  *
+ * @param <C> message context
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface LogicalHandler<C extends LogicalMessageContext> extends Handler<C> {
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java
index aab8550dead..76c5e5e1d54 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/MessageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -180,7 +180,17 @@ public interface MessageContext extends Map<String, Object> {
      * {@code HANDLER}
      * are only normally visible to handlers.
      */
-    public enum Scope {APPLICATION, HANDLER};
+    public enum Scope {
+
+        /**
+         * Application visibility.
+         */
+        APPLICATION,
+
+        /**
+         * Handler visibility.
+         */
+        HANDLER};
 
     /**
      * Sets the scope of a property.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java
new file mode 100644
index 00000000000..08c9db7e079
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines APIs for message handlers.
+ */
+package javax.xml.ws.handler;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html
deleted file mode 100644
index 483b45ec7e9..00000000000
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 2005, 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
- 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.
--->
-
-<html>
-<body>
-This package defines APIs for message handlers.
-</body>
-</html>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java
index 742c5335098..d76ff9b9364 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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.util.Set;
  *  to provide typesafety for the message context parameter and add a method
  *  to obtain access to the headers that may be processed by the handler.
  *
+ * @param <T> message context
  *  @since 1.6, JAX-WS 2.0
 **/
 public interface SOAPHandler<T extends SOAPMessageContext>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java
new file mode 100644
index 00000000000..ed794064096
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines APIs for SOAP message handlers.
+ */
+package javax.xml.ws.handler.soap;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html
deleted file mode 100644
index 862b416b167..00000000000
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/handler/soap/package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 2005, 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
- 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.
--->
-
-<html>
-<body>
-This package defines APIs for SOAP message handlers.
-</body>
-</html>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java
new file mode 100644
index 00000000000..8c0e4b09979
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines APIs specific to the HTTP binding.
+ */
+package javax.xml.ws.http;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html
deleted file mode 100644
index bc9020d3a3d..00000000000
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/http/package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 2005, 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
- 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.
--->
-
-<html>
-<body>
-This package defines APIs specific to the HTTP binding.
-</body>
-</html>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java
index fd26ba1dfe6..0c79833556e 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/Addressing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,9 +31,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.WebServiceRefs;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.soap.AddressingFeature.Responses;
 import javax.xml.ws.spi.WebServiceFeatureAnnotation;
@@ -44,7 +42,7 @@ import javax.xml.ws.spi.WebServiceFeatureAnnotation;
  * with any other binding is undefined.
  * <p>
  * This annotation MUST only be used in conjunction with the
- * {@link javax.jws.WebService}, {@link WebServiceProvider},
+ * {@code javax.jws.WebService}, {@link WebServiceProvider},
  *  and {@link WebServiceRef} annotations.
  * When used with a {@code javax.jws.WebService} annotation, this
  * annotation MUST only be used on the service endpoint implementation
@@ -70,6 +68,8 @@ public @interface Addressing {
      * Corresponding
      * <a href="http://www.w3.org/TR/ws-addr-metadata/#wspolicyaddressing">
      * 3.1.1 Addressing Assertion</a> must be generated in the generated WSDL.
+     *
+     * @return {@code true} if endpoint supports WS-Addressing, {@code false} otherwise
      */
     boolean enabled() default true;
 
@@ -80,6 +80,8 @@ public @interface Addressing {
      * be present on incoming messages. A corresponding
      * <a href="http://www.w3.org/TR/ws-addr-metadata/#wspolicyaddressing">
      * 3.1.1 Addressing Assertion</a> must be generated in the WSDL.
+     *
+     * @return {@code true} if endpoint requires WS-Addressing, {@code false} otherwise
      */
     boolean required() default false;
 
@@ -106,6 +108,7 @@ public @interface Addressing {
      * <a href="http://www.w3.org/TR/ws-addr-metadata/#wspolicynonanonresponses">
      * 3.1.3 NonAnonymousResponses Assertion</a> in the generated WSDL.
      *
+     * @return supported response types
      * @since 1.7, JAX-WS 2.2
      */
     Responses responses() default Responses.ALL;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java
index cd59f0ffcbb..b3d2f0dc56f 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/MTOM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -63,6 +63,8 @@ import javax.xml.ws.WebServiceProvider;
 public @interface MTOM {
     /**
      * Specifies if this feature is enabled or disabled.
+     *
+     * @return {@code true} if MTOM is supported, {@code false} otherwise
      */
     boolean enabled() default true;
 
@@ -70,6 +72,8 @@ public @interface MTOM {
      * Property for MTOM threshold value. When MTOM is enabled, binary data above this
      * size in bytes will be XOP encoded or sent as attachment. The value of this property
      * MUST always be {@literal >=} 0. Default value is 0.
+     *
+     * @return MTOM threshold in bytes
      */
     int threshold() default 0;
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java
new file mode 100644
index 00000000000..fc7f3859bbf
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines APIs specific to the SOAP binding.
+ */
+package javax.xml.ws.soap;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html
deleted file mode 100644
index abc85e703ee..00000000000
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/soap/package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 2005, 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
- 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.
--->
-
-<html>
-<body>
-This package defines APIs specific to the SOAP binding.
-</body>
-</html>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java
index 121409f7413..de8a01f111a 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/Provider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,8 @@
 
 package javax.xml.ws.spi;
 
-import java.net.URL;
 import java.util.List;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.ServiceLoader;
 import javax.xml.namespace.QName;
 import javax.xml.ws.*;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -77,6 +74,7 @@ public abstract class Provider {
      *  <li> Finally, a platform default implementation is used.
      * </ul>
      *
+     * @return provider object
      */
     public static Provider provider() {
         try {
@@ -123,7 +121,6 @@ public abstract class Provider {
         throw new UnsupportedOperationException("JAX-WS 2.2 implementation must override this default behaviour.");
     }
 
-
     /**
      *
      * Creates an endpoint object with the provided binding and implementation
@@ -139,7 +136,6 @@ public abstract class Provider {
     public abstract Endpoint createEndpoint(String bindingId,
             Object implementor);
 
-
     /**
      * Creates and publishes an endpoint object with the specified
      * address and implementation object.
@@ -199,6 +195,7 @@ public abstract class Provider {
      * {@code serviceName} metadata.
      *
      *
+     * @param <T> Service endpoint interface
      * @param endpointReference the EndpointReference that will
      * be invoked by the returned proxy.
      * @param serviceEndpointInterface Service endpoint interface
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java
index 49954ba8d88..d3127f301d6 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/ServiceDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -51,6 +51,9 @@ import javax.xml.ws.WebServiceException;
  */
 public abstract class ServiceDelegate {
 
+    /**
+     * Default constructor.
+     */
     protected ServiceDelegate() {
     }
 
@@ -61,6 +64,7 @@ public abstract class ServiceDelegate {
      * specifies the service endpoint interface that is supported by
      * the created dynamic proxy instance.
      *
+     * @param <T> Service endpoint interface
      * @param portName  Qualified name of the service endpoint in
      *                  the WSDL service description
      * @param serviceEndpointInterface Service endpoint interface
@@ -92,6 +96,7 @@ public abstract class ServiceDelegate {
      * specifies the service endpoint interface that is supported by
      * the created dynamic proxy instance.
      *
+     * @param <T> Service endpoint interface
      * @param portName  Qualified name of the service endpoint in
      *                  the WSDL service description
      * @param serviceEndpointInterface Service endpoint interface
@@ -164,6 +169,7 @@ public abstract class ServiceDelegate {
      * {@code serviceEndpointInterface} and the WSDL
      * associated with this {@code Service} instance.
      *
+     * @param <T> Service endpoint interface.
      * @param endpointReference  The {@code EndpointReference}
      * for the target service endpoint that will be invoked by the
      * returned proxy.
@@ -209,6 +215,7 @@ public abstract class ServiceDelegate {
      * binding (and a port) and configuring the proxy accordingly.
      * The returned proxy should not be reconfigured by the client.
      *
+     * @param <T> Service endpoint interface
      * @param serviceEndpointInterface Service endpoint interface
      * @return Object instance that supports the
      *                  specified service endpoint interface
@@ -235,6 +242,7 @@ public abstract class ServiceDelegate {
      * binding (and a port) and configuring the proxy accordingly.
      * The returned proxy should not be reconfigured by the client.
      *
+     * @param <T> Service endpoint interface
      * @param serviceEndpointInterface Service endpoint interface
      * @param features  An array of {@code WebServiceFeatures} to configure on the
      *                proxy.  Supported features not in the {@code features
@@ -286,6 +294,8 @@ public abstract class ServiceDelegate {
      * Creates a {@code Dispatch} instance for use with objects of
      * the user's choosing.
      *
+     * @param <T> type used for messages or message payloads. Implementations are required to
+     * support {@code javax.xml.transform.Source} and {@code javax.xml.soap.SOAPMessage}.
      * @param portName  Qualified name for the target service endpoint
      * @param type The class of object used for messages or message
      * payloads. Implementations are required to support
@@ -310,6 +320,8 @@ public abstract class ServiceDelegate {
      * Creates a {@code Dispatch} instance for use with objects of
      * the user's choosing.
      *
+     * @param <T> type used for messages or message payloads. Implementations are required to
+     * support {@code javax.xml.transform.Source} and {@code javax.xml.soap.SOAPMessage}.
      * @param portName  Qualified name for the target service endpoint
      * @param type The class of object used for messages or message
      * payloads. Implementations are required to support
@@ -369,6 +381,9 @@ public abstract class ServiceDelegate {
      * where the {@code portName} is retrieved from the
      * WSDL or {@code EndpointReference} metadata.
      *
+     * @param <T> type of object used to messages or message
+     * payloads. Implementations are required to support
+     * {@code javax.xml.transform.Source} and {@code javax.xml.soap.SOAPMessage}.
      * @param endpointReference  The {@code EndpointReference}
      * for the target service endpoint that will be invoked by the
      * returned {@code Dispatch} object.
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
index 74423670e4e..a60784edebb 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,7 +32,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import javax.xml.ws.WebServiceFeature;
 import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.WebServiceRefs;
 import javax.xml.ws.RespectBinding;
 import javax.xml.ws.soap.Addressing;
 import javax.xml.ws.soap.MTOM;
@@ -74,12 +73,14 @@ public @interface WebServiceFeatureAnnotation {
      * Unique identifier for the WebServiceFeature.  This
      * identifier MUST be unique across all implementations
      * of JAX-WS.
+     * @return unique identifier for the WebServiceFeature
      */
     String id();
 
     /**
      * The {@code WebServiceFeature} bean that is associated
      * with the {@code WebServiceFeature} annotation
+     * @return the {@code WebServiceFeature} bean
      */
     Class<? extends WebServiceFeature> bean();
 }
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java
index f62458455ac..211e9441161 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/http/HttpContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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
@@ -41,6 +41,9 @@ import java.util.Set;
  */
 public abstract class HttpContext {
 
+    /**
+     * The handler to set for this context.
+     */
     protected HttpHandler handler;
 
     /**
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java
new file mode 100644
index 00000000000..ec642e76331
--- /dev/null
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package defines SPIs for JAX-WS.
+ */
+package javax.xml.ws.spi;
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html
deleted file mode 100644
index e269ef9b53c..00000000000
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/spi/package.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- Copyright (c) 2005, 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
- 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.
--->
-
-<html>
-<body>
-This package defines SPIs for JAX-WS.
-</body>
-</html>
diff --git a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
index 0a9a0cfe429..b3638847e51 100644
--- a/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
+++ b/jaxws/src/java.xml.ws/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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,10 +72,18 @@ public final class W3CEndpointReference extends EndpointReference {
     private final JAXBContext w3cjc = getW3CJaxbContext();
 
     // should be changed to package private, keeping original modifier to keep backwards compatibility
+
+    /**
+     * Addressing namespace.
+     */
     protected static final String NS = "http://www.w3.org/2005/08/addressing";
 
     // default constructor forbidden ...
     // should be private, keeping original modifier to keep backwards compatibility
+
+    /**
+     * Default constructor.
+     */
     protected W3CEndpointReference() {
     }
 
@@ -110,6 +118,7 @@ public final class W3CEndpointReference extends EndpointReference {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeTo(Result result){
         try {
             Marshaller marshaller = w3cjc.createMarshaller();
diff --git a/jaxws/src/java.xml.ws/share/classes/module-info.java b/jaxws/src/java.xml.ws/share/classes/module-info.java
index a9313c30fb8..fa16a92cc39 100644
--- a/jaxws/src/java.xml.ws/share/classes/module-info.java
+++ b/jaxws/src/java.xml.ws/share/classes/module-info.java
@@ -122,9 +122,19 @@ module java.xml.ws {
     // com.sun.xml.internal.ws.fault.SOAPFaultBuilder uses JAXBContext.newInstance
     opens com.sun.xml.internal.ws.fault to java.xml.bind;
 
-    // classes passed to JAXBContext.newInstance for deep reflection
+    // com.sun.xml.internal.ws.addressing.WsaTubeHelperImpl uses JAXBContext.newInstance
     opens com.sun.xml.internal.ws.addressing to java.xml.bind;
 
+    // com.sun.xml.internal.ws.addressing.v200408.WsaTubeHelperImpl uses JAXBContext.newInstance
+    opens com.sun.xml.internal.ws.addressing.v200408 to java.xml.bind;
+
+    // com.sun.xml.ws.developer.MemberSubmissionEndpointReference uses JAXBContext.newInstance
+    opens com.sun.xml.internal.ws.developer to java.xml.bind;
+
+    // com.sun.xml.ws.model.ExternalMetadataReader uses JAXBContext.newInstance
+    opens com.oracle.xmlns.internal.webservices.jaxws_databinding to java.xml.bind;
+
+
     uses javax.xml.ws.spi.Provider;
     uses javax.xml.soap.MessageFactory;
     uses javax.xml.soap.SAAJMetaFactory;
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java
index af71cbd9218..5c22491eb3b 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel/internal/JModuleDirective.java
@@ -94,14 +94,17 @@ public abstract class JModuleDirective {
 
     /**
      * Returns a hash code for this module directive based on directive type and name.
-     * The hash code for a module directive is computed as <blockquote><pre>
-     * 97 * Integer.hashCode(type_ordinal_value + 1) + name.hashCode()
-     * </pre></blockquote> using {@code int} arithmetic.
+     * The hash code for a module directive is computed as
+     * <blockquote><pre>
+     *     {@code 97 * (type_ordinal_value + 1) + name.hashCode()}
+     * </pre></blockquote>
+     * using {@code int} arithmetic.
+     *
      * @return a hash code value for this object.
      */
     @Override
     public int hashCode() {
-        return 97 * (Integer.valueOf(getType().ordinal() + 1)).hashCode() + name.hashCode();
+        return 97 * (getType().ordinal() + 1) + name.hashCode();
     }
 
     /**
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
index 0f2b377cc5b..aecb2773243 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
@@ -30,10 +30,10 @@ BASEDIR_DOESNT_EXIST = \
     Non-existent directory: {0}
 
 VERSION = \
-        schemagen 2.3.0-b170215.1712
+        schemagen 2.3.0-b170531.0717
 
 FULLVERSION = \
-        schemagen full version "2.3.0-b170215.1712"
+        schemagen full version "2.3.0-b170531.0717"
 
 USAGE = \
 Usage: schemagen [-options ...] <java files> \n\
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties
index be77744f1df..f826e6297d5 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_de.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2}
 
 BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = schemagen vollst\u00E4ndige Version "2.3.0-b170215.1712"
+FULLVERSION = schemagen vollst\u00E4ndige Version "2.3.0-b170531.0717"
 
 USAGE = Verwendung: schemagen [-options ...] <java files> \nOptionen: \n\\ \\ \\ \\ -d <path>             : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp <path>            : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath <path>     : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding <encoding>  : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode <file>       : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version              : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion          : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help                 : Zeigt diese Verwendungsmeldung an
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties
index 632f594e2b5..063d107a602 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_es.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Aparece un {0} inesperado en la l\u00EDnea {1} y la colu
 
 BASEDIR_DOESNT_EXIST = Directorio no existente: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = versi\u00F3n completa de schemagen "2.3.0-b170215.1712"
+FULLVERSION = versi\u00F3n completa de schemagen "2.3.0-b170531.0717"
 
 USAGE = Sintaxis: schemagen [-options ...] <archivos java> \nOpciones: \n\\ \\ \\ \\ -d <ruta de acceso>             : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp <ruta de acceso>            : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding <codificaci\u00F3n>  : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode <archivo>       : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version              : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion          : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help                 : muestra este mensaje de sintaxis
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties
index 6acdbba38d8..b3f913c9772 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_fr.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0
 
 BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = version compl\u00E8te de schemagen "2.3.0-b170215.1712"
+FULLVERSION = version compl\u00E8te de schemagen "2.3.0-b170531.0717"
 
 USAGE = Syntaxe : schemagen [-options ...] <java files> \nOptions : \n\ \ \ \ -d <path> : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding <encoding> : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode <file> : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties
index 00fe597645f..37360925c4a 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_it.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2}
 
 BASEDIR_DOESNT_EXIST = Directory non esistente: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = versione completa schemagen "2.3.0-b170215.1712"
+FULLVERSION = versione completa schemagen "2.3.0-b170531.0717"
 
 USAGE = Uso: schemagen [-options ...] <java files> \nOpzioni: \n\ \ \ \ -d <path>             : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp <path>            : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath <path>     : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding <encoding>  : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode <file>       : genera il file di episodio per la compilazione separata\n\ \ \ \ -version              : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion          : visualizza le informazioni sulla versione completa\n\ \ \ \ -help                 : visualizza questo messaggio sull'uso
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties
index 638e47d9ce5..0acac182736 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ja.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u4E88\u671F\u3057\u306A\u3044{0}\u304C\u884C{1}\u3001\u
 
 BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.3.0-b170215.1712"
+FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.3.0-b170531.0717"
 
 USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] <java files> \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d <path>             : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp <path>            : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath <path>     : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding <encoding>  : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode <file>       : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version              : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion          : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help                 : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties
index 416931124b3..4b585c25816 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_ko.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \uC608\uC0C1\uCE58 \uC54A\uC740 {0}\uC774(\uAC00) {1}\uD
 
 BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.3.0-b170215.1712"
+FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.3.0-b170531.0717"
 
 USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] <java files> \n\uC635\uC158: \n\ \ \ \ -d <path>             : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp <path>            : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath <path>     : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding <encoding>  : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode <file>       : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version              : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion          : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help                 : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties
index 6da2bc93337..38d6da28b9b 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_pt_BR.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2}
 
 BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0}
 
-VERSION = gera\u00E7\u00E3o do esquema 2.3.0-b170215.1712
+VERSION = gera\u00E7\u00E3o do esquema 2.3.0-b170531.0717
 
-FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.3.0-b170215.1712"
+FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.3.0-b170531.0717"
 
 USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] <java files> \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d <path>             : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp <path>            : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath <path>     : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding <encoding>  : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode <file>       : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version              : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion          : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help                 : exibir esta mensagem de uso
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties
index beed169c9ae..896dc2d5480 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_CN.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u5728\u7B2C {1} \u884C, \u7B2C {2} \u5217\u51FA\u73B0\u
 
 BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.3.0-b170215.1712"
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.3.0-b170531.0717"
 
 USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9009\u9879: \n\ \ \ \ -d <path>             : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp <path>            : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath <path>     : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding <encoding>  : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode <file>       : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version              : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion          : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help                 : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties
index 01744696586..6ffd45d8984 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/jxc/MessageBundle_zh_TW.properties
@@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u672A\u9810\u671F\u7684 {0} \u986F\u793A\u65BC\u884C {1
 
 BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0}
 
-VERSION = schemagen 2.3.0-b170215.1712
+VERSION = schemagen 2.3.0-b170531.0717
 
-FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.3.0-b170215.1712"
+FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.3.0-b170531.0717"
 
 USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9078\u9805: \n\\ \\ \\ \\ -d <path>             : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp <path>            : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath <path>     : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding <encoding>  : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode <file>       : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version              : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion          : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help                 : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
index fa3f5b2f8f3..4231c45b6e4 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
@@ -173,23 +173,23 @@ Driver.CompilingSchema = \
 Driver.FailedToGenerateCode = \
         Failed to produce code.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
 Driver.FilePrologComment = \
-        This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170215.1712 \n\
+        This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170531.0717 \n\
         See <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\
         Any modifications to this file will be lost upon recompilation of the source schema. \n\
         Generated on: {0} \n
 
 Driver.Version = \
-        xjc 2.3.0-b170215.1712
+        xjc 2.3.0-b170531.0717
 
 Driver.FullVersion = \
-        xjc full version "2.3.0-b170215.1712"
+        xjc full version "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties
index 57e1bb38224..83a0e115a21 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_de.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = Ein Schema wird kompiliert ...
 
 Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170215.1712 generiert \nSiehe <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170531.0717 generiert \nSiehe <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = xjc vollst\u00E4ndige Version "2.3.0-b170215.1712"
+Driver.FullVersion = xjc vollst\u00E4ndige Version "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties
index 63de1fab45b..178f0ec7b39 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_es.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = Compilando un esquema...
 
 Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.3.0-b170215.1712 \nVisite <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.3.0-b170531.0717 \nVisite <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = versi\u00F3n completa de xjc "2.3.0-b170215.1712"
+Driver.FullVersion = versi\u00F3n completa de xjc "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties
index 5ad5ff87055..5bd13440b3f 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_fr.properties
@@ -131,17 +131,17 @@ Driver.CompilingSchema = compilation d'un sch\u00e9ma...
 
 Driver.FailedToGenerateCode = Echec de la production du code.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.3.0-b170215.1712 \nVoir <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.3.0-b170531.0717 \nVoir <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = version compl\u00E8te xjc "2.3.0-b170215.1712"
+Driver.FullVersion = version compl\u00E8te xjc "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties
index 9d00dd77f4e..aad9f6bca1d 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_it.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = compilazione di uno schema in corso...
 
 Driver.FailedToGenerateCode = Produzione del codice non riuscita.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.3.0-b170215.1712 \nVedere <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.3.0-b170531.0717 \nVedere <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = versione completa xjc "2.3.0-b170215.1712"
+Driver.FullVersion = versione completa xjc "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties
index c7a60c6e59a..ceb952818eb 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ja.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = \u30b9\u30ad\u30fc\u30de\u306e\u30b3\u30f3\u30d1\u30a4\
 
 Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.3.0-b170215.1712\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.3.0-b170531.0717\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.3.0-b170215.1712"
+Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties
index 31018022265..275be7748b0 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_ko.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = \uc2a4\ud0a4\ub9c8\ub97c \ucef4\ud30c\uc77c\ud558\ub294
 
 Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.3.0-b170215.1712 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.3.0-b170531.0717 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="https://jaxb.java.net/">https://jaxb.java.net/</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
 
-Driver.Version = XJC 2.3.0-b170215.1712
+Driver.Version = XJC 2.3.0-b170531.0717
 
-Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.3.0-b170215.1712"
+Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties
index 71c827a099b..7926f4d5331 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_pt_BR.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = compilando um esquema...
 
 Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.3.0-b170215.1712 \nConsulte <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.3.0-b170531.0717 \nConsulte <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = vers\u00E3o completa de xjc "2.3.0-b170215.1712"
+Driver.FullVersion = vers\u00E3o completa de xjc "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties
index efd45c540e8..daad91ff9e2 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_CN.properties
@@ -131,17 +131,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7f16\u8bd1\u6a21\u5f0f...
 
 Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.3.0-b170215.1712 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.3.0-b170531.0717 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-b170215.1712"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties
index 4889fc512ae..d0282b8efc7 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/MessageBundle_zh_TW.properties
@@ -127,17 +127,17 @@ Driver.CompilingSchema = \u6b63\u5728\u7de8\u8b6f\u7db1\u8981...
 
 Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc.
 
-# DO NOT localize the 2.3.0-b170215.1712 string - it is a token for an mvn <properties filter>
-Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170215.1712 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
+# DO NOT localize the 2.3.0-b170531.0717 string - it is a token for an mvn <properties filter>
+Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0-b170531.0717 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="https://jaxb.java.net/">https://jaxb.java.net/</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
 
-Driver.Version = xjc 2.3.0-b170215.1712
+Driver.Version = xjc 2.3.0-b170531.0717
 
-Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-b170215.1712"
+Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.3.0-b170531.0717"
 
-Driver.BuildID = 2.3.0-b170215.1712
+Driver.BuildID = 2.3.0-b170531.0717
 
 # for JDK integration - include version in source zip
-jaxb.jdk.version=@@JAXB_JDK_VERSION@@
+jaxb.jdk.version=2.3.0-b170531.0717
 
 # see java.text.SimpleDateFormat for format syntax
 # DO NOT LOCALIZE, Format should not be changed, English locale is used to transform this string into a real date.
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
index e1603cb9aaa..c1136f45f65 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java
@@ -77,37 +77,53 @@ import org.xml.sax.InputSource;
  * The configuration in this class should be abstract enough so that
  * it could be parsed from both command-line or Ant.
  */
-public class Options
-{
-    /** If "-debug" is specified. */
+public class Options {
+    /**
+     * If "-debug" is specified.
+     */
     public boolean debugMode;
 
-    /** If the "-verbose" option is specified. */
+    /**
+     * If the "-verbose" option is specified.
+     */
     public boolean verbose;
 
-    /** If the "-quiet" option is specified. */
+    /**
+     * If the "-quiet" option is specified.
+     */
     public boolean quiet;
 
-    /** If the -readOnly option is specified. */
+    /**
+     * If the -readOnly option is specified.
+     */
     public boolean readOnly;
 
-    /** No file header comment (to be more friendly with diff.) */
+    /**
+     * No file header comment (to be more friendly with diff.)
+     */
     public boolean noFileHeader;
 
-    /** When on, fixes getter/setter generation to match the Bean Introspection API */
+    /**
+     * When on, fixes getter/setter generation to match the Bean Introspection API
+     */
     public boolean enableIntrospection;
 
-    /** When on, generates content property for types with multiple xs:any derived elements (which is supposed to be correct behaviour) */
+    /**
+     * When on, generates content property for types with multiple xs:any derived elements (which is supposed to be correct behaviour)
+     */
     public boolean contentForWildcard;
 
-    /** Encoding to be used by generated java sources, null for platform default. */
+    /**
+     * Encoding to be used by generated java sources, null for platform default.
+     */
     public String encoding;
 
     /**
      * If true XML security features when parsing XML documents will be disabled.
      * The default value is false.
-     *
+     * <p>
      * Boolean
+     *
      * @since 2.2.6
      */
     public boolean disableXmlSecurity;
@@ -116,7 +132,7 @@ public class Options
      * Check the source schemas with extra scrutiny.
      * The exact meaning depends on the schema language.
      */
-    public boolean strictCheck =true;
+    public boolean strictCheck = true;
 
     /**
      * If -explicit-annotation option is specified.
@@ -149,7 +165,7 @@ public class Options
     public int compatibilityMode = STRICT;
 
     public boolean isExtensionMode() {
-        return compatibilityMode==EXTENSION;
+        return compatibilityMode == EXTENSION;
     }
 
     private static final Logger logger = com.sun.xml.internal.bind.Util.getClassLogger();
@@ -277,30 +293,26 @@ public class Options
 
     /**
      * Sets the {@link FieldRendererFactory}.
-     *
+     * <p>
      * <p>
      * This method is for plugins to call to set a custom {@link FieldRendererFactory}.
      *
-     * @param frf
-     *      The {@link FieldRendererFactory} to be installed. Must not be null.
-     * @param owner
-     *      Identifies the plugin that owns this {@link FieldRendererFactory}.
-     *      When two {@link Plugin}s try to call this method, this allows XJC
-     *      to report it as a user-friendly error message.
-     *
-     * @throws BadCommandLineException
-     *      If a conflit happens, this exception carries a user-friendly error
-     *      message, indicating a conflict.
+     * @param frf   The {@link FieldRendererFactory} to be installed. Must not be null.
+     * @param owner Identifies the plugin that owns this {@link FieldRendererFactory}.
+     *              When two {@link Plugin}s try to call this method, this allows XJC
+     *              to report it as a user-friendly error message.
+     * @throws BadCommandLineException If a conflit happens, this exception carries a user-friendly error
+     *                                 message, indicating a conflict.
      */
     public void setFieldRendererFactory(FieldRendererFactory frf, Plugin owner) throws BadCommandLineException {
         // since this method is for plugins, make it bit more fool-proof than usual
-        if(frf==null)
+        if (frf == null)
             throw new IllegalArgumentException();
-        if(fieldRendererFactoryOwner!=null) {
+        if (fieldRendererFactoryOwner != null) {
             throw new BadCommandLineException(
                 Messages.format(Messages.FIELD_RENDERER_CONFLICT,
                     fieldRendererFactoryOwner.getOptionName(),
-                    owner.getOptionName() ));
+                    owner.getOptionName()));
         }
         this.fieldRendererFactoryOwner = owner;
         this.fieldRendererFactory = frf;
@@ -318,30 +330,26 @@ public class Options
 
     /**
      * Sets the {@link NameConverter}.
-     *
+     * <p>
      * <p>
      * This method is for plugins to call to set a custom {@link NameConverter}.
      *
-     * @param nc
-     *      The {@link NameConverter} to be installed. Must not be null.
-     * @param owner
-     *      Identifies the plugin that owns this {@link NameConverter}.
-     *      When two {@link Plugin}s try to call this method, this allows XJC
-     *      to report it as a user-friendly error message.
-     *
-     * @throws BadCommandLineException
-     *      If a conflit happens, this exception carries a user-friendly error
-     *      message, indicating a conflict.
+     * @param nc    The {@link NameConverter} to be installed. Must not be null.
+     * @param owner Identifies the plugin that owns this {@link NameConverter}.
+     *              When two {@link Plugin}s try to call this method, this allows XJC
+     *              to report it as a user-friendly error message.
+     * @throws BadCommandLineException If a conflit happens, this exception carries a user-friendly error
+     *                                 message, indicating a conflict.
      */
     public void setNameConverter(NameConverter nc, Plugin owner) throws BadCommandLineException {
         // since this method is for plugins, make it bit more fool-proof than usual
-        if(nc==null)
+        if (nc == null)
             throw new IllegalArgumentException();
-        if(nameConverter!=null) {
+        if (nameConverter != null) {
             throw new BadCommandLineException(
                 Messages.format(Messages.NAME_CONVERTER_CONFLICT,
                     nameConverterOwner.getOptionName(),
-                    owner.getOptionName() ));
+                    owner.getOptionName()));
         }
         this.nameConverterOwner = owner;
         this.nameConverter = nc;
@@ -349,15 +357,16 @@ public class Options
 
     /**
      * Gets all the {@link Plugin}s discovered so far.
-     *
+     * <p>
      * <p>
      * A plugins are enumerated when this method is called for the first time,
      * by taking {@link #classpaths} into account. That means
      * "-cp plugin.jar" has to come before you specify options to enable it.
+     *
      * @return
      */
     public List<Plugin> getAllPlugins() {
-        if(allPlugins==null) {
+        if (allPlugins == null) {
             allPlugins = findServices(Plugin.class);
         }
 
@@ -365,29 +374,34 @@ public class Options
     }
 
     public Language getSchemaLanguage() {
-        if( schemaLanguage==null)
+        if (schemaLanguage == null)
             schemaLanguage = guessSchemaLanguage();
         return schemaLanguage;
     }
+
     public void setSchemaLanguage(Language _schemaLanguage) {
         this.schemaLanguage = _schemaLanguage;
     }
 
-    /** Input schema files.
-     * @return  */
+    /**
+     * Input schema files.
+     *
+     * @return
+     */
     public InputSource[] getGrammars() {
         return grammars.toArray(new InputSource[grammars.size()]);
     }
 
     /**
      * Adds a new input schema.
+     *
      * @param is
      */
-    public void addGrammar( InputSource is ) {
+    public void addGrammar(InputSource is) {
         grammars.add(absolutize(is));
     }
 
-    private InputSource fileToInputSource( File source ) {
+    private InputSource fileToInputSource(File source) {
         try {
             String url = source.toURL().toExternalForm();
             return new InputSource(Util.escapeSpace(url));
@@ -396,27 +410,27 @@ public class Options
         }
     }
 
-    public void addGrammar( File source ) {
+    public void addGrammar(File source) {
         addGrammar(fileToInputSource(source));
     }
 
     /**
      * Recursively scan directories and add all XSD files in it.
+     *
      * @param dir
      */
-    public void addGrammarRecursive( File dir ) {
-        addRecursive(dir,".xsd",grammars);
+    public void addGrammarRecursive(File dir) {
+        addRecursive(dir, ".xsd", grammars);
     }
 
-    private  void addRecursive( File dir, String suffix, List<InputSource> result ) {
+    private void addRecursive(File dir, String suffix, List<InputSource> result) {
         File[] files = dir.listFiles();
-        if(files==null)     return; // work defensively
+        if (files == null) return; // work defensively
 
-        for( File f : files ) {
-            if(f.isDirectory())
-                addRecursive(f,suffix,result);
-            else
-            if(f.getPath().endsWith(suffix))
+        for (File f : files) {
+            if (f.isDirectory())
+                addRecursive(f, suffix, result);
+            else if (f.getPath().endsWith(suffix))
                 result.add(absolutize(fileToInputSource(f)));
         }
     }
@@ -426,59 +440,68 @@ public class Options
         // absolutize all the system IDs in the input, so that we can map system IDs to DOM trees.
         try {
             URL baseURL = new File(".").getCanonicalFile().toURL();
-            is.setSystemId( new URL(baseURL,is.getSystemId()).toExternalForm() );
-        } catch( IOException e ) {
+            is.setSystemId(new URL(baseURL, is.getSystemId()).toExternalForm());
+        } catch (IOException e) {
             logger.log(Level.FINE, "{0}, {1}", new Object[]{is.getSystemId(), e.getLocalizedMessage()});
         }
         return is;
     }
 
-    /** Input external binding files.
-     * @return  */
+    /**
+     * Input external binding files.
+     *
+     * @return
+     */
     public InputSource[] getBindFiles() {
         return bindFiles.toArray(new InputSource[bindFiles.size()]);
     }
 
     /**
      * Adds a new binding file.
+     *
      * @param is
      */
-    public void addBindFile( InputSource is ) {
+    public void addBindFile(InputSource is) {
         bindFiles.add(absolutize(is));
     }
 
     /**
      * Adds a new binding file.
+     *
      * @param bindFile
      */
-    public void addBindFile( File bindFile ) {
+    public void addBindFile(File bindFile) {
         bindFiles.add(fileToInputSource(bindFile));
     }
 
     /**
      * Recursively scan directories and add all ".xjb" files in it.
+     *
      * @param dir
      */
-    public void addBindFileRecursive( File dir ) {
-        addRecursive(dir,".xjb",bindFiles);
+    public void addBindFileRecursive(File dir) {
+        addRecursive(dir, ".xjb", bindFiles);
     }
 
     public final List<URL> classpaths = new ArrayList<>();
+
     /**
      * Gets a classLoader that can load classes specified via the
      * -classpath option.
+     *
      * @param parent
      * @return
      */
-    public ClassLoader getUserClassLoader( ClassLoader parent ) {
+    public ClassLoader getUserClassLoader(ClassLoader parent) {
         if (classpaths.isEmpty())
             return parent;
         return new URLClassLoader(
-                classpaths.toArray(new URL[classpaths.size()]),parent);
+            classpaths.toArray(new URL[classpaths.size()]), parent);
     }
 
     /**
      * Gets Java module name option.
+     *
      * @return Java module name option or {@code null} if this option was not set.
      */
     public String getModuleName() {
@@ -491,13 +514,11 @@ public class Options
      *
      * @param args
      * @param i
-     * @return
-     *      0 if the argument is not understood. Returning 0
-     *      will let the caller report an error.
-     * @exception BadCommandLineException
-     *      If the callee wants to provide a custom message for an error.
+     * @return 0 if the argument is not understood. Returning 0
+     * will let the caller report an error.
+     * @throws BadCommandLineException If the callee wants to provide a custom message for an error.
      */
-    public int parseArgument( String[] args, int i ) throws BadCommandLineException {
+    public int parseArgument(String[] args, int i) throws BadCommandLineException {
         if (args[i].equals("-classpath") || args[i].equals("-cp")) {
             String a = requireArgument(args[i], args, ++i);
             for (String p : a.split(File.pathSeparator)) {
@@ -506,16 +527,16 @@ public class Options
                     classpaths.add(file.toURL());
                 } catch (MalformedURLException e) {
                     throw new BadCommandLineException(
-                        Messages.format(Messages.NOT_A_VALID_FILENAME,file),e);
+                        Messages.format(Messages.NOT_A_VALID_FILENAME, file), e);
                 }
             }
             return 2;
         }
         if (args[i].equals("-d")) {
-            targetDir = new File(requireArgument("-d",args,++i));
-            if( !targetDir.exists() )
+            targetDir = new File(requireArgument("-d", args, ++i));
+            if (!targetDir.exists())
                 throw new BadCommandLineException(
-                    Messages.format(Messages.NON_EXISTENT_DIR,targetDir));
+                    Messages.format(Messages.NON_EXISTENT_DIR, targetDir));
             return 2;
         }
         if (args[i].equals("-readOnly")) {
@@ -523,8 +544,8 @@ public class Options
             return 1;
         }
         if (args[i].equals("-p")) {
-            defaultPackage = requireArgument("-p",args,++i);
-            if(defaultPackage.length()==0) { // user specified default package
+            defaultPackage = requireArgument("-p", args, ++i);
+            if (defaultPackage.length() == 0) { // user specified default package
                 // there won't be any package to annotate, so disable them
                 // automatically as a usability feature
                 packageLevelAnnotations = false;
@@ -544,11 +565,11 @@ public class Options
             strictCheck = false;
             return 1;
         }
-        if( args[i].equals("-npa")) {
+        if (args[i].equals("-npa")) {
             packageLevelAnnotations = false;
             return 1;
         }
-        if( args[i].equals("-no-header")) {
+        if (args[i].equals("-no-header")) {
             noFileHeader = true;
             return 1;
         }
@@ -581,7 +602,7 @@ public class Options
             return 1;
         }
         if (args[i].equals("-b")) {
-            addFile(requireArgument("-b",args,++i),bindFiles,".xjb");
+            addFile(requireArgument("-b", args, ++i), bindFiles, ".xjb");
             return 2;
         }
         if (args[i].equals("-dtd")) {
@@ -601,10 +622,10 @@ public class Options
             return 1;
         }
         if (args[i].equals("-target")) {
-            String token = requireArgument("-target",args,++i);
+            String token = requireArgument("-target", args, ++i);
             target = SpecVersion.parse(token);
-            if(target==null)
-                throw new BadCommandLineException(Messages.format(Messages.ILLEGAL_TARGET_VERSION,token));
+            if (target == null)
+                throw new BadCommandLineException(Messages.format(Messages.ILLEGAL_TARGET_VERSION, token));
             return 2;
         }
         if (args[i].equals("-httpproxyfile")) {
@@ -614,16 +635,16 @@ public class Options
             }
 
             File file = new File(args[++i]);
-            if(!file.exists()) {
+            if (!file.exists()) {
                 throw new BadCommandLineException(
-                    Messages.format(Messages.NO_SUCH_FILE,file));
+                    Messages.format(Messages.NO_SUCH_FILE, file));
             }
 
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"))) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"))) {
                 parseProxy(in.readLine());
             } catch (IOException e) {
                 throw new BadCommandLineException(
-                    Messages.format(Messages.FAILED_TO_PARSE,file,e.getMessage()),e);
+                    Messages.format(Messages.FAILED_TO_PARSE, file, e.getMessage()), e);
             }
 
             return 2;
@@ -638,33 +659,33 @@ public class Options
             return 2;
         }
         if (args[i].equals("-host")) {
-            proxyHost = requireArgument("-host",args,++i);
+            proxyHost = requireArgument("-host", args, ++i);
             return 2;
         }
         if (args[i].equals("-port")) {
-            proxyPort = requireArgument("-port",args,++i);
+            proxyPort = requireArgument("-port", args, ++i);
             return 2;
         }
-        if( args[i].equals("-catalog") ) {
+        if (args[i].equals("-catalog")) {
             // use Sun's "XML Entity and URI Resolvers" by Norman Walsh
             // to resolve external entities.
             // https://xerces.apache.org/xml-commons/components/resolver/resolver-article.html
 
-            File catalogFile = new File(requireArgument("-catalog",args,++i));
+            File catalogFile = new File(requireArgument("-catalog", args, ++i));
             try {
                 addCatalog(catalogFile);
             } catch (IOException e) {
                 throw new BadCommandLineException(
-                    Messages.format(Messages.FAILED_TO_PARSE,catalogFile,e.getMessage()),e);
+                    Messages.format(Messages.FAILED_TO_PARSE, catalogFile, e.getMessage()), e);
             }
             return 2;
         }
-        if( args[i].equals("-Xtest-class-name-allocator") ) {
+        if (args[i].equals("-Xtest-class-name-allocator")) {
             classNameAllocator = new ClassNameAllocator() {
                 @Override
                 public String assignClassName(String packageName, String className) {
-                    System.out.printf("assignClassName(%s,%s)\n",packageName,className);
-                    return className+"_Type";
+                    System.out.printf("assignClassName(%s,%s)\n", packageName, className);
+                    return className + "_Type";
                 }
             };
             return 1;
@@ -685,9 +706,9 @@ public class Options
         }
 
         // see if this is one of the extensions
-        for( Plugin plugin : getAllPlugins() ) {
+        for (Plugin plugin : getAllPlugins()) {
             try {
-                if( ('-'+plugin.getOptionName()).equals(args[i]) ) {
+                if (('-' + plugin.getOptionName()).equals(args[i])) {
                     activePlugins.add(plugin);
                     plugin.onActivated(this);
                     pluginURIs.addAll(plugin.getCustomizationURIs());
@@ -696,17 +717,17 @@ public class Options
                     // this is new in 2.1, and due to the backward compatibility reason,
                     // if plugin didn't understand it, we still return 1 to indicate
                     // that this option is consumed.
-                    int r = plugin.parseArgument(this,args,i);
-                    if(r!=0)
+                    int r = plugin.parseArgument(this, args, i);
+                    if (r != 0)
                         return r;
                     else
                         return 1;
                 }
 
-                int r = plugin.parseArgument(this,args,i);
-                if(r!=0)    return r;
+                int r = plugin.parseArgument(this, args, i);
+                if (r != 0) return r;
             } catch (IOException e) {
-                throw new BadCommandLineException(e.getMessage(),e);
+                throw new BadCommandLineException(e.getMessage(), e);
             }
         }
 
@@ -740,12 +761,13 @@ public class Options
         try {
             Integer.valueOf(proxyPort);
         } catch (NumberFormatException e) {
-            throw new BadCommandLineException(Messages.format(Messages.ILLEGAL_PROXY,text));
+            throw new BadCommandLineException(Messages.format(Messages.ILLEGAL_PROXY, text));
         }
     }
 
     /**
      * Obtains an operand and reports an error if it's not there.
+     *
      * @param optionName
      * @param args
      * @param i
@@ -755,7 +777,7 @@ public class Options
     public String requireArgument(String optionName, String[] args, int i) throws BadCommandLineException {
         if (i == args.length || args[i].startsWith("-")) {
             throw new BadCommandLineException(
-                Messages.format(Messages.MISSING_OPERAND,optionName));
+                Messages.format(Messages.MISSING_OPERAND, optionName));
         }
         return args[i];
     }
@@ -764,9 +786,8 @@ public class Options
      * Parses a token to a file (or a set of files)
      * and add them as {@link InputSource} to the specified list.
      *
-     * @param suffix
-     *      If the given token is a directory name, we do a recursive search
-     *      and find all files that have the given suffix.
+     * @param suffix If the given token is a directory name, we do a recursive search
+     *               and find all files that have the given suffix.
      */
     private void addFile(String name, List<InputSource> target, String suffix) throws BadCommandLineException {
         Object src;
@@ -774,14 +795,14 @@ public class Options
             src = Util.getFileOrURL(name);
         } catch (IOException e) {
             throw new BadCommandLineException(
-                Messages.format(Messages.NOT_A_FILE_NOR_URL,name));
+                Messages.format(Messages.NOT_A_FILE_NOR_URL, name));
         }
-        if(src instanceof URL) {
-            target.add(absolutize(new InputSource(Util.escapeSpace(((URL)src).toExternalForm()))));
+        if (src instanceof URL) {
+            target.add(absolutize(new InputSource(Util.escapeSpace(((URL) src).toExternalForm()))));
         } else {
-            File fsrc = (File)src;
-            if(fsrc.isDirectory()) {
-                addRecursive(fsrc,suffix,target);
+            File fsrc = (File) src;
+            if (fsrc.isDirectory()) {
+                addRecursive(fsrc, suffix, target);
             } else {
                 target.add(absolutize(fileToInputSource(fsrc)));
             }
@@ -794,6 +815,7 @@ public class Options
 
     /**
      * Adds a new catalog file.Use created or existed resolver to parse new catalog file.
+     *
      * @param catalogFile
      * @throws java.io.IOException
      */
@@ -809,25 +831,24 @@ public class Options
      * Parses arguments and fill fields of this object.
      *
      * @param args
-     * @exception BadCommandLineException
-     *      thrown when there's a problem in the command-line arguments
+     * @throws BadCommandLineException thrown when there's a problem in the command-line arguments
      */
-    public void parseArguments( String[] args ) throws BadCommandLineException {
+    public void parseArguments(String[] args) throws BadCommandLineException {
 
         for (int i = 0; i < args.length; i++) {
-            if(args[i].length()==0)
+            if (args[i].length() == 0)
                 throw new BadCommandLineException();
             if (args[i].charAt(0) == '-') {
-                int j = parseArgument(args,i);
-                if(j==0)
+                int j = parseArgument(args, i);
+                if (j == 0)
                     throw new BadCommandLineException(
                         Messages.format(Messages.UNRECOGNIZED_PARAMETER, args[i]));
-                i += (j-1);
+                i += (j - 1);
             } else {
-                if(args[i].endsWith(".jar"))
+                if (args[i].endsWith(".jar"))
                     scanEpisodeFile(new File(args[i]));
                 else
-                    addFile(args[i],grammars,".xsd");
+                    addFile(args[i], grammars, ".xsd");
             }
         }
 
@@ -854,7 +875,7 @@ public class Options
             throw new BadCommandLineException(
                 Messages.format(Messages.MISSING_GRAMMAR));
 
-        if( schemaLanguage==null )
+        if (schemaLanguage == null)
             schemaLanguage = guessSchemaLanguage();
 
 //        if(target==SpecVersion.V2_2 && !isExtensionMode())
@@ -862,13 +883,14 @@ public class Options
 //                "Currently 2.2 is still not finalized yet, so using it requires the -extension switch." +
 //                "NOTE THAT 2.2 SPEC MAY CHANGE BEFORE IT BECOMES FINAL.");
 
-        if(pluginLoadFailure!=null)
+        if (pluginLoadFailure != null)
             throw new BadCommandLineException(
-                Messages.format(Messages.PLUGIN_LOAD_FAILURE,pluginLoadFailure));
+                Messages.format(Messages.PLUGIN_LOAD_FAILURE, pluginLoadFailure));
     }
 
     /**
      * Finds the {@code META-INF/sun-jaxb.episode} file to add as a binding customization.
+     *
      * @param jar
      * @throws com.sun.tools.internal.xjc.BadCommandLineException
      */
@@ -882,13 +904,14 @@ public class Options
             }
         } catch (IOException e) {
             throw new BadCommandLineException(
-                    Messages.format(Messages.FAILED_TO_LOAD,jar,e.getMessage()), e);
+                Messages.format(Messages.FAILED_TO_LOAD, jar, e.getMessage()), e);
         }
     }
 
 
     /**
      * Guesses the schema language.
+     *
      * @return
      */
     public Language guessSchemaLanguage() {
@@ -910,27 +933,30 @@ public class Options
 
     /**
      * Creates a configured CodeWriter that produces files into the specified directory.
+     *
      * @return
      * @throws java.io.IOException
      */
     public CodeWriter createCodeWriter() throws IOException {
-        return createCodeWriter(new FileCodeWriter( targetDir, readOnly, encoding ));
+        return createCodeWriter(new FileCodeWriter(targetDir, readOnly, encoding));
     }
 
     /**
      * Creates a configured CodeWriter that produces files into the specified directory.
+     *
      * @param core
      * @return
      */
-    public CodeWriter createCodeWriter( CodeWriter core ) {
-        if(noFileHeader)
+    public CodeWriter createCodeWriter(CodeWriter core) {
+        if (noFileHeader)
             return core;
 
-        return new PrologCodeWriter( core,getPrologComment() );
+        return new PrologCodeWriter(core, getPrologComment());
     }
 
     /**
      * Gets the string suitable to be used as the prolog comment baked into artifacts.This is the string like "This file was generated by the JAXB RI on YYYY/mm/dd..."
+     *
      * @return
      */
     public String getPrologComment() {
@@ -957,7 +983,7 @@ public class Options
      * Looks for all "META-INF/services/[className]" files and
      * create one instance for each class name found inside this file.
      */
-    private <T> List<T> findServices( Class<T> clazz) {
+    private <T> List<T> findServices(Class<T> clazz) {
         final List<T> result = new ArrayList<>();
         final boolean debug = getDebugPropertyValue();
         try {
@@ -967,12 +993,12 @@ public class Options
             final ServiceLoader<T> sl = ServiceLoader.load(clazz, tccl);
             for (T t : sl)
                 result.add(t);
-        } catch( Throwable e ) {
+        } catch (Throwable e) {
             // ignore any error
             StringWriter w = new StringWriter();
             e.printStackTrace(new PrintWriter(w));
             pluginLoadFailure = w.toString();
-            if(debug)
+            if (debug)
                 System.out.println(pluginLoadFailure);
         }
         return result;
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
index 2bd07fb7f01..03454af445a 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,5 +55,21 @@ public enum SpecVersion {
         return null;
     }
 
+    /**
+     * Gives the String representation of the {@link SpecVersion}
+     */
+    public String getVersion(){
+        switch(this){
+            case V2_0:
+                return "2.0";
+            case V2_1:
+                return "2.1";
+            case V2_2:
+                return "2.2";
+            default:
+                return null;
+        }
+    }
+
     public static final SpecVersion LATEST = V2_2;
 }
diff --git a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
index 37a0b40e1dd..51ac49302eb 100644
--- a/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
+++ b/jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -85,7 +85,7 @@ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
  */
 public final class DOMForest {
     /** actual data storage {@code map<SystemId,Document>}. */
-    private final Map<String,Document> core = new HashMap<String,Document>();
+    private final Map<String,Document> core = new LinkedHashMap<>();
 
     /**
      * To correctly feed documents to a schema parser, we need to remember
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
index eb8fe7bcd0e..77108990cb6 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -27,9 +27,6 @@ package com.sun.tools.internal.ws.processor;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 /**
  * ProcessorException represents an exception that occurred while processing
  * a web service.
@@ -55,9 +52,4 @@ public class ProcessorException extends JAXWSExceptionBase {
     public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.processor";
     }
-
-    @Override
-    public ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
-    }
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
index d46e6cf9271..22bf34ee7ae 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,26 +38,32 @@ import java.util.ResourceBundle;
  *
  */
 public final class ConfigurationMessages {
-    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.configuration";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ConfigurationMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.configuration";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ConfigurationMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableCONFIGURATION_NOT_BINDING_FILE(Object arg0) {
-        return messageFactory.getMessage("configuration.notBindingFile", arg0);
+        return MESSAGE_FACTORY.getMessage("configuration.notBindingFile", arg0);
     }
 
-
     /**
      * Ignoring: binding file "{0}". It is not a jaxws or a jaxb binding file.
      *
      */
     public static String CONFIGURATION_NOT_BINDING_FILE(Object arg0) {
-        return localizer.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
+        return LOCALIZER.localize(localizableCONFIGURATION_NOT_BINDING_FILE(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
index a750a5741fd..5ab2dc817b1 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,65 +38,13 @@ import java.util.ResourceBundle;
  *
  */
 public final class GeneratorMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.generator";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, GeneratorMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
-        return messageFactory.getMessage("generator.service.classAlreadyExist", arg0, arg1);
-    }
-
-    /**
-     * Could not generate Service, class: {0} already exists. Rename wsdl:Service "{1}" using JAX-WS customization
-     *
-     */
-    public static String GENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
-        return localizer.localize(localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(arg0, arg1));
-    }
-
-    public static Localizable localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
-        return messageFactory.getMessage("generator.sei.classAlreadyExist", arg0, arg1);
-    }
-
-    /**
-     * Could not generate SEI, class: {0} already exists. Rename wsdl:portType "{1}" using JAX-WS customization
-     *
-     */
-    public static String GENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
-        return localizer.localize(localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(arg0, arg1));
-    }
-
-    public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
-        return messageFactory.getMessage("generator.nestedGeneratorError", arg0);
-    }
-
-    /**
-     * generator error: {0}
-     *
-     */
-    public static String GENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
-        return localizer.localize(localizableGENERATOR_NESTED_GENERATOR_ERROR(arg0));
-    }
-
-    public static Localizable localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
-        return messageFactory.getMessage("generator.internal.error.should.not.happen", arg0);
-    }
-
-    /**
-     * internal error (should not happen): {0}
-     *
-     */
-    public static String GENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
-        return localizer.localize(localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new GeneratorMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
-        return messageFactory.getMessage("generator.indentingwriter.charset.cantencode", arg0);
+        return MESSAGE_FACTORY.getMessage("generator.indentingwriter.charset.cantencode", arg0);
     }
 
     /**
@@ -104,11 +52,11 @@ public final class GeneratorMessages {
      *
      */
     public static String GENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(Object arg0) {
-        return localizer.localize(localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(arg0));
+        return LOCALIZER.localize(localizableGENERATOR_INDENTINGWRITER_CHARSET_CANTENCODE(arg0));
     }
 
     public static Localizable localizableGENERATOR_CANNOT_CREATE_DIR(Object arg0) {
-        return messageFactory.getMessage("generator.cannot.create.dir", arg0);
+        return MESSAGE_FACTORY.getMessage("generator.cannot.create.dir", arg0);
     }
 
     /**
@@ -116,7 +64,66 @@ public final class GeneratorMessages {
      *
      */
     public static String GENERATOR_CANNOT_CREATE_DIR(Object arg0) {
-        return localizer.localize(localizableGENERATOR_CANNOT_CREATE_DIR(arg0));
+        return LOCALIZER.localize(localizableGENERATOR_CANNOT_CREATE_DIR(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("generator.internal.error.should.not.happen", arg0);
+    }
+
+    /**
+     * internal error (should not happen): {0}
+     *
+     */
+    public static String GENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(Object arg0) {
+        return LOCALIZER.localize(localizableGENERATOR_INTERNAL_ERROR_SHOULD_NOT_HAPPEN(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("generator.nestedGeneratorError", arg0);
+    }
+
+    /**
+     * generator error: {0}
+     *
+     */
+    public static String GENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableGENERATOR_NESTED_GENERATOR_ERROR(arg0));
+    }
+
+    public static Localizable localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("generator.sei.classAlreadyExist", arg0, arg1);
+    }
+
+    /**
+     * Could not generate SEI, class: {0} already exists. Rename wsdl:portType "{1}" using JAX-WS customization
+     *
+     */
+    public static String GENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(arg0, arg1));
+    }
+
+    public static Localizable localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("generator.service.classAlreadyExist", arg0, arg1);
+    }
+
+    /**
+     * Could not generate Service, class: {0} already exists. Rename wsdl:Service "{1}" using JAX-WS customization
+     *
+     */
+    public static String GENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
index 8c72a46ce9c..dda631c0873 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,17 +38,13 @@ import java.util.ResourceBundle;
  *
  */
 public final class JavacompilerMessages {
-    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.javacompiler";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, JavacompilerMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
+    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.javacompiler";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new JavacompilerMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableNO_JAVACOMPILER_ERROR() {
-        return messageFactory.getMessage("no.javacompiler.error");
+        return MESSAGE_FACTORY.getMessage("no.javacompiler.error");
     }
 
     /**
@@ -56,7 +52,18 @@ public final class JavacompilerMessages {
      *
      */
     public static String NO_JAVACOMPILER_ERROR() {
-        return localizer.localize(localizableNO_JAVACOMPILER_ERROR());
+        return LOCALIZER.localize(localizableNO_JAVACOMPILER_ERROR());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
index 722a0a74a14..7fc93f86381 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,161 +38,61 @@ import java.util.ResourceBundle;
  *
  */
 public final class ModelMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.model";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ModelMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableMODEL_NESTED_MODEL_ERROR(Object arg0) {
-        return messageFactory.getMessage("model.nestedModelError", arg0);
+    public static Localizable localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("model.importer.invalidMinorMinorOrPatchVersion", arg0, arg1, arg2);
     }
 
     /**
-     * model error: {0}
+     * model version "{1}" newer than runtime version "{2}" (line {0}): need to upgrade to a newer runtime
      *
      */
-    public static String MODEL_NESTED_MODEL_ERROR(Object arg0) {
-        return localizer.localize(localizableMODEL_NESTED_MODEL_ERROR(arg0));
+    public static String MODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableMODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.exception.notunique", arg0, arg1);
+    public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("model.schema.unsupportedType", arg0, arg1, arg2);
     }
 
     /**
-     * Failed to generate Java signature: duplicate exception names {0}. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     * unsupported type ({0}): "{1}" (namespace: {2})
      *
      */
-    public static String MODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_EXCEPTION_NOTUNIQUE(arg0, arg1));
+    public static String MODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
-        return messageFactory.getMessage("model.schema.invalidWildcard.allCompositor", arg0);
+    public static Localizable localizableMODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.importer.invalidClass", arg0, arg1);
     }
 
     /**
-     * xsd:all compositor not supported for the wildcard in schema type: "{0}"
+     * invalid class name "{1}" in model document (line {0})
      *
      */
-    public static String MODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(arg0));
+    public static String MODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_CLASS(arg0, arg1));
     }
 
-    public static Localizable localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
-        return messageFactory.getMessage("model.schema.simpleTypeWithFacets", arg0);
+    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+        return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.subtypes");
     }
 
     /**
-     * facet "{0}" not supported on simple type: "{0}"
+     * LiteralArrayWrapper cannot have subtypes
      *
      */
-    public static String MODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(arg0));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
-        return messageFactory.getMessage("model.schema.unionNotSupported", arg0);
-    }
-
-    /**
-     * simpleType: "{0}" derivation by xsd:union not supported
-     *
-     */
-    public static String MODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(arg0));
-    }
-
-    public static Localizable localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
-        return messageFactory.getMessage("model.complexType.simpleContent.reservedName", arg0);
-    }
-
-    /**
-     * invalid attribute name: "_value" in complexType: "{0}", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
-     *
-     */
-    public static String MODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
-        return localizer.localize(localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(arg0));
-    }
-
-    public static Localizable localizableMODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.importer.invalidId", arg0, arg1);
-    }
-
-    /**
-     * invalid id "{1} in model document (line {0})
-     *
-     */
-    public static String MODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_IMPORTER_INVALID_ID(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("model.schema.jaxbException.message", arg0);
-    }
-
-    /**
-     * "{0}"
-     *
-     */
-    public static String MODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(arg0));
-    }
-
-    public static Localizable localizableMODEL_INVALID_MESSAGE_TYPE(Object arg0) {
-        return messageFactory.getMessage("model.invalid.message.type", arg0);
-    }
-
-    /**
-     * invalid message type: {0}
-     *
-     */
-    public static String MODEL_INVALID_MESSAGE_TYPE(Object arg0) {
-        return localizer.localize(localizableMODEL_INVALID_MESSAGE_TYPE(arg0));
-    }
-
-    public static Localizable localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
-        return messageFactory.getMessage("ConsoleErrorReporter.UnknownLocation");
-    }
-
-    /**
-     * unknown location
-     *
-     */
-    public static String CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
-        return localizer.localize(localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION());
-    }
-
-    public static Localizable localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
-        return messageFactory.getMessage("model.exporter.unsupportedClass", arg0);
-    }
-
-    /**
-     * model exporter: unsupported class: {0}
-     *
-     */
-    public static String MODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
-        return localizer.localize(localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(arg0));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("model.schema.elementNotFound", arg0);
-    }
-
-    /**
-     * Element "{0}" not found.
-     *
-     */
-    public static String MODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(arg0));
+    public static String MODEL_ARRAYWRAPPER_NO_SUBTYPES() {
+        return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES());
     }
 
     public static Localizable localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.uniqueness.javastructuretype", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("model.uniqueness.javastructuretype", arg0, arg1);
     }
 
     /**
@@ -200,11 +100,83 @@ public final class ModelMessages {
      *
      */
     public static String MODEL_UNIQUENESS_JAVASTRUCTURETYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(arg0, arg1));
+        return LOCALIZER.localize(localizableMODEL_UNIQUENESS_JAVASTRUCTURETYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.schema.invalidSimpleType.invalidItemType", arg0, arg1);
+    }
+
+    /**
+     * in simpleType: "{0}", itemType "{1}" can not be derived by list
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.importer.invalidVersion", arg0, arg1);
+    }
+
+    /**
+     * invalid version "{1}" in model document (line {0})
+     *
+     */
+    public static String MODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_VERSION(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.exporter.unsupportedClass", arg0);
+    }
+
+    /**
+     * model exporter: unsupported class: {0}
+     *
+     */
+    public static String MODEL_EXPORTER_UNSUPPORTED_CLASS(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_EXPORTER_UNSUPPORTED_CLASS(arg0));
+    }
+
+    public static Localizable localizableMODEL_NESTED_MODEL_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.nestedModelError", arg0);
+    }
+
+    /**
+     * model error: {0}
+     *
+     */
+    public static String MODEL_NESTED_MODEL_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_NESTED_MODEL_ERROR(arg0));
+    }
+
+    public static Localizable localizableMODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.exception.notunique", arg0, arg1);
+    }
+
+    /**
+     * Failed to generate Java signature: duplicate exception names {0}. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *
+     */
+    public static String MODEL_EXCEPTION_NOTUNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_EXCEPTION_NOTUNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+        return MESSAGE_FACTORY.getMessage("model.arraywrapper.only.one.member");
+    }
+
+    /**
+     * LiteralArrayWrapper may only have one element member.
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
+        return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER());
     }
 
     public static Localizable localizableMODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.saxparser.exception", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("model.saxparser.exception", arg0, arg1);
     }
 
     /**
@@ -213,217 +185,23 @@ public final class ModelMessages {
      *
      */
     public static String MODEL_SAXPARSER_EXCEPTION(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
+        return LOCALIZER.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
     }
 
-    public static Localizable localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("model.schema.unsupportedType", arg0, arg1, arg2);
+    public static Localizable localizableMODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.importer.invalidId", arg0, arg1);
     }
 
     /**
-     * unsupported type ({0}): "{1}" (namespace: {2})
+     * invalid id "{1} in model document (line {0})
      *
      */
-    public static String MODEL_SCHEMA_UNSUPPORTED_TYPE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableMODEL_SCHEMA_UNSUPPORTED_TYPE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
-        return messageFactory.getMessage("model.schema.listNotSupported", arg0);
-    }
-
-    /**
-     * simpleType: "{0}" derivation by xsd:list not supported
-     *
-     */
-    public static String MODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(arg0));
-    }
-
-    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_PARENT() {
-        return messageFactory.getMessage("model.arraywrapper.no.parent");
-    }
-
-    /**
-     * LiteralArrayWrapper cannot have a parent type
-     *
-     */
-    public static String MODEL_ARRAYWRAPPER_NO_PARENT() {
-        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_PARENT());
-    }
-
-    public static Localizable localizableMODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("model.parent.type.already.set", arg0, arg1, arg2);
-    }
-
-    /**
-     * parent of type "{0}" already set to "{1}", new value = "{2}"
-     *
-     */
-    public static String MODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableMODEL_PARENT_TYPE_ALREADY_SET(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES() {
-        return messageFactory.getMessage("model.arraywrapper.no.subtypes");
-    }
-
-    /**
-     * LiteralArrayWrapper cannot have subtypes
-     *
-     */
-    public static String MODEL_ARRAYWRAPPER_NO_SUBTYPES() {
-        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_SUBTYPES());
-    }
-
-    public static Localizable localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("model.importer.invalidMinorMinorOrPatchVersion", arg0, arg1, arg2);
-    }
-
-    /**
-     * model version "{1}" newer than runtime version "{2}" (line {0}): need to upgrade to a newer runtime
-     *
-     */
-    public static String MODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableMODEL_IMPORTER_INVALID_MINOR_MINOR_OR_PATCH_VERSION(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_CIRCULARITY(Object arg0) {
-        return messageFactory.getMessage("model.schema.circularity", arg0);
-    }
-
-    /**
-     * circularity detected in schema: "{0}"
-     *
-     */
-    public static String MODEL_SCHEMA_CIRCULARITY(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_CIRCULARITY(arg0));
-    }
-
-    public static Localizable localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
-        return messageFactory.getMessage("model.arraywrapper.member.already.set");
-    }
-
-    /**
-     * LiteralArrayWrapper element member already set.
-     *
-     */
-    public static String MODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
-        return localizer.localize(localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET());
-    }
-
-    public static Localizable localizableMODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.importer.invalidClass", arg0, arg1);
-    }
-
-    /**
-     * invalid class name "{1}" in model document (line {0})
-     *
-     */
-    public static String MODEL_IMPORTER_INVALID_CLASS(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_IMPORTER_INVALID_CLASS(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.importer.invalidVersion", arg0, arg1);
-    }
-
-    /**
-     * invalid version "{1}" in model document (line {0})
-     *
-     */
-    public static String MODEL_IMPORTER_INVALID_VERSION(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_IMPORTER_INVALID_VERSION(arg0, arg1));
-    }
-
-    public static Localizable localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
-        return messageFactory.getMessage("ConsoleErrorReporter.LineXOfY", arg0, arg1);
-    }
-
-    /**
-     *   line {0} of {1}
-     *
-     */
-    public static String CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
-        return localizer.localize(localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.parameter.notunique", arg0, arg1);
-    }
-
-    /**
-     * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
-     *  1. Use JAXWS binding customization to rename the wsdl:part "{1}"
-     *  2. Run wsimport with -extension switch.
-     *
-     */
-    public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.schema.invalidSimpleType.invalidItemType", arg0, arg1);
-    }
-
-    /**
-     * in simpleType: "{0}", itemType "{1}" can not be derived by list
-     *
-     */
-    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_INVALID_ITEM_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_UNIQUENESS() {
-        return messageFactory.getMessage("model.uniqueness");
-    }
-
-    /**
-     * uniqueness constraint violation
-     *
-     */
-    public static String MODEL_UNIQUENESS() {
-        return localizer.localize(localizableMODEL_UNIQUENESS());
-    }
-
-    public static Localizable localizable_002F_002F_REPLACEMENT() {
-        return messageFactory.getMessage("//replacement");
-    }
-
-    /**
-     * for Uxxx codes
-     *
-     */
-    public static String _002F_002F_REPLACEMENT() {
-        return localizer.localize(localizable_002F_002F_REPLACEMENT());
-    }
-
-    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.schema.invalidSimpleType.noItemLiteralType", arg0, arg1);
-    }
-
-    /**
-     * in simpleType: "{0}", xsd:list itemType "{1}" is invalid
-     *
-     */
-    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
-        return messageFactory.getMessage("model.arraywrapper.only.one.member");
-    }
-
-    /**
-     * LiteralArrayWrapper may only have one element member.
-     *
-     */
-    public static String MODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER() {
-        return localizer.localize(localizableMODEL_ARRAYWRAPPER_ONLY_ONE_MEMBER());
+    public static String MODEL_IMPORTER_INVALID_ID(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_IMPORTER_INVALID_ID(arg0, arg1));
     }
 
     public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.parameter.notunique.wrapper", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("model.parameter.notunique.wrapper", arg0, arg1);
     }
 
     /**
@@ -434,23 +212,47 @@ public final class ModelMessages {
      *
      */
     public static String MODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(arg0, arg1));
+        return LOCALIZER.localize(localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(arg0, arg1));
     }
 
-    public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
-        return messageFactory.getMessage("model.schema.notImplemented", arg0);
+    public static Localizable localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.elementNotFound", arg0);
     }
 
     /**
-     * unsupported XML Schema feature ({0})
+     * Element "{0}" not found.
      *
      */
-    public static String MODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED(arg0));
+    public static String MODEL_SCHEMA_ELEMENT_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_ELEMENT_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.unionNotSupported", arg0);
+    }
+
+    /**
+     * simpleType: "{0}" derivation by xsd:union not supported
+     *
+     */
+    public static String MODEL_SCHEMA_UNION_NOT_SUPPORTED(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_UNION_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+        return MESSAGE_FACTORY.getMessage("ConsoleErrorReporter.UnknownLocation");
+    }
+
+    /**
+     * unknown location
+     *
+     */
+    public static String CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION() {
+        return LOCALIZER.localize(localizableCONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION());
     }
 
     public static Localizable localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
-        return messageFactory.getMessage("model.schema.invalidLiteralInEnumeration.anonymous", arg0);
+        return MESSAGE_FACTORY.getMessage("model.schema.invalidLiteralInEnumeration.anonymous", arg0);
     }
 
     /**
@@ -458,23 +260,11 @@ public final class ModelMessages {
      *
      */
     public static String MODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(Object arg0) {
-        return localizer.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(arg0));
-    }
-
-    public static Localizable localizableMODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("model.part.notUnique", arg0, arg1);
-    }
-
-    /**
-     * parts in wsdl:message "{0}", reference "{1}", they must reference unique global elements.
-     *
-     */
-    public static String MODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMODEL_PART_NOT_UNIQUE(arg0, arg1));
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_LITERAL_IN_ENUMERATION_ANONYMOUS(arg0));
     }
 
     public static Localizable localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
-        return messageFactory.getMessage("model.arraywrapper.no.content.member");
+        return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.content.member");
     }
 
     /**
@@ -482,7 +272,224 @@ public final class ModelMessages {
      *
      */
     public static String MODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER() {
-        return localizer.localize(localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER());
+        return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_CONTENT_MEMBER());
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+        return MESSAGE_FACTORY.getMessage("model.arraywrapper.member.already.set");
+    }
+
+    /**
+     * LiteralArrayWrapper element member already set.
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET() {
+        return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_MEMBER_ALREADY_SET());
+    }
+
+    public static Localizable localizableMODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.invalid.message.type", arg0);
+    }
+
+    /**
+     * invalid message type: {0}
+     *
+     */
+    public static String MODEL_INVALID_MESSAGE_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_INVALID_MESSAGE_TYPE(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_CIRCULARITY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.circularity", arg0);
+    }
+
+    /**
+     * circularity detected in schema: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_CIRCULARITY(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_CIRCULARITY(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.schema.invalidSimpleType.noItemLiteralType", arg0, arg1);
+    }
+
+    /**
+     * in simpleType: "{0}", xsd:list itemType "{1}" is invalid
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_SIMPLE_TYPE_NO_ITEM_LITERAL_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.listNotSupported", arg0);
+    }
+
+    /**
+     * simpleType: "{0}" derivation by xsd:list not supported
+     *
+     */
+    public static String MODEL_SCHEMA_LIST_NOT_SUPPORTED(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_LIST_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizable_002F_002F_REPLACEMENT() {
+        return MESSAGE_FACTORY.getMessage("//replacement");
+    }
+
+    /**
+     * for Uxxx codes
+     *
+     */
+    public static String _002F_002F_REPLACEMENT() {
+        return LOCALIZER.localize(localizable_002F_002F_REPLACEMENT());
+    }
+
+    public static Localizable localizableMODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.part.notUnique", arg0, arg1);
+    }
+
+    /**
+     * parts in wsdl:message "{0}", reference "{1}", they must reference unique global elements.
+     *
+     */
+    public static String MODEL_PART_NOT_UNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_PART_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_ARRAYWRAPPER_NO_PARENT() {
+        return MESSAGE_FACTORY.getMessage("model.arraywrapper.no.parent");
+    }
+
+    /**
+     * LiteralArrayWrapper cannot have a parent type
+     *
+     */
+    public static String MODEL_ARRAYWRAPPER_NO_PARENT() {
+        return LOCALIZER.localize(localizableMODEL_ARRAYWRAPPER_NO_PARENT());
+    }
+
+    public static Localizable localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.complexType.simpleContent.reservedName", arg0);
+    }
+
+    /**
+     * invalid attribute name: "_value" in complexType: "{0}", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
+     *
+     */
+    public static String MODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_COMPLEX_TYPE_SIMPLE_CONTENT_RESERVED_NAME(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.simpleTypeWithFacets", arg0);
+    }
+
+    /**
+     * facet "{0}" not supported on simple type: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_SIMPLE_TYPE_WITH_FACETS(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.notImplemented", arg0);
+    }
+
+    /**
+     * unsupported XML Schema feature ({0})
+     *
+     */
+    public static String MODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_NOT_IMPLEMENTED(arg0));
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.jaxbException.message", arg0);
+    }
+
+    /**
+     * "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_JAXB_EXCEPTION_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableMODEL_UNIQUENESS() {
+        return MESSAGE_FACTORY.getMessage("model.uniqueness");
+    }
+
+    /**
+     * uniqueness constraint violation
+     *
+     */
+    public static String MODEL_UNIQUENESS() {
+        return LOCALIZER.localize(localizableMODEL_UNIQUENESS());
+    }
+
+    public static Localizable localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("model.schema.invalidWildcard.allCompositor", arg0);
+    }
+
+    /**
+     * xsd:all compositor not supported for the wildcard in schema type: "{0}"
+     *
+     */
+    public static String MODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(Object arg0) {
+        return LOCALIZER.localize(localizableMODEL_SCHEMA_INVALID_WILDCARD_ALL_COMPOSITOR(arg0));
+    }
+
+    public static Localizable localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("ConsoleErrorReporter.LineXOfY", arg0, arg1);
+    }
+
+    /**
+     *   line {0} of {1}
+     *
+     */
+    public static String CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableCONSOLE_ERROR_REPORTER_LINE_X_OF_Y(arg0, arg1));
+    }
+
+    public static Localizable localizableMODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("model.parent.type.already.set", arg0, arg1, arg2);
+    }
+
+    /**
+     * parent of type "{0}" already set to "{1}", new value = "{2}"
+     *
+     */
+    public static String MODEL_PARENT_TYPE_ALREADY_SET(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableMODEL_PARENT_TYPE_ALREADY_SET(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("model.parameter.notunique", arg0, arg1);
+    }
+
+    /**
+     * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
+     *  1. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *  2. Run wsimport with -extension switch.
+     *
+     */
+    public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMODEL_PARAMETER_NOTUNIQUE(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
index 708ffc37008..542aa686d73 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,401 +38,13 @@ import java.util.ResourceBundle;
  *
  */
 public final class ModelerMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.modeler";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ModelerMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.invalidSchemaType", arg0, arg1);
-    }
-
-    /**
-     * Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.parameterorder.parameter", arg0, arg1);
-    }
-
-    /**
-     * "{0}" specified in the parameterOrder attribute of operation "{1}" is not a valid part of the message.
-     *
-     */
-    public static String WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.noSoapFaultName", arg0, arg1);
-    }
-
-    /**
-     * soap:fault name not specified, wsdl:fault "{0}" in operation "{1}"
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
-        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.import");
-    }
-
-    /**
-     * Non conforming WS-I WSDL used for wsdl:import
-     *
-     */
-    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT());
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace", arg0);
-    }
-
-    /**
-     * output message of binding operation "{0}" must specify a value for the "namespace" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.fault.notLiteral", arg0, arg1);
-    }
-
-    /**
-     * ignoring encoded fault "{0}" in literal binding operation "{1}"
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody", arg0);
-    }
-
-    /**
-     * input message of binding operation "{0}" does not have a SOAP body extension
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport", arg0);
-    }
-
-    /**
-     * ignoring SOAP port "{0}": unrecognized transport. try running wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notFound", arg0, arg1);
-    }
-
-    /**
-     * in binding "{1}", operation "{0}" does not match any operation in the corresponding port type
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME() {
-        return messageFactory.getMessage("wsdlmodeler.unsupportedBinding.mime");
-    }
-
-    /**
-     * WSDL MIME binding is not currently supported!
-     *
-     */
-    public static String WSDLMODELER_UNSUPPORTED_BINDING_MIME() {
-        return localizer.localize(localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME());
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.noElementAttribute", arg0, arg1, arg2);
-    }
-
-    /**
-     * ignoring header fault part="{0}" message="{1}" of operation {2}
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
-    }
-
-    /**
-     * Invalid operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.notLiteral", arg0, arg1);
-    }
-
-    /**
-     * Invalid headerfault "{0}" of binding operation "{1}": not literal
-     *
-     */
-    public static String WSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(arg0, arg1));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.differentPart");
-    }
-
-    /**
-     * Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
-    }
-
-    public static Localizable localizableWSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.error.partNotFound", arg0, arg1);
-    }
-
-    /**
-     * part "{1}" of operation "{0}" could not be resolved!
-     *
-     */
-    public static String WSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_ERROR_PART_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor", arg0, arg1);
-    }
-
-    /**
-     * Invalid header "{0}" in operation {1}: part must specify a "element" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", arg0);
-    }
-
-    /**
-     * Invalid operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" in operation "{1}" does not have a SOAP fault extension
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": message part does not refer to a schema type declaration
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(arg0));
-    }
-
-    public static Localizable localizableWSDLMODLER_WARNING_OPERATION_USE() {
-        return messageFactory.getMessage("wsdlmodler.warning.operation.use");
-    }
-
-    /**
-     * The WSDL used has operations with literal and encoded use. -f:searchschema is not supported for this scenario.
-     *
-     */
-    public static String WSDLMODLER_WARNING_OPERATION_USE() {
-        return localizer.localize(localizableWSDLMODLER_WARNING_OPERATION_USE());
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort", arg0);
-    }
-
-    /**
-     * ignoring port "{0}": not a standard SOAP port. try running wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" refers to message "{1}", but the message has more than one parts
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
-        return messageFactory.getMessage("wsdlmodeler.warning.noServiceDefinitionsFound");
-    }
-
-    /**
-     * WSDL document does not define any services
-     *
-     */
-    public static String WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.cant.resolve.message", arg0, arg1);
-    }
-
-    /**
-     * ignoring fault "{0}" of binding operation "{1}": cannot resolve message
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.jaxb.javatype.notfound", arg0, arg1);
-    }
-
-    /**
-     * Schema descriptor {0} in message part "{1}" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
-     *
-     */
-    public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", arg0);
-    }
-
-    /**
-     * not a WS-I BP1.1 compliant SOAP port "{0}": the WSDL binding has mixed style, it must be rpc-literal or document-literal operation!
-     *
-     */
-    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.doclitoperation", arg0);
-    }
-
-    /**
-     * Invalid wsdl:operation "{0}": its a document-literal operation,  message part must refer to a schema element declaration
-     *
-     */
-    public static String WSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_DOCLITOPERATION(arg0));
-    }
-
-    public static Localizable localizableMODELER_NESTED_MODEL_ERROR(Object arg0) {
-        return messageFactory.getMessage("modeler.nestedModelError", arg0);
-    }
-
-    /**
-     * modeler error: {0}
-     *
-     */
-    public static String MODELER_NESTED_MODEL_ERROR(Object arg0) {
-        return localizer.localize(localizableMODELER_NESTED_MODEL_ERROR(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.duplicate.fault.soap.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * ignoring fault "{0}" of operation "{1}", soap:fault name "{2}" is not unique
-     *
-     */
-    public static String WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName", arg0, arg1, arg2);
-    }
-
-    /**
-     * name of soap:fault "{0}" doesn''t match the name of wsdl:fault "{1}" in operation "{2}"
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notLiteral", arg0);
-    }
-
-    /**
-     * ignoring document-style operation "{0}": parameters are not literal
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleDocumentStyle", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": cannot handle document-style operations
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ModelerMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notLiteral", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.notLiteral", arg0, arg1);
     }
 
     /**
@@ -440,359 +52,11 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.rpclitoperation", arg0);
-    }
-
-    /**
-     * Invalid wsdl:operation "{0}": its a rpc-literal operation,  message part must refer to a schema type declaration
-     *
-     */
-    public static String WSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_RPCLITOPERATION(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName", arg0, arg1);
-    }
-
-    /**
-     * Invalid operation "{0}", can''t generate java method. Parameter,customized name "{1}"  is a java keyword.
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.memberSubmissionAddressingUsed", arg0, arg1);
-    }
-
-    /**
-     * obsolete addressing version 08-2004:"{0}" used; version "{1}" should be used instead.
-     *
-     */
-    public static String WSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.bindingOperation.multiplePartBinding", arg0, arg1);
-    }
-
-    /**
-     * Check the abstract operation "{0}" binding, part "{1}" has multiple binding. Will try to generated artifacts anyway...
-     *
-     */
-    public static String WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.port.SOAPBinding12", arg0);
-    }
-
-    /**
-     * SOAP port "{0}": uses a non-standard SOAP 1.2 binding.
-     *
-     */
-    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.portTypeFault.notFound", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" in portType operation "{1}" does not match any fault in the corresponding binding operation
-     *
-     */
-    public static String WSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.invalidMimePart.nameNotAllowed", arg0);
-    }
-
-    /**
-     * name attribute on wsdl:part in Operation "{0}" is ignored. Its not allowed as per WS-I AP 1.0.
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringMimePart.notFound", arg0, arg1);
-    }
-
-    /**
-     * ignoring mime:part, cannot find part "{0}" referenced by the mime:content in the wsdl:operation "{1}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.operation.MoreThanOnePartInMessage", arg0);
-    }
-
-    /**
-     * Ignoring operation "{0}": more than one part bound to body
-     *
-     */
-    public static String WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
-    }
-
-    /**
-     * Ignoring operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.fault.cant.resolve.message", arg0, arg1);
-    }
-
-    /**
-     * fault message "{0}" in binding operation "{1}" could not be resolved
-     *
-     */
-    public static String WSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.emptyMessage", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" refers to message "{1}", but the message has no parts
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.rpclit.unkownschematype", arg0, arg1, arg2);
-    }
-
-    /**
-     * XML type "{0}" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part "{1}" in the wsdl:message "{2}".
-     *
-     */
-    public static String WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleBodyPartsAttribute", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": cannot handle "parts" attribute of "soap:body" element
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("wsdlmodeler.nonUnique.body.error", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
-     *
-     */
-    public static String WSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
-    }
-
-    /**
-     * ignoring port "{0}", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(arg0));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingTypeAttribute", arg0);
-    }
-
-    /**
-     * Missing type attribute in mime:content in operation "{0}". part attribute must be present in mime:content declaration.
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyInputMessage", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": input message is empty
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.noPortsInService", arg0);
-    }
-
-    /**
-     * Service "{0}" does not contain any usable ports. try running wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.tooManyUnmentionedParts", arg0);
-    }
-
-    /**
-     * more than one part left out in the parameterOrder attribute of operation "{0}"
-     *
-     */
-    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace", arg0);
-    }
-
-    /**
-     * input message of binding operation "{0}" must specify a value for the "namespace" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of binding operation "{1}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.responsebean.notfound", arg0);
-    }
-
-    /**
-     * wsimport failed to generate async response bean for operation: {0}
-     *
-     */
-    public static String WSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
-        return messageFactory.getMessage("wsdlmodeler20.rpcenc.not.supported");
-    }
-
-    /**
-     * rpc/encoded wsdl's are not supported in JAXWS 2.0.
-     *
-     */
-    public static String WSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
-        return localizer.localize(localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED());
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.partNotFound", arg0, arg1);
-    }
-
-    /**
-     * ignoring operation "{0}": part "{1}" not found
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.message.partMustHaveElementDescriptor", arg0, arg1);
-    }
-
-    /**
-     * in message "{0}", part "{1}" must specify a "element" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.error.partsNotFound", arg0, arg1);
-    }
-
-    /**
-     * parts "{0}" not found in the message "{1}", wrong WSDL
-     *
-     */
-    public static String WSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.notEncoded", arg0, arg1);
-    }
-
-    /**
-     * ignoring literal fault "{0}" of binding operation "{1}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notSupportedStyle", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": not request-response or one-way
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(arg0));
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_LITERAL(arg0, arg1));
     }
 
     public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multiplePartBinding", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.multiplePartBinding", arg0, arg1);
     }
 
     /**
@@ -800,131 +64,23 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
     }
 
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations", arg0, arg1);
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notLiteral", arg0, arg1, arg2);
     }
 
     /**
-     * in binding "{1}", operation "{0}" does not reference a unique operation in the corresponding port type
+     * ignoring header fault part="{0}" message="{1}" of operation {2}, use attribute must be "literal"
      *
      */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of binding operation "{1}": cannot resolve message
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
-    }
-
-    /**
-     * Ignoring operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notLiteral", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of binding operation "{1}": not literal
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.inputHeader.missingNamespace", arg0, arg1);
-    }
-
-    /**
-     * input header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingInputName", arg0);
-    }
-
-    /**
-     * binding operation "{0}" must specify a name for its input message
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", arg0);
-    }
-
-    /**
-     * ignoring port "{0}": no SOAP address specified. try running wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.resultIsInOutParameter", arg0);
-    }
-
-    /**
-     * result is "inout" parameter in operation: {0}
-     *
-     */
-    public static String WSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.header.notFound", arg0, arg1);
-    }
-
-    /**
-     * header "{0}" of binding operation "{1}": not found
-     *
-     */
-    public static String WSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("mimemodeler.elementPart.invalidElementMimeType", arg0, arg1);
-    }
-
-    /**
-     * The mime:content part refers to wsdl:part "{0}", defined using element attribute. Please make sure the mime type: "{1}" is appropriate to serialize XML.
-     *
-     */
-    public static String MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(arg0, arg1));
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.header.notLiteral", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.notLiteral", arg0, arg1);
     }
 
     /**
@@ -932,443 +88,47 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_INVALID_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(arg0, arg1));
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_LITERAL(arg0, arg1));
     }
 
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.mesagePartElementKind", arg0);
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notSupportedStyle", arg0);
     }
 
     /**
-     * wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
+     * ignoring operation "{0}": not request-response or one-way
      *
      */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(arg0));
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_SUPPORTED_STYLE(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notEncoded", arg0);
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterOrder.tooManyUnmentionedParts", arg0);
     }
 
     /**
-     * ignoring RPC-style operation "{0}": parameters are not encoded
+     * more than one part left out in the parameterOrder attribute of operation "{0}"
      *
      */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(arg0));
+    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_TOO_MANY_UNMENTIONED_PARTS(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
-        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.types");
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
     }
 
     /**
-     * Non conforming WS-I WSDL used for wsdl:types
+     * Ignoring operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
      *
      */
-    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES());
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInInputMessage", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": more than one part in input message
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyOutputMessage", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": output message is empty
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.r2716r2726", arg0, arg1);
-    }
-
-    /**
-     * R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: "{1}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_R_2716_R_2726(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.ignoringMemberSubmissionAddressing", arg0, arg1);
-    }
-
-    /**
-     * ignoring wsa:Action attribute since obsolete addressing version 08-2004:"{0}" used; expecting addressing version "{1}". To use version 08-2004 anyway run wsimport with -extension switch.
-     *
-     */
-    public static String WSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.noSOAPAddress", arg0);
-    }
-
-    /**
-     * Port "{0}" is not a SOAP port, it has no soap:address
-     *
-     */
-    public static String WSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFaults", arg0);
-    }
-
-    /**
-     * ignoring faults declared by operation "{0}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULTS(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingName", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" in operation "{1}" must specify a value for the "name" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart", arg0);
-    }
-
-    /**
-     * Headers not in root mime:part with soap:body, ignoring headers in operation "{0}"
-     *
-     */
-    public static String MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(arg0));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.errorLoadingJavaClass");
-    }
-
-    /**
-     * Couldn't find class "{0}" for mime type "{1}"
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS());
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.notInPortType", arg0, arg1);
-    }
-
-    /**
-     * in binding "{1}", operation "{0}" does not appear in the corresponding port type
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.conflictStyleInWSIMode", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": binding style and operation style are conflicting
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(arg0));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.missingPartAttribute", arg0);
-    }
-
-    /**
-     * Ignoring operation "{0}", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.searchSchema.unrecognizedTypes", arg0);
-    }
-
-    /**
-     * encountered {0} unrecognized type(s)
-     *
-     */
-    public static String WSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
-    }
-
-    /**
-     * Invalid operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.header.cant.resolve.message", arg0, arg1);
-    }
-
-    /**
-     * header "{0}" of binding operation "{1}": cannot resolve message
-     *
-     */
-    public static String WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.missingNamespace", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" in operation "{1}" must specify a value for the "namespace" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(arg0, arg1));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
-        return messageFactory.getMessage("mimemodeler.invalidMimePart.moreThanOneSOAPBody", arg0);
-    }
-
-    /**
-     * Ignoring operation "{0}". The Multipart/Related structure has invalid root part: more than one soap:body parts found
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.inconsistentDefinition", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of operation "{1}": part not found
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notFound", arg0, arg1);
-    }
-
-    /**
-     * fault "{0}" in operation "{1}" does not match any fault in the corresponding port type operation
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName", arg0, arg1);
-    }
-
-    /**
-     * Ignoring operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension", arg0);
-    }
-
-    /**
-     * ignoring schema element (unsupported version): {0}
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notFound", arg0, arg1, arg2);
-    }
-
-    /**
-     * ignoring header fault "{0}", cannot find part "{1}" in binding "{2}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("wsdlmodeler.nonUnique.body.warning", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
-     *
-     */
-    public static String WSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
-    }
-
-    /**
-     * Invalid operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("mimemodeler.invalidMimeContent.unknownSchemaType", arg0, arg1);
-    }
-
-    /**
-     * Unknown schema type: {1} for mime:content part: {0}
-     *
-     */
-    public static String MIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.r2716", arg0, arg1);
-    }
-
-    /**
-     * R2716 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit for {0}: "{1}"
-     *
-     */
-    public static String WSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_R_2716(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notFound", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of binding operation "{1}": not found
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", arg0);
-    }
-
-    /**
-     * ignoring operation "{0}": message part does not refer to a schema element declaration
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder", arg0);
-    }
-
-    /**
-     * parameterOrder attribute on operation "{0}" is invalid, ignoring parameterOrder hint
-     *
-     */
-    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.missingOutputName", arg0);
-    }
-
-    /**
-     * binding operation "{0}" must specify a name for its output message
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalidOperation", arg0);
-    }
-
-    /**
-     * invalid operation: {0}
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputHeader.missingNamespace", arg0, arg1);
-    }
-
-    /**
-     * output header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
-     *
-     */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.partFromBody", arg0);
-    }
-
-    /**
-     * header part: "{0}" already bound by soapbind:body, illegal to bind the part twice
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(arg0));
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
     }
 
     public static Localizable localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.notSupportedStyle", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.notSupportedStyle", arg0, arg1);
     }
 
     /**
@@ -1376,11 +136,167 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(arg0, arg1));
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_NOT_SUPPORTED_STYLE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.types");
+    }
+
+    /**
+     * Non conforming WS-I WSDL used for wsdl:types
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES() {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_TYPES());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.notFound", arg0, arg1);
+    }
+
+    /**
+     * header "{0}" of binding operation "{1}": not found
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.warning.IgnoringinvalidHeaderPart.notDeclaredInRootPart", arg0);
+    }
+
+    /**
+     * Headers not in root mime:part with soap:body, ignoring headers in operation "{0}"
+     *
+     */
+    public static String MIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_WARNING_IGNORINGINVALID_HEADER_PART_NOT_DECLARED_IN_ROOT_PART(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.unsupportedBinding.mime");
+    }
+
+    /**
+     * WSDL MIME binding is not currently supported!
+     *
+     */
+    public static String WSDLMODELER_UNSUPPORTED_BINDING_MIME() {
+        return LOCALIZER.localize(localizableWSDLMODELER_UNSUPPORTED_BINDING_MIME());
+    }
+
+    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.nonUnique.body.error", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
+     *
+     */
+    public static String WSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODLER_WARNING_OPERATION_USE() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodler.warning.operation.use");
+    }
+
+    /**
+     * The WSDL used has operations with literal and encoded use. -f:searchschema is not supported for this scenario.
+     *
+     */
+    public static String WSDLMODLER_WARNING_OPERATION_USE() {
+        return LOCALIZER.localize(localizableWSDLMODLER_WARNING_OPERATION_USE());
+    }
+
+    public static Localizable localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.error.partsNotFound", arg0, arg1);
+    }
+
+    /**
+     * parts "{0}" not found in the message "{1}", wrong WSDL
+     *
+     */
+    public static String WSDLMODELER_ERROR_PARTS_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_ERROR_PARTS_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.jaxb.javatype.notfound", arg0, arg1);
+    }
+
+    /**
+     * Schema descriptor {0} in message part "{1}" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
+     *
+     */
+    public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_JAXB_JAVATYPE_NOTFOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.headerfault.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * Invalid headerfault "{0}" of binding operation "{1}": not literal
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler20.rpcenc.not.supported");
+    }
+
+    /**
+     * rpc/encoded wsdl's are not supported in JAXWS 2.0.
+     *
+     */
+    public static String WSDLMODELER_20_RPCENC_NOT_SUPPORTED() {
+        return LOCALIZER.localize(localizableWSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.notFound", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" does not match any fault in the corresponding port type operation
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.doclitoperation", arg0);
+    }
+
+    /**
+     * Invalid wsdl:operation "{0}": its a document-literal operation,  message part must refer to a schema element declaration
+     *
+     */
+    public static String WSDLMODELER_INVALID_DOCLITOPERATION(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_DOCLITOPERATION(arg0));
     }
 
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.notNCName", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notNCName", arg0, arg1);
     }
 
     /**
@@ -1388,23 +304,35 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(arg0, arg1));
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_NC_NAME(arg0, arg1));
     }
 
-    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.parameter.differentTypes", arg0, arg1);
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimePart.nameNotAllowed", arg0);
     }
 
     /**
-     * parameter "{0}" of operation "{1}" appears with different types in the input and output messages
+     * name attribute on wsdl:part in Operation "{0}" is ignored. Its not allowed as per WS-I AP 1.0.
      *
      */
-    public static String WSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(arg0, arg1));
+    public static String MIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_PART_NAME_NOT_ALLOWED(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notLiteral", arg0);
+    }
+
+    /**
+     * ignoring document-style operation "{0}": parameters are not literal
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_LITERAL(arg0));
     }
 
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringFault.documentOperation", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.documentOperation", arg0, arg1);
     }
 
     /**
@@ -1412,107 +340,47 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(arg0, arg1));
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_DOCUMENT_OPERATION(arg0, arg1));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.nonconforming.wsdl.use", arg0);
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.notUnique", arg0, arg1);
     }
 
     /**
-     * Processing WS-I non conforming operation "{0}" with RPC-Style and SOAP-encoded
+     * fault "{0}" in operation "{1}" matches more than one fault in the corresponding port type operation
      *
      */
-    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(arg0));
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(arg0, arg1));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.nonSOAPPort", arg0);
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.missingInputName", arg0);
     }
 
     /**
-     * port "{0}": not a standard SOAP port. The generated artifacts may not work with JAX-WS runtime.
+     * binding operation "{0}" must specify a name for its input message
      *
      */
-    public static String WSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NON_SOAP_PORT(arg0));
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_INPUT_NAME(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.headerfault.message.partMustHaveElementDescriptor", arg0, arg1, arg2);
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
     }
 
     /**
-     * Invalid headerfault "{0}" for header {1} in operation {2}: part must specify an "element" attribute
+     * Invalid operation "{0}", can''t generate java method parameter. Local name of the wrapper child "{1}" in the global element "{2}" is a java keyword. Use customization to change the parameter name.
      *
      */
-    public static String WSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalidState.modelingOperation", arg0);
-    }
-
-    /**
-     * invalid state while modeling operation: {0}
-     *
-     */
-    public static String WSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", arg0);
-    }
-
-    /**
-     * Ignoring operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
-    }
-
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.notEncoded", arg0, arg1);
-    }
-
-    /**
-     * ignoring header "{0}" of binding operation "{1}": not SOAP-encoded
-     *
-     */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(arg0, arg1));
-    }
-
-    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.duplicate.fault.part.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * ignoring fault "{0}" of operation "{1}", part name "{2}" is not unique
-     *
-     */
-    public static String WSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", arg0);
-    }
-
-    /**
-     * operation "{0}": more than one part bound to body
-     *
-     */
-    public static String WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding12", arg0);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding12", arg0);
     }
 
     /**
@@ -1521,71 +389,539 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(arg0));
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_12(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingFault.notUnique", arg0, arg1);
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.mesagePartElementKind", arg0);
     }
 
     /**
-     * fault "{0}" in operation "{1}" matches more than one fault in the corresponding port type operation
+     * wsdl:part element referenced by mime:content part attribute: {0} must be defined using type attribute!
      *
      */
-    public static String WSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NOT_UNIQUE(arg0, arg1));
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MESAGE_PART_ELEMENT_KIND(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody", arg0);
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport", arg0);
     }
 
     /**
-     * output message of binding operation "{0}" does not have a SOAP body extension
+     * ignoring SOAP port "{0}": unrecognized transport. try running wsimport with -extension switch.
      *
      */
-    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(arg0));
+    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notLiteral", arg0, arg1, arg2);
+    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.duplicate.fault.soap.name", arg0, arg1, arg2);
     }
 
     /**
-     * ignoring header fault part="{0}" message="{1}" of operation {2}, use attribute must be "literal"
+     * ignoring fault "{0}" of operation "{1}", soap:fault name "{2}" is not unique
      *
      */
-    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_LITERAL(arg0, arg1, arg2));
+    public static String WSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_DUPLICATE_FAULT_SOAP_NAME(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInOutputMessage", arg0);
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyOutputMessage", arg0);
     }
 
     /**
-     * ignoring operation "{0}": more than one part in output message
+     * ignoring operation "{0}": output message is empty
      *
      */
-    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(arg0));
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_OUTPUT_MESSAGE(arg0));
     }
 
-    public static Localizable localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.warning.noOperationsInPort", arg0);
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimePart.moreThanOneSOAPBody", arg0);
     }
 
     /**
-     * Port "{0}" does not contain any usable operations
+     * Ignoring operation "{0}". The Multipart/Related structure has invalid root part: more than one soap:body parts found
      *
      */
-    public static String WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(arg0));
+    public static String MIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_PART_MORE_THAN_ONE_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.messageHasMoreThanOnePart", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" refers to message "{1}", but the message has more than one parts
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MESSAGE_HAS_MORE_THAN_ONE_PART(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleTypeMessagePart", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": message part does not refer to a schema element declaration
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_TYPE_MESSAGE_PART(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFaults", arg0);
+    }
+
+    /**
+     * ignoring faults declared by operation "{0}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULTS(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULTS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputSoapBody.missingNamespace", arg0);
+    }
+
+    /**
+     * input message of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleElementMessagePart", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": message part does not refer to a schema type declaration
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_ELEMENT_MESSAGE_PART(arg0));
+    }
+
+    public static Localizable localizableMODELER_NESTED_MODEL_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("modeler.nestedModelError", arg0);
+    }
+
+    /**
+     * modeler error: {0}
+     *
+     */
+    public static String MODELER_NESTED_MODEL_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableMODELER_NESTED_MODEL_ERROR(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.differentPart");
+    }
+
+    /**
+     * Ignoring the mime:part. Invalid mime:part, the mime:content has different part attribute.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART() {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.ignoringMemberSubmissionAddressing", arg0, arg1);
+    }
+
+    /**
+     * ignoring wsa:Action attribute since obsolete addressing version 08-2004:"{0}" used; expecting addressing version "{1}". To use version 08-2004 anyway run wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_IGNORING_MEMBER_SUBMISSION_ADDRESSING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.bindingOperation.multiplePartBinding", arg0, arg1);
+    }
+
+    /**
+     * Check the abstract operation "{0}" binding, part "{1}" has multiple binding. Will try to generated artifacts anyway...
+     *
+     */
+    public static String WSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_BINDING_OPERATION_MULTIPLE_PART_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort.noAddress", arg0);
+    }
+
+    /**
+     * ignoring port "{0}": no SOAP address specified. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT_NO_ADDRESS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.port.SOAPBinding12", arg0);
+    }
+
+    /**
+     * SOAP port "{0}": uses a non-standard SOAP 1.2 binding.
+     *
+     */
+    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_12(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_12(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.invalidSchemaType", arg0, arg1);
+    }
+
+    /**
+     * Ignoring the mime:part. mime part: {0} can not be mapped to schema type: {1}
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_INVALID_SCHEMA_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.notEncoded", arg0);
+    }
+
+    /**
+     * ignoring RPC-style operation "{0}": parameters are not encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_NOT_ENCODED(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.message.partMustHaveElementDescriptor", arg0, arg1);
+    }
+
+    /**
+     * Invalid header "{0}" in operation {1}: part must specify a "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.message.partMustHaveElementDescriptor", arg0, arg1);
+    }
+
+    /**
+     * in message "{0}", part "{1}" must specify a "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.error.partNotFound", arg0, arg1);
+    }
+
+    /**
+     * part "{1}" of operation "{0}" could not be resolved!
+     *
+     */
+    public static String WSDLMODELER_ERROR_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_ERROR_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName", arg0);
+    }
+
+    /**
+     * Invalid operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.notInPortType", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not appear in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_IN_PORT_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalidOperation", arg0);
+    }
+
+    /**
+     * invalid operation: {0}
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputHeader.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * output header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInInputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": more than one part in input message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_INPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.missingOutputName", arg0);
+    }
+
+    /**
+     * binding operation "{0}" must specify a name for its output message
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MISSING_OUTPUT_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.missingName", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" must specify a value for the "name" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_MISSING_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.notFound", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not match any operation in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleBodyPartsAttribute", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": cannot handle "parts" attribute of "soap:body" element
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.conflictStyleInWSIMode", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": binding style and operation style are conflicting
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CONFLICT_STYLE_IN_WSI_MODE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.memberSubmissionAddressingUsed", arg0, arg1);
+    }
+
+    /**
+     * obsolete addressing version 08-2004:"{0}" used; version "{1}" should be used instead.
+     *
+     */
+    public static String WSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_MEMBER_SUBMISSION_ADDRESSING_USED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noSOAPAddress", arg0);
+    }
+
+    /**
+     * Port "{0}" is not a SOAP port, it has no soap:address
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_SOAP_ADDRESS(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_SOAP_ADDRESS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.operationName", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}", it''s java reserved word, can''t generate java method. Use customization to change the operation name.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_OPERATION_NAME(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not literal
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.outputMissingSoapFault", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in operation "{1}" does not have a SOAP fault extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_OUTPUT_MISSING_SOAP_FAULT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.nonUnique.body.warning", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
+     *
+     */
+    public static String WSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.port.SOAPBinding.mixedStyle", arg0);
+    }
+
+    /**
+     * not a WS-I BP1.1 compliant SOAP port "{0}": the WSDL binding has mixed style, it must be rpc-literal or document-literal operation!
+     *
+     */
+    public static String WSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_PORT_SOAP_BINDING_MIXED_STYLE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.noSoapFaultName", arg0, arg1);
+    }
+
+    /**
+     * soap:fault name not specified, wsdl:fault "{0}" in operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_NO_SOAP_FAULT_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.headerfault.message.partMustHaveElementDescriptor", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid headerfault "{0}" for header {1} in operation {2}: part must specify an "element" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADERFAULT_MESSAGE_PART_MUST_HAVE_ELEMENT_DESCRIPTOR(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.rpclit.unkownschematype", arg0, arg1, arg2);
+    }
+
+    /**
+     * XML type "{0}" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part "{1}" in the wsdl:message "{2}".
+     *
+     */
+    public static String WSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_RPCLIT_UNKOWNSCHEMATYPE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.r2716", arg0, arg1);
+    }
+
+    /**
+     * R2716 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit for {0}: "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_R_2716(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_R_2716(arg0, arg1));
     }
 
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
     }
 
     /**
@@ -1593,11 +929,71 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.fault.notLiteral", arg0, arg1);
+    }
+
+    /**
+     * ignoring encoded fault "{0}" in literal binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_FAULT_NOT_LITERAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputSoapBody.missingNamespace", arg0);
+    }
+
+    /**
+     * output message of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.header.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * header "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.searchSchema.unrecognizedTypes", arg0);
+    }
+
+    /**
+     * encountered {0} unrecognized type(s)
+     *
+     */
+    public static String WSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_SEARCH_SCHEMA_UNRECOGNIZED_TYPES(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.responsebean.notfound", arg0);
+    }
+
+    /**
+     * wsimport failed to generate async response bean for operation: {0}
+     *
+     */
+    public static String WSDLMODELER_RESPONSEBEAN_NOTFOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_RESPONSEBEAN_NOTFOUND(arg0));
     }
 
     public static Localizable localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
-        return messageFactory.getMessage("wsdlmodeler.unsolvableNamingConflicts", arg0);
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.unsolvableNamingConflicts", arg0);
     }
 
     /**
@@ -1605,7 +1001,618 @@ public final class ModelerMessages {
      *
      */
     public static String WSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(Object arg0) {
-        return localizer.localize(localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(arg0));
+        return LOCALIZER.localize(localizableWSDLMODELER_UNSOLVABLE_NAMING_CONFLICTS(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noPortsInService", arg0);
+    }
+
+    /**
+     * Service "{0}" does not contain any usable ports. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_PORTS_IN_SERVICE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * ignoring fault "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.partNotFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring operation "{0}": part "{1}" not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.noElementAttribute", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring header fault part="{0}" message="{1}" of operation {2}
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NO_ELEMENT_ATTRIBUTE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.r2716r2726", arg0, arg1);
+    }
+
+    /**
+     * R2716/R2726 WSI-BasicProfile ver. 1.0, namespace attribute not allowed in doc/lit or rpc/lit for {0}: "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_R_2716_R_2726(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_R_2716_R_2726(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.multipleMatchingOperations", arg0, arg1);
+    }
+
+    /**
+     * in binding "{1}", operation "{0}" does not reference a unique operation in the corresponding port type
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.notEncoded", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": not SOAP-encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_NOT_ENCODED(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.elementPart.invalidElementMimeType", arg0, arg1);
+    }
+
+    /**
+     * The mime:content part refers to wsdl:part "{0}", defined using element attribute. Please make sure the mime type: "{1}" is appropriate to serialize XML.
+     *
+     */
+    public static String MIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMIMEMODELER_ELEMENT_PART_INVALID_ELEMENT_MIME_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.portTypeFault.notFound", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" in portType operation "{1}" does not match any fault in the corresponding binding operation
+     *
+     */
+    public static String WSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PORT_TYPE_FAULT_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.resultIsInOutParameter", arg0);
+    }
+
+    /**
+     * result is "inout" parameter in operation: {0}
+     *
+     */
+    public static String WSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_RESULT_IS_IN_OUT_PARAMETER(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.operation.MoreThanOnePartInMessage", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}": more than one part bound to body
+     *
+     */
+    public static String WSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.errorLoadingJavaClass");
+    }
+
+    /**
+     * Couldn't find class "{0}" for mime type "{1}"
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS() {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_ERROR_LOADING_JAVA_CLASS());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.rpclitoperation", arg0);
+    }
+
+    /**
+     * Invalid wsdl:operation "{0}": its a rpc-literal operation,  message part must refer to a schema type declaration
+     *
+     */
+    public static String WSDLMODELER_INVALID_RPCLITOPERATION(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_RPCLITOPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.partFromBody", arg0);
+    }
+
+    /**
+     * header part: "{0}" already bound by soapbind:body, illegal to bind the part twice
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_PART_FROM_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noServiceDefinitionsFound");
+    }
+
+    /**
+     * WSDL document does not define any services
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND() {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_SERVICE_DEFINITIONS_FOUND());
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.emptyMessage", arg0, arg1);
+    }
+
+    /**
+     * fault "{0}" refers to message "{1}", but the message has no parts
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_EMPTY_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterorder.parameter", arg0, arg1);
+    }
+
+    /**
+     * "{0}" specified in the parameterOrder attribute of operation "{1}" is not a valid part of the message.
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETERORDER_PARAMETER(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.duplicate.fault.part.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring fault "{0}" of operation "{1}", part name "{2}" is not unique
+     *
+     */
+    public static String WSDLMODELER_DUPLICATE_FAULT_PART_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_DUPLICATE_FAULT_PART_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringNonSOAPPort", arg0);
+    }
+
+    /**
+     * ignoring port "{0}": not a standard SOAP port. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_NON_SOAP_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName", arg0, arg1);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method ,customized name "{1}" of the wsdl:operation is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOMIZED_OPERATION_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.nonWrapperStyle", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method. Parameter: part "{2}" in wsdl:message "{1}", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_NON_WRAPPER_STYLE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}": cannot resolve message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputMissingSoapBody", arg0);
+    }
+
+    /**
+     * input message of binding operation "{0}" does not have a SOAP body extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_MISSING_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameterOrder.invalidParameterOrder", arg0);
+    }
+
+    /**
+     * parameterOrder attribute on operation "{0}" is invalid, ignoring parameterOrder hint
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_ORDER_INVALID_PARAMETER_ORDER(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.noOperationsInPort", arg0);
+    }
+
+    /**
+     * Port "{0}" does not contain any usable operations
+     *
+     */
+    public static String WSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NO_OPERATIONS_IN_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.import");
+    }
+
+    /**
+     * Non conforming WS-I WSDL used for wsdl:import
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT() {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_IMPORT());
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.missingTypeAttribute", arg0);
+    }
+
+    /**
+     * Missing type attribute in mime:content in operation "{0}". part attribute must be present in mime:content declaration.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_TYPE_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.inputHeader.missingNamespace", arg0, arg1);
+    }
+
+    /**
+     * input header "{1}" of binding operation "{0}" must specify a value for the "namespace" attribute
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_INPUT_HEADER_MISSING_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.parameter.differentTypes", arg0, arg1);
+    }
+
+    /**
+     * parameter "{0}" of operation "{1}" appears with different types in the input and output messages
+     *
+     */
+    public static String WSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_PARAMETER_DIFFERENT_TYPES(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleMoreThanOnePartInOutputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": more than one part in output message
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_MORE_THAN_ONE_PART_IN_OUTPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonconforming.wsdl.use", arg0);
+    }
+
+    /**
+     * Processing WS-I non conforming operation "{0}" with RPC-Style and SOAP-encoded
+     *
+     */
+    public static String WSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NONCONFORMING_WSDL_USE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleDocumentStyle", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": cannot handle document-style operations
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_DOCUMENT_STYLE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingFault.wrongSoapFaultName", arg0, arg1, arg2);
+    }
+
+    /**
+     * name of soap:fault "{0}" doesn''t match the name of wsdl:fault "{1}" in operation "{2}"
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_FAULT_WRONG_SOAP_FAULT_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.MoreThanOnePartInMessage", arg0);
+    }
+
+    /**
+     * operation "{0}": more than one part bound to body
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_MORE_THAN_ONE_PART_IN_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.nonSOAPPort", arg0);
+    }
+
+    /**
+     * port "{0}": not a standard SOAP port. The generated artifacts may not work with JAX-WS runtime.
+     *
+     */
+    public static String WSDLMODELER_WARNING_NON_SOAP_PORT(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_NON_SOAP_PORT(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalidState.modelingOperation", arg0);
+    }
+
+    /**
+     * invalid state while modeling operation: {0}
+     *
+     */
+    public static String WSDLMODELER_INVALID_STATE_MODELING_OPERATION(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_STATE_MODELING_OPERATION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.cannotHandleEmptyInputMessage", arg0);
+    }
+
+    /**
+     * ignoring operation "{0}": input message is empty
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_EMPTY_INPUT_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.bindingOperation.outputMissingSoapBody", arg0);
+    }
+
+    /**
+     * output message of binding operation "{0}" does not have a SOAP body extension
+     *
+     */
+    public static String WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_MISSING_SOAP_BODY(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeaderFault.notFound", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring header fault "{0}", cannot find part "{1}" in binding "{2}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.fault.cant.resolve.message", arg0, arg1);
+    }
+
+    /**
+     * fault message "{0}" in binding operation "{1}" could not be resolved
+     *
+     */
+    public static String WSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_FAULT_CANT_RESOLVE_MESSAGE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringMimePart.notFound", arg0, arg1);
+    }
+
+    /**
+     * ignoring mime:part, cannot find part "{0}" referenced by the mime:content in the wsdl:operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_MIME_PART_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringUnrecognizedSchemaExtension", arg0);
+    }
+
+    /**
+     * ignoring schema element (unsupported version): {0}
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_UNRECOGNIZED_SCHEMA_EXTENSION(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
+    }
+
+    /**
+     * ignoring port "{0}", its not WS-I BP 1.1 compliant: the wsdl binding has mixed style, it must be rpc-literal or document-literal operation. try running wsimport with -extension switch.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(arg0));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.unknownSchemaType", arg0, arg1);
+    }
+
+    /**
+     * Unknown schema type: {1} for mime:content part: {0}
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_UNKNOWN_SCHEMA_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringFault.notEncoded", arg0, arg1);
+    }
+
+    /**
+     * ignoring literal fault "{0}" of binding operation "{1}"
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_FAULT_NOT_ENCODED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customName", arg0, arg1);
+    }
+
+    /**
+     * Ignoring operation "{0}", can''t generate java method. Parameter,customized name "{1}" is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("mimemodeler.invalidMimeContent.missingPartAttribute", arg0);
+    }
+
+    /**
+     * Ignoring operation "{0}", missing part attribute in mime:content. part attribute must be present in mime:content declaration.
+     *
+     */
+    public static String MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(Object arg0) {
+        return LOCALIZER.localize(localizableMIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(arg0));
+    }
+
+    public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.warning.ignoringHeader.inconsistentDefinition", arg0, arg1);
+    }
+
+    /**
+     * ignoring header "{0}" of operation "{1}": part not found
+     *
+     */
+    public static String WSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_INCONSISTENT_DEFINITION(arg0, arg1));
+    }
+
+    public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customName", arg0, arg1);
+    }
+
+    /**
+     * Invalid operation "{0}", can''t generate java method. Parameter,customized name "{1}"  is a java keyword.
+     *
+     */
+    public static String WSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_CUSTOM_NAME(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
index e9296456fbf..58c15b5eead 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -37,12 +37,20 @@ import java.util.ResourceBundle;
  *
  */
 public final class ProcessorMessages {
-    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.processor";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, ProcessorMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+    private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.processor";
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new ProcessorMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
+
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
index c90a9ab2358..eb979056acc 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,29 +38,13 @@ import java.util.ResourceBundle;
  *
  */
 public final class UtilMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.util";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, UtilMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
-        return messageFactory.getMessage("sax2dom.notsupported.createelement", arg0);
-    }
-
-    /**
-     * SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
-     *
-     */
-    public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
-        return localizer.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new UtilMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableNULL_NAMESPACE_FOUND(Object arg0) {
-        return messageFactory.getMessage("null.namespace.found", arg0);
+        return MESSAGE_FACTORY.getMessage("null.namespace.found", arg0);
     }
 
     /**
@@ -68,11 +52,11 @@ public final class UtilMessages {
      *
      */
     public static String NULL_NAMESPACE_FOUND(Object arg0) {
-        return localizer.localize(localizableNULL_NAMESPACE_FOUND(arg0));
+        return LOCALIZER.localize(localizableNULL_NAMESPACE_FOUND(arg0));
     }
 
     public static Localizable localizableHOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("holder.valuefield.not.found", arg0);
+        return MESSAGE_FACTORY.getMessage("holder.valuefield.not.found", arg0);
     }
 
     /**
@@ -80,7 +64,30 @@ public final class UtilMessages {
      *
      */
     public static String HOLDER_VALUEFIELD_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
+        return LOCALIZER.localize(localizableHOLDER_VALUEFIELD_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("sax2dom.notsupported.createelement", arg0);
+    }
+
+    /**
+     * SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
+     *
+     */
+    public static String SAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableSAX_2_DOM_NOTSUPPORTED_CREATEELEMENT(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
index b4918e43d9a..edb724e4cb4 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,353 +38,13 @@ import java.util.ResourceBundle;
  *
  */
 public final class WebserviceapMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.webserviceap";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WebserviceapMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
-
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
-    }
-
-    /**
-     * The endpoint interface {0} does not match the interface {1}.
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
-    }
-
-    /**
-     * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
-    }
-
-    /**
-     * A service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
-     *
-     */
-    public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.invalid.soapbinding.parameterstyle", arg0, arg1);
-    }
-
-    /**
-     * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
-    }
-
-    /**
-     * All RPC literal parameters must have a WebParam annotation.  Class: {0} method: {1} parameter {2}
-     *
-     */
-    public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
-    }
-
-    /**
-     * Exception bean names must be unique and must not clash with other generated classes.  Class: {0} exception {1}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
-    }
-
-    /**
-     * Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.no.default.constructor", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
-    }
-
-    /**
-     * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
-    }
-
-    /**
-     * Failed to parse HandlerChain file. Class: {0}, file: {1}
-     *
-     */
-    public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.java.typeNotFound", arg0);
-    }
-
-    /**
-     * The type: {0} was not found in the mapping
-     *
-     */
-    public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
-    }
-
-    /**
-     * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.webservice.method.is.static.or.final", arg0, arg1);
-    }
-
-    /**
-     * Method annotated with @javax.jws.WebMethod must not be static or final. Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.return.type", arg0, arg1);
-    }
-
-    /**
-     * The method {1} of class {0} is annotated @Oneway but has a return type.
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WARNING(Object arg0) {
-        return messageFactory.getMessage("webserviceap.warning", arg0);
-    }
-
-    /**
-     * warning: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WARNING(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WARNING(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
-    }
-
-    /**
-     * Response wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.endpointinterface.on.interface", arg0, arg1);
-    }
-
-    /**
-     * Service endpoint interface: {0} cannot have a WebService.endpointInterface annotation: {1}
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.and.out", arg0, arg1);
-    }
-
-    /**
-     * @Oneway methods cannot have out parameters. Class: {0} method {1}
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * All RPC literal WebParams must specify a name.  Class: {0} method {1} parameter {2}
-     *
-     */
-    public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
-    }
-
-    /**
-     * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.class.not.found", arg0);
-    }
-
-    /**
-     * Class Not Found: {0}
-     *
-     */
-    public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinteface.plus.element", arg0);
-    }
-
-    /**
-     * The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element.
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
-        return messageFactory.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
-    }
-
-    /**
-     * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
-     *
-     */
-    public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
-        return localizer.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
-    }
-
-    /**
-     * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
-    }
-
-    /**
-     * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
-     *
-     */
-    public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
-    }
-
-    /**
-     * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_SUCCEEDED() {
-        return messageFactory.getMessage("webserviceap.succeeded");
-    }
-
-    /**
-     * Success
-     *
-     */
-    public static String WEBSERVICEAP_SUCCEEDED() {
-        return localizer.localize(localizableWEBSERVICEAP_SUCCEEDED());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods must have one non-header, IN/INOUT parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
-    }
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WebserviceapMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
     public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
     }
 
     /**
@@ -392,107 +52,35 @@ public final class WebserviceapMessages {
      *
      */
     public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
     }
 
     /**
-     * Document literal bare methods must have a unique result name return type combination.  Class {0} method: {1}, result name: {2} return type: {3}
+     * Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class: {0}
      *
      */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
+    public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
     }
 
-    public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
-        return messageFactory.getMessage("webserviceap.no.webservice.endpoint.found");
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
     }
 
     /**
-     * A web service endpoint could not be found
+     * Document literal bare methods must have one non-header, IN/INOUT parameter.  Class: {0} Method: {1}
      *
      */
-    public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
-        return localizer.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.fileNotFound", arg0);
-    }
-
-    /**
-     * error: file not found: {0}
-     *
-     */
-    public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
-        return messageFactory.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
-    }
-
-    /**
-     * The handlerchain file {0} is invalid, it does not contain a handler-config element
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * All WebParam annotations on header parameters must specify a name.  Class: {0} method {1} parameter {2}
-     *
-     */
-    public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.method.return.type.cannot.implement.remote", arg0, arg1, arg2);
-    }
-
-    /**
-     * Method return types cannot implement java.rmi.Remote.  Class: {0} method: {1} return type: {2}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
-    }
-
-    /**
-     * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
-    }
-
-    /**
-     * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property.  Class: {0} method: {1} parameter: {2}
-     *
-     */
-    public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
+    public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
     }
 
     public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
     }
 
     /**
@@ -500,407 +88,11 @@ public final class WebserviceapMessages {
      *
      */
     public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
-    }
-
-    /**
-     * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Method parameter types cannot implement java.rmi.Remote.  Class: {0} method: {1} parameter: {2} type: {3}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
-        return messageFactory.getMessage("webserviceap.compilationFailed");
-    }
-
-    /**
-     * compilation failed, errors should have been reported
-     *
-     */
-    public static String WEBSERVICEAP_COMPILATION_FAILED() {
-        return localizer.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS() {
-        return messageFactory.getMessage("webserviceap.model.already.exists");
-    }
-
-    /**
-     * model already exists
-     *
-     */
-    public static String WEBSERVICEAP_MODEL_ALREADY_EXISTS() {
-        return localizer.localize(localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.could.not.find.typedecl", arg0, arg1);
-    }
-
-    /**
-     * Could not get TypeElement for: {0} in annotation processing round: {1}
-     *
-     */
-    public static String WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.not.public", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must be public. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.method.not.unique", arg0, arg1, arg2);
-    }
-
-    /**
-     * Document literal bare methods must have unique parameter names.  Class: {0} method: {1} parameter name: {2}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.rpc.soapbinding.not.allowed.on.method", arg0, arg1);
-    }
-
-    /**
-     * SOAPBinding.Style.RPC binding annotations are not allowed on methods.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
-    }
-
-    /**
-     * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinterface.has.no.webservice.annotation", arg0);
-    }
-
-    /**
-     * The endpoint interface {0} must have a WebService annotation
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INFO(Object arg0) {
-        return messageFactory.getMessage("webserviceap.info", arg0);
-    }
-
-    /**
-     * info: {0}
-     *
-     */
-    public static String WEBSERVICEAP_INFO(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_INFO(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.must.not.be.bare", arg0);
-    }
-
-    /**
-     * RPC literal SOAPBindings must have parameterStyle WRAPPED. Class: {0}.
-     *
-     */
-    public static String WEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
-    }
-
-    /**
-     * Could not find the handlerchain {0} in the handler file {1}
-     *
-     */
-    public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
-        return messageFactory.getMessage("webserviceap.rpc.encoded.not.supported", arg0);
-    }
-
-    /**
-     * The class {0} has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
-     *
-     */
-    public static String WEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ERROR(Object arg0) {
-        return messageFactory.getMessage("webserviceap.error", arg0);
-    }
-
-    /**
-     * error: {0}
-     *
-     */
-    public static String WEBSERVICEAP_ERROR(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ERROR(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
-    }
-
-    /**
-     * The endpointInterface class {0} could not be found
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.method.not.implemented", arg0, arg1, arg2);
-    }
-
-    /**
-     * Methods in an endpointInterface must be implemented in the implementation class.  Interface Class:{0} Implementation Class:{1} Method: {2}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR() {
-        return messageFactory.getMessage("webserviceap.parsing.javac.options.error");
-    }
-
-    /**
-     * Can't get javac options from processingEnv.
-     *
-     */
-    public static String WEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR() {
-        return localizer.localize(localizableWEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR());
-    }
-
-    public static Localizable localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webservice.encoded.not.supported", arg0, arg1);
-    }
-
-    /**
-     * The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
-     *
-     */
-    public static String WEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
-        return messageFactory.getMessage("webserviceap.handlerclass.notspecified", arg0);
-    }
-
-    /**
-     * A handler in the HandlerChain file: {0} does not specify a handler-class
-     *
-     */
-    public static String WEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
-    }
-
-    /**
-     * Cannot find HandlerChain file. class: {0}, file: {1}
-     *
-     */
-    public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.is.abstract", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must not be abstract. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
-        return messageFactory.getMessage("webserviceap.init_param.format.error");
-    }
-
-    /**
-     * a <init-param> element must have exactly 1 <param-name> and 1 <param-value>
-     *
-     */
-    public static String WEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
-        return localizer.localize(localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.mixed.binding.style", arg0);
-    }
-
-    /**
-     * Class: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
-     *
-     */
-    public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.not.annotated", arg0, arg1);
-    }
-
-    /**
-     * The method {0} on class {1} is not annotated.
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.holders", arg0, arg1);
-    }
-
-    /**
-     * The method {1} of class {0} is annotated @Oneway but contains INOUT or OUT parameters (javax.xml.ws.Holder)
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.cannot.have.more.than.one.out", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods must have a return value or one out parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
-    }
-
-    /**
-     * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.operation.name.not.unique", arg0, arg1, arg2);
-    }
-
-    /**
-     * Operation names must be unique.  Class: {0} method: {1} operation name: {2}
-     *
-     */
-    public static String WEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.is.final", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must not be final. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.one.in.or.out", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods must have at least one of: a return, an in parameter or an out parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.request.wrapper.bean.name.not.unique", arg0, arg1);
-    }
-
-    /**
-     * Request wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
     }
 
     /**
@@ -908,11 +100,215 @@ public final class WebserviceapMessages {
      *
      */
     public static String WEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.compilationFailed");
+    }
+
+    /**
+     * compilation failed, errors should have been reported
+     *
+     */
+    public static String WEBSERVICEAP_COMPILATION_FAILED() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.mixed.binding.style", arg0);
+    }
+
+    /**
+     * Class: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
+     *
+     */
+    public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterface.on.interface", arg0, arg1);
+    }
+
+    /**
+     * Service endpoint interface: {0} cannot have a WebService.endpointInterface annotation: {1}
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
+    }
+
+    /**
+     * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_SUCCEEDED() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.succeeded");
+    }
+
+    /**
+     * Success
+     *
+     */
+    public static String WEBSERVICEAP_SUCCEEDED() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_SUCCEEDED());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.error", arg0);
+    }
+
+    /**
+     * error: {0}
+     *
+     */
+    public static String WEBSERVICEAP_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ERROR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
+    }
+
+    /**
+     * Could not find the handlerchain {0} in the handler file {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
+    }
+
+    /**
+     * The endpointInterface class {0} could not be found
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.return.type.cannot.implement.remote", arg0, arg1, arg2);
+    }
+
+    /**
+     * Method return types cannot implement java.rmi.Remote.  Class: {0} method: {1} return type: {2}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.method.is.static.or.final", arg0, arg1);
+    }
+
+    /**
+     * Method annotated with @javax.jws.WebMethod must not be static or final. Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
+    }
+
+    /**
+     * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.no.default.constructor", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Exception bean names must be unique and must not clash with other generated classes.  Class: {0} exception {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Cannot find HandlerChain file. class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
     }
 
     public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
     }
 
     /**
@@ -920,7 +316,618 @@ public final class WebserviceapMessages {
      *
      */
     public static String WEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.class.not.found", arg0);
+    }
+
+    /**
+     * Class Not Found: {0}
+     *
+     */
+    public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Method parameter types cannot implement java.rmi.Remote.  Class: {0} method: {1} parameter: {2} type: {3}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
+    }
+
+    /**
+     * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
+     *
+     */
+    public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.init_param.format.error");
+    }
+
+    /**
+     * a <init-param> element must have exactly 1 <param-name> and 1 <param-value>
+     *
+     */
+    public static String WEBSERVICEAP_INIT_PARAM_FORMAT_ERROR() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.must.have.one.in.or.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have at least one of: a return, an in parameter or an out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.oneway.operation.cannot.have.holders", arg0, arg1);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but contains INOUT or OUT parameters (javax.xml.ws.Holder)
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinteface.plus.element", arg0);
+    }
+
+    /**
+     * The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
+    }
+
+    /**
+     * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * All WebParam annotations on header parameters must specify a name.  Class: {0} method {1} parameter {2}
+     *
+     */
+    public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.fileNotFound", arg0);
+    }
+
+    /**
+     * error: file not found: {0}
+     *
+     */
+    public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.not.annotated", arg0, arg1);
+    }
+
+    /**
+     * The method {0} on class {1} is not annotated.
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterface.has.no.webservice.annotation", arg0);
+    }
+
+    /**
+     * The endpoint interface {0} must have a WebService annotation
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * All RPC literal WebParams must specify a name.  Class: {0} method {1} parameter {2}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.method.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Document literal bare methods must have unique parameter names.  Class: {0} method: {1} parameter name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.rpc.literal.must.not.be.bare", arg0);
+    }
+
+    /**
+     * RPC literal SOAPBindings must have parameterStyle WRAPPED. Class: {0}.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Document literal bare methods must have a unique result name return type combination.  Class {0} method: {1}, result name: {2} return type: {3}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.oneway.operation.cannot.have.return.type", arg0, arg1);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but has a return type.
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.no.webservice.endpoint.found");
+    }
+
+    /**
+     * A web service endpoint could not be found
+     *
+     */
+    public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.oneway.and.out", arg0, arg1);
+    }
+
+    /**
+     * @Oneway methods cannot have out parameters. Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ONEWAY_AND_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
+    }
+
+    /**
+     * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
+     *
+     */
+    public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
+    }
+
+    /**
+     * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INFO(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.info", arg0);
+    }
+
+    /**
+     * info: {0}
+     *
+     */
+    public static String WEBSERVICEAP_INFO(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INFO(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.java.typeNotFound", arg0);
+    }
+
+    /**
+     * The type: {0} was not found in the mapping
+     *
+     */
+    public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.rpc.soapbinding.not.allowed.on.method", arg0, arg1);
+    }
+
+    /**
+     * SOAPBinding.Style.RPC binding annotations are not allowed on methods.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.could.not.find.typedecl", arg0, arg1);
+    }
+
+    /**
+     * Could not get TypeElement for: {0} in annotation processing round: {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
+    }
+
+    /**
+     * The endpoint interface {0} does not match the interface {1}.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Response wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.document.literal.bare.cannot.have.more.than.one.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have a return value or one out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webservice.encoded.not.supported", arg0, arg1);
+    }
+
+    /**
+     * The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
+     *
+     */
+    public static String WEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.operation.name.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Operation names must be unique.  Class: {0} method: {1} operation name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
+    }
+
+    /**
+     * The handlerchain file {0} is invalid, it does not contain a handler-config element
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.request.wrapper.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Request wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.model.already.exists");
+    }
+
+    /**
+     * model already exists
+     *
+     */
+    public static String WEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.soapbinding.parameterstyle", arg0, arg1);
+    }
+
+    /**
+     * Incorrect usage of Annotation {0} on {1}, ParameterStyle can only be WRAPPED with RPC Style Web service.
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_SOAPBINDING_PARAMETERSTYLE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
+    }
+
+    /**
+     * All RPC literal parameters must have a WebParam annotation.  Class: {0} method: {1} parameter {2}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR() {
+        return MESSAGE_FACTORY.getMessage("webserviceap.parsing.javac.options.error");
+    }
+
+    /**
+     * Can't get javac options from processingEnv.
+     *
+     */
+    public static String WEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR() {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_PARSING_JAVAC_OPTIONS_ERROR());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.class.is.abstract", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not be abstract. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.method.not.implemented", arg0, arg1, arg2);
+    }
+
+    /**
+     * Methods in an endpointInterface must be implemented in the implementation class.  Interface Class:{0} Implementation Class:{1} Method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
+    }
+
+    /**
+     * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.rpc.encoded.not.supported", arg0);
+    }
+
+    /**
+     * The class {0} has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
+    }
+
+    /**
+     * A service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
+     *
+     */
+    public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
+    }
+
+    /**
+     * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property.  Class: {0} method: {1} parameter: {2}
+     *
+     */
+    public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
+    }
+
+    /**
+     * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.class.not.public", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must be public. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.webservice.class.is.final", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not be final. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
+    }
+
+    /**
+     * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WARNING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.warning", arg0);
+    }
+
+    /**
+     * warning: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WARNING(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_WARNING(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Failed to parse HandlerChain file. Class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("webserviceap.handlerclass.notspecified", arg0);
+    }
+
+    /**
+     * A handler in the HandlerChain file: {0} does not specify a handler-class
+     *
+     */
+    public static String WEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return LOCALIZER.localize(localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(arg0));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
index f186c7b8d19..35845d5fe9b 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,247 +38,25 @@ import java.util.ResourceBundle;
  *
  */
 public final class WscompileMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.wscompile";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WscompileMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WscompileMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizableWSIMPORT_ARCHIVING_ARTIFACTS(Object arg0) {
-        return messageFactory.getMessage("wsimport.archivingArtifacts", arg0);
+    public static Localizable localizableWSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.NotAFileNorURL", arg0);
     }
 
     /**
-     *
-     * Archiving the generated artifacts into {0}.
-     *
+     * "{0}" is neither a file name nor an URL
      *
      */
-    public static String WSIMPORT_ARCHIVING_ARTIFACTS(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_ARCHIVING_ARTIFACTS(arg0));
-    }
-
-    public static Localizable localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
-        return messageFactory.getMessage("wsgen.class.must.be.implementation.class", arg0);
-    }
-
-    /**
-     * The class "{0}" is not an endpoint implementation class.
-     *
-     */
-    public static String WSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
-        return localizer.localize(localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(arg0));
-    }
-
-    public static Localizable localizableWSGEN_FULLVERSION(Object arg0) {
-        return messageFactory.getMessage("wsgen.fullversion", arg0);
-    }
-
-    /**
-     * wsgen full version "{0}"
-     *
-     */
-    public static String WSGEN_FULLVERSION(Object arg0) {
-        return localizer.localize(localizableWSGEN_FULLVERSION(arg0));
-    }
-
-    public static Localizable localizableWRAPPER_TASK_LOADING_INCORRECT_API(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wrapperTask.loadingIncorrectApi", arg0, arg1, arg2);
-    }
-
-    /**
-     * You are loading JAX-WS {0} API from {1} but this tool requires JAX-WS {2} API.
-     *
-     */
-    public static String WRAPPER_TASK_LOADING_INCORRECT_API(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWRAPPER_TASK_LOADING_INCORRECT_API(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSIMPORT_WSDLLOCATION_CLIENTJAR() {
-        return messageFactory.getMessage("wsimport.wsdllocation.clientjar");
-    }
-
-    /**
-     * wsdlLocation cannot be specified when using clientJar option
-     *
-     */
-    public static String WSIMPORT_WSDLLOCATION_CLIENTJAR() {
-        return localizer.localize(localizableWSIMPORT_WSDLLOCATION_CLIENTJAR());
-    }
-
-    public static Localizable localizableWSIMPORT_VERSION(Object arg0) {
-        return messageFactory.getMessage("wsimport.version", arg0);
-    }
-
-    /**
-     * wsimport version "{0}"
-     *
-     */
-    public static String WSIMPORT_VERSION(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_VERSION(arg0));
-    }
-
-    public static Localizable localizableWSGEN_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("wsgen.class.not.found", arg0);
-    }
-
-    /**
-     * Class not found: "{0}"
-     *
-     */
-    public static String WSGEN_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWSGEN_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.httpRedirect", arg0, arg1);
-    }
-
-    /**
-     * Server returned HTTP Status code: "{0}", retrying with "{1}"
-     *
-     */
-    public static String WSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_HTTP_REDIRECT(arg0, arg1));
-    }
-
-    public static Localizable localizableWSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsimport.authInfoNeeded", arg0, arg1, arg2);
-    }
-
-    /**
-     * {0},  "{1}" needs authorization, please provide authorization file with read access at {2} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
-     *
-     */
-    public static String WSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSIMPORT_AUTH_INFO_NEEDED(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSGEN_USAGE_EXAMPLES() {
-        return messageFactory.getMessage("wsgen.usage.examples");
-    }
-
-    /**
-     *
-     * Examples:
-     *   wsgen -cp . example.Stock
-     *   wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'
-     *
-     *
-     */
-    public static String WSGEN_USAGE_EXAMPLES() {
-        return localizer.localize(localizableWSGEN_USAGE_EXAMPLES());
-    }
-
-    public static Localizable localizableWSIMPORT_FETCHING_METADATA() {
-        return messageFactory.getMessage("wsimport.fetchingMetadata");
-    }
-
-    /**
-     *
-     * Downloading the WSDL and associated metadata
-     *
-     *
-     */
-    public static String WSIMPORT_FETCHING_METADATA() {
-        return localizer.localize(localizableWSIMPORT_FETCHING_METADATA());
-    }
-
-    public static Localizable localizableWSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsgen.invalid.protocol", arg0, arg1);
-    }
-
-    /**
-     * "{0}" is not a supported protocol.  Supported protocols include: {1}.
-     *
-     */
-    public static String WSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSGEN_INVALID_PROTOCOL(arg0, arg1));
-    }
-
-    public static Localizable localizableWSIMPORT_USAGE_EXAMPLES() {
-        return messageFactory.getMessage("wsimport.usage.examples");
-    }
-
-    /**
-     *
-     * Examples:
-     *   wsimport stock.wsdl -b stock.xml -b stock.xjb
-     *   wsimport -d generated http://example.org/stock?wsdl
-     *
-     *
-     */
-    public static String WSIMPORT_USAGE_EXAMPLES() {
-        return localizer.localize(localizableWSIMPORT_USAGE_EXAMPLES());
-    }
-
-    public static Localizable localizableINVOKER_NEED_ENDORSED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invoker.needEndorsed", arg0, arg1);
-    }
-
-    /**
-     * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), or use -Xendorsed option.
-     *
-     */
-    public static String INVOKER_NEED_ENDORSED(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVOKER_NEED_ENDORSED(arg0, arg1));
-    }
-
-    public static Localizable localizableWSIMPORT_MISSING_FILE() {
-        return messageFactory.getMessage("wsimport.missingFile");
-    }
-
-    /**
-     * Missing WSDL_URI
-     *
-     */
-    public static String WSIMPORT_MISSING_FILE() {
-        return localizer.localize(localizableWSIMPORT_MISSING_FILE());
-    }
-
-    public static Localizable localizableWSIMPORT_USAGE_EXTENSIONS() {
-        return messageFactory.getMessage("wsimport.usage.extensions");
-    }
-
-    /**
-     *
-     * Extensions:
-     *   -XadditionalHeaders              map headers not bound to request or response message to
-     *                                    Java method parameters
-     *   -Xauthfile                       file to carry authorization information in the format
-     *                                    http://username:password@example.org/stock?wsdl
-     *   -Xdebug                          print debug information
-     *   -Xno-addressing-databinding      enable binding of W3C EndpointReferenceType to Java
-     *   -Xnocompile                      do not compile generated Java files
-     *   -XdisableAuthenticator           disable Authenticator used by JAX-WS RI,
-     *                                    -Xauthfile option will be ignored if set
-     *   -XdisableSSLHostnameVerification disable the SSL Hostname verification while fetching
-     *                                    wsdls
-     *
-     */
-    public static String WSIMPORT_USAGE_EXTENSIONS() {
-        return localizer.localize(localizableWSIMPORT_USAGE_EXTENSIONS());
-    }
-
-    public static Localizable localizableWSIMPORT_USAGE(Object arg0) {
-        return messageFactory.getMessage("wsimport.usage", arg0);
-    }
-
-    /**
-     * Usage: {0} [options] <WSDL_URI>
-     *
-     * Use "wsimport -help" for a detailed description of options.
-     *
-     */
-    public static String WSIMPORT_USAGE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_USAGE(arg0));
+    public static String WSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_NOT_A_FILE_NOR_URL(arg0));
     }
 
     public static Localizable localizableWSGEN_USAGE_EXTENSIONS() {
-        return messageFactory.getMessage("wsgen.usage.extensions");
+        return MESSAGE_FACTORY.getMessage("wsgen.usage.extensions");
     }
 
     /**
@@ -288,50 +66,11 @@ public final class WscompileMessages {
      *
      */
     public static String WSGEN_USAGE_EXTENSIONS() {
-        return localizer.localize(localizableWSGEN_USAGE_EXTENSIONS());
-    }
-
-    public static Localizable localizableWSCOMPILE_EXISTING_OPTION(Object arg0) {
-        return messageFactory.getMessage("wscompile.existingOption", arg0);
-    }
-
-    /**
-     * Ignoring already defined option {0}
-     *
-     *
-     */
-    public static String WSCOMPILE_EXISTING_OPTION(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_EXISTING_OPTION(arg0));
-    }
-
-    public static Localizable localizableWSIMPORT_PARSING_WSDL() {
-        return messageFactory.getMessage("wsimport.ParsingWSDL");
-    }
-
-    /**
-     * parsing WSDL...
-     *
-     *
-     *
-     */
-    public static String WSIMPORT_PARSING_WSDL() {
-        return localizer.localize(localizableWSIMPORT_PARSING_WSDL());
-    }
-
-    public static Localizable localizableWSGEN_MISSING_FILE() {
-        return messageFactory.getMessage("wsgen.missingFile");
-    }
-
-    /**
-     * Missing SEI
-     *
-     */
-    public static String WSGEN_MISSING_FILE() {
-        return localizer.localize(localizableWSGEN_MISSING_FILE());
+        return LOCALIZER.localize(localizableWSGEN_USAGE_EXTENSIONS());
     }
 
     public static Localizable localizableWSIMPORT_HELP(Object arg0) {
-        return messageFactory.getMessage("wsimport.help", arg0);
+        return MESSAGE_FACTORY.getMessage("wsimport.help", arg0);
     }
 
     /**
@@ -358,6 +97,7 @@ public final class WscompileMessages {
      *   -J<javacOption>           pass this option to javac
      *   -keep                     keep generated files
      *   -p <pkg>                  specifies the target package
+     *   -m <name>                 generate module-info.java with given Java module name
      *   -quiet                    suppress wsimport output
      *   -s <directory>            specify where to place generated source files
      *   -target <version>         generate code as per the given JAXWS spec version
@@ -376,48 +116,258 @@ public final class WscompileMessages {
      *
      */
     public static String WSIMPORT_HELP(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_HELP(arg0));
+        return LOCALIZER.localize(localizableWSIMPORT_HELP(arg0));
     }
 
-    public static Localizable localizableWSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wscompile.cant.get.compiler", arg0, arg1, arg2);
+    public static Localizable localizableWSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.ILLEGAL_TARGET_VERSION", arg0);
     }
 
     /**
-     * No Java compiler found. Perhaps environment/JDK problem?
-     *  Used JVM: {0}, {1}/{2}
+     * "{0}" is not a valid target version. "2.0" and "2.1" are supported.
      *
      */
-    public static String WSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSCOMPILE_CANT_GET_COMPILER(arg0, arg1, arg2));
+    public static String WSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_ILLEGAL_TARGET_VERSION(arg0));
     }
 
-    public static Localizable localizableWSCOMPILE_ERROR(Object arg0) {
-        return messageFactory.getMessage("wscompile.error", arg0);
+    public static Localizable localizableWSIMPORT_USAGE_EXAMPLES() {
+        return MESSAGE_FACTORY.getMessage("wsimport.usage.examples");
     }
 
     /**
-     * error: {0}
+     *
+     * Examples:
+     *   wsimport stock.wsdl -b stock.xml -b stock.xjb
+     *   wsimport -d generated http://example.org/stock?wsdl
+     *
      *
      */
-    public static String WSCOMPILE_ERROR(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_ERROR(arg0));
+    public static String WSIMPORT_USAGE_EXAMPLES() {
+        return LOCALIZER.localize(localizableWSIMPORT_USAGE_EXAMPLES());
     }
 
-    public static Localizable localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
-        return messageFactory.getMessage("wsgen.protocol.without.extension", arg0);
+    public static Localizable localizableWSIMPORT_DEBUG_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.DebugMessage", arg0);
     }
 
     /**
-     * The optional protocol "{0}" must be used in conjunction with the "-extension" option.
+     * [DEBUG] {0}
      *
      */
-    public static String WSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
-        return localizer.localize(localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(arg0));
+    public static String WSIMPORT_DEBUG_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_DEBUG_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_FULLVERSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.fullversion", arg0);
+    }
+
+    /**
+     * wsimport full version "{0}"
+     *
+     */
+    public static String WSIMPORT_FULLVERSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_FULLVERSION(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.noSuchJaxbOption", arg0);
+    }
+
+    /**
+     * no such JAXB option: {0}
+     *
+     */
+    public static String WSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_NO_SUCH_JAXB_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_ILLEGAL_PROXY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.ILLEGAL_PROXY", arg0);
+    }
+
+    /**
+     * "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost:proxyPort
+     *
+     */
+    public static String WSIMPORT_ILLEGAL_PROXY(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_ILLEGAL_PROXY(arg0));
+    }
+
+    public static Localizable localizableINVOKER_NEED_ENDORSED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invoker.needEndorsed", arg0, arg1);
+    }
+
+    /**
+     * You are running on JDK6 or newer which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} or newer API. Use the standard override mechanism.
+     *
+     */
+    public static String INVOKER_NEED_ENDORSED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVOKER_NEED_ENDORSED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wsimport.authInfoNeeded", arg0, arg1, arg2);
+    }
+
+    /**
+     * {0},  "{1}" needs authorization, please provide authorization file with read access at {2} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
+     *
+     */
+    public static String WSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSIMPORT_AUTH_INFO_NEEDED(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsimport.AUTH_INFO_LINENO", arg0, arg1);
+    }
+
+    /**
+     * line {0} of {1}
+     *
+     */
+    public static String WSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSIMPORT_AUTH_INFO_LINENO(arg0, arg1));
+    }
+
+    public static Localizable localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.missingOptionArgument", arg0);
+    }
+
+    /**
+     * option "{0}" requires an argument
+     *
+     */
+    public static String WSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_ARCHIVE_ARTIFACT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsimport.archiveArtifact", arg0, arg1);
+    }
+
+    /**
+     * Adding {0} to the archive {1}
+     *
+     */
+    public static String WSIMPORT_ARCHIVE_ARTIFACT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSIMPORT_ARCHIVE_ARTIFACT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSGEN_USAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.usage", arg0);
+    }
+
+    /**
+     * Usage: {0} [options] <SEI>
+     *
+     * Use "wsgen -help" for a detailed description of options.
+     *
+     */
+    public static String WSGEN_USAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_USAGE(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_USAGE_EXTENSIONS() {
+        return MESSAGE_FACTORY.getMessage("wsimport.usage.extensions");
+    }
+
+    /**
+     *
+     * Extensions:
+     *   -XadditionalHeaders              map headers not bound to request or response message to
+     *                                    Java method parameters
+     *   -Xauthfile                       file to carry authorization information in the format
+     *                                    http://username:password@example.org/stock?wsdl
+     *   -Xdebug                          print debug information
+     *   -Xno-addressing-databinding      enable binding of W3C EndpointReferenceType to Java
+     *   -Xnocompile                      do not compile generated Java files
+     *   -XdisableAuthenticator           disable Authenticator used by JAX-WS RI,
+     *                                    -Xauthfile option will be ignored if set
+     *   -XdisableSSLHostnameVerification disable the SSL Hostname verification while fetching
+     *                                    wsdls
+     *
+     */
+    public static String WSIMPORT_USAGE_EXTENSIONS() {
+        return LOCALIZER.localize(localizableWSIMPORT_USAGE_EXTENSIONS());
+    }
+
+    public static Localizable localizableWSIMPORT_WARNING_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.WarningMessage", arg0);
+    }
+
+    /**
+     * [WARNING] {0}
+     *
+     */
+    public static String WSIMPORT_WARNING_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_WARNING_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsgen.invalid.transport", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not a supported transport.  Supported transport includes: {1}.
+     *
+     */
+    public static String WSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSGEN_INVALID_TRANSPORT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_DOCUMENT_DOWNLOAD(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsimport.document.download", arg0, arg1);
+    }
+
+    /**
+     *
+     * Downloading metadata document from {0} to {1}
+     *
+     */
+    public static String WSIMPORT_DOCUMENT_DOWNLOAD(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSIMPORT_DOCUMENT_DOWNLOAD(arg0, arg1));
+    }
+
+    public static Localizable localizableWSGEN_CLASS_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.class.not.found", arg0);
+    }
+
+    /**
+     * Class not found: "{0}"
+     *
+     */
+    public static String WSGEN_CLASS_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_DUPLICATE_OPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.duplicateOption", arg0);
+    }
+
+    /**
+     * duplicate option: {0}
+     *
+     */
+    public static String WSCOMPILE_DUPLICATE_OPTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_DUPLICATE_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_UNSUPPORTED_ENCODING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.unsupportedEncoding", arg0);
+    }
+
+    /**
+     * unsupported encoding: {0}
+     *
+     */
+    public static String WSCOMPILE_UNSUPPORTED_ENCODING(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_UNSUPPORTED_ENCODING(arg0));
     }
 
     public static Localizable localizableWSIMPORT_COMPILING_CODE() {
-        return messageFactory.getMessage("wsimport.CompilingCode");
+        return MESSAGE_FACTORY.getMessage("wsimport.CompilingCode");
     }
 
     /**
@@ -427,83 +377,23 @@ public final class WscompileMessages {
      *
      */
     public static String WSIMPORT_COMPILING_CODE() {
-        return localizer.localize(localizableWSIMPORT_COMPILING_CODE());
+        return LOCALIZER.localize(localizableWSIMPORT_COMPILING_CODE());
     }
 
-    public static Localizable localizableWSIMPORT_READING_AUTH_FILE(Object arg0) {
-        return messageFactory.getMessage("wsimport.readingAuthFile", arg0);
+    public static Localizable localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.servicename.missing.namespace", arg0);
     }
 
     /**
-     * Trying to read authorization file : "{0}"...
+     * The service name "{0}" is missing a namespace.
      *
      */
-    public static String WSIMPORT_READING_AUTH_FILE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_READING_AUTH_FILE(arg0));
-    }
-
-    public static Localizable localizableWSCOMPILE_UNSUPPORTED_ENCODING(Object arg0) {
-        return messageFactory.getMessage("wscompile.unsupportedEncoding", arg0);
-    }
-
-    /**
-     * unsupported encoding: {0}
-     *
-     */
-    public static String WSCOMPILE_UNSUPPORTED_ENCODING(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_UNSUPPORTED_ENCODING(arg0));
-    }
-
-    public static Localizable localizableWSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
-        return messageFactory.getMessage("wsgen.no.webservices.class", arg0);
-    }
-
-    /**
-     * wsgen did not find any class with @WebService annotation. Please specify @WebService annotation on {0}.
-     *
-     */
-    public static String WSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
-        return localizer.localize(localizableWSGEN_NO_WEBSERVICES_CLASS(arg0));
-    }
-
-    public static Localizable localizableWSIMPORT_ARCHIVE_ARTIFACT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.archiveArtifact", arg0, arg1);
-    }
-
-    /**
-     * Adding {0} to the archive {1}
-     *
-     */
-    public static String WSIMPORT_ARCHIVE_ARTIFACT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_ARCHIVE_ARTIFACT(arg0, arg1));
-    }
-
-    public static Localizable localizableWSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
-        return messageFactory.getMessage("wscompile.noSuchDirectory", arg0);
-    }
-
-    /**
-     * directory not found: {0}
-     *
-     */
-    public static String WSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_NO_SUCH_DIRECTORY(arg0));
-    }
-
-    public static Localizable localizableWSCOMPILE_INFO(Object arg0) {
-        return messageFactory.getMessage("wscompile.info", arg0);
-    }
-
-    /**
-     * info: {0}
-     *
-     */
-    public static String WSCOMPILE_INFO(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_INFO(arg0));
+    public static String WSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(arg0));
     }
 
     public static Localizable localizableWSIMPORT_MAX_REDIRECT_ATTEMPT() {
-        return messageFactory.getMessage("wsimport.maxRedirectAttempt");
+        return MESSAGE_FACTORY.getMessage("wsimport.maxRedirectAttempt");
     }
 
     /**
@@ -511,47 +401,72 @@ public final class WscompileMessages {
      *
      */
     public static String WSIMPORT_MAX_REDIRECT_ATTEMPT() {
-        return localizer.localize(localizableWSIMPORT_MAX_REDIRECT_ATTEMPT());
+        return LOCALIZER.localize(localizableWSIMPORT_MAX_REDIRECT_ATTEMPT());
     }
 
-    public static Localizable localizableWSIMPORT_WARNING_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsimport.WarningMessage", arg0);
+    public static Localizable localizableWSIMPORT_READING_AUTH_FILE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.readingAuthFile", arg0);
     }
 
     /**
-     * [WARNING] {0}
+     * Trying to read authorization file : "{0}"...
      *
      */
-    public static String WSIMPORT_WARNING_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_WARNING_MESSAGE(arg0));
+    public static String WSIMPORT_READING_AUTH_FILE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_READING_AUTH_FILE(arg0));
     }
 
-    public static Localizable localizableWSCOMPILE_INVALID_OPTION(Object arg0) {
-        return messageFactory.getMessage("wscompile.invalidOption", arg0);
+    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsgen.cannot.gen.wsdl.for.soap12.binding", arg0, arg1);
     }
 
     /**
-     * unrecognized parameter {0}
+     * wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.Please specify "-extension" and "-wsdl:protocol XSoap1.2" switches. For example:wsgen -wsdl:protocol XSoap1.2 -extenson {1}
      *
      */
-    public static String WSCOMPILE_INVALID_OPTION(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_INVALID_OPTION(arg0));
+    public static String WSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(arg0, arg1));
     }
 
-    public static Localizable localizableWSIMPORT_ERROR_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsimport.ErrorMessage", arg0);
+    public static Localizable localizableWSIMPORT_INFO_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.InfoMessage", arg0);
     }
 
     /**
-     * [ERROR] {0}
+     * [INFO] {0}
      *
      */
-    public static String WSIMPORT_ERROR_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_ERROR_MESSAGE(arg0));
+    public static String WSIMPORT_INFO_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_INFO_MESSAGE(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_EXISTING_OPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.existingOption", arg0);
+    }
+
+    /**
+     * Ignoring already defined option {0}
+     *
+     *
+     */
+    public static String WSCOMPILE_EXISTING_OPTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_EXISTING_OPTION(arg0));
+    }
+
+    public static Localizable localizableWSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.portname.missing.namespace", arg0);
+    }
+
+    /**
+     * The port name "{0}" is missing a namespace.
+     *
+     */
+    public static String WSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_PORTNAME_MISSING_NAMESPACE(arg0));
     }
 
     public static Localizable localizableWSIMPORT_GENERATING_CODE() {
-        return messageFactory.getMessage("wsimport.GeneratingCode");
+        return MESSAGE_FACTORY.getMessage("wsimport.GeneratingCode");
     }
 
     /**
@@ -561,71 +476,11 @@ public final class WscompileMessages {
      *
      */
     public static String WSIMPORT_GENERATING_CODE() {
-        return localizer.localize(localizableWSIMPORT_GENERATING_CODE());
-    }
-
-    public static Localizable localizableWSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
-        return messageFactory.getMessage("wsimport.NotAFileNorURL", arg0);
-    }
-
-    /**
-     * "{0}" is neither a file name nor an URL
-     *
-     */
-    public static String WSIMPORT_NOT_A_FILE_NOR_URL(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_NOT_A_FILE_NOR_URL(arg0));
-    }
-
-    public static Localizable localizableWSCOMPILE_WARNING(Object arg0) {
-        return messageFactory.getMessage("wscompile.warning", arg0);
-    }
-
-    /**
-     * warning: {0}
-     *
-     */
-    public static String WSCOMPILE_WARNING(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_WARNING(arg0));
-    }
-
-    public static Localizable localizableWRAPPER_TASK_NEED_ENDORSED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wrapperTask.needEndorsed", arg0, arg1, arg2);
-    }
-
-    /**
-     * You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), or set xendorsed="true" on <{2}>.
-     *
-     */
-    public static String WRAPPER_TASK_NEED_ENDORSED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWRAPPER_TASK_NEED_ENDORSED(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
-        return messageFactory.getMessage("wsimport.noSuchJaxbOption", arg0);
-    }
-
-    /**
-     * no such JAXB option: {0}
-     *
-     */
-    public static String WSIMPORT_NO_SUCH_JAXB_OPTION(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_NO_SUCH_JAXB_OPTION(arg0));
-    }
-
-    public static Localizable localizableWSGEN_VERSION(Object arg0) {
-        return messageFactory.getMessage("wsgen.version", arg0);
-    }
-
-    /**
-     * wsgen version "{0}"
-     *
-     */
-    public static String WSGEN_VERSION(Object arg0) {
-        return localizer.localize(localizableWSGEN_VERSION(arg0));
+        return LOCALIZER.localize(localizableWSIMPORT_GENERATING_CODE());
     }
 
     public static Localizable localizableWSIMPORT_AUTH_FILE_NOT_FOUND(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.authFileNotFound", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("wsimport.authFileNotFound", arg0, arg1);
     }
 
     /**
@@ -633,47 +488,59 @@ public final class WscompileMessages {
      *
      */
     public static String WSIMPORT_AUTH_FILE_NOT_FOUND(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_AUTH_FILE_NOT_FOUND(arg0, arg1));
+        return LOCALIZER.localize(localizableWSIMPORT_AUTH_FILE_NOT_FOUND(arg0, arg1));
     }
 
-    public static Localizable localizableWSIMPORT_DEBUG_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsimport.DebugMessage", arg0);
+    public static Localizable localizableWSIMPORT_WSDLLOCATION_CLIENTJAR() {
+        return MESSAGE_FACTORY.getMessage("wsimport.wsdllocation.clientjar");
     }
 
     /**
-     * [DEBUG] {0}
+     * wsdlLocation cannot be specified when using clientJar option
      *
      */
-    public static String WSIMPORT_DEBUG_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_DEBUG_MESSAGE(arg0));
+    public static String WSIMPORT_WSDLLOCATION_CLIENTJAR() {
+        return LOCALIZER.localize(localizableWSIMPORT_WSDLLOCATION_CLIENTJAR());
     }
 
-    public static Localizable localizableWSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
-        return messageFactory.getMessage("wsgen.could.not.create.file", arg0);
+    public static Localizable localizableWSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsimport.FailedToParse", arg0, arg1);
     }
 
     /**
-     * Could not create file: "{0}"
+     * Failed to parse "{0}": {1}
      *
      */
-    public static String WSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
-        return localizer.localize(localizableWSGEN_COULD_NOT_CREATE_FILE(arg0));
+    public static String WSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSIMPORT_FAILED_TO_PARSE(arg0, arg1));
     }
 
-    public static Localizable localizableWSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
-        return messageFactory.getMessage("wsgen.wsdl.arg.no.genwsdl", arg0);
+    public static Localizable localizableWSIMPORT_NO_WSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.no.wsdl", arg0);
     }
 
     /**
-     * The "{0}" option can only be in conjunction with the "-wsdl" option.
+     * Failed to read the WSDL document: {0}, because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <wsdl:definitions>.
      *
      */
-    public static String WSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
-        return localizer.localize(localizableWSGEN_WSDL_ARG_NO_GENWSDL(arg0));
+    public static String WSIMPORT_NO_WSDL(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_NO_WSDL(arg0));
+    }
+
+    public static Localizable localizableWSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsgen.invalid.protocol", arg0, arg1);
+    }
+
+    /**
+     * "{0}" is not a supported protocol.  Supported protocols include: {1}.
+     *
+     */
+    public static String WSGEN_INVALID_PROTOCOL(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSGEN_INVALID_PROTOCOL(arg0, arg1));
     }
 
     public static Localizable localizableWSGEN_HELP(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("wsgen.help", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("wsgen.help", arg0, arg1, arg2);
     }
 
     /**
@@ -714,59 +581,97 @@ public final class WscompileMessages {
      *
      */
     public static String WSGEN_HELP(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWSGEN_HELP(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizableWSGEN_HELP(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableWSIMPORT_INFO_MESSAGE(Object arg0) {
-        return messageFactory.getMessage("wsimport.InfoMessage", arg0);
+    public static Localizable localizableWSIMPORT_USAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.usage", arg0);
     }
 
     /**
-     * [INFO] {0}
+     * Usage: {0} [options] <WSDL_URI>
+     *
+     * Use "wsimport -help" for a detailed description of options.
      *
      */
-    public static String WSIMPORT_INFO_MESSAGE(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_INFO_MESSAGE(arg0));
+    public static String WSIMPORT_USAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_USAGE(arg0));
     }
 
-    public static Localizable localizableWSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL() {
-        return messageFactory.getMessage("wsgen.inlineSchemas.only.with.wsdl");
+    public static Localizable localizableWSCOMPILE_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.error", arg0);
     }
 
     /**
-     * "-inlineSchemas" must be used in conjunction with the "-wsdl" option
+     * error: {0}
      *
      */
-    public static String WSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL() {
-        return localizer.localize(localizableWSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL());
+    public static String WSCOMPILE_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_ERROR(arg0));
     }
 
-    public static Localizable localizableWSGEN_SOAP_12_WITHOUT_EXTENSION() {
-        return messageFactory.getMessage("wsgen.soap12.without.extension");
+    public static Localizable localizableWSCOMPILE_WARNING(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.warning", arg0);
     }
 
     /**
-     * The optional protocol "Xsoap1.2" must be used in conjunction with the "-extension" option.
+     * warning: {0}
      *
      */
-    public static String WSGEN_SOAP_12_WITHOUT_EXTENSION() {
-        return localizer.localize(localizableWSGEN_SOAP_12_WITHOUT_EXTENSION());
+    public static String WSCOMPILE_WARNING(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_WARNING(arg0));
     }
 
-    public static Localizable localizableWSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
-        return messageFactory.getMessage("wsimport.ILLEGAL_AUTH_INFO", arg0);
+    public static Localizable localizableWRAPPER_TASK_NEED_ENDORSED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wrapperTask.needEndorsed", arg0, arg1);
     }
 
     /**
-     * "{0}" is not a valid authorization information format. The format is http[s]://user:password@host:port//<url-path>.
+     * You are running on JDK6 or newer which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} or newer API. Use the standard override mechanism.
      *
      */
-    public static String WSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_ILLEGAL_AUTH_INFO(arg0));
+    public static String WRAPPER_TASK_NEED_ENDORSED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWRAPPER_TASK_NEED_ENDORSED(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_VERSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.version", arg0);
+    }
+
+    /**
+     * wsimport version "{0}"
+     *
+     */
+    public static String WSIMPORT_VERSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_VERSION(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.noSuchDirectory", arg0);
+    }
+
+    /**
+     * directory not found: {0}
+     *
+     */
+    public static String WSCOMPILE_NO_SUCH_DIRECTORY(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_NO_SUCH_DIRECTORY(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_MISSING_FILE() {
+        return MESSAGE_FACTORY.getMessage("wsimport.missingFile");
+    }
+
+    /**
+     * Missing WSDL_URI
+     *
+     */
+    public static String WSIMPORT_MISSING_FILE() {
+        return LOCALIZER.localize(localizableWSIMPORT_MISSING_FILE());
     }
 
     public static Localizable localizableWSCOMPILE_COMPILATION_FAILED() {
-        return messageFactory.getMessage("wscompile.compilationFailed");
+        return MESSAGE_FACTORY.getMessage("wscompile.compilationFailed");
     }
 
     /**
@@ -774,96 +679,164 @@ public final class WscompileMessages {
      *
      */
     public static String WSCOMPILE_COMPILATION_FAILED() {
-        return localizer.localize(localizableWSCOMPILE_COMPILATION_FAILED());
+        return LOCALIZER.localize(localizableWSCOMPILE_COMPILATION_FAILED());
     }
 
-    public static Localizable localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
-        return messageFactory.getMessage("wscompile.missingOptionArgument", arg0);
+    public static Localizable localizableWSIMPORT_PARSING_WSDL() {
+        return MESSAGE_FACTORY.getMessage("wsimport.ParsingWSDL");
     }
 
     /**
-     * option "{0}" requires an argument
+     * parsing WSDL...
+     *
+     *
      *
      */
-    public static String WSCOMPILE_MISSING_OPTION_ARGUMENT(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_MISSING_OPTION_ARGUMENT(arg0));
+    public static String WSIMPORT_PARSING_WSDL() {
+        return LOCALIZER.localize(localizableWSIMPORT_PARSING_WSDL());
     }
 
-    public static Localizable localizableWSIMPORT_DOCUMENT_DOWNLOAD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.document.download", arg0, arg1);
+    public static Localizable localizableWSGEN_USAGE_EXAMPLES() {
+        return MESSAGE_FACTORY.getMessage("wsgen.usage.examples");
     }
 
     /**
      *
-     * Downloading metadata document from {0} to {1}
+     * Examples:
+     *   wsgen -cp . example.Stock
+     *   wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'
+     *
      *
      */
-    public static String WSIMPORT_DOCUMENT_DOWNLOAD(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_DOCUMENT_DOWNLOAD(arg0, arg1));
+    public static String WSGEN_USAGE_EXAMPLES() {
+        return LOCALIZER.localize(localizableWSGEN_USAGE_EXAMPLES());
     }
 
-    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsgen.cannot.gen.wsdl.for.non.soap.binding", arg0, arg1);
+    public static Localizable localizableWSIMPORT_ARCHIVING_ARTIFACTS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.archivingArtifacts", arg0);
     }
 
     /**
-     * wsgen can not generate WSDL for non-SOAP binding: {0} on Class {1}
+     *
+     * Archiving the generated artifacts into {0}.
+     *
      *
      */
-    public static String WSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(arg0, arg1));
+    public static String WSIMPORT_ARCHIVING_ARTIFACTS(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_ARCHIVING_ARTIFACTS(arg0));
     }
 
-    public static Localizable localizableWSCOMPILE_DUPLICATE_OPTION(Object arg0) {
-        return messageFactory.getMessage("wscompile.duplicateOption", arg0);
+    public static Localizable localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.protocol.without.extension", arg0);
     }
 
     /**
-     * duplicate option: {0}
+     * The optional protocol "{0}" must be used in conjunction with the "-extension" option.
      *
      */
-    public static String WSCOMPILE_DUPLICATE_OPTION(Object arg0) {
-        return localizer.localize(localizableWSCOMPILE_DUPLICATE_OPTION(arg0));
+    public static String WSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(arg0));
     }
 
-    public static Localizable localizableWSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.FailedToParse", arg0, arg1);
+    public static Localizable localizableWSGEN_MISSING_FILE() {
+        return MESSAGE_FACTORY.getMessage("wsgen.missingFile");
     }
 
     /**
-     * Failed to parse "{0}": {1}
+     * Missing SEI
      *
      */
-    public static String WSIMPORT_FAILED_TO_PARSE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_FAILED_TO_PARSE(arg0, arg1));
+    public static String WSGEN_MISSING_FILE() {
+        return LOCALIZER.localize(localizableWSGEN_MISSING_FILE());
     }
 
-    public static Localizable localizableWSIMPORT_NO_WSDL(Object arg0) {
-        return messageFactory.getMessage("wsimport.no.wsdl", arg0);
+    public static Localizable localizableWSGEN_VERSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.version", arg0);
     }
 
     /**
-     * Failed to read the WSDL document: {0}, because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <wsdl:definitions>.
+     * wsgen version "{0}"
      *
      */
-    public static String WSIMPORT_NO_WSDL(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_NO_WSDL(arg0));
+    public static String WSGEN_VERSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_VERSION(arg0));
     }
 
-    public static Localizable localizableWSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsimport.AUTH_INFO_LINENO", arg0, arg1);
+    public static Localizable localizableWSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.no.webservices.class", arg0);
     }
 
     /**
-     * line {0} of {1}
+     * wsgen did not find any class with @WebService annotation. Please specify @WebService annotation on {0}.
      *
      */
-    public static String WSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSIMPORT_AUTH_INFO_LINENO(arg0, arg1));
+    public static String WSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_NO_WEBSERVICES_CLASS(arg0));
+    }
+
+    public static Localizable localizableWSGEN_SOAP_12_WITHOUT_EXTENSION() {
+        return MESSAGE_FACTORY.getMessage("wsgen.soap12.without.extension");
+    }
+
+    /**
+     * The optional protocol "Xsoap1.2" must be used in conjunction with the "-extension" option.
+     *
+     */
+    public static String WSGEN_SOAP_12_WITHOUT_EXTENSION() {
+        return LOCALIZER.localize(localizableWSGEN_SOAP_12_WITHOUT_EXTENSION());
+    }
+
+    public static Localizable localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.class.must.be.implementation.class", arg0);
+    }
+
+    /**
+     * The class "{0}" is not an endpoint implementation class.
+     *
+     */
+    public static String WSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_CLASS_MUST_BE_IMPLEMENTATION_CLASS(arg0));
+    }
+
+    public static Localizable localizableWSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL() {
+        return MESSAGE_FACTORY.getMessage("wsgen.inlineSchemas.only.with.wsdl");
+    }
+
+    /**
+     * "-inlineSchemas" must be used in conjunction with the "-wsdl" option
+     *
+     */
+    public static String WSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL() {
+        return LOCALIZER.localize(localizableWSGEN_INLINE_SCHEMAS_ONLY_WITH_WSDL());
+    }
+
+    public static Localizable localizableWRAPPER_TASK_LOADING_INCORRECT_API(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wrapperTask.loadingIncorrectApi", arg0, arg1, arg2);
+    }
+
+    /**
+     * You are loading JAX-WS {0} API from {1} but this tool requires JAX-WS {2} API.
+     *
+     */
+    public static String WRAPPER_TASK_LOADING_INCORRECT_API(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWRAPPER_TASK_LOADING_INCORRECT_API(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("wscompile.cant.get.compiler", arg0, arg1, arg2);
+    }
+
+    /**
+     * No Java compiler found. Perhaps environment/JDK problem?
+     *  Used JVM: {0}, {1}/{2}
+     *
+     */
+    public static String WSCOMPILE_CANT_GET_COMPILER(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWSCOMPILE_CANT_GET_COMPILER(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSGEN_SERVICENAME_MISSING_LOCALNAME(Object arg0) {
-        return messageFactory.getMessage("wsgen.servicename.missing.localname", arg0);
+        return MESSAGE_FACTORY.getMessage("wsgen.servicename.missing.localname", arg0);
     }
 
     /**
@@ -871,85 +844,35 @@ public final class WscompileMessages {
      *
      */
     public static String WSGEN_SERVICENAME_MISSING_LOCALNAME(Object arg0) {
-        return localizer.localize(localizableWSGEN_SERVICENAME_MISSING_LOCALNAME(arg0));
+        return LOCALIZER.localize(localizableWSGEN_SERVICENAME_MISSING_LOCALNAME(arg0));
     }
 
-    public static Localizable localizableWSGEN_USAGE(Object arg0) {
-        return messageFactory.getMessage("wsgen.usage", arg0);
+    public static Localizable localizableWSCOMPILE_INVALID_OPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.invalidOption", arg0);
     }
 
     /**
-     * Usage: {0} [options] <SEI>
-     *
-     * Use "wsgen -help" for a detailed description of options.
+     * unrecognized parameter {0}
      *
      */
-    public static String WSGEN_USAGE(Object arg0) {
-        return localizer.localize(localizableWSGEN_USAGE(arg0));
+    public static String WSCOMPILE_INVALID_OPTION(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_INVALID_OPTION(arg0));
     }
 
-    public static Localizable localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("wsgen.servicename.missing.namespace", arg0);
+    public static Localizable localizableWSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsimport.httpRedirect", arg0, arg1);
     }
 
     /**
-     * The service name "{0}" is missing a namespace.
+     * Server returned HTTP Status code: "{0}", retrying with "{1}"
      *
      */
-    public static String WSGEN_SERVICENAME_MISSING_NAMESPACE(Object arg0) {
-        return localizer.localize(localizableWSGEN_SERVICENAME_MISSING_NAMESPACE(arg0));
-    }
-
-    public static Localizable localizableWSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsgen.invalid.transport", arg0, arg1);
-    }
-
-    /**
-     * "{0}" is not a supported transport.  Supported transport includes: {1}.
-     *
-     */
-    public static String WSGEN_INVALID_TRANSPORT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSGEN_INVALID_TRANSPORT(arg0, arg1));
-    }
-
-    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("wsgen.cannot.gen.wsdl.for.soap12.binding", arg0, arg1);
-    }
-
-    /**
-     * wsgen can not generate WSDL for SOAP 1.2 binding: {0} on class: {1}.Please specify "-extension" and "-wsdl:protocol XSoap1.2" switches. For example:wsgen -wsdl:protocol XSoap1.2 -extenson {1}
-     *
-     */
-    public static String WSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_SOAP_12_BINDING(arg0, arg1));
-    }
-
-    public static Localizable localizableWSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
-        return messageFactory.getMessage("wsimport.ILLEGAL_TARGET_VERSION", arg0);
-    }
-
-    /**
-     * "{0}" is not a valid target version. "2.0" and "2.1" are supported.
-     *
-     */
-    public static String WSIMPORT_ILLEGAL_TARGET_VERSION(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_ILLEGAL_TARGET_VERSION(arg0));
-    }
-
-    public static Localizable localizableWSIMPORT_ILLEGAL_PROXY(Object arg0) {
-        return messageFactory.getMessage("wsimport.ILLEGAL_PROXY", arg0);
-    }
-
-    /**
-     * "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost:proxyPort
-     *
-     */
-    public static String WSIMPORT_ILLEGAL_PROXY(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_ILLEGAL_PROXY(arg0));
+    public static String WSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSIMPORT_HTTP_REDIRECT(arg0, arg1));
     }
 
     public static Localizable localizableWSGEN_PORTNAME_MISSING_LOCALNAME(Object arg0) {
-        return messageFactory.getMessage("wsgen.portname.missing.localname", arg0);
+        return MESSAGE_FACTORY.getMessage("wsgen.portname.missing.localname", arg0);
     }
 
     /**
@@ -957,31 +880,116 @@ public final class WscompileMessages {
      *
      */
     public static String WSGEN_PORTNAME_MISSING_LOCALNAME(Object arg0) {
-        return localizer.localize(localizableWSGEN_PORTNAME_MISSING_LOCALNAME(arg0));
+        return LOCALIZER.localize(localizableWSGEN_PORTNAME_MISSING_LOCALNAME(arg0));
     }
 
-    public static Localizable localizableWSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("wsgen.portname.missing.namespace", arg0);
+    public static Localizable localizableWSIMPORT_ERROR_MESSAGE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.ErrorMessage", arg0);
     }
 
     /**
-     * The port name "{0}" is missing a namespace.
+     * [ERROR] {0}
      *
      */
-    public static String WSGEN_PORTNAME_MISSING_NAMESPACE(Object arg0) {
-        return localizer.localize(localizableWSGEN_PORTNAME_MISSING_NAMESPACE(arg0));
+    public static String WSIMPORT_ERROR_MESSAGE(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_ERROR_MESSAGE(arg0));
     }
 
-    public static Localizable localizableWSIMPORT_FULLVERSION(Object arg0) {
-        return messageFactory.getMessage("wsimport.fullversion", arg0);
+    public static Localizable localizableWSGEN_FULLVERSION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.fullversion", arg0);
     }
 
     /**
-     * wsimport full version "{0}"
+     * wsgen full version "{0}"
      *
      */
-    public static String WSIMPORT_FULLVERSION(Object arg0) {
-        return localizer.localize(localizableWSIMPORT_FULLVERSION(arg0));
+    public static String WSGEN_FULLVERSION(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_FULLVERSION(arg0));
+    }
+
+    public static Localizable localizableWSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.wsdl.arg.no.genwsdl", arg0);
+    }
+
+    /**
+     * The "{0}" option can only be in conjunction with the "-wsdl" option.
+     *
+     */
+    public static String WSGEN_WSDL_ARG_NO_GENWSDL(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_WSDL_ARG_NO_GENWSDL(arg0));
+    }
+
+    public static Localizable localizableWSCOMPILE_INFO(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wscompile.info", arg0);
+    }
+
+    /**
+     * info: {0}
+     *
+     */
+    public static String WSCOMPILE_INFO(Object arg0) {
+        return LOCALIZER.localize(localizableWSCOMPILE_INFO(arg0));
+    }
+
+    public static Localizable localizableWSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsgen.could.not.create.file", arg0);
+    }
+
+    /**
+     * Could not create file: "{0}"
+     *
+     */
+    public static String WSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
+        return LOCALIZER.localize(localizableWSGEN_COULD_NOT_CREATE_FILE(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("wsimport.ILLEGAL_AUTH_INFO", arg0);
+    }
+
+    /**
+     * "{0}" is not a valid authorization information format. The format is http[s]://user:password@host:port//<url-path>.
+     *
+     */
+    public static String WSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
+        return LOCALIZER.localize(localizableWSIMPORT_ILLEGAL_AUTH_INFO(arg0));
+    }
+
+    public static Localizable localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("wsgen.cannot.gen.wsdl.for.non.soap.binding", arg0, arg1);
+    }
+
+    /**
+     * wsgen can not generate WSDL for non-SOAP binding: {0} on Class {1}
+     *
+     */
+    public static String WSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWSGEN_CANNOT_GEN_WSDL_FOR_NON_SOAP_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_FETCHING_METADATA() {
+        return MESSAGE_FACTORY.getMessage("wsimport.fetchingMetadata");
+    }
+
+    /**
+     *
+     * Downloading the WSDL and associated metadata
+     *
+     *
+     */
+    public static String WSIMPORT_FETCHING_METADATA() {
+        return LOCALIZER.localize(localizableWSIMPORT_FETCHING_METADATA());
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
index a4ac6af4dfe..056ece95582 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.tools.internal.ws.resources;
 
-import com.sun.istack.internal.localization.Localizable;
-import com.sun.istack.internal.localization.LocalizableMessageFactory;
-import com.sun.istack.internal.localization.Localizer;
-
 import java.util.Locale;
 import java.util.ResourceBundle;
+import com.sun.istack.internal.localization.Localizable;
+import com.sun.istack.internal.localization.LocalizableMessageFactory;
+import com.sun.istack.internal.localization.LocalizableMessageFactory.ResourceBundleSupplier;
+import com.sun.istack.internal.localization.Localizer;
 
 
 /**
@@ -38,41 +38,49 @@ import java.util.ResourceBundle;
  *
  */
 public final class WsdlMessages {
+
     private final static String BUNDLE_NAME = "com.sun.tools.internal.ws.resources.wsdl";
-    private final static LocalizableMessageFactory messageFactory =
-        new LocalizableMessageFactory(BUNDLE_NAME, WsdlMessages::getResourceBundle);
-    private final static Localizer localizer = new Localizer();
+    private final static LocalizableMessageFactory MESSAGE_FACTORY = new LocalizableMessageFactory(BUNDLE_NAME, new WsdlMessages.BundleSupplier());
+    private final static Localizer LOCALIZER = new Localizer();
 
-    private static ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(BUNDLE_NAME, locale);
-    }
-
-    public static Localizable localizablePARSING_ELEMENT_EXPECTED() {
-        return messageFactory.getMessage("parsing.elementExpected");
+    public static Localizable localizablePARSING_NOT_AWSDL(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("Parsing.NotAWSDL", arg0);
     }
 
     /**
-     * unexpected non-element found
+     * Failed to get WSDL components, probably {0} is not a valid WSDL file.
      *
      */
-    public static String PARSING_ELEMENT_EXPECTED() {
-        return localizer.localize(localizablePARSING_ELEMENT_EXPECTED());
+    public static String PARSING_NOT_AWSDL(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_NOT_AWSDL(arg0));
     }
 
-    public static Localizable localizableENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
-        return messageFactory.getMessage("entity.notFound.binding", arg0, arg1);
+    public static Localizable localizablePARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("Parser.NotABindingFile", arg0, arg1);
     }
 
     /**
-     * wsdl:binding "{0}" referenced by wsdl:port "{1}", but it's not found in the wsdl
+     *  not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
      *
      */
-    public static String ENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
-        return localizer.localize(localizableENTITY_NOT_FOUND_BINDING(arg0, arg1));
+    public static String PARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSER_NOT_A_BINDING_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.unknownExtensibilityElementOrAttribute", arg0, arg1);
+    }
+
+    /**
+     * unknown extensibility element or attribute "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(arg0, arg1));
     }
 
     public static Localizable localizablePARSING_UNABLE_TO_GET_METADATA(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.unableToGetMetadata", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("parsing.unableToGetMetadata", arg0, arg1);
     }
 
     /**
@@ -82,555 +90,11 @@ public final class WsdlMessages {
      *
      */
     public static String PARSING_UNABLE_TO_GET_METADATA(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_UNABLE_TO_GET_METADATA(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_PARSE_FAILED() {
-        return messageFactory.getMessage("Parsing.ParseFailed");
-    }
-
-    /**
-     *  Failed to parse the WSDL.
-     *
-     */
-    public static String PARSING_PARSE_FAILED() {
-        return localizer.localize(localizablePARSING_PARSE_FAILED());
-    }
-
-    public static Localizable localizablePARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.invalidAttributeValue", arg0, arg1);
-    }
-
-    /**
-     * invalid value "{1}" for attribute "{0}"
-     *
-     */
-    public static String PARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
-    }
-
-    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.invalidAttributeValue", arg0, arg1);
-    }
-
-    /**
-     * invalid value "{1}" for attribute "{0}"
-     *
-     */
-    public static String VALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INVALID_TAG(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.invalidTag", arg0, arg1);
-    }
-
-    /**
-     * expected element "{1}", found "{0}"
-     *
-     */
-    public static String PARSING_INVALID_TAG(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_INVALID_TAG(arg0, arg1));
-    }
-
-    public static Localizable localizableENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("entity.notFound.portType", arg0, arg1);
-    }
-
-    /**
-     * wsdl:portType "{0}" referenced by wsdl:binding "{1}", but it's not found in the wsdl
-     *
-     */
-    public static String ENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableENTITY_NOT_FOUND_PORT_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.missingRequiredAttribute", arg0, arg1);
-    }
-
-    /**
-     * missing required attribute "{1}" of element "{0}"
-     *
-     */
-    public static String PARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.invalidElement", arg0, arg1);
-    }
-
-    /**
-     * invalid element: "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_INVALID_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableVALIDATION_INVALID_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("validation.invalidElement", arg0);
-    }
-
-    /**
-     * invalid element: "{0}"
-     *
-     */
-    public static String VALIDATION_INVALID_ELEMENT(Object arg0) {
-        return localizer.localize(localizableVALIDATION_INVALID_ELEMENT(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES() {
-        return messageFactory.getMessage("Internalizer.TwoVersionAttributes");
-    }
-
-    /**
-     *  Both jaxws:version and version are present
-     *
-     */
-    public static String INTERNALIZER_TWO_VERSION_ATTRIBUTES() {
-        return localizer.localize(localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES());
-    }
-
-    public static Localizable localizableVALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.duplicatePartName", arg0, arg1);
-    }
-
-    /**
-     * Invalid WSDL, duplicate parts in a wsdl:message is not allowed.
-     * wsdl:message {0} has a duplicated part name: "{1}"
-     *
-     */
-    public static String VALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_DUPLICATE_PART_NAME(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INVALID_WSDL_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("parsing.invalidWsdlElement", arg0);
-    }
-
-    /**
-     * invalid WSDL element: "{0}"
-     *
-     */
-    public static String PARSING_INVALID_WSDL_ELEMENT(Object arg0) {
-        return localizer.localize(localizablePARSING_INVALID_WSDL_ELEMENT(arg0));
-    }
-
-    public static Localizable localizablePARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
-        return messageFactory.getMessage("parsing.nonWhitespaceTextFound", arg0);
-    }
-
-    /**
-     * found unexpected non-whitespace text: "{0}"
-     *
-     */
-    public static String PARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
-        return localizer.localize(localizablePARSING_NON_WHITESPACE_TEXT_FOUND(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("internalizer.targetNotFound", arg0);
-    }
-
-    /**
-     *  No target found for the wsdlLocation: {0}
-     *
-     */
-    public static String INTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableINTERNALIZER_TARGET_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
-        return messageFactory.getMessage("parsing.saxExceptionWithSystemId", arg0);
-    }
-
-    /**
-     * invalid WSDL file! failed to parse document at "{0}"
-     *
-     */
-    public static String PARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
-        return localizer.localize(localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(arg0));
-    }
-
-    public static Localizable localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.requiredExtensibilityElement", arg0, arg1);
-    }
-
-    /**
-     * unknown required extensibility element "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableENTITY_NOT_FOUND_BY_ID(Object arg0) {
-        return messageFactory.getMessage("entity.notFoundByID", arg0);
-    }
-
-    /**
-     * invalid entity id: "{0}"
-     *
-     */
-    public static String ENTITY_NOT_FOUND_BY_ID(Object arg0) {
-        return localizer.localize(localizableENTITY_NOT_FOUND_BY_ID(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.exclusiveAttributes", arg0, arg1);
-    }
-
-    /**
-     * exclusive attributes: "{0}", "{1}"
-     *
-     */
-    public static String VALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(arg0, arg1));
-    }
-
-    public static Localizable localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.missingRequiredSubEntity", arg0, arg1);
-    }
-
-    /**
-     * missing required sub-entity "{0}" of element "{1}"
-     *
-     */
-    public static String VALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(arg0, arg1));
-    }
-
-    public static Localizable localizableINTERNALIZER_INCORRECT_VERSION() {
-        return messageFactory.getMessage("Internalizer.IncorrectVersion");
-    }
-
-    /**
-     *  JAXWS version attribute must be "2.0"
-     *
-     */
-    public static String INTERNALIZER_INCORRECT_VERSION() {
-        return localizer.localize(localizableINTERNALIZER_INCORRECT_VERSION());
-    }
-
-    public static Localizable localizableLOCALIZED_ERROR(Object arg0) {
-        return messageFactory.getMessage("localized.error", arg0);
-    }
-
-    /**
-     * {0}
-     *
-     */
-    public static String LOCALIZED_ERROR(Object arg0) {
-        return localizer.localize(localizableLOCALIZED_ERROR(arg0));
-    }
-
-    public static Localizable localizableENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("entity.duplicateWithType", arg0, arg1);
-    }
-
-    /**
-     * duplicate "{0}" entity: "{1}"
-     *
-     */
-    public static String ENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
-        return localizer.localize(localizableENTITY_DUPLICATE_WITH_TYPE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
-        return messageFactory.getMessage("parsing.onlyOneOfElementOrTypeRequired", arg0);
-    }
-
-    /**
-     * only one of the "element" or "type" attributes is allowed in part "{0}"
-     *
-     */
-    public static String PARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
-        return localizer.localize(localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_UNSUPPORTED_USE_ENCODED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.unsupportedUse.encoded", arg0, arg1);
-    }
-
-    /**
-     * "Use of SOAP Encoding is not supported.
-     * SOAP extension element on line {0} in {1} has use="encoded" "
-     *
-     */
-    public static String VALIDATION_UNSUPPORTED_USE_ENCODED(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_UNSUPPORTED_USE_ENCODED(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("parsing.incorrectRootElement", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * expected root element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizablePARSING_INCORRECT_ROOT_ELEMENT(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableTRY_WITH_MEX(Object arg0) {
-        return messageFactory.getMessage("try.with.mex", arg0);
-    }
-
-    /**
-     * {0}
-     *
-     * retrying with MEX...
-     *
-     */
-    public static String TRY_WITH_MEX(Object arg0) {
-        return localizer.localize(localizableTRY_WITH_MEX(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.missingRequiredAttribute", arg0, arg1);
-    }
-
-    /**
-     * missing required attribute "{0}" of element "{1}"
-     *
-     */
-    public static String VALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_IO_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("parsing.ioException", arg0);
-    }
-
-    /**
-     * parsing failed: {0}
-     *
-     */
-    public static String PARSING_IO_EXCEPTION(Object arg0) {
-        return localizer.localize(localizablePARSING_IO_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("internalizer.XPathEvaulatesToTooManyTargets", arg0, arg1);
-    }
-
-    /**
-     * XPath evaluation of "{0}" results in too many ({1}) target nodes
-     *
-     */
-    public static String INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
-        return localizer.localize(localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("Parser.NotABindingFile", arg0, arg1);
-    }
-
-    /**
-     *  not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
-     *
-     */
-    public static String PARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSER_NOT_A_BINDING_FILE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
-        return messageFactory.getMessage("parsing.unknownNamespacePrefix", arg0);
-    }
-
-    /**
-     * undeclared namespace prefix: "{0}"
-     *
-     */
-    public static String PARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
-        return localizer.localize(localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(arg0));
-    }
-
-    public static Localizable localizablePARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("parsing.factoryConfigException", arg0);
-    }
-
-    /**
-     * invalid WSDL file! parsing failed: {0}
-     *
-     */
-    public static String PARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
-        return localizer.localize(localizablePARSING_FACTORY_CONFIG_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.missingRequiredProperty", arg0, arg1);
-    }
-
-    /**
-     * missing required property "{0}" of element "{1}"
-     *
-     */
-    public static String VALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_MISSING_REQUIRED_PROPERTY(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INVALID_OPERATION_STYLE(Object arg0) {
-        return messageFactory.getMessage("parsing.invalidOperationStyle", arg0);
-    }
-
-    /**
-     * operation "{0}" has an invalid style
-     *
-     */
-    public static String PARSING_INVALID_OPERATION_STYLE(Object arg0) {
-        return localizer.localize(localizablePARSING_INVALID_OPERATION_STYLE(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
-        return messageFactory.getMessage("internalizer.XPathEvaluationError", arg0);
-    }
-
-    /**
-     * XPath error: {0}
-     *
-     */
-    public static String INTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
-        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.invalidSubEntity", arg0, arg1);
-    }
-
-    /**
-     * invalid sub-element "{0}" of element "{1}"
-     *
-     */
-    public static String VALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_INVALID_SUB_ENTITY(arg0, arg1));
-    }
-
-    public static Localizable localizableVALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
-        return messageFactory.getMessage("validation.shouldNotHappen", arg0);
-    }
-
-    /**
-     * internal error ("{0}")
-     *
-     */
-    public static String VALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
-        return localizer.localize(localizableVALIDATION_SHOULD_NOT_HAPPEN(arg0));
-    }
-
-    public static Localizable localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("AbstractReferenceFinderImpl.UnableToParse", arg0, arg1);
-    }
-
-    /**
-     *  Unable to parse "{0}" : {1}
-     *
-     */
-    public static String ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
-        return localizer.localize(localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(arg0, arg1));
-    }
-
-    public static Localizable localizableWARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("warning.faultEmptyAction", arg0, arg1, arg2);
-    }
-
-    /**
-     * ignoring empty Action in "{0}" {1} element of "{2}" operation, using default instead
-     *
-     */
-    public static String WARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWARNING_FAULT_EMPTY_ACTION(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizablePARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.invalidExtensionElement", arg0, arg1);
-    }
-
-    /**
-     * invalid extension element: "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_INVALID_EXTENSION_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("internalizer.XPathEvaluatesToNonElement", arg0);
-    }
-
-    /**
-     * XPath evaluation of "{0}" needs to result in an element.
-     *
-     */
-    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
-        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
-        return messageFactory.getMessage("internalizer.XPathEvaluatesToNoTarget", arg0);
-    }
-
-    /**
-     * XPath evaluation of "{0}" results in an empty target node
-     *
-     */
-    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
-        return localizer.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(arg0));
-    }
-
-    public static Localizable localizablePARSING_SAX_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("parsing.saxException", arg0);
-    }
-
-    /**
-     * invalid WSDL file! parsing failed: {0}
-     *
-     */
-    public static String PARSING_SAX_EXCEPTION(Object arg0) {
-        return localizer.localize(localizablePARSING_SAX_EXCEPTION(arg0));
-    }
-
-    public static Localizable localizableINVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("invalid.customization.namespace", arg0);
-    }
-
-    /**
-     * Ignoring customization: "{0}", because it has no namespace. It must belong to the customization namespace.
-     *
-     */
-    public static String INVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
-        return localizer.localize(localizableINVALID_CUSTOMIZATION_NAMESPACE(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.invalidAttribute", arg0, arg1);
-    }
-
-    /**
-     * invalid attribute "{0}" of element "{1}"
-     *
-     */
-    public static String VALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_INVALID_ATTRIBUTE(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
-        return messageFactory.getMessage("parsing.parserConfigException", arg0);
-    }
-
-    /**
-     * invalid WSDL file! parsing failed: {0}
-     *
-     */
-    public static String PARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
-        return localizer.localize(localizablePARSING_PARSER_CONFIG_EXCEPTION(arg0));
+        return LOCALIZER.localize(localizablePARSING_UNABLE_TO_GET_METADATA(arg0, arg1));
     }
 
     public static Localizable localizablePARSING_ONLY_ONE_TYPES_ALLOWED(Object arg0) {
-        return messageFactory.getMessage("parsing.onlyOneTypesAllowed", arg0);
+        return MESSAGE_FACTORY.getMessage("parsing.onlyOneTypesAllowed", arg0);
     }
 
     /**
@@ -638,215 +102,23 @@ public final class WsdlMessages {
      *
      */
     public static String PARSING_ONLY_ONE_TYPES_ALLOWED(Object arg0) {
-        return localizer.localize(localizablePARSING_ONLY_ONE_TYPES_ALLOWED(arg0));
+        return LOCALIZER.localize(localizablePARSING_ONLY_ONE_TYPES_ALLOWED(arg0));
     }
 
-    public static Localizable localizablePARSING_INVALID_URI(Object arg0) {
-        return messageFactory.getMessage("parsing.invalidURI", arg0);
+    public static Localizable localizableVALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("validation.shouldNotHappen", arg0);
     }
 
     /**
-     * invalid URI: {0}
+     * internal error ("{0}")
      *
      */
-    public static String PARSING_INVALID_URI(Object arg0) {
-        return localizer.localize(localizablePARSING_INVALID_URI(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.incorrectTargetNamespace", arg0, arg1);
-    }
-
-    /**
-     * target namespace is incorrect (expected: {1}, found: {0})
-     *
-     */
-    public static String VALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(arg0, arg1));
-    }
-
-    public static Localizable localizableENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("entity.notFoundByQName", arg0, arg1, arg2);
-    }
-
-    /**
-     * {0} "{1}" not found in the wsdl: {2}
-     *
-     */
-    public static String ENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableENTITY_NOT_FOUND_BY_Q_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableINVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("invalid.wsdl", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Invalid WSDL {0}, expected {1} found {2} at (line {3})
-     *
-     */
-    public static String INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableINVALID_WSDL(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
-        return messageFactory.getMessage("parsing.unknownImportedDocumentType", arg0);
-    }
-
-    /**
-     * imported document is of unknown type: {0}
-     *
-     */
-    public static String PARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
-        return localizer.localize(localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(arg0));
-    }
-
-    public static Localizable localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
-        return messageFactory.getMessage("parsing.ioExceptionWithSystemId", arg0);
-    }
-
-    /**
-     * failed to parse document at "{0}"
-     *
-     */
-    public static String PARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
-        return localizer.localize(localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(arg0));
-    }
-
-    public static Localizable localizableVALIDATION_AMBIGUOUS_NAME(Object arg0) {
-        return messageFactory.getMessage("validation.ambiguousName", arg0);
-    }
-
-    /**
-     * ambiguous operation name: "{0}"
-     *
-     */
-    public static String VALIDATION_AMBIGUOUS_NAME(Object arg0) {
-        return localizer.localize(localizableVALIDATION_AMBIGUOUS_NAME(arg0));
-    }
-
-    public static Localizable localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
-        return messageFactory.getMessage("parsing.wsdlNotDefaultNamespace", arg0);
-    }
-
-    /**
-     * default namespace must be "{0}"
-     *
-     */
-    public static String PARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
-        return localizer.localize(localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(arg0));
-    }
-
-    public static Localizable localizablePARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("parsing.unknownExtensibilityElementOrAttribute", arg0, arg1);
-    }
-
-    /**
-     * unknown extensibility element or attribute "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(Object arg0, Object arg1) {
-        return localizer.localize(localizablePARSING_UNKNOWN_EXTENSIBILITY_ELEMENT_OR_ATTRIBUTE(arg0, arg1));
-    }
-
-    public static Localizable localizableVALIDATION_DUPLICATED_ELEMENT(Object arg0) {
-        return messageFactory.getMessage("validation.duplicatedElement", arg0);
-    }
-
-    /**
-     * duplicated element: "{0}"
-     *
-     */
-    public static String VALIDATION_DUPLICATED_ELEMENT(Object arg0) {
-        return localizer.localize(localizableVALIDATION_DUPLICATED_ELEMENT(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT() {
-        return messageFactory.getMessage("internalizer.targetNotAnElement");
-    }
-
-    /**
-     *  Target node is not an element
-     *
-     */
-    public static String INTERNALIZER_TARGET_NOT_AN_ELEMENT() {
-        return localizer.localize(localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT());
-    }
-
-    public static Localizable localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("warning.inputOutputEmptyAction", arg0, arg1);
-    }
-
-    /**
-     * ignoring empty Action in {0} element of "{1}" operation, using default instead
-     *
-     */
-    public static String WARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-        return messageFactory.getMessage("parsing.invalidTagNS", arg0, arg1, arg2, arg3, arg4);
-    }
-
-    /**
-     * Invalid WSDL at {4}: expected element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
-     *
-     */
-    public static String PARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
-        return localizer.localize(localizablePARSING_INVALID_TAG_NS(arg0, arg1, arg2, arg3, arg4));
-    }
-
-    public static Localizable localizableINVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
-        return messageFactory.getMessage("invalid.wsdl.with.dooc", arg0, arg1);
-    }
-
-    /**
-     * "Not a WSDL document: {0}, it gives "{1}", retrying with MEX..."
-     *
-     */
-    public static String INVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
-        return localizer.localize(localizableINVALID_WSDL_WITH_DOOC(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_NOT_AWSDL(Object arg0) {
-        return messageFactory.getMessage("Parsing.NotAWSDL", arg0);
-    }
-
-    /**
-     * Failed to get WSDL components, probably {0} is not a valid WSDL file.
-     *
-     */
-    public static String PARSING_NOT_AWSDL(Object arg0) {
-        return localizer.localize(localizablePARSING_NOT_AWSDL(arg0));
-    }
-
-    public static Localizable localizableENTITY_DUPLICATE(Object arg0) {
-        return messageFactory.getMessage("entity.duplicate", arg0);
-    }
-
-    /**
-     * duplicate entity: "{0}"
-     *
-     */
-    public static String ENTITY_DUPLICATE(Object arg0) {
-        return localizer.localize(localizableENTITY_DUPLICATE(arg0));
-    }
-
-    public static Localizable localizableWARNING_WSI_R_2004() {
-        return messageFactory.getMessage("warning.wsi.r2004");
-    }
-
-    /**
-     * Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definitions embedded inline within the WSDL document.
-     *
-     */
-    public static String WARNING_WSI_R_2004() {
-        return localizer.localize(localizableWARNING_WSI_R_2004());
+    public static String VALIDATION_SHOULD_NOT_HAPPEN(Object arg0) {
+        return LOCALIZER.localize(localizableVALIDATION_SHOULD_NOT_HAPPEN(arg0));
     }
 
     public static Localizable localizableWARNING_WSI_R_2003() {
-        return messageFactory.getMessage("warning.wsi.r2003");
+        return MESSAGE_FACTORY.getMessage("warning.wsi.r2003");
     }
 
     /**
@@ -854,95 +126,71 @@ public final class WsdlMessages {
      *
      */
     public static String WARNING_WSI_R_2003() {
-        return localizer.localize(localizableWARNING_WSI_R_2003());
+        return LOCALIZER.localize(localizableWARNING_WSI_R_2003());
     }
 
-    public static Localizable localizableWARNING_WSI_R_2002(Object arg0, Object arg1) {
-        return messageFactory.getMessage("warning.wsi.r2002", arg0, arg1);
+    public static Localizable localizableWARNING_WSI_R_2004() {
+        return MESSAGE_FACTORY.getMessage("warning.wsi.r2004");
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected WSDL namespace: {0}, found: {1}
+     * Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definitions embedded inline within the WSDL document.
      *
      */
-    public static String WARNING_WSI_R_2002(Object arg0, Object arg1) {
-        return localizer.localize(localizableWARNING_WSI_R_2002(arg0, arg1));
+    public static String WARNING_WSI_R_2004() {
+        return LOCALIZER.localize(localizableWARNING_WSI_R_2004());
     }
 
-    public static Localizable localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
-        return messageFactory.getMessage("parsing.elementOrTypeRequired", arg0);
+    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.invalidAttribute", arg0, arg1);
     }
 
     /**
-     * warning: part {0} is ignored, either the "element" or the "type" attribute is required in part "{0}"
+     * invalid attribute "{0}" of element "{1}"
      *
      */
-    public static String PARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
-        return localizer.localize(localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(arg0));
+    public static String VALIDATION_INVALID_ATTRIBUTE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_INVALID_ATTRIBUTE(arg0, arg1));
     }
 
-    public static Localizable localizableWARNING_WSI_R_2001() {
-        return messageFactory.getMessage("warning.wsi.r2001");
+    public static Localizable localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.invalidAttributeValue", arg0, arg1);
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must import only WSDL documents. It's trying to import: "{0}"
+     * invalid value "{1}" for attribute "{0}"
      *
      */
-    public static String WARNING_WSI_R_2001() {
-        return localizer.localize(localizableWARNING_WSI_R_2001());
+    public static String VALIDATION_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
     }
 
-    public static Localizable localizableFILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("file.not.found", arg0);
+    public static Localizable localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.ioExceptionWithSystemId", arg0);
     }
 
     /**
-     * {0} is unreachable
+     * failed to parse document at "{0}"
      *
      */
-    public static String FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableFILE_NOT_FOUND(arg0));
+    public static String PARSING_IO_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_IO_EXCEPTION_WITH_SYSTEM_ID(arg0));
     }
 
-    public static Localizable localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("validation.invalidSimpleTypeInElement", arg0, arg1);
+    public static Localizable localizablePARSING_PARSE_FAILED() {
+        return MESSAGE_FACTORY.getMessage("Parsing.ParseFailed");
     }
 
     /**
-     * invalid element: "{1}", has named simpleType: "{0}"
+     *  Failed to parse the WSDL.
      *
      */
-    public static String VALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
-        return messageFactory.getMessage("parsing.onlyOneDocumentationAllowed", arg0);
-    }
-
-    /**
-     * only one "documentation" element allowed in "{0}"
-     *
-     */
-    public static String PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
-        return localizer.localize(localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(arg0));
-    }
-
-    public static Localizable localizableINTERNALIZER_VERSION_NOT_PRESENT() {
-        return messageFactory.getMessage("Internalizer.VersionNotPresent");
-    }
-
-    /**
-     *  JAXWS version attribute must be present
-     *
-     */
-    public static String INTERNALIZER_VERSION_NOT_PRESENT() {
-        return localizer.localize(localizableINTERNALIZER_VERSION_NOT_PRESENT());
+    public static String PARSING_PARSE_FAILED() {
+        return LOCALIZER.localize(localizablePARSING_PARSE_FAILED());
     }
 
     public static Localizable localizableFAILED_NOSERVICE(Object arg0) {
-        return messageFactory.getMessage("failed.noservice", arg0);
+        return MESSAGE_FACTORY.getMessage("failed.noservice", arg0);
     }
 
     /**
@@ -952,11 +200,120 @@ public final class WsdlMessages {
      *
      */
     public static String FAILED_NOSERVICE(Object arg0) {
-        return localizer.localize(localizableFAILED_NOSERVICE(arg0));
+        return LOCALIZER.localize(localizableFAILED_NOSERVICE(arg0));
+    }
+
+    public static Localizable localizableENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("entity.duplicateWithType", arg0, arg1);
+    }
+
+    /**
+     * duplicate "{0}" entity: "{1}"
+     *
+     */
+    public static String ENTITY_DUPLICATE_WITH_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableENTITY_DUPLICATE_WITH_TYPE(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.duplicatePartName", arg0, arg1);
+    }
+
+    /**
+     * Invalid WSDL, duplicate parts in a wsdl:message is not allowed.
+     * wsdl:message {0} has a duplicated part name: "{1}"
+     *
+     */
+    public static String VALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_DUPLICATE_PART_NAME(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.onlyOneOfElementOrTypeRequired", arg0);
+    }
+
+    /**
+     * only one of the "element" or "type" attributes is allowed in part "{0}"
+     *
+     */
+    public static String PARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_ONLY_ONE_OF_ELEMENT_OR_TYPE_REQUIRED(arg0));
+    }
+
+    public static Localizable localizablePARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("parsing.incorrectRootElement", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * expected root element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INCORRECT_ROOT_ELEMENT(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizablePARSING_INCORRECT_ROOT_ELEMENT(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableINVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("invalid.wsdl.with.dooc", arg0, arg1);
+    }
+
+    /**
+     * "Not a WSDL document: {0}, it gives "{1}", retrying with MEX..."
+     *
+     */
+    public static String INVALID_WSDL_WITH_DOOC(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINVALID_WSDL_WITH_DOOC(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("internalizer.XPathEvaulatesToTooManyTargets", arg0, arg1);
+    }
+
+    /**
+     * XPath evaluation of "{0}" results in too many ({1}) target nodes
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableINTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ELEMENT_EXPECTED() {
+        return MESSAGE_FACTORY.getMessage("parsing.elementExpected");
+    }
+
+    /**
+     * unexpected non-element found
+     *
+     */
+    public static String PARSING_ELEMENT_EXPECTED() {
+        return LOCALIZER.localize(localizablePARSING_ELEMENT_EXPECTED());
+    }
+
+    public static Localizable localizableFILE_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("file.not.found", arg0);
+    }
+
+    /**
+     * {0} is unreachable
+     *
+     */
+    public static String FILE_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableFILE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.invalidSimpleTypeInElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element: "{1}", has named simpleType: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(arg0, arg1));
     }
 
     public static Localizable localizablePARSING_TOO_MANY_ELEMENTS(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("parsing.tooManyElements", arg0, arg1, arg2);
+        return MESSAGE_FACTORY.getMessage("parsing.tooManyElements", arg0, arg1, arg2);
     }
 
     /**
@@ -964,11 +321,241 @@ public final class WsdlMessages {
      *
      */
     public static String PARSING_TOO_MANY_ELEMENTS(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizablePARSING_TOO_MANY_ELEMENTS(arg0, arg1, arg2));
+        return LOCALIZER.localize(localizablePARSING_TOO_MANY_ELEMENTS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableLOCALIZED_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("localized.error", arg0);
+    }
+
+    /**
+     * {0}
+     *
+     */
+    public static String LOCALIZED_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableLOCALIZED_ERROR(arg0));
+    }
+
+    public static Localizable localizablePARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.factoryConfigException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_FACTORY_CONFIG_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_FACTORY_CONFIG_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.unknownImportedDocumentType", arg0);
+    }
+
+    /**
+     * imported document is of unknown type: {0}
+     *
+     */
+    public static String PARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_UNKNOWN_IMPORTED_DOCUMENT_TYPE(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_DUPLICATED_ELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("validation.duplicatedElement", arg0);
+    }
+
+    /**
+     * duplicated element: "{0}"
+     *
+     */
+    public static String VALIDATION_DUPLICATED_ELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableVALIDATION_DUPLICATED_ELEMENT(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_URI(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidURI", arg0);
+    }
+
+    /**
+     * invalid URI: {0}
+     *
+     */
+    public static String PARSING_INVALID_URI(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_URI(arg0));
+    }
+
+    public static Localizable localizablePARSING_SAX_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.saxException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_SAX_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_SAX_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_INCORRECT_VERSION() {
+        return MESSAGE_FACTORY.getMessage("Internalizer.IncorrectVersion");
+    }
+
+    /**
+     *  JAXWS version attribute must be "2.0"
+     *
+     */
+    public static String INTERNALIZER_INCORRECT_VERSION() {
+        return LOCALIZER.localize(localizableINTERNALIZER_INCORRECT_VERSION());
+    }
+
+    public static Localizable localizablePARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.nonWhitespaceTextFound", arg0);
+    }
+
+    /**
+     * found unexpected non-whitespace text: "{0}"
+     *
+     */
+    public static String PARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_NON_WHITESPACE_TEXT_FOUND(arg0));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("entity.notFoundByQName", arg0, arg1, arg2);
+    }
+
+    /**
+     * {0} "{1}" not found in the wsdl: {2}
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableENTITY_NOT_FOUND_BY_Q_NAME(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.missingRequiredAttribute", arg0, arg1);
+    }
+
+    /**
+     * missing required attribute "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
+    }
+
+    public static Localizable localizableWARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
+        return MESSAGE_FACTORY.getMessage("warning.faultEmptyAction", arg0, arg1, arg2);
+    }
+
+    /**
+     * ignoring empty Action in "{0}" {1} element of "{2}" operation, using default instead
+     *
+     */
+    public static String WARNING_FAULT_EMPTY_ACTION(Object arg0, Object arg1, Object arg2) {
+        return LOCALIZER.localize(localizableWARNING_FAULT_EMPTY_ACTION(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizablePARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidAttributeValue", arg0, arg1);
+    }
+
+    /**
+     * invalid value "{1}" for attribute "{0}"
+     *
+     */
+    public static String PARSING_INVALID_ATTRIBUTE_VALUE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_ATTRIBUTE_VALUE(arg0, arg1));
+    }
+
+    public static Localizable localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("AbstractReferenceFinderImpl.UnableToParse", arg0, arg1);
+    }
+
+    /**
+     *  Unable to parse "{0}" : {1}
+     *
+     */
+    public static String ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(arg0, arg1));
+    }
+
+    public static Localizable localizableENTITY_DUPLICATE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("entity.duplicate", arg0);
+    }
+
+    /**
+     * duplicate entity: "{0}"
+     *
+     */
+    public static String ENTITY_DUPLICATE(Object arg0) {
+        return LOCALIZER.localize(localizableENTITY_DUPLICATE(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.missingRequiredProperty", arg0, arg1);
+    }
+
+    /**
+     * missing required property "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_PROPERTY(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_MISSING_REQUIRED_PROPERTY(arg0, arg1));
+    }
+
+    public static Localizable localizableINVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("invalid.customization.namespace", arg0);
+    }
+
+    /**
+     * Ignoring customization: "{0}", because it has no namespace. It must belong to the customization namespace.
+     *
+     */
+    public static String INVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizableINVALID_CUSTOMIZATION_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizableTRY_WITH_MEX(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("try.with.mex", arg0);
+    }
+
+    /**
+     * {0}
+     *
+     * retrying with MEX...
+     *
+     */
+    public static String TRY_WITH_MEX(Object arg0) {
+        return LOCALIZER.localize(localizableTRY_WITH_MEX(arg0));
+    }
+
+    public static Localizable localizableINVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return MESSAGE_FACTORY.getMessage("invalid.wsdl", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Invalid WSDL {0}, expected {1} found {2} at (line {3})
+     *
+     */
+    public static String INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return LOCALIZER.localize(localizableINVALID_WSDL(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BY_ID(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("entity.notFoundByID", arg0);
+    }
+
+    /**
+     * invalid entity id: "{0}"
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BY_ID(Object arg0) {
+        return LOCALIZER.localize(localizableENTITY_NOT_FOUND_BY_ID(arg0));
     }
 
     public static Localizable localizableINTERNALIZER_INCORRECT_SCHEMA_REFERENCE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("Internalizer.IncorrectSchemaReference", arg0, arg1);
+        return MESSAGE_FACTORY.getMessage("Internalizer.IncorrectSchemaReference", arg0, arg1);
     }
 
     /**
@@ -976,7 +563,427 @@ public final class WsdlMessages {
      *
      */
     public static String INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(Object arg0, Object arg1) {
-        return localizer.localize(localizableINTERNALIZER_INCORRECT_SCHEMA_REFERENCE(arg0, arg1));
+        return LOCALIZER.localize(localizableINTERNALIZER_INCORRECT_SCHEMA_REFERENCE(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidExtensionElement", arg0, arg1);
+    }
+
+    /**
+     * invalid extension element: "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_EXTENSION_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_EXTENSION_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.exclusiveAttributes", arg0, arg1);
+    }
+
+    /**
+     * exclusive attributes: "{0}", "{1}"
+     *
+     */
+    public static String VALIDATION_EXCLUSIVE_ATTRIBUTES(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_EXCLUSIVE_ATTRIBUTES(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.incorrectTargetNamespace", arg0, arg1);
+    }
+
+    /**
+     * target namespace is incorrect (expected: {1}, found: {0})
+     *
+     */
+    public static String VALIDATION_INCORRECT_TARGET_NAMESPACE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES() {
+        return MESSAGE_FACTORY.getMessage("Internalizer.TwoVersionAttributes");
+    }
+
+    /**
+     *  Both jaxws:version and version are present
+     *
+     */
+    public static String INTERNALIZER_TWO_VERSION_ATTRIBUTES() {
+        return LOCALIZER.localize(localizableINTERNALIZER_TWO_VERSION_ATTRIBUTES());
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("entity.notFound.binding", arg0, arg1);
+    }
+
+    /**
+     * wsdl:binding "{0}" referenced by wsdl:port "{1}", but it's not found in the wsdl
+     *
+     */
+    public static String ENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableENTITY_NOT_FOUND_BINDING(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.invalidSubEntity", arg0, arg1);
+    }
+
+    /**
+     * invalid sub-element "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_INVALID_SUB_ENTITY(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_INVALID_SUB_ENTITY(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.requiredExtensibilityElement", arg0, arg1);
+    }
+
+    /**
+     * unknown required extensibility element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_REQUIRED_EXTENSIBILITY_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_REQUIRED_EXTENSIBILITY_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_IO_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.ioException", arg0);
+    }
+
+    /**
+     * parsing failed: {0}
+     *
+     */
+    public static String PARSING_IO_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_IO_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_VERSION_NOT_PRESENT() {
+        return MESSAGE_FACTORY.getMessage("Internalizer.VersionNotPresent");
+    }
+
+    /**
+     *  JAXWS version attribute must be present
+     *
+     */
+    public static String INTERNALIZER_VERSION_NOT_PRESENT() {
+        return LOCALIZER.localize(localizableINTERNALIZER_VERSION_NOT_PRESENT());
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("internalizer.XPathEvaluationError", arg0);
+    }
+
+    /**
+     * XPath error: {0}
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATION_ERROR(Object arg0) {
+        return LOCALIZER.localize(localizableINTERNALIZER_X_PATH_EVALUATION_ERROR(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_WSDL_ELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidWsdlElement", arg0);
+    }
+
+    /**
+     * invalid WSDL element: "{0}"
+     *
+     */
+    public static String PARSING_INVALID_WSDL_ELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_WSDL_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT() {
+        return MESSAGE_FACTORY.getMessage("internalizer.targetNotAnElement");
+    }
+
+    /**
+     *  Target node is not an element
+     *
+     */
+    public static String INTERNALIZER_TARGET_NOT_AN_ELEMENT() {
+        return LOCALIZER.localize(localizableINTERNALIZER_TARGET_NOT_AN_ELEMENT());
+    }
+
+    public static Localizable localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("warning.inputOutputEmptyAction", arg0, arg1);
+    }
+
+    /**
+     * ignoring empty Action in {0} element of "{1}" operation, using default instead
+     *
+     */
+    public static String WARNING_INPUT_OUTPUT_EMPTY_ACTION(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWARNING_INPUT_OUTPUT_EMPTY_ACTION(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("internalizer.XPathEvaluatesToNoTarget", arg0);
+    }
+
+    /**
+     * XPath evaluation of "{0}" results in an empty target node
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
+        return LOCALIZER.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidTagNS", arg0, arg1, arg2, arg3, arg4);
+    }
+
+    /**
+     * Invalid WSDL at {4}: expected element "{2}" (in namespace "{3}"), found element "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_TAG_NS(Object arg0, Object arg1, Object arg2, Object arg3, Object arg4) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_TAG_NS(arg0, arg1, arg2, arg3, arg4));
+    }
+
+    public static Localizable localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.unknownNamespacePrefix", arg0);
+    }
+
+    /**
+     * undeclared namespace prefix: "{0}"
+     *
+     */
+    public static String PARSING_UNKNOWN_NAMESPACE_PREFIX(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_UNKNOWN_NAMESPACE_PREFIX(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidElement", arg0, arg1);
+    }
+
+    /**
+     * invalid element: "{0}" (in namespace "{1}")
+     *
+     */
+    public static String PARSING_INVALID_ELEMENT(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_ELEMENT(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.onlyOneDocumentationAllowed", arg0);
+    }
+
+    /**
+     * only one "documentation" element allowed in "{0}"
+     *
+     */
+    public static String PARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_ONLY_ONE_DOCUMENTATION_ALLOWED(arg0));
+    }
+
+    public static Localizable localizablePARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.parserConfigException", arg0);
+    }
+
+    /**
+     * invalid WSDL file! parsing failed: {0}
+     *
+     */
+    public static String PARSING_PARSER_CONFIG_EXCEPTION(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_PARSER_CONFIG_EXCEPTION(arg0));
+    }
+
+    public static Localizable localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.missingRequiredAttribute", arg0, arg1);
+    }
+
+    /**
+     * missing required attribute "{1}" of element "{0}"
+     *
+     */
+    public static String PARSING_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_MISSING_REQUIRED_ATTRIBUTE(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.missingRequiredSubEntity", arg0, arg1);
+    }
+
+    /**
+     * missing required sub-entity "{0}" of element "{1}"
+     *
+     */
+    public static String VALIDATION_MISSING_REQUIRED_SUB_ENTITY(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_MISSING_REQUIRED_SUB_ENTITY(arg0, arg1));
+    }
+
+    public static Localizable localizableVALIDATION_INVALID_ELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("validation.invalidElement", arg0);
+    }
+
+    /**
+     * invalid element: "{0}"
+     *
+     */
+    public static String VALIDATION_INVALID_ELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableVALIDATION_INVALID_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_AMBIGUOUS_NAME(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("validation.ambiguousName", arg0);
+    }
+
+    /**
+     * ambiguous operation name: "{0}"
+     *
+     */
+    public static String VALIDATION_AMBIGUOUS_NAME(Object arg0) {
+        return LOCALIZER.localize(localizableVALIDATION_AMBIGUOUS_NAME(arg0));
+    }
+
+    public static Localizable localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.saxExceptionWithSystemId", arg0);
+    }
+
+    /**
+     * invalid WSDL file! failed to parse document at "{0}"
+     *
+     */
+    public static String PARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_SAX_EXCEPTION_WITH_SYSTEM_ID(arg0));
+    }
+
+    public static Localizable localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.wsdlNotDefaultNamespace", arg0);
+    }
+
+    /**
+     * default namespace must be "{0}"
+     *
+     */
+    public static String PARSING_WSDL_NOT_DEFAULT_NAMESPACE(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_WSDL_NOT_DEFAULT_NAMESPACE(arg0));
+    }
+
+    public static Localizable localizablePARSING_INVALID_OPERATION_STYLE(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidOperationStyle", arg0);
+    }
+
+    /**
+     * operation "{0}" has an invalid style
+     *
+     */
+    public static String PARSING_INVALID_OPERATION_STYLE(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_OPERATION_STYLE(arg0));
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2001() {
+        return MESSAGE_FACTORY.getMessage("warning.wsi.r2001");
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must import only WSDL documents. It's trying to import: "{0}"
+     *
+     */
+    public static String WARNING_WSI_R_2001() {
+        return LOCALIZER.localize(localizableWARNING_WSI_R_2001());
+    }
+
+    public static Localizable localizableWARNING_WSI_R_2002(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("warning.wsi.r2002", arg0, arg1);
+    }
+
+    /**
+     * Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected WSDL namespace: {0}, found: {1}
+     *
+     */
+    public static String WARNING_WSI_R_2002(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableWARNING_WSI_R_2002(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_INVALID_TAG(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("parsing.invalidTag", arg0, arg1);
+    }
+
+    /**
+     * expected element "{1}", found "{0}"
+     *
+     */
+    public static String PARSING_INVALID_TAG(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizablePARSING_INVALID_TAG(arg0, arg1));
+    }
+
+    public static Localizable localizableINTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("internalizer.targetNotFound", arg0);
+    }
+
+    /**
+     *  No target found for the wsdlLocation: {0}
+     *
+     */
+    public static String INTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
+        return LOCALIZER.localize(localizableINTERNALIZER_TARGET_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("internalizer.XPathEvaluatesToNonElement", arg0);
+    }
+
+    /**
+     * XPath evaluation of "{0}" needs to result in an element.
+     *
+     */
+    public static String INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(Object arg0) {
+        return LOCALIZER.localize(localizableINTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(arg0));
+    }
+
+    public static Localizable localizableVALIDATION_UNSUPPORTED_USE_ENCODED(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("validation.unsupportedUse.encoded", arg0, arg1);
+    }
+
+    /**
+     * "Use of SOAP Encoding is not supported.
+     * SOAP extension element on line {0} in {1} has use="encoded" "
+     *
+     */
+    public static String VALIDATION_UNSUPPORTED_USE_ENCODED(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableVALIDATION_UNSUPPORTED_USE_ENCODED(arg0, arg1));
+    }
+
+    public static Localizable localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return MESSAGE_FACTORY.getMessage("parsing.elementOrTypeRequired", arg0);
+    }
+
+    /**
+     * warning: part {0} is ignored, either the "element" or the "type" attribute is required in part "{0}"
+     *
+     */
+    public static String PARSING_ELEMENT_OR_TYPE_REQUIRED(Object arg0) {
+        return LOCALIZER.localize(localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(arg0));
+    }
+
+    public static Localizable localizableENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
+        return MESSAGE_FACTORY.getMessage("entity.notFound.portType", arg0, arg1);
+    }
+
+    /**
+     * wsdl:portType "{0}" referenced by wsdl:binding "{1}", but it's not found in the wsdl
+     *
+     */
+    public static String ENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
+        return LOCALIZER.localize(localizableENTITY_NOT_FOUND_PORT_TYPE(arg0, arg1));
+    }
+
+    private static class BundleSupplier
+        implements ResourceBundleSupplier
+    {
+
+
+        public ResourceBundle getResourceBundle(Locale locale) {
+            return ResourceBundle.getBundle(BUNDLE_NAME, locale);
+        }
+
     }
 
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/newmessages.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/newmessages.properties
deleted file mode 100644
index bd358f254f9..00000000000
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/newmessages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-wrapperTask.needEndorsed=\
-You are running on JDK6 or newer which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} or newer API. Use \
-the standard override mechanism. 
-
-runtime.modeler.addressing.responses.nosuchmethod = JAX-WS 2.1 API is loaded from {0}, But JAX-WS runtime requires JAX-WS 2.2 or newer API. \
-  Use the standard override mechanism to load JAX-WS 2.2 or newer API.
\ No newline at end of file
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
index 94c7c57fc71..43a863fdfb2 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -142,18 +142,16 @@ wsgen.version=wsgen version \"{0}\"
 wsgen.fullversion=wsgen full version \"{0}\"
 
 wrapperTask.needEndorsed=\
-You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. \
-Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \
-or set xendorsed="true" on <{2}>.
+You are running on JDK6 or newer which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} or newer API. Use \
+the standard override mechanism.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=\
 You are loading JAX-WS {0} API from {1} but this tool requires JAX-WS {2} API.
 
 invoker.needEndorsed=\
-You are running on JDK6 which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} API. \
-Use the endorsed standards override mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \
-or use -Xendorsed option.
+You are running on JDK6 or newer which comes with JAX-WS {0} API, but this tool requires JAX-WS {1} or newer API. Use \
+the standard override mechanism.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties
index b325ad5be5a..d51973dc968 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\nVerwendung: {0} [options] <SEI>\n\n\\wobei [options] Folgendes umfa
 
 
 wsgen.usage.examples=\n\\Beispiele:\n\\  wsgen -cp . example.Stock\n\\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=Sie arbeiten mit JDK6, das mit JAX-WS {0}-API geliefert wird, dieses Tool erfordert jedoch JAX-WS {1}-API. Verwenden Sie das "Endorsed Standards Override Mechanism"-Verfahren (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), oder setzen Sie xendorsed="true" in <{2}>.
+wrapperTask.needEndorsed=Sie arbeiten mit JDK6 oder h\u00F6her, das mit der JAX-WS {0}-API geliefert wird. Dieses Tool erfordert jedoch JAX-WS {1} oder eine neuere API. Verwenden Sie das Standard-Override-Verfahren.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=Sie laden JAX-WS {0}-API aus {1}, dieses Tool erfordert jedoch JAX-WS {2}-API.
 
-invoker.needEndorsed=Sie arbeiten mit JDK6, das mit JAX-WS {0}-API geliefert wird, dieses Tool erfordert jedoch JAX-WS {1}-API. Verwenden Sie das "Endorsed Standards Override Mechanism"-Verfahren (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), oder verwenden Sie die Option "-Xendorsed".
+invoker.needEndorsed=Sie arbeiten mit JDK6 oder h\u00F6her, das mit der JAX-WS {0}-API geliefert wird. Dieses Tool erfordert jedoch JAX-WS {1} oder eine neuere API. Verwenden Sie das Standard-Override-Verfahren.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties
index 5c3906c63dd..57ffdc5dbf3 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_es.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\nSintaxis: {0} [options] <SEI>\n\n\\donde [options] incluye:\n\\  -c
 
 
 wsgen.usage.examples=\n\\Ejemplos:\n\\ wsgen -cp . example.Stock\n\\ wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=Est\u00e1 utilizando JDK6, que incluye la API JAX-WS {0}, pero esta herramienta necesita la API JAX-WS {1}. Utilice el mecanismo de sustituci\u00f3n de los est\u00e1ndares aprobados (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), o defina xendorsed="true" en <{2}>.
+wrapperTask.needEndorsed=Est\u00E1 ejecutando JDK6 o una versi\u00F3n posterior que incluye la API JAX-WS {0}, pero esta herramienta necesita la API JAX-WS {1} o una versi\u00F3n posterior. Utilice el mecanismo de sustituci\u00F3n de est\u00E1ndares.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=Est\u00e1 cargando la API JAX-WS {0} desde {1}, pero esta herramienta necesita la API JAX-WS {2}.
 
-invoker.needEndorsed=Est\u00e1 utilizando JDK6, que incluye la API JAX-WS {0}, pero esta herramienta necesita la API JAX-WS {1}. Utilice el mecanismo de sustituci\u00f3n de los est\u00e1ndares aprobados (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), o utilice la opci\u00f3n -Xendorsed.
+invoker.needEndorsed=Est\u00E1 ejecutando JDK6 o una versi\u00F3n posterior que incluye la API JAX-WS {0}, pero esta herramienta necesita la API JAX-WS {1} o una versi\u00F3n posterior. Utilice el mecanismo de sustituci\u00F3n de est\u00E1ndares.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties
index c26d69e9b8e..6931093f120 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_fr.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\nSyntaxe : {0} [options] <SEI>\n\n\\o\u00f9 [options] incluent :\n\
 
 
 wsgen.usage.examples=\n\\Exemples :\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=Vous ex\u00e9cutez JDK6, qui comporte l''API JAX-WS {0}, mais cet outil exige l''API JAX-WS {1}. Utilisez le m\u00e9canisme Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), ou d\u00e9finissez xendorsed="True" sur <{2}>.
+wrapperTask.needEndorsed=Vous ex\u00E9cutez JDK6 ou une version ult\u00E9rieure, qui est fournie avec l''API JAX-WS {0}, mais cet outil exige l''API JAX-WS {1} ou une version plus r\u00E9cente. Utilisez le m\u00E9canisme Standard Override Mechanism.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=Vous \u00eates en train de charger l''API JAX-WS {0} \u00e0 partir de {1}, mais cet outil exige l''API JAX-WS {2}.
 
-invoker.needEndorsed=Vous ex\u00e9cutez JDK6, qui comporte l''API JAX-WS {0}, mais cet outil exige l''API JAX-WS {1}. Utilisez le m\u00e9canisme Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), ou utilisez l''option -Xendorsed.
+invoker.needEndorsed=Vous ex\u00E9cutez JDK6 ou une version ult\u00E9rieure, qui est fournie avec l''API JAX-WS {0}, mais cet outil exige l''API JAX-WS {1} ou une version plus r\u00E9cente. Utilisez le m\u00E9canisme Standard Override Mechanism.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties
index 92a0c8cba5a..f0d82449eae 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_it.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\nUso: {0} [options] <SEI>\n\n\\dove [options] include:\n\  -classpat
 
 
 wsgen.usage.examples=\n\\Esempi:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=\u00c8 in corso l''esecuzione su JDK6, fornito con l''API JAX-WS {0} ma questo strumento richiede l''API JAX-WS {1}. Usare il meccanismo Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/) o impostare xendorsed="true" su <{2}>.
+wrapperTask.needEndorsed=\u00C8 in corso l''esecuzione su JDK6 o versione successiva, fornito con l''API JAX-WS {0}, ma questo strumento richiede l''API JAX-WS {1} o versione successiva. Usare il meccanismo di sostituzione standard.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=\u00c8 in corso il caricamento dell''API JAX-WS {0} da {1} ma questo strumento richiede l''API JAX-WS {2}.
 
-invoker.needEndorsed=\u00c8 in corso l''esecuzione su JDK6, fornito con l''API JAX-WS {0} ma questo strumento richiede l''API JAX-WS {1}. Usare il meccanismo Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/) o usare l''opzione -Xendorsed.
+invoker.needEndorsed=\u00C8 in corso l''esecuzione su JDK6 o versione successiva, fornito con l''API JAX-WS {0}, ma questo strumento richiede l''API JAX-WS {1} o versione successiva. Usare il meccanismo di sostituzione standard.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties
index 65561cc41a1..ed0276a4e4c 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\n\u4f7f\u7528\u65b9\u6cd5: {0} [options] <SEI>\n\n\\[options]\u306b\
 
 
 wsgen.usage.examples=\n\\\u4f8b:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=JAX-WS {0} API\u306b\u4ed8\u5c5e\u3057\u305fJDK6\u3067\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u306e\u30c4\u30fc\u30eb\u306b\u306fJAX-WS {1} API\u304c\u5fc5\u8981\u3067\u3059\u3002Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/)\u3092\u4f7f\u7528\u3059\u308b\u304b\u3001<{2}>\u3067xendorsed="true"\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+wrapperTask.needEndorsed=JAX-WS {0} API\u306B\u4ED8\u5C5E\u3057\u305FJDK6\u4EE5\u4E0A\u3067\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u306E\u30C4\u30FC\u30EB\u306B\u306FJAX-WS {1}\u4EE5\u4E0A\u306EAPI\u304C\u5FC5\u8981\u3067\u3059\u3002Standards Override Mechanism\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi={1}\u304b\u3089JAX-WS {0} API\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u306e\u30c4\u30fc\u30eb\u306b\u306fJAX-WS {2} API\u304c\u5fc5\u8981\u3067\u3059\u3002
 
-invoker.needEndorsed=JAX-WS {0} API\u306b\u4ed8\u5c5e\u3057\u305fJDK6\u3067\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u306e\u30c4\u30fc\u30eb\u306b\u306fJAX-WS {1} API\u304c\u5fc5\u8981\u3067\u3059\u3002Endorsed Standards Override Mechanism (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/)\u3092\u4f7f\u7528\u3059\u308b\u304b\u3001-Xendorsed\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+invoker.needEndorsed=JAX-WS {0} API\u306B\u4ED8\u5C5E\u3057\u305FJDK6\u4EE5\u4E0A\u3067\u5B9F\u884C\u3057\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u306E\u30C4\u30FC\u30EB\u306B\u306FJAX-WS {1}\u4EE5\u4E0A\u306EAPI\u304C\u5FC5\u8981\u3067\u3059\u3002Standards Override Mechanism\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties
index c6571186abd..6ea2065a4ea 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_ko.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\n\uc0ac\uc6a9\ubc95: {0} [options] <SEI>\n\n\\\uc5ec\uae30\uc11c [op
 
 
 wsgen.usage.examples=\n\\\uc608:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=JAX-WS {0} API\uc640 \ud568\uaed8 \uc81c\uacf5\ub418\ub294 JDK6\uc5d0\uc11c \uc2e4\ud589\ud558\uace0 \uc788\uc9c0\ub9cc \uc774 \ud234\uc744 \uc0ac\uc6a9\ud558\ub824\uba74 JAX-WS {1} API\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc778\uc99d\ub41c \ud45c\uc900 \ubb34\ud6a8\ud654 \ubc29\uc2dd(http://docs.oracle.com/javase/6/docs/technotes/guides/standards/)\uc744 \uc0ac\uc6a9\ud558\uac70\ub098 <{2}>\uc5d0 \ub300\ud574 xendorsed="true"\ub97c \uc124\uc815\ud558\uc2ed\uc2dc\uc624.
+wrapperTask.needEndorsed=JAX-WS {0} API\uC640 \uD568\uAED8 \uC81C\uACF5\uB418\uB294 JDK6 \uC774\uC0C1\uC5D0\uC11C \uC2E4\uD589\uD558\uACE0 \uC788\uC9C0\uB9CC \uC774 \uD234\uC744 \uC0AC\uC6A9\uD558\uB824\uBA74 JAX-WS {1} \uC774\uC0C1 API\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. \uD45C\uC900 \uBB34\uD6A8\uD654 \uBC29\uC2DD\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi={1}\uc5d0\uc11c JAX-WS {0} API\ub97c \ub85c\ub4dc\ud558\uace0 \uc788\uc9c0\ub9cc \uc774 \ud234\uc744 \uc0ac\uc6a9\ud558\ub824\uba74 JAX-WS {2} API\uac00 \ud544\uc694\ud569\ub2c8\ub2e4.
 
-invoker.needEndorsed=JAX-WS {0} API\uc640 \ud568\uaed8 \uc81c\uacf5\ub418\ub294 JDK6\uc5d0\uc11c \uc2e4\ud589\ud558\uace0 \uc788\uc9c0\ub9cc \uc774 \ud234\uc744 \uc0ac\uc6a9\ud558\ub824\uba74 JAX-WS {1} API\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc778\uc99d\ub41c \ud45c\uc900 \ubb34\ud6a8\ud654 \ubc29\uc2dd(http://docs.oracle.com/javase/6/docs/technotes/guides/standards/)\uc744 \uc0ac\uc6a9\ud558\uac70\ub098 -Xendorsed \uc635\uc158\uc744 \uc0ac\uc6a9\ud558\uc2ed\uc2dc\uc624.
+invoker.needEndorsed=JAX-WS {0} API\uC640 \uD568\uAED8 \uC81C\uACF5\uB418\uB294 JDK6 \uC774\uC0C1\uC5D0\uC11C \uC2E4\uD589\uD558\uACE0 \uC788\uC9C0\uB9CC \uC774 \uD234\uC744 \uC0AC\uC6A9\uD558\uB824\uBA74 JAX-WS {1} \uC774\uC0C1 API\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. \uD45C\uC900 \uBB34\uD6A8\uD654 \uBC29\uC2DD\uC744 \uC0AC\uC6A9\uD558\uC2ED\uC2DC\uC624.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties
index 3806bf2a029..d479d1901a7 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_pt_BR.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\nUso: {0} [options] <SEI>\n\n\\onde [options] inclui:\n\\  -classpat
 
 
 wsgen.usage.examples=\n\\Exemplos:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=Voc\u00ea est\u00e1 executando no JDK6 que vem com a API de JAX-WS {0}, mas esta ferramenta exige a API de JAX-WS {1}. Use o mecanismo de substitui\u00e7\u00e3o de padr\u00f5es endossados (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/) ou defina xendorsed="true" em <{2}>.
+wrapperTask.needEndorsed=Voc\u00EA est\u00E1 executando no JDK6 ou mais recente que vem com a API de JAX-WS {0}, mas esta ferramenta exige a API de JAX-WS {1} ou mais recente. Use o mecanismo de substitui\u00E7\u00E3o de padr\u00F5es.
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=Voc\u00ea est\u00e1 carregando a API de JAX-WS {0} de {1}, mas esta ferramenta requer a API de JAX-WS {2}.
 
-invoker.needEndorsed=Voc\u00ea est\u00e1 executando no JDK6 que vem com a API de JAX-WS {0}, mas esta ferramenta exige a API de JAX-WS {1}. Use o mecanismo de substitui\u00e7\u00e3o de padr\u00f5es endossados (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), ou use a op\u00e7\u00e3o -Xendorsed.
+invoker.needEndorsed=Voc\u00EA est\u00E1 executando no JDK6 ou mais recente que vem com a API de JAX-WS {0}, mas esta ferramenta exige a API de JAX-WS {1} ou mais recente. Use o mecanismo de substitui\u00E7\u00E3o de padr\u00F5es.
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties
index 1eabe9a7baa..32f92fd4993 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\n\u7528\u6cd5: {0} [options] <SEI>\n\n\\\u5176\u4e2d [options] \u530
 
 
 wsgen.usage.examples=\n\\\u793a\u4f8b:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=\u60a8\u6b63\u5728\u9644\u5e26 JAX-WS {0} API \u7684 JDK6 \u4e0a\u8fd0\u884c, \u4f46\u6b64\u5de5\u5177\u9700\u8981 JAX-WS {1} API\u3002\u8bf7\u4f7f\u7528\u6388\u6743\u6807\u51c6\u8986\u76d6\u673a\u5236 (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \u6216\u8005\u5728 <{2}> \u4e0a\u8bbe\u7f6e xendorsed="true"\u3002
+wrapperTask.needEndorsed=\u60A8\u6B63\u5728\u9644\u5E26 JAX-WS {0} API \u7684 JDK6 \u6216\u66F4\u65B0\u7248\u672C\u4E0A\u8FD0\u884C, \u4F46\u6B64\u5DE5\u5177\u9700\u8981 JAX-WS {1} \u6216\u66F4\u65B0\u7684 API\u3002\u8BF7\u4F7F\u7528\u6807\u51C6\u8986\u76D6\u673A\u5236\u3002
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=\u60a8\u6b63\u5728\u4ece{1}\u52a0\u8f7d JAX-WS {0} API, \u4f46\u6b64\u5de5\u5177\u9700\u8981 JAX-WS {2} API\u3002
 
-invoker.needEndorsed=\u60a8\u6b63\u5728\u9644\u5e26 JAX-WS {0} API \u7684 JDK6 \u4e0a\u8fd0\u884c, \u4f46\u6b64\u5de5\u5177\u9700\u8981 JAX-WS {1} API\u3002\u8bf7\u4f7f\u7528\u6388\u6743\u6807\u51c6\u8986\u76d6\u673a\u5236 (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \u6216\u8005\u4f7f\u7528 -Xendorsed \u9009\u9879\u3002
+invoker.needEndorsed=\u60A8\u6B63\u5728\u9644\u5E26 JAX-WS {0} API \u7684 JDK6 \u6216\u66F4\u65B0\u7248\u672C\u4E0A\u8FD0\u884C, \u4F46\u6B64\u5DE5\u5177\u9700\u8981 JAX-WS {1} \u6216\u66F4\u65B0\u7684 API\u3002\u8BF7\u4F7F\u7528\u6807\u51C6\u8986\u76D6\u673A\u5236\u3002
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties
index 6c338863b1d..40b2297b594 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/resources/wscompile_zh_TW.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, 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
@@ -38,12 +38,12 @@ wsgen.help=\n\u7528\u6cd5: {0} [options] <SEI>\n\n\\\u5176\u4e2d [options] \u530
 
 
 wsgen.usage.examples=\n\\\u7bc4\u4f8b:\n\  wsgen -cp . example.Stock\n\  wsgen -cp . example.Stock -wsdl -servicename '{http://mynamespace}MyService'\n
-wrapperTask.needEndorsed=\u60a8\u76ee\u524d\u57f7\u884c\u96a8\u9644\u65bc JAX-WS {0} API \u7684 JDK6, \u4f46\u662f\u6b64\u5de5\u5177\u9700\u8981\u4f7f\u7528 JAX-WS {1} API. \u8acb\u4f7f\u7528\u8a8d\u53ef\u7684\u6a19\u6e96\u8986\u5beb\u6a5f\u5236 (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \u6216\u8005\u5728 <{2}> \u8a2d\u5b9a xendorsed="true".
+wrapperTask.needEndorsed=\u60A8\u76EE\u524D\u57F7\u884C\u96A8\u9644\u65BC JAX-WS {0} API \u7684 JDK6 \u6216\u66F4\u65B0\u7248\u672C\uFF0C\u4F46\u662F\u6B64\u5DE5\u5177\u9700\u8981\u642D\u914D JAX-WS {1} \u6216\u66F4\u65B0\u7248\u672C\u7684 API\u3002\u8ACB\u4F7F\u7528\u6A19\u6E96\u8986\u5BEB\u6A5F\u5236\u3002
 
 # {0}, {2} - version (e.g. 2.1), {1} - absolute class location
 wrapperTask.loadingIncorrectApi=\u60a8\u6b63\u5728\u5f9e {1} \u8f09\u5165 JAX-WS {0} API, \u4f46\u662f\u6b64\u5de5\u5177\u9700\u8981\u4f7f\u7528 JAX-WS {2} API.
 
-invoker.needEndorsed=\u60a8\u76ee\u524d\u57f7\u884c\u96a8\u9644\u65bc JAX-WS {0} API \u7684 JDK6, \u4f46\u662f\u6b64\u5de5\u5177\u9700\u8981\u4f7f\u7528 JAX-WS {1} API. \u8acb\u4f7f\u7528\u8a8d\u53ef\u7684\u6a19\u6e96\u8986\u5beb\u6a5f\u5236 (http://docs.oracle.com/javase/6/docs/technotes/guides/standards/), \u6216\u8005\u4f7f\u7528 -Xendorsed \u9078\u9805.
+invoker.needEndorsed=\u60A8\u76EE\u524D\u57F7\u884C\u96A8\u9644\u65BC JAX-WS {0} API \u7684 JDK6 \u6216\u66F4\u65B0\u7248\u672C\uFF0C\u4F46\u662F\u6B64\u5DE5\u5177\u9700\u8981\u642D\u914D JAX-WS {1} \u6216\u66F4\u65B0\u7248\u672C\u7684 API\u3002\u8ACB\u4F7F\u7528\u6A19\u6E96\u8986\u5BEB\u6A5F\u5236\u3002
 
 
 #
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
index b9ceb98e6cb..1ea2ae0a8f9 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -27,9 +27,6 @@ package com.sun.tools.internal.ws.util;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 /**
   * @author WS Development Team
   */
@@ -46,9 +43,4 @@ public class WSDLParseException extends JAXWSExceptionBase {
     public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.util";
     }
-
-    @Override
-    public ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
-    }
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties
index 82452acb3d7..88eace686b6 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/version.properties
@@ -26,4 +26,4 @@
 build-id=2.3.0-SNAPSHOT
 build-version=JAX-WS RI 2.3.0-SNAPSHOT
 major-version=2.3.0
-svn-revision=e8c5e9697d9b27d83ff35d767939b2f55e667621
+svn-revision=3012ef421cf43774943c57736dac2207aeea9f07
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
index f98dfcf9708..73061693351 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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,9 +28,6 @@ package com.sun.tools.internal.ws.wsdl.framework;
 import com.sun.istack.internal.localization.Localizable;
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 /**
  * An exception signalling a parsing error.
  *
@@ -53,9 +50,4 @@ public class ParseException extends JAXWSExceptionBase {
     public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
-
-    @Override
-    public ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
-    }
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
index 708d8b190e7..d73b5fb0d4d 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -27,9 +27,6 @@ package com.sun.tools.internal.ws.wsdl.framework;
 
 import com.sun.xml.internal.ws.util.exception.JAXWSExceptionBase;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 /**
  * An exception signalling that validation of an entity failed.
  *
@@ -48,9 +45,4 @@ public class ValidationException extends JAXWSExceptionBase {
     public String getDefaultResourceBundleName() {
         return "com.sun.tools.internal.ws.resources.wsdl";
     }
-
-    @Override
-    public ResourceBundle getResourceBundle(Locale locale) {
-        return ResourceBundle.getBundle(getDefaultResourceBundleName(), locale);
-    }
 }
diff --git a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
index aed48abe794..e105d2f386c 100644
--- a/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
+++ b/jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -115,12 +115,26 @@ public class DOMForest {
         try {
             // secure xml processing can be switched off if input requires it
             boolean secureProcessingEnabled = options == null || !options.disableXmlSecurity;
-            DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(secureProcessingEnabled);
+            DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(!secureProcessingEnabled);
             dbf.setNamespaceAware(true);
             this.documentBuilder = dbf.newDocumentBuilder();
 
             this.parserFactory = XmlUtil.newSAXParserFactory(secureProcessingEnabled);
             this.parserFactory.setNamespaceAware(true);
+
+            if(secureProcessingEnabled){
+                dbf.setExpandEntityReferences(false);
+                try {
+                parserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+                parserFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+                parserFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+              } catch (SAXNotRecognizedException e){
+                throw new ParserConfigurationException(e.getMessage());
+              } catch (SAXNotSupportedException e) {
+                throw new ParserConfigurationException(e.getMessage());
+              }
+            }
+
         } catch (ParserConfigurationException e) {
             throw new AssertionError(e);
         }

From 65ef5fbef075a95c8b362646b7c3646b23e567b6 Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Sun, 18 Jun 2017 23:10:05 +0100
Subject: [PATCH 25/83] 8176508: Update JAX-WS RI integration to latest version

Reviewed-by: lancea, mchung, alanb, iris
---
 jaxp/src/java.xml/share/classes/module-info.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jaxp/src/java.xml/share/classes/module-info.java b/jaxp/src/java.xml/share/classes/module-info.java
index 584b7f11854..53f166f8a82 100644
--- a/jaxp/src/java.xml/share/classes/module-info.java
+++ b/jaxp/src/java.xml/share/classes/module-info.java
@@ -82,8 +82,6 @@ module java.xml {
         java.xml.crypto;
     exports com.sun.org.apache.xpath.internal.res to
         java.xml.crypto;
-    // reflection access from com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory
-    exports com.sun.xml.internal.stream.writers to java.xml.ws;
 
     uses javax.xml.datatype.DatatypeFactory;
     uses javax.xml.parsers.DocumentBuilderFactory;

From 06cf2f81e727bc27bd1e7d933b927fd9f02f674e Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 19 Jun 2017 05:56:49 +0200
Subject: [PATCH 26/83] 8182162: Remove -XD-Xmodule

Removing the undocumented -XD-Xmodule: option.

Reviewed-by: jjg
---
 .../com/sun/tools/javac/comp/Modules.java     | 22 +----
 .../javac/modules/LegacyXModuleTest.java      | 85 -------------------
 2 files changed, 2 insertions(+), 105 deletions(-)
 delete mode 100644 langtools/test/tools/javac/modules/LegacyXModuleTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 32ef920cce6..55118280e3d 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -146,8 +146,6 @@ public class Modules extends JCTree.Visitor {
 
     public final boolean multiModuleMode;
 
-    private final String legacyModuleOverride;
-
     private final Name java_se;
     private final Name java_;
 
@@ -196,14 +194,6 @@ public class Modules extends JCTree.Visitor {
         allowAccessIntoSystem = options.isUnset(Option.RELEASE);
         lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option);
 
-        Collection<String> xmodules = options.keySet()
-                                             .stream()
-                                             .filter(opt -> opt.startsWith(XMODULES_PREFIX))
-                                             .map(opt -> opt.substring(XMODULES_PREFIX.length()))
-                                             .collect(Collectors.toList());
-
-        legacyModuleOverride = xmodules.size() == 1 ? xmodules.iterator().next() : null;
-
         multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH);
         ClassWriter classWriter = ClassWriter.instance(context);
         classWriter.multiModuleMode = multiModuleMode;
@@ -469,9 +459,6 @@ public class Modules extends JCTree.Visitor {
                             if (moduleOverride != null) {
                                 checkNoAllModulePath();
                                 defaultModule = moduleFinder.findModule(names.fromString(moduleOverride));
-                                if (legacyModuleOverride != null) {
-                                    defaultModule.sourceLocation = StandardLocation.SOURCE_PATH;
-                                }
                                 defaultModule.patchOutputLocation = StandardLocation.CLASS_OUTPUT;
                             } else {
                                 // Question: why not do findAllModules and initVisiblePackages here?
@@ -546,11 +533,6 @@ public class Modules extends JCTree.Visitor {
     }
 
     private void checkSourceLocation(JCCompilationUnit tree, ModuleSymbol msym) {
-        // skip check if legacy module override still in use
-        if (legacyModuleOverride != null) {
-            return;
-        }
-
         try {
             JavaFileObject fo = tree.sourcefile;
             if (fileManager.contains(msym.sourceLocation, fo)) {
@@ -582,7 +564,7 @@ public class Modules extends JCTree.Visitor {
 
     private String singleModuleOverride(List<JCCompilationUnit> trees) {
         if (!fileManager.hasLocation(StandardLocation.PATCH_MODULE_PATH)) {
-            return legacyModuleOverride;
+            return null;
         }
 
         Set<String> override = new LinkedHashSet<>();
@@ -602,7 +584,7 @@ public class Modules extends JCTree.Visitor {
         }
 
         switch (override.size()) {
-            case 0: return legacyModuleOverride;
+            case 0: return null;
             case 1: return override.iterator().next();
             default:
                 log.error(Errors.TooManyPatchedModules(override));
diff --git a/langtools/test/tools/javac/modules/LegacyXModuleTest.java b/langtools/test/tools/javac/modules/LegacyXModuleTest.java
deleted file mode 100644
index 36113364e06..00000000000
--- a/langtools/test/tools/javac/modules/LegacyXModuleTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2017, 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 8178012
- * @summary tests for multi-module mode compilation
- * @library /tools/lib
- * @modules
- *      jdk.compiler/com.sun.tools.javac.api
- *      jdk.compiler/com.sun.tools.javac.main
- * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
- * @run main LegacyXModuleTest
- */
-
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import toolbox.JavacTask;
-import toolbox.Task;
-
-public class LegacyXModuleTest extends ModuleTestBase {
-
-    public static void main(String... args) throws Exception {
-        new LegacyXModuleTest().runTests();
-    }
-
-    @Test
-    public void testLegacyXModule(Path base) throws Exception {
-        //note: avoiding use of java.base, as that gets special handling on some places:
-        Path src = base.resolve("src");
-        tb.writeJavaFiles(src, "package com.sun.tools.javac.comp; public class Extra { Modules modules; }");
-        Path classes = base.resolve("classes");
-        tb.createDirectories(classes);
-
-        new JavacTask(tb)
-            .options("-XD-Xmodule:jdk.compiler")
-            .outdir(classes)
-            .files(findJavaFiles(src))
-            .run()
-            .writeAll()
-            .getOutput(Task.OutputKind.DIRECT);
-
-        List<String> log = new JavacTask(tb)
-                .options("-XD-Xmodule:java.compiler",
-                         "-XD-Xmodule:jdk.compiler",
-                         "-XDrawDiagnostics")
-                .outdir(classes)
-                .files(findJavaFiles(src))
-                .run(Task.Expect.FAIL)
-                .writeAll()
-                .getOutputLines(Task.OutputKind.DIRECT);
-
-        List<String> actual =
-                Arrays.asList("Extra.java:1:56: compiler.err.cant.resolve.location: kindname.class, Modules, , , " +
-                                                "(compiler.misc.location: kindname.class, com.sun.tools.javac.comp.Extra, null)",
-                              "1 error");
-
-        if (!Objects.equals(actual, log))
-            throw new Exception("expected output not found: " + log);
-    }
-
-}

From 8906ca8e00314423f3c5acfedc96168ab2dbf2b6 Mon Sep 17 00:00:00 2001
From: Mark Reinhold <mr@openjdk.org>
Date: Mon, 19 Jun 2017 18:20:42 +0200
Subject: [PATCH 27/83] 8182408: Simplify the API-specification overview page

Reviewed-by: erikj, mchung, jrose, alanb
---
 make/Docs.gmk | 95 +++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 49 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 0abf9e1de5d..1f1adf4add0 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -116,9 +116,9 @@ endif
 # General text snippets
 
 FULL_COMPANY_NAME := Oracle and/or its affiliates
-COMPANY_ADDRESS := 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA
+COMPANY_ADDRESS := 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 
-JAVA_PLATFORM := Java&trade; Platform
+JAVA_PLATFORM := Java Platform
 
 ifeq ($(IS_DRAFT), true)
   DRAFT_MARKER_STR := <br><strong>DRAFT $(VERSION_STRING)</strong>
@@ -127,46 +127,44 @@ ifeq ($(IS_DRAFT), true)
   else
     DRAFT_MARKER_TITLE := [build $(VERSION_BUILD)]
   endif
-  DRAFT_TEXT := Please note that the specifications and other information \
-      contained herein are not final and are subject to change. The \
-      information is being made available to you solely for purpose of \
-      evaluation.
+  DRAFT_TEXT := This specification is not final and is subject to change. \
+      Use is subject to <a href="$(LICENSE_URL)">license terms</a>.
 endif
 
 JAVADOC_BOTTOM := \
-    <span style="font-size:smaller"> \
-    <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a><br> \
-    For further API reference and developer documentation, see \
+    <a href="$(BUG_SUBMIT_URL)">Report a bug or suggest an enhancement</a><br> \
+    For further API reference and developer documentation see the \
     <a href="$(JAVADOC_BASE_URL)" target="_blank">Java SE \
-    Documentation</a>. That documentation contains more detailed, \
-    developer-targeted descriptions, with conceptual overviews, definitions \
+    Documentation</a>, which contains more detailed, \
+    developer-targeted descriptions with conceptual overviews, definitions \
     of terms, workarounds, and working code examples.<br> \
     Java is a trademark or registered trademark of $(FULL_COMPANY_NAME) in \
     the US and other countries.<br> \
     <a href="$(COPYRIGHT_URL)">Copyright</a> \
-    &copy; 1993, $(COPYRIGHT_YEAR), $(FULL_COMPANY_NAME). \
-    $(COMPANY_ADDRESS). All rights reserved. \
-    Use is subject to <a href="$(LICENSE_URL)">license terms</a>. Also see the \
+    &copy; 1993, $(COPYRIGHT_YEAR), $(FULL_COMPANY_NAME), \
+    $(COMPANY_ADDRESS).<br>All rights reserved. \
+    Use is subject to <a href="$(LICENSE_URL)">license terms</a> and the \
     <a href="$(REDISTRIBUTION_URL)">documentation redistribution policy</a>. \
-    $(DRAFT_MARKER_STR)</span>
+    $(DRAFT_MARKER_STR) <!-- Version $(VERSION_STRING) -->
+
 
 JAVADOC_TOP := \
-    <div style="background-color: $(HASH)EEEEEE"><div style="padding: 6px; \
-    margin-top: 2px; margin-bottom: 6px; margin-left: 6px; margin-right: \
-    6px; text-align: justify; font-size: 80%; font-family: Helvetica, Arial, \
-    sans-serif; font-weight: normal;">$(DRAFT_TEXT)</div></div>
+    <div style="padding: 6px; text-align: center; font-size: 80%; \
+    font-family: DejaVu Sans, Arial, Helvetica, sans-serif; \
+    font-weight: normal;">$(DRAFT_TEXT)</div>
 
 ################################################################################
 # JDK javadoc titles/text snippets
 
-JDK_SHORT_NAME := JDK&trade; $(VERSION_SPECIFICATION)
-JDK_LONG_NAME := Standard Edition Development Kit (JDK&trade;) $(VERSION_SPECIFICATION)
+JDK_SHORT_NAME := Java SE $(VERSION_SPECIFICATION) &amp; JDK $(VERSION_SPECIFICATION)
+JDK_LONG_NAME := Java<sup>&reg;</sup> Platform, Standard Edition \
+    <span style="white-space: nowrap;">&amp; Java Development Kit</span>
 
 ################################################################################
 # Java SE javadoc titles/text snippets
 
-JAVASE_SHORT_NAME := SE $(VERSION_SPECIFICATION)
-JAVASE_LONG_NAME := Standard Edition $(VERSION_SPECIFICATION)
+JAVASE_SHORT_NAME := Java SE $(VERSION_SPECIFICATION)
+JAVASE_LONG_NAME := Java<sup>&reg;</sup> Platform, Standard Edition
 
 ################################################################################
 # Functions
@@ -199,23 +197,19 @@ define create_overview_file
   $1_OVERVIEW_TEXT := \
       <!DOCTYPE html> \
       <html><head></head><body> \
-      <p>This document is the API specification for $$($1_FULL_NAME).</p> \
       #
   ifneq ($$($1_GROUPS),)
     $1_OVERVIEW_TEXT += \
-        <dl> \
-        #
+      <p>This document is divided into \
+      $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) sections:</p> \
+      <blockquote><dl> \
+      #
     $1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
-        <dt><a href="\#$$g">$$($$g_GROUP_NAME)</a></dt> \
-        <dd>$$($$g_GROUP_DESCRIPTION)</dt> \
+        <dt style="margin-top: 8px;"><a href="\#$$g">$$($$g_GROUP_NAME)</a></dt> \
+        <dd style="margin-top: 8px;">$$($$g_GROUP_DESCRIPTION)</dt> \
     )
     $1_OVERVIEW_TEXT += \
-        </dl> \
-        #
-  endif
-  ifeq ($$(IS_DRAFT), true)
-    $1_OVERVIEW_TEXT += \
-        <p><strong>$$(DRAFT_TEXT)</strong></p> \
+        </dl><blockquote> \
         #
   endif
   $1_OVERVIEW_TEXT += \
@@ -273,13 +267,16 @@ define SetupApiDocsGenerationBody
   $1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \
       $$(JAVADOC_DISABLED_DOCLINT)))
 
-  $1_FULL_NAME := $$(JAVA_PLATFORM), $$($1_LONG_NAME) \
-      $$(DRAFT_MARKER_TITLE)
-  $1_DOC_TITLE := $$($1_FULL_NAME)<br>API Specification
-  $1_WINDOW_TITLE := $$(subst &trade;,,$$(JAVA_PLATFORM) $$($1_SHORT_NAME)) \
+  $1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API Specification
+  $1_WINDOW_TITLE := $$(subst &amp;,&,$$($1_SHORT_NAME)) \
     $$(DRAFT_MARKER_TITLE)
-  $1_HEADER_TITLE := <strong>$$(JAVA_PLATFORM)<br>$$($1_SHORT_NAME)</strong> \
-      $$(DRAFT_MARKER_STR)
+  ifeq ($(VERSION_IS_GA), true) # Workaround stylesheet bug
+    $1_HEADER_PAD := 14
+  else
+    $1_HEADER_PAD := 9
+  endif
+  $1_HEADER_TITLE := <div style="margin-top: $$($1_HEADER_PAD)px;"><strong>$$($1_SHORT_NAME)</strong> \
+      $$(DRAFT_MARKER_STR)</div>
 
   $1_OPTIONS += -doctitle '$$($1_DOC_TITLE)'
   $1_OPTIONS += -windowtitle '$$($1_WINDOW_TITLE)'
@@ -373,18 +370,18 @@ JavaSE_GROUP_NAME := Java SE
 JavaSE_GROUP_MODULES := $(call ColonList, $(sort java.se.ee \
     $(call FindTransitiveIndirectDepsForModules, java.se.ee)))
 JavaSE_GROUP_DESCRIPTION := \
-    The Java Platform, Standard Edition ("Java SE") APIs define the core Java \
-    platform for general-purpose computing. These APIs are in modules with \
-    names starting with the string "java.". \
+    The Java Platform, Standard Edition (Java SE) APIs define the core Java \
+    platform for general-purpose computing. These APIs are in modules whose \
+    names start with {@code java}. \
     #
 JDK_GROUPS += JavaSE
 
 JDK_GROUP_NAME := JDK
 JDK_GROUP_MODULES := jdk.*
 JDK_GROUP_DESCRIPTION := \
-    The Java Development Kit ("JDK") APIs define an implementation of the Java \
-    SE Platform which may include platform-specific details. These APIs are in \
-    modules with names starting with the string "jdk.". \
+    The Java Development Kit (JDK) APIs are specific to the JDK and will not \
+    necessarily be available in all implementations of the Java SE Platform. \
+    These APIs are in modules whose names start with {@code jdk}. \
     #
 JDK_GROUPS += JDK
 
@@ -395,9 +392,9 @@ ifneq ($(findstring javafx., $(IMPORTED_MODULES)), )
   JavaFX_GROUP_NAME := JavaFX
   JavaFX_GROUP_MODULES := javafx.*
   JavaFX_GROUP_DESCRIPTION := \
-      The JavaFX APIs define a set of user interface (UI) controls, graphics, \
+      The JavaFX APIs define a set of user-interface controls, graphics, \
       media, and web packages for developing rich client applications. These \
-      APIs are in modules with names starting with the string "javafx.". \
+      APIs are in modules whose names start with {@code javafx}. \
       #
   JDK_GROUPS += JavaFX
 endif
@@ -419,7 +416,7 @@ $(eval $(call SetupApiDocsGeneration, JDK_API, \
 ################################################################################
 # Setup generation of the Java SE API documentation (javadoc + modulegraph)
 
-# The Java SE module scope is just java.se.ee and it's transitive indirect
+# The Java SE module scope is just java.se.ee and its transitive indirect
 # exports.
 JAVASE_MODULES := java.se.ee
 

From dda120e874a24d252d61789467f8baeff967cc40 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 19 Jun 2017 12:25:02 -0700
Subject: [PATCH 28/83] 8182492: docs bundle needs legal notices for 3rd party
 libraries distributed for javadoc search

Reviewed-by: jjg
---
 langtools/src/jdk.javadoc/share/legal/pako.md | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 langtools/src/jdk.javadoc/share/legal/pako.md

diff --git a/langtools/src/jdk.javadoc/share/legal/pako.md b/langtools/src/jdk.javadoc/share/legal/pako.md
new file mode 100644
index 00000000000..de339d89898
--- /dev/null
+++ b/langtools/src/jdk.javadoc/share/legal/pako.md
@@ -0,0 +1,45 @@
+## Pako v1.0
+
+### Pako License
+<pre>
+Copyright (C) 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+(C) 1995-2013 Jean-loup Gailly and Mark Adler
+(C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+</pre>
+
+

From f68df147c2ce1d5d19b5e7b60be4364b73237a99 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 19 Jun 2017 12:25:37 -0700
Subject: [PATCH 29/83] 8182492: docs bundle needs legal notices for 3rd party
 libraries distributed for javadoc search

Reviewed-by: jjg
---
 make/Docs.gmk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 1f1adf4add0..662606ee1b5 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -456,6 +456,15 @@ $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
 ))
 JDK_INDEX_TARGETS += $(COPY_GLOBAL_RESOURCES)
 
+# Copy the legal notices distributed with the docs bundle
+DOCS_LEGAL_NOTICES := jquery.md jszip.md pako.md
+$(eval $(call SetupCopyFiles, COPY_DOCS_LEGAL_NOTICES, \
+    SRC := $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/legal, \
+    FILES := $(DOCS_LEGAL_NOTICES), \
+    DEST := $(DOCS_OUTPUTDIR)/legal, \
+))
+JDK_INDEX_TARGETS += $(COPY_DOCS_LEGAL_NOTICES)
+
 ################################################################################
 # Copy JDK specs files
 

From cd5a336735ae8092709757356314b81aae06cd2c Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 19 Jun 2017 15:06:01 -0700
Subject: [PATCH 30/83] 8163989: Clarify ModuleElement spec

Reviewed-by: abuckley, jjg
---
 .../lang/model/element/ModuleElement.java     | 16 +++++
 .../lang/model/element/PackageElement.java    |  7 ++
 .../com/sun/tools/javac/code/Symbol.java      | 11 +++
 .../JavacProcessingEnvironment.java           |  2 +-
 .../test/tools/javac/modules/EdgeCases.java   |  4 +-
 .../model/element/TestModuleElementNames.java | 68 +++++++++++++++++++
 .../model/element/TestPackageElement.java     | 17 ++++-
 7 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java

diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
index d5bb4f65754..8a776ef5325 100644
--- a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
+++ b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
@@ -42,8 +42,16 @@ public interface ModuleElement extends Element, QualifiedNameable {
      * Returns the fully qualified name of this module.  For an
      * {@linkplain #isUnnamed() unnamed module}, an empty name is returned.
      *
+     * @apiNote If the module name consists of one identifier, then
+     * this method returns that identifier, which is deemed to be
+     * module's fully qualified name despite not being in qualified
+     * form.  If the module name consists of more than one identifier,
+     * then this method returns the entire name.
+     *
      * @return the fully qualified name of this module, or an
      * empty name if this is an unnamed module
+     *
+     * @jls 6.2 Names and Identifiers
      */
     @Override
     Name getQualifiedName();
@@ -52,8 +60,16 @@ public interface ModuleElement extends Element, QualifiedNameable {
      * Returns the simple name of this module.  For an {@linkplain
      * #isUnnamed() unnamed module}, an empty name is returned.
      *
+     * @apiNote If the module name consists of one identifier, then
+     * this method returns that identifier.  If the module name
+     * consists of more than one identifier, then this method returns
+     * the rightmost such identifier, which is deemed to be the
+     * module's simple name.
+     *
      * @return the simple name of this module or an empty name if
      * this is an unnamed module
+     *
+     * @jls 6.2 Names and Identifiers
      */
     @Override
     Name getSimpleName();
diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
index ad2fc6b0519..b23152fe0f0 100644
--- a/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
+++ b/langtools/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
@@ -44,6 +44,13 @@ public interface PackageElement extends Element, QualifiedNameable {
      * This is also known as the package's <i>canonical</i> name.
      * For an {@linkplain #isUnnamed() unnamed package}, an empty name is returned.
      *
+     * @apiNote The fully qualified name of a named package that is
+     * not a subpackage of a named package is its simple name. The
+     * fully qualified name of a named package that is a subpackage of
+     * another named package consists of the fully qualified name of
+     * the containing package, followed by "{@code .}", followed by the simple
+     * (member) name of the subpackage.
+     *
      * @return the fully qualified name of this package, or an
      * empty name if this is an unnamed package
      * @jls 6.7 Fully Qualified Names and Canonical Names
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index 2298d197121..ed5e444b25a 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -949,6 +949,17 @@ public abstract class Symbol extends AnnoConstruct implements Element {
             this.type = new ModuleType(this);
         }
 
+        @Override @DefinedBy(Api.LANGUAGE_MODEL)
+        public Name getSimpleName() {
+            Name fullName = getQualifiedName();
+            int lastPeriod = fullName.lastIndexOf((byte)'.');
+            if (lastPeriod == -1) {
+                return fullName;
+            } else {
+                return fullName.subName(lastPeriod + 1, fullName.length());
+            }
+        }
+
         @Override @DefinedBy(Api.LANGUAGE_MODEL)
         public boolean isOpen() {
             return flags.contains(ModuleFlags.OPEN);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 3da5a547754..72e5a09dcb4 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -838,7 +838,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
 
         for(TypeElement a  : annotationsPresent) {
             ModuleElement mod = elementUtils.getModuleOf(a);
-            String moduleSpec = allowModules && mod != null ? mod.getSimpleName() + "/" : "";
+            String moduleSpec = allowModules && mod != null ? mod.getQualifiedName() + "/" : "";
             unmatchedAnnotations.put(moduleSpec + a.getQualifiedName().toString(),
                                      a);
         }
diff --git a/langtools/test/tools/javac/modules/EdgeCases.java b/langtools/test/tools/javac/modules/EdgeCases.java
index 679bc1709e6..8fc240f6ae7 100644
--- a/langtools/test/tools/javac/modules/EdgeCases.java
+++ b/langtools/test/tools/javac/modules/EdgeCases.java
@@ -595,12 +595,12 @@ public class EdgeCases extends ModuleTestBase {
 
                 System.out.println("from directives:");
                 for (RequiresDirective rd : ElementFilter.requiresIn(testE.getDirectives())) {
-                    System.out.println(rd.getDependency().getSimpleName());
+                    System.out.println(rd.getDependency().getQualifiedName());
                 }
 
                 System.out.println("from requires:");
                 for (RequiresDirective rd : ((ModuleSymbol) testE).requires) {
-                    System.out.println(rd.getDependency().getSimpleName());
+                    System.out.println(rd.getDependency().getQualifiedName());
                 }
             }
 
diff --git a/langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java b/langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java
new file mode 100644
index 00000000000..9449b61be0c
--- /dev/null
+++ b/langtools/test/tools/javac/processing/model/element/TestModuleElementNames.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 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 8163989
+ * @summary Test basic workings of naming methods on ModuleElement
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
+ * @build   JavacTestingAbstractProcessor TestModuleElementNames
+ * @compile -processor TestModuleElementNames -proc:only TestModuleElementNames.java
+ */
+
+import java.util.Set;
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+
+/**
+ * Test basic workings of names of ModuleElement.
+ */
+public class TestModuleElementNames extends JavacTestingAbstractProcessor {
+    public boolean process(Set<? extends TypeElement> annotations,
+                           RoundEnvironment roundEnv) {
+        if (!roundEnv.processingOver()) {
+            checkNames(eltUtils.getModuleElement(""),          "",          "",          true);
+            checkNames(eltUtils.getModuleElement("java.base"), "base",      "java.base", false);
+        }
+        return true;
+    }
+
+    private void checkNames(ModuleElement mod, String expectedSimple, String expectedQual, boolean expectedUnnamed) {
+        boolean unnamed = mod.isUnnamed();
+        String simpleName    = mod.getSimpleName().toString();
+        String qualifiedName = mod.getQualifiedName().toString();
+
+        if (unnamed != expectedUnnamed) {
+            throw new RuntimeException("Unnamed mismatch on " + qualifiedName);
+        }
+
+        if (!simpleName.equals(expectedSimple) ||
+            !qualifiedName.equals(expectedQual)) {
+            throw new RuntimeException("Unexpected name,\tqualitifed ``" + qualifiedName +
+                                       "''\tsimmple ``" + simpleName + "''");
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/processing/model/element/TestPackageElement.java b/langtools/test/tools/javac/processing/model/element/TestPackageElement.java
index 1d6803c5565..f3749f6c5ff 100644
--- a/langtools/test/tools/javac/processing/model/element/TestPackageElement.java
+++ b/langtools/test/tools/javac/processing/model/element/TestPackageElement.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6449798 6399404 8173776
+ * @bug 6449798 6399404 8173776 8163989
  * @summary Test basic workings of PackageElement
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
@@ -54,8 +54,7 @@ public class TestPackageElement extends JavacTestingAbstractProcessor {
         if (!roundEnv.processingOver()) {
             PackageElement unnamedPkg = eltUtils.getPackageElement("");
 
-            if (!unnamedPkg.getQualifiedName().contentEquals(""))
-                throw new RuntimeException("The unnamed package is named!");
+            testNames(unnamedPkg, "", "");
 
             // The next line tests an implementation detail upon which
             // some diagnostics depend.
@@ -70,11 +69,23 @@ public class TestPackageElement extends JavacTestingAbstractProcessor {
             if (javaLang.isUnnamed())
                 throw new RuntimeException("Package java.lang is unnamed!");
 
+            testNames(javaLang, "java.lang", "lang");
+
             testEnclosingElement(javaLang);
         }
         return true;
     }
 
+    void testNames(PackageElement pkg, String expectedQualified, String expectedSimple) {
+        String tmp = pkg.getQualifiedName().toString();
+        if (!tmp.equals(expectedQualified))
+            throw new RuntimeException("Unexpected qualifed name ``" + tmp + "''.");
+
+        tmp = pkg.getSimpleName().toString();
+        if (!tmp.equals(expectedSimple))
+            throw new RuntimeException("Unexpected simple name ``" + tmp + "''.");
+    }
+
     void testEnclosingElement(PackageElement javaLang) {
         SourceVersion version = processingEnv.getSourceVersion();
         Element enclosing = javaLang.getEnclosingElement();

From 43ffee89aaf6b72614a87a1f325cc6d4f4fc3601 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 19 Jun 2017 17:13:42 -0700
Subject: [PATCH 31/83] 8182566: Including missing test update for JDK-8163989

Reviewed-by: jjg
---
 .../file/MultiReleaseJar/MutliReleaseModuleInfoTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java b/langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java
index 8d4cde4e669..96f715ca491 100644
--- a/langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java
+++ b/langtools/test/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -132,7 +132,7 @@ public class MutliReleaseModuleInfoTest {
             }
             boolean foundjd = false;
             for (RequiresDirective rd : ElementFilter.requiresIn(sm.getDirectives())) {
-                foundjd |= rd.getDependency().getSimpleName().contentEquals("java.desktop");
+                foundjd |= rd.getDependency().getQualifiedName().contentEquals("java.desktop");
             }
             if (!foundjd) {
                 throw new AssertionError("Missing dependency on java desktop module!");

From 0932a3dc0de2d4779dc8994b1a477a04eb7cfae2 Mon Sep 17 00:00:00 2001
From: Sergey Nazarkin <snazarkin@azul.com>
Date: Tue, 20 Jun 2017 17:00:07 +0800
Subject: [PATCH 32/83] 8182581: aarch64: fix for crash caused by earlyret of
 compiled method

Fix jvm crash caused by earlyret of compiled method for aarch64 port

Reviewed-by: aph
---
 .../src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp
index adb30aa0d1d..49a266e5480 100644
--- a/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp
@@ -109,9 +109,15 @@ int AbstractInterpreter::size_activation(int max_stack,
   // for the callee's params we only need to account for the extra
   // locals.
   int size = overhead +
-         (callee_locals - callee_params)*Interpreter::stackElementWords +
+         (callee_locals - callee_params) +
          monitors * frame::interpreter_frame_monitor_size() +
-         temps* Interpreter::stackElementWords + extra_args;
+         // On the top frame, at all times SP <= ESP, and SP is
+         // 16-aligned.  We ensure this by adjusting SP on method
+         // entry and re-entry to allow room for the maximum size of
+         // the expression stack.  When we call another method we bump
+         // SP so that no stack space is wasted.  So, only on the top
+         // frame do we need to allow max_stack words.
+         (is_top_frame ? max_stack : temps + extra_args);
 
   // On AArch64 we always keep the stack pointer 16-aligned, so we
   // must round up here.

From e987e9de9484a79a59e655356e6e93bb8d624a37 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 20 Jun 2017 13:12:42 +0200
Subject: [PATCH 33/83] 8179537: Update testing.md for more clarity regarding
 JTReg configuration

Reviewed-by: erikj
---
 common/doc/testing.html | 34 +++++++++++++++++++---------------
 common/doc/testing.md   | 35 ++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/common/doc/testing.html b/common/doc/testing.html
index 64f635d2306..4d8d61fda44 100644
--- a/common/doc/testing.html
+++ b/common/doc/testing.html
@@ -18,14 +18,16 @@
 </header>
 <nav id="TOC">
 <ul>
-<li><a href="#using-the-run-test-framework">Using the run-test framework</a></li>
+<li><a href="#using-the-run-test-framework">Using the run-test framework</a><ul>
+<li><a href="#configuration">Configuration</a></li>
+</ul></li>
 <li><a href="#test-selection">Test selection</a><ul>
-<li><a href="#jtreg">JTreg</a></li>
+<li><a href="#jtreg">JTReg</a></li>
 <li><a href="#gtest">Gtest</a></li>
 </ul></li>
 <li><a href="#test-results-and-summary">Test results and summary</a></li>
 <li><a href="#test-suite-control">Test suite control</a><ul>
-<li><a href="#jtreg-keywords">JTreg keywords</a></li>
+<li><a href="#jtreg-keywords">JTReg keywords</a></li>
 <li><a href="#gtest-keywords">Gtest keywords</a></li>
 </ul></li>
 </ul>
@@ -39,14 +41,16 @@ $ make run-test TEST=jdk_lang
 $ make run-test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
 $ make run-test TEST=&quot;hotspot/test:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
 $ make run-test TEST=&quot;jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java&quot;</code></pre>
+<h3 id="configuration">Configuration</h3>
+<p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
 <h2 id="test-selection">Test selection</h2>
 <p>All functionality is available using the run-test make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, run-test-only can be used instead, which do not depend on the source and test image build.</p>
-<p>For some common top-level tests, direct make targets have been generated. This includes all JTreg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
+<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:jdk/test:tier1 jtreg:langtools/test:tier1 jtreg:nashorn/test:tier1 jtreg:jaxp/test:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
-<h3 id="jtreg">JTreg</h3>
-<p>JTreg test groups can be specified either without a test root, e.g. <code>:tier1</code> (or <code>tier1</code>, the initial colon is optional), or with, e.g. <code>hotspot/test:tier1</code>, <code>jdk/test:jdk_util</code>.</p>
+<h3 id="jtreg">JTReg</h3>
+<p>JTReg test groups can be specified either without a test root, e.g. <code>:tier1</code> (or <code>tier1</code>, the initial colon is optional), or with, e.g. <code>hotspot/test:tier1</code>, <code>jdk/test:jdk_util</code>.</p>
 <p>When specified without a test root, all matching groups from all tests roots will be added. Otherwise, only the group from the specified test root will be added.</p>
-<p>Individual JTreg tests or directories containing JTreg tests can also be specified, like <code>hotspot/test/native_sanity/JniVersion.java</code> or <code>hotspot/test/native_sanity</code>. You can also specify an absolute path, to point to a JTreg test outside the source tree.</p>
+<p>Individual JTReg tests or directories containing JTReg tests can also be specified, like <code>hotspot/test/native_sanity/JniVersion.java</code> or <code>hotspot/test/native_sanity</code>. You can also specify an absolute path, to point to a JTReg test outside the source tree.</p>
 <p>As long as the test groups or test paths can be uniquely resolved, you do not need to enter the <code>jtreg:</code> prefix. If this is not possible, or if you want to use a fully qualified test descriptor, add <code>jtreg:</code>, e.g. <code>jtreg:hotspot/test/native_sanity</code>.</p>
 <h3 id="gtest">Gtest</h3>
 <p>Since the Hotspot Gtest suite is so quick, the default is to run all tests. This is specified by just <code>gtest</code>, or as a fully qualified test descriptor <code>gtest:all</code>.</p>
@@ -65,15 +69,15 @@ TEST FAILURE</code></pre>
 <p>Tests where the number of TOTAL tests does not equal the number of PASSed tests will be considered a test failure. These are marked with the <code>&gt;&gt; ... &lt;&lt;</code> marker for easy identification.</p>
 <p>The classification of non-passed tests differs a bit between test suites. In the summary, ERROR is used as a catch-all for tests that neither passed nor are classified as failed by the framework. This might indicate test framework error, timeout or other problems.</p>
 <p>In case of test failures, <code>make run-test</code> will exit with a non-zero exit value.</p>
-<p>All tests have their result stored in <code>build/$BUILD/test-result/$TEST_ID</code>, where TEST_ID is a path-safe conversion from the fully qualified test descriptor, e.g. for <code>jtreg:jdk/test:tier1</code> the TEST_ID is <code>jtreg_jdk_test_tier1</code>. This path is also printed in the log at the end of the test run.</p>
+<p>All tests have their result stored in <code>build/$BUILD/test-results/$TEST_ID</code>, where TEST_ID is a path-safe conversion from the fully qualified test descriptor, e.g. for <code>jtreg:jdk/test:tier1</code> the TEST_ID is <code>jtreg_jdk_test_tier1</code>. This path is also printed in the log at the end of the test run.</p>
 <p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p>
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
-<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTreg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
+<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
 <p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
 <p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
-<h3 id="jtreg-keywords">JTreg keywords</h3>
+<h3 id="jtreg-keywords">JTReg keywords</h3>
 <h4 id="jobs">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
 <p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than 12.</p>
@@ -94,15 +98,15 @@ TEST FAILURE</code></pre>
 <p>Defaults to <code>fail,error</code>.</p>
 <h4 id="max_mem">MAX_MEM</h4>
 <p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
-<p>Limit memory consumption for JTreg test framework and VM under test. Set to 0 to disable the limits.</p>
+<p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
 <p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
 <h4 id="options">OPTIONS</h4>
-<p>Additional options to the JTreg test framework.</p>
-<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTreg options.</p>
+<p>Additional options to the JTReg test framework.</p>
+<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
 <h4 id="java_options">JAVA_OPTIONS</h4>
-<p>Additional Java options to JTreg (<code>-javaoption</code>).</p>
+<p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
 <h4 id="vm_options">VM_OPTIONS</h4>
-<p>Additional VM options to JTreg (<code>-vmoption</code>).</p>
+<p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>
diff --git a/common/doc/testing.md b/common/doc/testing.md
index f84bd27dda2..db570f4cd5c 100644
--- a/common/doc/testing.md
+++ b/common/doc/testing.md
@@ -16,6 +16,15 @@ Some example command-lines:
     $ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"
     $ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"
 
+### Configuration
+
+To be able to run JTReg tests, `configure` needs to know where to find the
+JTReg test framework. If it is not picked up automatically by configure, use
+the `--with-jtreg=<path to jtreg home>` option to point to the JTReg framework.
+Note that this option should point to the JTReg home, i.e. the top directory,
+containing `lib/jtreg.jar` etc. (An alternative is to set the `JT_HOME`
+environment variable to point to the JTReg home before running `configure`.)
+
 ## Test selection
 
 All functionality is available using the run-test make target. In this use
@@ -24,7 +33,7 @@ To speed up subsequent test runs with no source code changes, run-test-only can
 be used instead, which do not depend on the source and test image build.
 
 For some common top-level tests, direct make targets have been generated. This
-includes all JTreg test groups, the hotspot gtest, and custom tests (if
+includes all JTReg test groups, the hotspot gtest, and custom tests (if
 present). This means that `make run-test-tier1` is equivalent to `make run-test
 TEST="tier1"`, but the latter is more tab-completion friendly. For more complex
 test runs, the `run-test TEST="x"` solution needs to be used.
@@ -36,9 +45,9 @@ jtreg:langtools/test:tier1 jtreg:nashorn/test:tier1 jtreg:jaxp/test:tier1`. You
 can always submit a list of fully qualified test descriptors in the `TEST`
 variable if you want to shortcut the parser.
 
-### JTreg
+### JTReg
 
-JTreg test groups can be specified either without a test root, e.g. `:tier1`
+JTReg test groups can be specified either without a test root, e.g. `:tier1`
 (or `tier1`, the initial colon is optional), or with, e.g.
 `hotspot/test:tier1`, `jdk/test:jdk_util`.
 
@@ -46,10 +55,10 @@ When specified without a test root, all matching groups from all tests roots
 will be added. Otherwise, only the group from the specified test root will be
 added.
 
-Individual JTreg tests or directories containing JTreg tests can also be
+Individual JTReg tests or directories containing JTReg tests can also be
 specified, like `hotspot/test/native_sanity/JniVersion.java` or
 `hotspot/test/native_sanity`. You can also specify an absolute path, to point
-to a JTreg test outside the source tree.
+to a JTReg test outside the source tree.
 
 As long as the test groups or test paths can be uniquely resolved, you do not
 need to enter the `jtreg:` prefix. If this is not possible, or if you want to
@@ -93,7 +102,7 @@ error, timeout or other problems.
 
 In case of test failures, `make run-test` will exit with a non-zero exit value.
 
-All tests have their result stored in `build/$BUILD/test-result/$TEST_ID`,
+All tests have their result stored in `build/$BUILD/test-results/$TEST_ID`,
 where TEST_ID is a path-safe conversion from the fully qualified test
 descriptor, e.g. for `jtreg:jdk/test:tier1` the TEST_ID is
 `jtreg_jdk_test_tier1`. This path is also printed in the log at the end of the
@@ -109,7 +118,7 @@ It is possible to control various aspects of the test suites using make control
 variables.
 
 These variables use a keyword=value approach to allow multiple values to be
-set. So, for instance, `JTREG="JOBS=1;TIMEOUT=8"` will set the JTreg
+set. So, for instance, `JTREG="JOBS=1;TIMEOUT=8"` will set the JTReg
 concurrency level to 1 and the timeout factor to 8. This is equivalent to
 setting `JTREG_JOBS=1 JTREG_TIMEOUT=8`, but using the keyword format means that
 the `JTREG` variable is parsed and verified for correctness, so
@@ -130,7 +139,7 @@ proper quoting of command line arguments through.)
 As far as possible, the names of the keywords have been standardized between
 test suites.
 
-### JTreg keywords
+### JTReg keywords
 
 #### JOBS
 The test concurrency (`-concurrency`).
@@ -168,21 +177,21 @@ Defaults to `fail,error`.
 #### MAX_MEM
 Limit memory consumption (`-Xmx` and `-vmoption:-Xmx`, or none).
 
-Limit memory consumption for JTreg test framework and VM under test. Set to 0
+Limit memory consumption for JTReg test framework and VM under test. Set to 0
 to disable the limits.
 
 Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
 
 #### OPTIONS
-Additional options to the JTreg test framework.
+Additional options to the JTReg test framework.
 
-Use `JTREG="OPTIONS=--help all"` to see all available JTreg options.
+Use `JTREG="OPTIONS=--help all"` to see all available JTReg options.
 
 #### JAVA_OPTIONS
-Additional Java options to JTreg (`-javaoption`).
+Additional Java options to JTReg (`-javaoption`).
 
 #### VM_OPTIONS
-Additional VM options to JTreg (`-vmoption`).
+Additional VM options to JTReg (`-vmoption`).
 
 ### Gtest keywords
 

From 2a0ab692f73457453bf0e2f647452f2e337d9857 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Tue, 20 Jun 2017 14:37:25 +0300
Subject: [PATCH 34/83] 8181872: C1: possible overflow when strength reducing
 integer multiply by constant

Reviewed-by: kvn
---
 .../aarch64/vm/c1_LIRGenerator_aarch64.cpp    | 10 ++--
 .../src/cpu/arm/vm/c1_LIRGenerator_arm.cpp    |  4 +-
 .../src/cpu/x86/vm/c1_LIRGenerator_x86.cpp    |  8 +--
 hotspot/src/share/vm/c1/c1_LIRGenerator.cpp   |  6 +--
 hotspot/src/share/vm/c1/c1_LIRGenerator.hpp   |  2 +-
 .../test/compiler/c1/MultiplyByMaxInt.java    | 53 +++++++++++++++++++
 6 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 hotspot/test/compiler/c1/MultiplyByMaxInt.java

diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
index 5abe4281aa2..1a612b9bac2 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRGenerator_aarch64.cpp
@@ -598,12 +598,12 @@ void LIRGenerator::do_ArithmeticOp_Int(ArithmeticOp* x) {
   } else {
     assert (x->op() == Bytecodes::_imul, "expect imul");
     if (right.is_constant()) {
-      int c = right.get_jint_constant();
-      if (! is_power_of_2(c) && ! is_power_of_2(c + 1) && ! is_power_of_2(c - 1)) {
-        // Cannot use constant op.
-        right.load_item();
+      jint c = right.get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+        right_arg->dont_load_item();
       } else {
-        right.dont_load_item();
+        // Cannot use constant op.
+        right_arg->load_item();
       }
     } else {
       right.load_item();
diff --git a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp
index c614e137091..742705f1681 100644
--- a/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp
+++ b/hotspot/src/cpu/arm/vm/c1_LIRGenerator_arm.cpp
@@ -923,8 +923,8 @@ void LIRGenerator::do_ArithmeticOp_Int(ArithmeticOp* x) {
   } else {
     left_arg->load_item();
     if (x->op() == Bytecodes::_imul && right_arg->is_constant()) {
-      int c = right_arg->get_jint_constant();
-      if (c > 0 && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
+      jint c = right_arg->get_jint_constant();
+      if (c > 0 && c < max_jint && (is_power_of_2(c) || is_power_of_2(c - 1) || is_power_of_2(c + 1))) {
         right_arg->dont_load_item();
       } else {
         right_arg->load_item();
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
index 39718a34acf..95ee2d54beb 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
@@ -234,8 +234,8 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 }
 
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
-  if (tmp->is_valid()) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
+  if (tmp->is_valid() && c > 0 && c < max_jint) {
     if (is_power_of_2(c + 1)) {
       __ move(left, tmp);
       __ shift_left(left, log2_intptr(c + 1), left);
@@ -603,8 +603,8 @@ void LIRGenerator::do_ArithmeticOp_Int(ArithmeticOp* x) {
       bool use_constant = false;
       bool use_tmp = false;
       if (right_arg->is_constant()) {
-        int iconst = right_arg->get_jint_constant();
-        if (iconst > 0) {
+        jint iconst = right_arg->get_jint_constant();
+        if (iconst > 0 && iconst < max_jint) {
           if (is_power_of_2(iconst)) {
             use_constant = true;
           } else if (is_power_of_2(iconst - 1) || is_power_of_2(iconst + 1)) {
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index 68c959280d7..cfb9cbc997d 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -545,11 +545,11 @@ void LIRGenerator::arithmetic_op(Bytecodes::Code code, LIR_Opr result, LIR_Opr l
 
     case Bytecodes::_imul:
       {
-        bool    did_strength_reduce = false;
+        bool did_strength_reduce = false;
 
         if (right->is_constant()) {
-          int c = right->as_jint();
-          if (is_power_of_2(c)) {
+          jint c = right->as_jint();
+          if (c > 0 && is_power_of_2(c)) {
             // do not need tmp here
             __ shift_left(left_op, exact_log2(c), result_op);
             did_strength_reduce = true;
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
index 3a7e26a8562..322be3595c0 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
@@ -313,7 +313,7 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
   // is_strictfp is only needed for mul and div (and only generates different code on i486)
   void arithmetic_op(Bytecodes::Code code, LIR_Opr result, LIR_Opr left, LIR_Opr right, bool is_strictfp, LIR_Opr tmp, CodeEmitInfo* info = NULL);
   // machine dependent.  returns true if it emitted code for the multiply
-  bool strength_reduce_multiply(LIR_Opr left, int constant, LIR_Opr result, LIR_Opr tmp);
+  bool strength_reduce_multiply(LIR_Opr left, jint constant, LIR_Opr result, LIR_Opr tmp);
 
   void store_stack_parameter (LIR_Opr opr, ByteSize offset_from_sp_in_bytes);
 
diff --git a/hotspot/test/compiler/c1/MultiplyByMaxInt.java b/hotspot/test/compiler/c1/MultiplyByMaxInt.java
new file mode 100644
index 00000000000..f03c2dce199
--- /dev/null
+++ b/hotspot/test/compiler/c1/MultiplyByMaxInt.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2017, 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 8181872
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:CompileThreshold=100 -XX:+TieredCompilation -XX:TieredStopAtLevel=1
+ *                   -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,compiler.c1.MultiplyByMaxInt::test
+ *                   compiler.c1.MultiplyByMaxInt
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-BackgroundCompilation
+ *                   -XX:CompileThreshold=100 -XX:+TieredCompilation -XX:TieredStopAtLevel=3
+ *                   -XX:CompileCommand=dontinline,compiler.c1.MultiplyByMaxInt::test
+ *                   compiler.c1.MultiplyByMaxInt
+ */
+package compiler.c1;
+
+public class MultiplyByMaxInt {
+    static int test(int x) {
+        int loops = (x >>> 4) & 7;
+        while (loops-- > 0) {
+            x = (x * 2147483647) % 16807;
+        }
+        return x;
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 20000; i++) {
+            test(i);
+        }
+    }
+}

From 33ab1995fb469c92618abca21bf2d40fd613e1b1 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Wed, 21 Jun 2017 19:39:51 -0700
Subject: [PATCH 35/83] 8177511: Remove the old standard doclet

Reviewed-by: jjg
---
 .../classes/com/sun/tools/doclets/Taglet.java |  168 -
 .../html/AbstractExecutableMemberWriter.java  |  310 -
 .../formats/html/AbstractIndexWriter.java     |  436 -
 .../formats/html/AbstractMemberWriter.java    |  699 --
 .../html/AbstractPackageIndexWriter.java      |  198 -
 .../formats/html/AbstractTreeWriter.java      |  192 -
 .../formats/html/AllClassesFrameWriter.java   |  174 -
 .../html/AnnotationTypeFieldWriterImpl.java   |  315 -
 ...nnotationTypeOptionalMemberWriterImpl.java |  159 -
 ...nnotationTypeRequiredMemberWriterImpl.java |  317 -
 .../html/AnnotationTypeWriterImpl.java        |  432 -
 .../doclets/formats/html/ClassUseWriter.java  |  550 -
 .../doclets/formats/html/ClassWriterImpl.java |  738 --
 .../formats/html/ConfigurationImpl.java       |  710 --
 .../html/ConstantsSummaryWriterImpl.java      |  379 -
 .../formats/html/ConstructorWriterImpl.java   |  336 -
 .../formats/html/DeprecatedListWriter.java    |  267 -
 .../formats/html/EnumConstantWriterImpl.java  |  305 -
 .../doclets/formats/html/FieldWriterImpl.java |  336 -
 .../formats/html/FrameOutputWriter.java       |  173 -
 .../doclets/formats/html/HelpWriter.java      |  443 -
 .../doclets/formats/html/HtmlDoclet.java      |  350 -
 .../formats/html/HtmlDocletWriter.java        | 2148 ----
 .../formats/html/HtmlSerialFieldWriter.java   |  211 -
 .../formats/html/HtmlSerialMethodWriter.java  |  162 -
 .../doclets/formats/html/LinkFactoryImpl.java |  211 -
 .../doclets/formats/html/LinkInfoImpl.java    |  430 -
 .../doclets/formats/html/LinkOutputImpl.java  |   78 -
 .../formats/html/MethodWriterImpl.java        |  424 -
 .../formats/html/NestedClassWriterImpl.java   |  234 -
 .../formats/html/PackageFrameWriter.java      |  207 -
 .../formats/html/PackageIndexFrameWriter.java |  168 -
 .../formats/html/PackageIndexWriter.java      |  271 -
 .../formats/html/PackageTreeWriter.java       |  225 -
 .../formats/html/PackageUseWriter.java        |  341 -
 .../formats/html/PackageWriterImpl.java       |  365 -
 .../formats/html/PropertyWriterImpl.java      |  341 -
 .../doclets/formats/html/SearchIndexItem.java |  123 -
 .../doclets/formats/html/SectionName.java     |   81 -
 .../html/SerializedFormWriterImpl.java        |  296 -
 .../formats/html/SingleIndexWriter.java       |  152 -
 .../formats/html/SourceToHTMLConverter.java   |  297 -
 .../formats/html/SplitIndexWriter.java        |  208 -
 .../formats/html/SubWriterHolderWriter.java   |  362 -
 .../formats/html/TagletWriterImpl.java        |  437 -
 .../doclets/formats/html/TreeWriter.java      |  199 -
 .../formats/html/WriterFactoryImpl.java       |  217 -
 .../doclets/formats/html/markup/Comment.java  |  101 -
 .../formats/html/markup/ContentBuilder.java   |   96 -
 .../doclets/formats/html/markup/DocType.java  |  111 -
 .../doclets/formats/html/markup/HtmlAttr.java |   99 -
 .../formats/html/markup/HtmlConstants.java    |  224 -
 .../formats/html/markup/HtmlDocWriter.java    |  365 -
 .../formats/html/markup/HtmlDocument.java     |  113 -
 .../formats/html/markup/HtmlStyle.java        |  115 -
 .../doclets/formats/html/markup/HtmlTag.java  |  161 -
 .../doclets/formats/html/markup/HtmlTree.java |  973 --
 .../formats/html/markup/HtmlVersion.java      |   38 -
 .../formats/html/markup/HtmlWriter.java       |  520 -
 .../doclets/formats/html/markup/RawHtml.java  |  161 -
 .../formats/html/markup/StringContent.java    |  132 -
 .../formats/html/markup/package-info.java     |   35 -
 .../doclets/formats/html/package-info.java    |   39 -
 .../html/resources/standard.properties        |  237 -
 .../html/resources/standard_ja.properties     |  187 -
 .../html/resources/standard_zh_CN.properties  |  186 -
 .../internal/toolkit/AbstractDoclet.java      |  210 -
 .../toolkit/AnnotationTypeFieldWriter.java    |  133 -
 .../AnnotationTypeOptionalMemberWriter.java   |   54 -
 .../AnnotationTypeRequiredMemberWriter.java   |  134 -
 .../toolkit/AnnotationTypeWriter.java         |  170 -
 .../doclets/internal/toolkit/ClassWriter.java |  227 -
 .../internal/toolkit/Configuration.java       |  892 --
 .../toolkit/ConstantsSummaryWriter.java       |  160 -
 .../internal/toolkit/ConstructorWriter.java   |  127 -
 .../doclets/internal/toolkit/Content.java     |  119 -
 .../internal/toolkit/EnumConstantWriter.java  |  120 -
 .../doclets/internal/toolkit/FieldWriter.java |  120 -
 .../internal/toolkit/MemberSummaryWriter.java |  128 -
 .../internal/toolkit/MethodWriter.java        |  121 -
 .../internal/toolkit/NestedClassWriter.java   |   50 -
 .../toolkit/PackageSummaryWriter.java         |  128 -
 .../internal/toolkit/PropertyWriter.java      |  120 -
 .../toolkit/SerializedFormWriter.java         |  323 -
 .../internal/toolkit/WriterFactory.java       |  222 -
 .../toolkit/builders/AbstractBuilder.java     |  194 -
 .../builders/AbstractMemberBuilder.java       |   89 -
 .../builders/AnnotationTypeBuilder.java       |  263 -
 .../builders/AnnotationTypeFieldBuilder.java  |  240 -
 .../AnnotationTypeOptionalMemberBuilder.java  |  115 -
 .../AnnotationTypeRequiredMemberBuilder.java  |  241 -
 .../toolkit/builders/BuilderFactory.java      |  273 -
 .../toolkit/builders/ClassBuilder.java        |  416 -
 .../builders/ConstantsSummaryBuilder.java     |  387 -
 .../toolkit/builders/ConstructorBuilder.java  |  231 -
 .../toolkit/builders/EnumConstantBuilder.java |  231 -
 .../toolkit/builders/FieldBuilder.java        |  228 -
 .../toolkit/builders/LayoutParser.java        |  131 -
 .../builders/MemberSummaryBuilder.java        |  531 -
 .../toolkit/builders/MethodBuilder.java       |  242 -
 .../builders/PackageSummaryBuilder.java       |  364 -
 .../toolkit/builders/PropertyBuilder.java     |  229 -
 .../builders/SerializedFormBuilder.java       |  594 -
 .../internal/toolkit/builders/XMLNode.java    |   75 -
 .../toolkit/builders/package-info.java        |   41 -
 .../internal/toolkit/package-info.java        |   57 -
 .../internal/toolkit/resources/doclet.xml     |  190 -
 .../toolkit/resources/doclets.properties      |  219 -
 .../toolkit/resources/doclets_ja.properties   |  200 -
 .../resources/doclets_zh_CN.properties        |  200 -
 .../internal/toolkit/resources/glass.png      |  Bin 499 -> 0 bytes
 .../jquery/external/jquery/jquery.js          | 9789 -----------------
 .../images/ui-bg_flat_0_aaaaaa_40x100.png     |  Bin 212 -> 0 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png    |  Bin 208 -> 0 bytes
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    |  Bin 335 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 207 -> 0 bytes
 .../images/ui-bg_glass_75_dadada_1x400.png    |  Bin 262 -> 0 bytes
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    |  Bin 262 -> 0 bytes
 .../images/ui-bg_glass_95_fef1ec_1x400.png    |  Bin 332 -> 0 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  |  Bin 280 -> 0 bytes
 .../jquery/images/ui-icons_222222_256x240.png |  Bin 6922 -> 0 bytes
 .../jquery/images/ui-icons_2e83ff_256x240.png |  Bin 4549 -> 0 bytes
 .../jquery/images/ui-icons_454545_256x240.png |  Bin 6992 -> 0 bytes
 .../jquery/images/ui-icons_888888_256x240.png |  Bin 6999 -> 0 bytes
 .../jquery/images/ui-icons_cd0a0a_256x240.png |  Bin 4549 -> 0 bytes
 .../toolkit/resources/jquery/jquery-1.10.2.js | 9789 -----------------
 .../toolkit/resources/jquery/jquery-ui.css    |  544 -
 .../toolkit/resources/jquery/jquery-ui.js     | 2610 -----
 .../resources/jquery/jquery-ui.min.css        |    7 -
 .../toolkit/resources/jquery/jquery-ui.min.js |    7 -
 .../resources/jquery/jquery-ui.structure.css  |  152 -
 .../jquery/jquery-ui.structure.min.css        |    5 -
 .../jquery/jszip-utils/dist/jszip-utils-ie.js |   56 -
 .../jszip-utils/dist/jszip-utils-ie.min.js    |   10 -
 .../jquery/jszip-utils/dist/jszip-utils.js    |  118 -
 .../jszip-utils/dist/jszip-utils.min.js       |   10 -
 .../resources/jquery/jszip/dist/jszip.js      | 9155 ---------------
 .../resources/jquery/jszip/dist/jszip.min.js  |   14 -
 .../internal/toolkit/resources/script.js      |  109 -
 .../internal/toolkit/resources/search.js      |  271 -
 .../internal/toolkit/resources/stylesheet.css |  753 --
 .../doclets/internal/toolkit/resources/x.png  |  Bin 394 -> 0 bytes
 .../taglets/BaseExecutableMemberTaglet.java   |   96 -
 .../toolkit/taglets/BaseInlineTaglet.java     |   50 -
 .../toolkit/taglets/BasePropertyTaglet.java   |  112 -
 .../internal/toolkit/taglets/BaseTaglet.java  |  146 -
 .../internal/toolkit/taglets/CodeTaglet.java  |   73 -
 .../toolkit/taglets/DeprecatedTaglet.java     |   56 -
 .../toolkit/taglets/DocRootTaglet.java        |   68 -
 .../internal/toolkit/taglets/IndexTaglet.java |   60 -
 .../toolkit/taglets/InheritDocTaglet.java     |  172 -
 .../toolkit/taglets/InheritableTaglet.java    |   54 -
 .../toolkit/taglets/LegacyTaglet.java         |  143 -
 .../toolkit/taglets/LiteralTaglet.java        |   72 -
 .../internal/toolkit/taglets/ParamTaglet.java |  324 -
 .../toolkit/taglets/PropertyGetterTaglet.java |   51 -
 .../toolkit/taglets/PropertySetterTaglet.java |   51 -
 .../toolkit/taglets/ReturnTaglet.java         |   98 -
 .../internal/toolkit/taglets/SeeTaglet.java   |   77 -
 .../toolkit/taglets/SimpleTaglet.java         |  233 -
 .../internal/toolkit/taglets/Taglet.java      |  159 -
 .../toolkit/taglets/TagletManager.java        |  810 --
 .../toolkit/taglets/TagletWriter.java         |  319 -
 .../toolkit/taglets/ThrowsTaglet.java         |  186 -
 .../internal/toolkit/taglets/ValueTaglet.java |  189 -
 .../toolkit/taglets/package-info.java         |   52 -
 .../toolkit/util/ClassDocCatalog.java         |  286 -
 .../internal/toolkit/util/ClassTree.java      |  400 -
 .../internal/toolkit/util/ClassUseMapper.java |  485 -
 .../util/DeprecatedAPIListBuilder.java        |  168 -
 .../internal/toolkit/util/DocFile.java        |  247 -
 .../internal/toolkit/util/DocFileFactory.java |   93 -
 .../internal/toolkit/util/DocFinder.java      |  246 -
 .../internal/toolkit/util/DocLink.java        |   98 -
 .../internal/toolkit/util/DocPath.java        |  192 -
 .../internal/toolkit/util/DocPaths.java       |  183 -
 .../toolkit/util/DocletAbortException.java    |   45 -
 .../toolkit/util/DocletConstants.java         |   62 -
 .../doclets/internal/toolkit/util/Extern.java |  316 -
 .../internal/toolkit/util/FatalError.java     |   39 -
 .../doclets/internal/toolkit/util/Group.java  |  246 -
 .../toolkit/util/ImplementedMethods.java      |  152 -
 .../internal/toolkit/util/IndexBuilder.java   |  243 -
 .../toolkit/util/MessageRetriever.java        |  249 -
 .../internal/toolkit/util/MetaKeywords.java   |  146 -
 .../internal/toolkit/util/MethodTypes.java    |   70 -
 .../toolkit/util/PackageListWriter.java       |   94 -
 .../toolkit/util/StandardDocFileFactory.java  |  331 -
 .../internal/toolkit/util/TextTag.java        |  112 -
 .../doclets/internal/toolkit/util/Utils.java  | 1032 --
 .../toolkit/util/VisibleMemberMap.java        |  772 --
 .../toolkit/util/links/LinkFactory.java       |  262 -
 .../internal/toolkit/util/links/LinkInfo.java |  155 -
 .../toolkit/util/links/LinkOutput.java        |   56 -
 .../toolkit/util/links/package-info.java      |   35 -
 .../internal/toolkit/util/package-info.java   |   36 -
 .../com/sun/tools/doclets/package-info.java   |   33 -
 .../sun/tools/doclets/standard/Standard.java  |   28 +-
 .../tools/doclets/standard/package-info.java  |    2 +-
 .../com/sun/tools/javadoc/main/DocImpl.java   |    6 +-
 .../jdk/javadoc/internal/tool/Start.java      |   79 +-
 .../jdk/javadoc/internal/tool/ToolOption.java |    9 -
 .../share/classes/module-info.java            |    2 -
 .../sun/javadoc/5093723/DocumentedClass.java  |   34 -
 .../com/sun/javadoc/5093723/T5093723.java     |   49 -
 .../javadoc/5093723/UndocumentedClass.java    |   29 -
 .../AccessAsciiArt/AccessAsciiArt.java        |   57 -
 .../com/sun/javadoc/AccessAsciiArt/p1/C.java  |   27 -
 .../com/sun/javadoc/AccessAsciiArt/p1/I.java  |   27 -
 .../com/sun/javadoc/AccessAsciiArt/p1/SC.java |   27 -
 .../com/sun/javadoc/AccessAsciiArt/p1/SI.java |   27 -
 .../javadoc/AccessAsciiArt/p1/subpkg/SSC.java |   27 -
 .../AccessFrameTitle/AccessFrameTitle.java    |   58 -
 .../sun/javadoc/AccessFrameTitle/p1/C1.java   |   27 -
 .../sun/javadoc/AccessFrameTitle/p2/C2.java   |   27 -
 .../com/sun/javadoc/AccessH1/AccessH1.java    |   61 -
 .../test/com/sun/javadoc/AccessH1/p1/C.java   |   27 -
 .../test/com/sun/javadoc/AccessH1/p2/C2.java  |   27 -
 .../javadoc/AccessSkipNav/AccessSkipNav.java  |   66 -
 .../com/sun/javadoc/AccessSkipNav/p1/C1.java  |   27 -
 .../com/sun/javadoc/AccessSkipNav/p2/C2.java  |   27 -
 .../javadoc/AccessSummary/AccessSummary.java  |   61 -
 .../com/sun/javadoc/AccessSummary/p1/C1.java  |   30 -
 .../com/sun/javadoc/AccessSummary/p2/C2.java  |   27 -
 .../com/sun/javadoc/AuthorDD/AuthorDD.java    |   63 -
 .../test/com/sun/javadoc/AuthorDD/p1/C1.java  |   42 -
 .../javadoc/DocRootSlash/DocRootSlash.java    |  149 -
 .../sun/javadoc/DocRootSlash/overview.html    |   63 -
 .../com/sun/javadoc/DocRootSlash/p1/C1.java   |   85 -
 .../sun/javadoc/DocRootSlash/p1/package.html  |   64 -
 .../com/sun/javadoc/DocRootSlash/p2/C2.java   |   30 -
 .../sun/javadoc/DocRootSlash/p2/package.html  |    9 -
 .../InheritDocForUserTags/DocTest.java        |  248 -
 .../JavascriptWinTitle.java                   |   75 -
 .../javadoc/JavascriptWinTitle/overview.html  |   14 -
 .../sun/javadoc/JavascriptWinTitle/p1/C.java  |   27 -
 .../sun/javadoc/JavascriptWinTitle/p2/C2.java |   27 -
 .../javadoc/JavascriptWinTitle/package-list   |  135 -
 .../test/com/sun/javadoc/MetaTag/MetaTag.java |  115 -
 .../test/com/sun/javadoc/MetaTag/p1/C1.java   |   53 -
 .../test/com/sun/javadoc/MetaTag/p2/C2.java   |   27 -
 .../PackagesHeader/PackagesHeader.java        |   90 -
 .../com/sun/javadoc/PackagesHeader/p1/C1.java |   27 -
 .../com/sun/javadoc/PackagesHeader/p2/C2.java |   27 -
 .../sun/javadoc/T6735320/SerialFieldTest.java |   34 -
 .../com/sun/javadoc/T6735320/T6735320.java    |   49 -
 .../com/sun/javadoc/ValidHtml/ValidHtml.java  |   78 -
 .../com/sun/javadoc/ValidHtml/overview.html   |   14 -
 .../test/com/sun/javadoc/ValidHtml/p1/C.java  |   35 -
 .../test/com/sun/javadoc/ValidHtml/p2/C2.java |   27 -
 .../javadoc/VersionNumber/VersionNumber.java  |   57 -
 .../com/sun/javadoc/VersionNumber/p1/C.java   |   35 -
 .../javadoc/WindowTitles/WindowTitles.java    |   88 -
 .../com/sun/javadoc/WindowTitles/p1/C1.java   |   29 -
 .../com/sun/javadoc/WindowTitles/p2/C2.java   |   27 -
 .../com/sun/javadoc/_template/Template.java   |   54 -
 .../javadoc/_template/TemplateComplete.java   |   65 -
 .../com/sun/javadoc/constantValues/A.java     |   36 -
 .../constantValues/TestConstantValues.java    |   37 -
 .../constantValues/TestConstantValues2.java   |   37 -
 .../TestConstantValuesDriver.java             |   56 -
 .../dupThrowsTags/TestDupThrowsTags.java      |   62 -
 .../com/sun/javadoc/lib/JavadocTester.java    |  779 --
 .../testAbsLinkPath/TestAbsLinkPath.java      |   57 -
 .../sun/javadoc/testAbsLinkPath/pkg1/C1.java  |   32 -
 .../sun/javadoc/testAbsLinkPath/pkg2/C2.java  |   29 -
 .../TestAbstractMethod.java                   |   99 -
 .../sun/javadoc/testAbstractMethod/pkg/A.java |   31 -
 .../sun/javadoc/testAbstractMethod/pkg/B.java |   31 -
 .../sun/javadoc/testAbstractMethod/pkg/C.java |   29 -
 .../testAnchorNames/TestAnchorNames.java      |  163 -
 .../testAnchorNames/pkg1/DeprMemClass.java    |   45 -
 .../testAnchorNames/pkg1/RegClass.java        |  186 -
 .../TestAnnotationOptional.java               |   53 -
 .../pkg/AnnotationOptional.java               |   36 -
 .../TestAnnotationTypes.java                  |   79 -
 .../pkg/AnnotationType.java                   |   36 -
 .../pkg/AnnotationTypeField.java              |   35 -
 .../sun/javadoc/testBackSlashInLink/C.java    |    7 -
 .../TestBackSlashInLink.java                  |   54 -
 .../TestBadPackageFileInJar.java              |   54 -
 .../badPackageFileInJar.jar                   |  Bin 488 -> 0 bytes
 .../testBadPackageFileInJar/pkg/C.java        |   26 -
 .../com/sun/javadoc/testBadSourceFile/C1.java |   34 -
 .../com/sun/javadoc/testBadSourceFile/C2.java |   27 -
 .../testBadSourceFile/TestBadSourceFile.java  |   55 -
 .../com/sun/javadoc/testBaseClass/Bar.java    |   30 -
 .../sun/javadoc/testBaseClass/BaseClass.java  |   53 -
 .../javadoc/testBaseClass/TestBaseClass.java  |   51 -
 .../sun/javadoc/testBaseClass/baz/Foo.java    |   26 -
 .../testBreakIterator/TestBreakIterator.java  |   56 -
 .../pkg/BreakIteratorTest.java                |   30 -
 .../TestCRLineSeparator.java                  |   83 -
 .../testCRLineSeparator/pkg/MyClass.java      |   31 -
 .../sun/javadoc/testCharset/TestCharset.java  |   74 -
 .../com/sun/javadoc/testCharset/pkg/Foo.java  |   26 -
 .../javadoc/testClassCrossReferences/C.java   |   35 -
 .../TestClassCrossReferences.java             |   68 -
 .../testClassCrossReferences/package-list     |    2 -
 .../javadoc/testClassTree/TestClassTree.java  |   81 -
 .../testClassTree/pkg/AnnotationType.java     |   45 -
 .../javadoc/testClassTree/pkg/ChildClass.java |   26 -
 .../sun/javadoc/testClassTree/pkg/Coin.java   |   37 -
 .../testClassTree/pkg/ParentClass.java        |   26 -
 .../com/sun/javadoc/testCmndLineClass/C5.java |   32 -
 .../testCmndLineClass/TestCmndLineClass.java  |   72 -
 .../javadoc/testCmndLineClass/pkg1/C1.java    |   34 -
 .../javadoc/testCmndLineClass/pkg1/C2.java    |   34 -
 .../testCmndLineClass/pkg1/package.html       |    7 -
 .../javadoc/testCmndLineClass/pkg2/C3.java    |   34 -
 .../javadoc/testCmndLineClass/pkg2/C4.java    |   34 -
 .../testCmndLineClass/pkg2/package.html       |    7 -
 .../TestCompletionFailure.java                |   52 -
 .../pkg1/NumberFormatTest.java                |   28 -
 .../TestConstantValuesPage.java               |   53 -
 .../sun/javadoc/testConstructorIndent/C.java  |   32 -
 .../TestConstructorIndent.java                |   58 -
 .../testConstructors/TestConstructors.java    |   92 -
 .../javadoc/testConstructors/pkg1/Outer.java  |   86 -
 .../javadoc/testCustomTag/TagTestClass.java   |   31 -
 .../javadoc/testCustomTag/TestCustomTag.java  |   97 -
 .../testCustomTag/taglets/CustomTag.java      |   61 -
 .../TestDeprecatedDocs.java                   |   91 -
 .../pkg/DeprecatedClassByAnnotation.java      |   37 -
 .../pkg/TestAnnotationType.java               |   42 -
 .../testDeprecatedDocs/pkg/TestClass.java     |   45 -
 .../testDeprecatedDocs/pkg/TestEnum.java      |   35 -
 .../testDeprecatedDocs/pkg/TestError.java     |   45 -
 .../testDeprecatedDocs/pkg/TestException.java |   45 -
 .../testDeprecatedDocs/pkg/TestInterface.java |   45 -
 .../testDocEncoding/TestDocEncoding.java      |   61 -
 .../sun/javadoc/testDocEncoding/pkg/Test.java |   31 -
 .../TestDocErrorReporter.java                 |   57 -
 .../testDocFileDir/TestDocFileDir.java        |   88 -
 .../com/sun/javadoc/testDocFileDir/pkg/C.java |   30 -
 .../doc-files/subdir-excluded1/testfile.txt   |    2 -
 .../doc-files/subdir-excluded2/testfile.txt   |    2 -
 .../pkg/doc-files/subdir-used1/testfile.txt   |    2 -
 .../pkg/doc-files/subdir-used2/testfile.txt   |    2 -
 .../testDocFileDir/pkg/doc-files/testfile.txt |    2 -
 .../javadoc/testDocFiles/TestDocFiles.java    |   51 -
 .../sun/javadoc/testDocFiles/pkg/Test.java    |   27 -
 .../testDocFiles/pkg/doc-files/test.txt       |    2 -
 .../TestDocRootInlineTag.java                 |   66 -
 .../testDocRootInlineTag/TestDocRootTag.java  |   29 -
 .../javadoc/testDocRootInlineTag/package-list |    1 -
 .../javadoc/testDocRootInlineTag/pkg/C.java   |   30 -
 .../testDocRootLink/TestDocRootLink.java      |  104 -
 .../sun/javadoc/testDocRootLink/pkg1/C1.java  |   36 -
 .../javadoc/testDocRootLink/pkg1/package.html |   18 -
 .../sun/javadoc/testDocRootLink/pkg2/C2.java  |   36 -
 .../javadoc/testDocRootLink/pkg2/package.html |   18 -
 .../testDupParamWarn/TestDupParamWarn.java    |   53 -
 .../sun/javadoc/testDupParamWarn/pkg/Bar.java |   34 -
 .../sun/javadoc/testDupParamWarn/pkg/Foo.java |   34 -
 .../testEmptyClass/TestEmptyClass.java        |   59 -
 .../sun/javadoc/testEmptyClass/src/Empty.java |   26 -
 .../TestEnclosingClass.java                   |   52 -
 .../testEnclosingClass/pkg/MyClass.java       |   28 -
 .../sun/javadoc/testEncoding/EncodeTest.java  |   30 -
 .../javadoc/testEncoding/TestEncoding.java    |   55 -
 .../TestExternalOverridenMethod.java          |   66 -
 .../testExternalOverridenMethod/package-list  |    1 -
 .../pkg/XReader.java                          |   43 -
 .../testGeneratedBy/TestGeneratedBy.java      |   98 -
 .../javadoc/testGeneratedBy/pkg/MyClass.java  |   29 -
 .../testGroupOption/TestGroupOption.java      |   73 -
 .../sun/javadoc/testGroupOption/pkg1/C.java   |   26 -
 .../sun/javadoc/testGroupOption/pkg2/C.java   |   26 -
 .../sun/javadoc/testGroupOption/pkg3/C.java   |   26 -
 .../javadoc/testHeadings/TestHeadings.java    |  116 -
 .../com/sun/javadoc/testHeadings/pkg1/C1.java |   46 -
 .../com/sun/javadoc/testHeadings/pkg2/C2.java |   41 -
 .../javadoc/testHelpFile/TestHelpFile.java    |   52 -
 .../testHelpOption/TestHelpOption.java        |  106 -
 .../testHiddenMembers/TestHiddenMembers.java  |   64 -
 .../testHiddenMembers/pkg/BaseClass.java      |   34 -
 .../testHiddenMembers/pkg/SubClass.java       |   34 -
 .../com/sun/javadoc/testHref/TestHref.java    |   83 -
 .../com/sun/javadoc/testHref/package-list     |    1 -
 .../test/com/sun/javadoc/testHref/pkg/C1.java |   36 -
 .../test/com/sun/javadoc/testHref/pkg/C2.java |   32 -
 .../test/com/sun/javadoc/testHref/pkg/C4.java |   28 -
 .../TestHrefInDocComment.java                 |   49 -
 .../javadoc/testHrefInDocComment/pkg/I1.java  |   30 -
 .../javadoc/testHrefInDocComment/pkg/I2.java  |   31 -
 .../com/sun/javadoc/testHtmlComments/C.java   |   24 -
 .../testHtmlComments/TestHtmlComments.java    |   53 -
 .../TestHtmlDefinitionListTag.java            |  400 -
 .../testHtmlDefinitionListTag/pkg1/C1.java    |  106 -
 .../testHtmlDefinitionListTag/pkg1/C2.java    |   84 -
 .../testHtmlDefinitionListTag/pkg1/C3.java    |   40 -
 .../testHtmlDefinitionListTag/pkg1/C4.java    |   37 -
 .../testHtmlDefinitionListTag/pkg1/C5.java    |   63 -
 .../pkg1/package-info.java                    |   29 -
 .../testHtmlDocument/TestHtmlDocument.java    |  144 -
 .../javadoc/testHtmlDocument/testLink.html    |    9 -
 .../javadoc/testHtmlDocument/testMarkup.html  |   18 -
 .../testHtmlStrongTag/TestHtmlStrongTag.java  |   73 -
 .../javadoc/testHtmlStrongTag/pkg1/C1.java    |   34 -
 .../javadoc/testHtmlStrongTag/pkg2/C2.java    |   29 -
 .../TestHtmlTableStyles.java                  |   78 -
 .../testHtmlTableStyles/pkg1/TestTable.java   |   84 -
 .../testHtmlTableStyles/pkg2/TestUse.java     |   34 -
 .../testHtmlTableTags/TestHtmlTableTags.java  |  359 -
 .../javadoc/testHtmlTableTags/pkg1/C1.java    |   81 -
 .../javadoc/testHtmlTableTags/pkg1/I1.java    |   48 -
 .../testHtmlTableTags/pkg1/package-info.java  |   27 -
 .../javadoc/testHtmlTableTags/pkg2/C2.java    |   73 -
 .../javadoc/testHtmlTableTags/pkg2/C3.java    |   38 -
 .../javadoc/testHtmlTableTags/pkg2/C4.java    |   33 -
 .../testHtmlTableTags/pkg2/package-info.java  |   27 -
 .../sun/javadoc/testHtmlTag/TestHtmlTag.java  |   99 -
 .../com/sun/javadoc/testHtmlTag/pkg1/C1.java  |   31 -
 .../com/sun/javadoc/testHtmlTag/pkg2/C2.java  |   29 -
 .../testHtmlVersion/TestHtmlVersion.java      | 1913 ----
 .../testHtmlVersion/pkg/AnnotationType.java   |   36 -
 .../testHtmlVersion/pkg/AnotherClass.java     |   78 -
 .../testHtmlVersion/pkg/TestError.java        |   36 -
 .../testHtmlVersion/pkg/TestException.java    |   36 -
 .../testHtmlVersion/pkg/TestInterface.java    |   33 -
 .../testHtmlVersion/pkg/package-info.java     |   27 -
 .../pkg1/NestedInnerClass.java                |   60 -
 .../pkg1/PrivateIncludeInnerClass.java        |   60 -
 .../pkg1/ProtectedInnerClass.java             |   57 -
 .../pkg1/PublicExcludeInnerClass.java         |   60 -
 .../testHtmlVersion/pkg1/RegClass.java        |   42 -
 .../pkg2/DeprecatedClassByAnnotation.java     |   37 -
 .../testHtmlVersion/pkg2/Interface.java       |   33 -
 .../pkg2/TestAnnotationType.java              |   42 -
 .../testHtmlVersion/pkg2/TestClass.java       |   50 -
 .../testHtmlVersion/pkg2/TestEnum.java        |   35 -
 .../testHtmlVersion/pkg2/TestError.java       |   45 -
 .../testHtmlVersion/pkg2/TestException.java   |   45 -
 .../testHtmlVersion/pkg2/TestInterface.java   |   45 -
 .../pkg3/ClassNoConstants.java                |   31 -
 .../profile-rtjar-includes.txt                |   30 -
 .../testIndentation/TestIndentation.java      |   62 -
 .../sun/javadoc/testIndentation/p/Indent.java |   28 -
 .../testIndentation/p/IndentAnnot.java        |   40 -
 .../com/sun/javadoc/testIndex/NoPackage.java  |   24 -
 .../com/sun/javadoc/testIndex/TestIndex.java  |   80 -
 .../javadoc/testIndex/pkg/AnnotationType.java |   45 -
 .../test/com/sun/javadoc/testIndex/pkg/C.java |   34 -
 .../com/sun/javadoc/testIndex/pkg/Coin.java   |   37 -
 .../sun/javadoc/testIndex/pkg/Interface.java  |   26 -
 .../TestInlineLinkLabel.java                  |   55 -
 .../javadoc/testInlineLinkLabel/pkg/C1.java   |   30 -
 .../javadoc/testInlineLinkLabel/pkg/C2.java   |   29 -
 .../testInlineLinkLabel/pkg/package.html      |    5 -
 .../javadoc/testInterface/TestInterface.java  |  111 -
 .../sun/javadoc/testInterface/pkg/Child.java  |   32 -
 .../javadoc/testInterface/pkg/Interface.java  |   42 -
 .../sun/javadoc/testInterface/pkg/Parent.java |   32 -
 .../sun/javadoc/testJavaFX/TestJavaFX.java    |  182 -
 .../com/sun/javadoc/testJavaFX/pkg1/C.java    |  101 -
 .../com/sun/javadoc/testJavaFX/pkg1/D.java    |   26 -
 .../com/sun/javadoc/testJavaFX/pkg2/Test.java |   35 -
 .../testJavascript/TestJavascript.java        |  123 -
 .../com/sun/javadoc/testJavascript/pkg/C.java |   26 -
 .../testLambdaFeature/TestLambdaFeature.java  |  114 -
 .../sun/javadoc/testLambdaFeature/pkg/A.java  |   32 -
 .../sun/javadoc/testLambdaFeature/pkg/B.java  |   31 -
 .../testLambdaFeature/pkg1/FuncInf.java       |   30 -
 .../testLambdaFeature/pkg1/NotAFuncInf.java   |   29 -
 .../testLeadingSpaces/LeadingSpaces.java      |   79 -
 .../com/sun/javadoc/testLegacyTaglet/C.java   |   36 -
 .../sun/javadoc/testLegacyTaglet/Check.java   |  143 -
 .../testLegacyTaglet/TestLegacyTaglet.java    |   62 -
 .../javadoc/testLegacyTaglet/ToDoTaglet.java  |  177 -
 .../testLegacyTaglet/UnderlineTaglet.java     |  136 -
 .../testLinkOption/TestBadLinkOption.java     |   58 -
 .../testLinkOption/TestLinkOption.java        |  145 -
 .../testLinkOption/TestNewLineInLink.java     |   54 -
 .../testLinkOption/extra/StringBuilder.java   |   28 -
 .../javadoc/testLinkOption/jdk/package-list   |  135 -
 .../mylib/lang/StringBuilderChild.java        |   30 -
 .../com/sun/javadoc/testLinkOption/pkg/C.java |   39 -
 .../sun/javadoc/testLinkOption/pkg2/C2.java   |   30 -
 .../testLinkOption/testNewLineInLink/C.java   |   26 -
 .../testNewLineInLink/package.html            |    6 -
 .../testLinkTaglet/TestLinkTaglet.java        |   73 -
 .../javadoc/testLinkTaglet/checkPkg/A.java    |   32 -
 .../javadoc/testLinkTaglet/checkPkg/B.java    |   36 -
 .../com/sun/javadoc/testLinkTaglet/pkg/C.java |   60 -
 .../TestLinkToSerialForm.java                 |   55 -
 .../javadoc/testLinkToSerialForm/pkg/C.java   |   26 -
 .../TestLiteralCodeInPre.java                 |   86 -
 .../testLiteralCodeInPre/pkg/Test.java        |   99 -
 .../TestMemberInheritence.java                |   90 -
 .../testMemberInheritence/diamond/A.java      |   32 -
 .../testMemberInheritence/diamond/B.java      |   31 -
 .../testMemberInheritence/diamond/C.java      |   31 -
 .../testMemberInheritence/diamond/X.java      |   31 -
 .../testMemberInheritence/diamond/Z.java      |   31 -
 .../testMemberInheritence/inheritDist/A.java  |   32 -
 .../testMemberInheritence/inheritDist/B.java  |   31 -
 .../testMemberInheritence/inheritDist/C.java  |   28 -
 .../testMemberInheritence/pkg/BaseClass.java  |   47 -
 .../pkg/BaseInterface.java                    |   33 -
 .../testMemberInheritence/pkg/SubClass.java   |   35 -
 .../testMemberSummary/TestMemberSummary.java  |   68 -
 .../testMemberSummary/pkg/PrivateParent.java  |   35 -
 .../testMemberSummary/pkg/PublicChild.java    |   31 -
 .../sun/javadoc/testMemberSummary/pkg2/A.java |   29 -
 .../testMethodTypes/TestMethodTypes.java      |  100 -
 .../sun/javadoc/testMethodTypes/pkg1/A.java   |   77 -
 .../sun/javadoc/testMethodTypes/pkg1/B.java   |   56 -
 .../sun/javadoc/testMethodTypes/pkg1/D.java   |   53 -
 .../sun/javadoc/testModifier/Interface.java   |   26 -
 .../testModifier/ModifierAbstract.java        |   57 -
 .../com/sun/javadoc/testModifier/Test.java    |   81 -
 .../javadoc/testModifier/TestModifier.java    |   51 -
 .../testNavigation/TestNavigation.java        |  151 -
 .../com/sun/javadoc/testNavigation/pkg/A.java |   29 -
 .../com/sun/javadoc/testNavigation/pkg/C.java |   29 -
 .../com/sun/javadoc/testNavigation/pkg/E.java |   29 -
 .../com/sun/javadoc/testNavigation/pkg/I.java |   29 -
 .../TestNestedGenerics.java                   |   54 -
 .../pkg/NestedGenerics.java                   |   31 -
 .../TestNestedInlineTag.java                  |   90 -
 .../testtaglets/BoldTaglet.java               |   66 -
 .../testtaglets/GreenTaglet.java              |   68 -
 .../testtaglets/UnderlineTaglet.java          |   68 -
 .../TestNewLanguageFeatures.java              |  640 --
 .../pkg/AnnotationType.java                   |   45 -
 .../pkg/AnnotationTypeUndocumented.java       |   46 -
 .../pkg/AnnotationTypeUsage.java              |   54 -
 .../testNewLanguageFeatures/pkg/Coin.java     |   49 -
 .../pkg/MultiTypeParameters.java              |   34 -
 .../pkg/SubInterface.java                     |   26 -
 .../pkg/SuperInterface.java                   |   26 -
 .../pkg/TypeParameterSubClass.java            |   26 -
 .../pkg/TypeParameterSuperClass.java          |   26 -
 .../pkg/TypeParameters.java                   |   70 -
 .../testNewLanguageFeatures/pkg/VarArgs.java  |   52 -
 .../pkg/Wildcards.java                        |   40 -
 .../pkg/package-info.java                     |   25 -
 .../testNewLanguageFeatures/pkg1/A.java       |   43 -
 .../testNewLanguageFeatures/pkg1/B.java       |   42 -
 .../pkg2/ClassUseTest1.java                   |   34 -
 .../pkg2/ClassUseTest2.java                   |   34 -
 .../pkg2/ClassUseTest3.java                   |   38 -
 .../testNewLanguageFeatures/pkg2/Foo.java     |   32 -
 .../testNewLanguageFeatures/pkg2/Foo2.java    |   26 -
 .../testNewLanguageFeatures/pkg2/Foo3.java    |   26 -
 .../testNewLanguageFeatures/pkg2/Foo4.java    |   26 -
 .../pkg2/ParamTest.java                       |   27 -
 .../pkg2/ParamTest2.java                      |   27 -
 .../com/sun/javadoc/testNoPackagesFile/C.java |   24 -
 .../TestNoPackagesFile.java                   |   53 -
 .../testNonInlineHtmlTagRemoval/C.java        |   79 -
 .../testNonInlineHtmlTagRemoval/Negative.java |   29 -
 .../TestNonInlineHtmlTagRemoval.java          |   72 -
 .../testNotifications/TestNotifications.java  |   71 -
 .../sun/javadoc/testNotifications/pkg/C.java  |   26 -
 .../sun/javadoc/testOptions/TestOptions.java  |   56 -
 .../com/sun/javadoc/testOptions/pkg/Foo.java  |   27 -
 .../test/com/sun/javadoc/testOrdering/C.java  |   74 -
 .../javadoc/testOrdering/TestOrdering.java    |  427 -
 .../com/sun/javadoc/testOrdering/UsedInC.java |   27 -
 .../com/sun/javadoc/testOrdering/pkg1/A.java  |   61 -
 .../com/sun/javadoc/testOrdering/pkg1/B.java  |   44 -
 .../com/sun/javadoc/testOrdering/pkg1/C1.java |   55 -
 .../com/sun/javadoc/testOrdering/pkg1/C2.java |   69 -
 .../com/sun/javadoc/testOrdering/pkg1/C3.java |   50 -
 .../com/sun/javadoc/testOrdering/pkg1/C4.java |   50 -
 .../testOrdering/pkg1/MethodOrder.java        |  219 -
 .../javadoc/testOrdering/pkg1/UsedClass.java  |   28 -
 .../sun/javadoc/testOrdering/src-2/a/A.java   |   33 -
 .../testOrdering/src-2/a/something.java       |   37 -
 .../sun/javadoc/testOrdering/src-2/b/B.java   |   33 -
 .../testOrdering/src-2/b/something.java       |   28 -
 .../testOrdering/src-2/e/something.java       |   28 -
 .../testOrdering/src-2/something/J.java       |   30 -
 .../src-2/something/package-info.java         |   27 -
 .../src-2/something/something.java            |   28 -
 .../TestMultiInheritence.java                 |   81 -
 .../TestOverridenMethodDocCopy.java           |   59 -
 .../TestOverridenPrivateMethods.java          |   77 -
 ...verridenPrivateMethodsWithPackageFlag.java |   89 -
 ...verridenPrivateMethodsWithPrivateFlag.java |   83 -
 .../testOverridenMethods/pkg1/BaseClass.java  |   53 -
 .../testOverridenMethods/pkg1/SubClass.java   |   51 -
 .../testOverridenMethods/pkg2/SubClass.java   |   52 -
 .../javadoc/testOverridenMethods/pkg3/I0.java |   26 -
 .../javadoc/testOverridenMethods/pkg3/I1.java |   26 -
 .../javadoc/testOverridenMethods/pkg3/I2.java |   30 -
 .../javadoc/testOverridenMethods/pkg3/I3.java |   30 -
 .../javadoc/testOverridenMethods/pkg3/I4.java |   30 -
 .../javadoc/testPackageDeprecation/C2.java    |   55 -
 .../testPackageDeprecation/FooDepr.java       |   34 -
 .../TestPackageDeprecation.java               |   81 -
 .../javadoc/testPackageDeprecation/pkg/A.java |   35 -
 .../pkg1/ClassUseTest1.java                   |   31 -
 .../testPackageDeprecation/pkg1/Foo.java      |   36 -
 .../testPackageDeprecation/pkg1/Foo2.java     |   26 -
 .../pkg1/package-info.java                    |   28 -
 .../testPackagePage/TestPackagePage.java      |   86 -
 .../javadoc/testPackagePage/com/pkg/C.java    |   26 -
 .../testPackagePage/com/pkg/package.html      |    5 -
 .../sun/javadoc/testPackagePage/pkg2/C.java   |   29 -
 .../testParamTaglet/TestParamTaglet.java      |   66 -
 .../sun/javadoc/testParamTaglet/pkg/C.java    |   41 -
 .../javadoc/testParamTaglet/pkg/Parent.java   |   32 -
 .../TestPrivateClasses.java                   |  235 -
 .../pkg/PrivateInterface.java                 |   51 -
 .../testPrivateClasses/pkg/PrivateParent.java |   56 -
 .../testPrivateClasses/pkg/PublicChild.java   |   48 -
 .../pkg/PublicInterface.java                  |   29 -
 .../javadoc/testPrivateClasses/pkg2/C.java    |   28 -
 .../javadoc/testPrivateClasses/pkg2/I.java    |   31 -
 .../TestRecurseSubPackages.java               |   59 -
 .../testRecurseSubPackages/pkg1/C1.java       |   26 -
 .../testRecurseSubPackages/pkg1/C2.java       |   26 -
 .../testRecurseSubPackages/pkg1/pkg2/C3.java  |   26 -
 .../testRecurseSubPackages/pkg1/pkg2/C4.java  |   26 -
 .../pkg2/packageToExclude/DummyClass.java     |   26 -
 .../pkg1/pkg2/pkg3/C5.java                    |   26 -
 .../pkg1/pkg2/pkg3/C6.java                    |   26 -
 .../testRelativeLinks/TestRelativeLinks.java  |   91 -
 .../sun/javadoc/testRelativeLinks/pkg/C.java  |   51 -
 .../testRelativeLinks/pkg/package.html        |    7 -
 .../javadoc/testRelativeLinks/pkg2/Foo.java   |   29 -
 .../TestRepeatedAnnotations.java              |  151 -
 .../testRepeatedAnnotations/pkg/C.java        |   39 -
 .../pkg/ContaineeRegDoc.java                  |   36 -
 .../pkg/ContaineeSynthDoc.java                |   37 -
 .../pkg/ContainerRegDoc.java                  |   38 -
 .../pkg/ContainerRegNotDoc.java               |   37 -
 .../pkg/ContainerSynthDoc.java                |   38 -
 .../testRepeatedAnnotations/pkg/D.java        |   37 -
 .../pkg/NonSynthDocContainer.java             |   38 -
 .../pkg/RegArryDoc.java                       |   38 -
 .../pkg/RegContaineeDoc.java                  |   36 -
 .../pkg/RegContaineeNotDoc.java               |   36 -
 .../pkg/RegContainerDoc.java                  |   38 -
 .../pkg/RegContainerNotDoc.java               |   37 -
 .../testRepeatedAnnotations/pkg/RegDoc.java   |   38 -
 .../testRepeatedAnnotations/pkg1/C.java       |   38 -
 .../pkg1/ContaineeNotDoc.java                 |   36 -
 .../pkg1/ContaineeSynthDoc.java               |   37 -
 .../pkg1/ContainerSynthNotDoc.java            |   37 -
 .../pkg1/ContainerValDoc.java                 |   40 -
 .../pkg1/ContainerValNotDoc.java              |   39 -
 .../pkg1/RegContaineeDoc.java                 |   36 -
 .../pkg1/RegContaineeNotDoc.java              |   35 -
 .../pkg1/RegContainerValDoc.java              |   40 -
 .../pkg1/RegContainerValNotDoc.java           |   39 -
 .../javadoc/testReturnTag/TestReturnTag.java  |   60 -
 .../sun/javadoc/testSearch/TestSearch.java    |  380 -
 .../javadoc/testSearch/UnnamedPkgClass.java   |   30 -
 .../testSearch/pkg/AnnotationType.java        |   36 -
 .../javadoc/testSearch/pkg/AnotherClass.java  |   78 -
 .../sun/javadoc/testSearch/pkg/TestError.java |   36 -
 .../javadoc/testSearch/pkg/TestException.java |   36 -
 .../javadoc/testSearch/pkg/TestInterface.java |   34 -
 .../javadoc/testSearch/pkg/package-info.java  |   28 -
 .../testSearch/pkg1/NestedInnerClass.java     |   60 -
 .../pkg1/PrivateIncludeInnerClass.java        |   60 -
 .../testSearch/pkg1/ProtectedInnerClass.java  |   57 -
 .../pkg1/PublicExcludeInnerClass.java         |   60 -
 .../sun/javadoc/testSearch/pkg1/RegClass.java |   42 -
 .../pkg2/DeprecatedClassByAnnotation.java     |   37 -
 .../javadoc/testSearch/pkg2/Interface.java    |   33 -
 .../testSearch/pkg2/TestAnnotationType.java   |   43 -
 .../javadoc/testSearch/pkg2/TestClass.java    |   50 -
 .../sun/javadoc/testSearch/pkg2/TestEnum.java |   35 -
 .../javadoc/testSearch/pkg2/TestError.java    |   46 -
 .../testSearch/pkg2/TestException.java        |   45 -
 .../testSearch/pkg2/TestInterface.java        |   45 -
 .../testSearch/pkg3/ClassNoConstants.java     |   31 -
 .../com/sun/javadoc/testSearch/pkgfx/C.java   |   95 -
 .../sun/javadoc/testSeeTag/TestSeeTag.java    |   55 -
 .../com/sun/javadoc/testSeeTag/pkg/Test.java  |   29 -
 .../sun/javadoc/testSerialVersionUID/C.java   |   27 -
 .../TestSerialVersionUID.java                 |   52 -
 .../TestSerializedForm.java                   |  161 -
 .../pkg1/NestedInnerClass.java                |   60 -
 .../pkg1/PrivateIncludeInnerClass.java        |   60 -
 .../pkg1/ProtectedInnerClass.java             |   57 -
 .../pkg1/PublicExcludeInnerClass.java         |   60 -
 .../TestSerializedFormDeprecationInfo.java    |  166 -
 .../pkg1/C1.java                              |  106 -
 .../pkg1/C2.java                              |   84 -
 .../pkg1/C3.java                              |   63 -
 .../test/com/sun/javadoc/testSimpleTag/C.java |   31 -
 .../javadoc/testSimpleTag/TestSimpleTag.java  |   63 -
 .../testSimpleTagExclude/DummyClass.java      |   28 -
 .../TestSimpleTagExclude.java                 |   54 -
 .../TestSimpleTagInherit.java                 |   65 -
 .../testSimpleTagInherit/p/BaseClass.java     |   34 -
 .../testSimpleTagInherit/p/TestClass.java     |   34 -
 .../javadoc/testSinceTag/TestSinceTag.java    |   75 -
 .../com/sun/javadoc/testSinceTag/pkg1/C1.java |  100 -
 .../TestSingleQuotedLink.java                 |   58 -
 .../javadoc/testSingleQuotedLink/pkg1/C1.java |   29 -
 .../javadoc/testSingleQuotedLink/pkg1/C2.java |   31 -
 .../testSingleQuotedLink/pkg1/package.html    |   14 -
 .../javadoc/testSourceTab/DoubleTab/C.java    |   37 -
 .../javadoc/testSourceTab/SingleTab/C.java    |   37 -
 .../javadoc/testSourceTab/TestSourceTab.java  |  104 -
 .../testStylesheet/TestStylesheet.java        |  173 -
 .../com/sun/javadoc/testStylesheet/pkg/A.java |   26 -
 .../javadoc/testSubTitle/TestSubTitle.java    |   65 -
 .../com/sun/javadoc/testSubTitle/pkg/C.java   |   30 -
 .../sun/javadoc/testSubTitle/pkg/package.html |    8 -
 .../com/sun/javadoc/testSummaryHeading/C.java |   24 -
 .../TestSummaryHeading.java                   |   54 -
 .../TestSuperClassInSerialForm.java           |   54 -
 .../pkg/SubClass.java                         |   26 -
 .../pkg/SuperClass.java                       |   26 -
 .../com/sun/javadoc/testSupplementary/C.java  |   45 -
 .../testSupplementary/TestSupplementary.java  |   69 -
 .../TestTagHolderMethod.java                  |   85 -
 .../javadoc/testTagHolderMethod/pkg/C.java    |   52 -
 .../TestTagInheritence.java                   |   70 -
 .../testTagInheritence/firstSentence/A.java   |   31 -
 .../testTagInheritence/firstSentence/B.java   |   31 -
 .../testTagInheritence/firstSentence2/A.java  |   31 -
 .../testTagInheritence/firstSentence2/B.java  |   33 -
 .../testTagInheritence/firstSentence2/C.java  |   33 -
 .../pkg/TestAbstractClass.java                |   74 -
 .../testTagInheritence/pkg/TestInterface.java |   58 -
 .../pkg/TestInterfaceForAbstractClass.java    |   31 -
 .../pkg/TestSuperSuperClass.java              |   52 -
 .../pkg/TestSuperSuperInterface.java          |   32 -
 .../pkg/TestTagInheritence.java               |  110 -
 .../javadoc/testTagMisuse/TestTagMisuse.java  |   74 -
 .../javadoc/testTagOutput/TestTagOutput.java  |   58 -
 .../testTagOutput/pkg1/DeprecatedTag.java     |   44 -
 .../test/com/sun/javadoc/testTaglets/C.java   |   30 -
 .../com/sun/javadoc/testTaglets/Child.java    |   30 -
 .../com/sun/javadoc/testTaglets/Parent.java   |   30 -
 .../sun/javadoc/testTaglets/TestTaglets.java  |   73 -
 .../sun/javadoc/testTaglets/taglets/Foo.java  |   61 -
 .../com/sun/javadoc/testThrowsHead/C.java     |   26 -
 .../testThrowsHead/TestThrowsHead.java        |   53 -
 .../sun/javadoc/testThrowsInheritence/C.java  |   31 -
 .../javadoc/testThrowsInheritence/Foo.java    |   34 -
 .../sun/javadoc/testThrowsInheritence/I.java  |   30 -
 .../javadoc/testThrowsInheritence/Iface.java  |   34 -
 .../TestThrowsTagInheritence.java             |   63 -
 .../javadoc/testThrowsTag/TestThrowsTag.java  |   61 -
 .../com/sun/javadoc/testThrowsTag/pkg/C.java  |   36 -
 .../com/sun/javadoc/testThrowsTag/pkg/P.java  |   36 -
 .../com/sun/javadoc/testThrowsTag/pkg/T1.java |   26 -
 .../com/sun/javadoc/testThrowsTag/pkg/T2.java |   26 -
 .../com/sun/javadoc/testThrowsTag/pkg/T3.java |   26 -
 .../com/sun/javadoc/testThrowsTag/pkg/T4.java |   26 -
 .../com/sun/javadoc/testThrowsTag/pkg/T5.java |   28 -
 .../com/sun/javadoc/testThrowsTag/pkg/T6.java |   28 -
 .../com/sun/javadoc/testThrowsTag/pkg/T7.java |   28 -
 .../com/sun/javadoc/testThrowsTag/pkg/T8.java |   28 -
 .../testTitleInHref/TestTitleInHref.java      |   61 -
 .../sun/javadoc/testTitleInHref/package-list  |    1 -
 .../javadoc/testTitleInHref/pkg/Class.java    |   26 -
 .../testTitleInHref/pkg/Interface.java        |   26 -
 .../javadoc/testTitleInHref/pkg/Links.java    |   32 -
 .../javadoc/testTopOption/TestTopOption.java  |   93 -
 .../sun/javadoc/testTopOption/overview.html   |    5 -
 .../testTopOption/pkg/AnnotationType.java     |   29 -
 .../com/sun/javadoc/testTopOption/pkg/Cl.java |   28 -
 .../TestTypeAnnotations.java                  |  352 -
 .../typeannos/ClassExtends.java               |   45 -
 .../typeannos/ClassParameters.java            |   60 -
 .../testTypeAnnotations/typeannos/Fields.java |   82 -
 .../typeannos/MethodReturnType.java           |   78 -
 .../typeannos/MethodTypeParameters.java       |   52 -
 .../typeannos/Parameters.java                 |   54 -
 .../typeannos/Receivers.java                  |  131 -
 .../testTypeAnnotations/typeannos/Throws.java |   51 -
 .../typeannos/TypeParameters.java             |   60 -
 .../typeannos/Varargs.java                    |   43 -
 .../typeannos/Wildcards.java                  |   74 -
 .../testTypeParams/TestTypeParameters.java    |   91 -
 .../com/sun/javadoc/testTypeParams/pkg/C.java |   43 -
 .../testTypeParams/pkg/ClassUseTest3.java     |   37 -
 .../sun/javadoc/testTypeParams/pkg/Foo4.java  |   26 -
 .../testTypeParams/pkg/ParamTest2.java        |   27 -
 .../javadoc/testTypeParams/pkg/Parent.java    |   26 -
 .../javadoc/testUnnamedPackage/BadSource.java |   24 -
 .../com/sun/javadoc/testUnnamedPackage/C.java |   27 -
 .../TestUnnamedPackage.java                   |   70 -
 .../javadoc/testUnnamedPackage/package.html   |    5 -
 .../test/com/sun/javadoc/testUseOption/C.java |   41 -
 .../javadoc/testUseOption/TestUseOption.java  |  160 -
 .../sun/javadoc/testUseOption/UsedInC.java    |   26 -
 .../testUseOption/pkg1/AnAbstract.java        |   25 -
 .../sun/javadoc/testUseOption/pkg1/C1.java    |   56 -
 .../sun/javadoc/testUseOption/pkg1/C10.java   |   88 -
 .../sun/javadoc/testUseOption/pkg1/C2.java    |   56 -
 .../sun/javadoc/testUseOption/pkg1/C4.java    |   40 -
 .../sun/javadoc/testUseOption/pkg1/C5.java    |   40 -
 .../sun/javadoc/testUseOption/pkg1/C6.java    |   40 -
 .../sun/javadoc/testUseOption/pkg1/C7.java    |   40 -
 .../sun/javadoc/testUseOption/pkg1/C8.java    |   40 -
 .../sun/javadoc/testUseOption/pkg1/C9.java    |   32 -
 .../javadoc/testUseOption/pkg1/UsedClass.java |   28 -
 .../testUseOption/pkg1/UsedInterface.java     |   37 -
 .../testUseOption/pkg1/UsedInterfaceA.java    |   37 -
 .../javadoc/testUseOption/pkg1/package.html   |    5 -
 .../sun/javadoc/testUseOption/pkg2/C3.java    |   46 -
 .../javadoc/testUseOption/pkg2/package.html   |    5 -
 .../sun/javadoc/testUseOption/unique/C1.java  |   60 -
 .../javadoc/testUseOption/unique/UseMe.java   |   26 -
 .../javadoc/testValueTag/TestValueTag.java    |  141 -
 .../sun/javadoc/testValueTag/pkg1/Class1.java |   91 -
 .../sun/javadoc/testValueTag/pkg1/Class2.java |   65 -
 .../testValueTag/pkg1/CustomTagUsage.java     |   43 -
 .../sun/javadoc/testValueTag/pkg2/Class3.java |   34 -
 .../javadoc/testValueTag/pkg2/package.html    |    5 -
 .../sun/javadoc/testWarnBadParamNames/C.java  |   33 -
 .../TestWarnBadParamNames.java                |   55 -
 .../javadoc/testWarnings/TestWarnings.java    |   80 -
 .../com/sun/javadoc/testWarnings/pkg/X.java   |   29 -
 .../sun/javadoc/testWarnings/pkg/package.html |    4 -
 .../testWindowTitle/TestWindowTitle.java      |  218 -
 .../sun/javadoc/testWindowTitle/p1/C1.java    |   27 -
 .../sun/javadoc/testWindowTitle/p2/C2.java    |   27 -
 .../sun/javadoc/testXOption/TestXOption.java  |   73 -
 .../typeAnnotations/smoke/TestSmoke.java      |  110 -
 .../smoke/pkg/TargetTypes.java                |  234 -
 .../jdk/javadoc/tool/EnsureNewOldDoclet.java  |  169 +-
 .../test/tools/javadoc/6942366/T6942366.java  |   22 +-
 .../test/tools/javadoc/6958836/Test.java      |   95 +-
 .../tools/javadoc/6958836/errs/Errors.java    |   38 -
 .../tools/javadoc/6958836/warns/Warnings.java |   57 -
 .../test/tools/javadoc/6964914/Test.java      |    4 +-
 .../test/tools/javadoc/BadOptionsTest.java    |   40 +-
 .../test/tools/javadoc/CheckResourceKeys.java |    9 +-
 langtools/test/tools/javadoc/MaxWarns.java    |   56 +-
 .../test/tools/javadoc/ReleaseOption.java     |    4 +-
 langtools/test/tools/javadoc/T4696488.java    |   57 -
 langtools/test/tools/javadoc/T6551367.java    |   55 -
 langtools/test/tools/javadoc/T6968833.java    |   13 +-
 .../tools/javadoc/TestScriptInComment.java    |  314 -
 .../javadoc/api/basic/TagletPathTest.java     |  111 -
 .../test/tools/javadoc/badSuper/BadSuper.java |   40 -
 .../test/tools/javadoc/badSuper/p/A.java      |   27 -
 .../test/tools/javadoc/badSuper/p/B.java      |   30 -
 .../test/tools/javadoc/lib/ToyDoclet.java     |   80 +
 .../tools/javadoc/nonConstExprs/Test.java     |    3 +-
 .../javadoc/parser/7091528/T7091528.java      |   19 +-
 .../javadoc/sampleapi/SampleApiTest.java      |   94 -
 .../test/tools/javadoc/sampleapi/res/fx.xml   |   48 -
 .../tools/javadoc/sampleapi/res/simple.xml    |  533 -
 .../test/tools/javadoc/sampleapi/res/sub.xml  |   92 -
 .../test/tools/javadoc/sampleapi/res/tiny.xml |   73 -
 849 files changed, 270 insertions(+), 110604 deletions(-)
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/glass.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/external/jquery/jquery.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_222222_256x240.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_2e83ff_256x240.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_454545_256x240.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_888888_256x240.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_cd0a0a_256x240.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-1.10.2.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.css
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.css
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.css
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.min.css
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.min.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.min.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/search.js
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/x.png
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
 delete mode 100644 langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/5093723/DocumentedClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/5093723/T5093723.java
 delete mode 100644 langtools/test/com/sun/javadoc/5093723/UndocumentedClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/p1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/p1/I.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessH1/AccessH1.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessH1/p1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessH1/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSkipNav/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSkipNav/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSummary/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/AccessSummary/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java
 delete mode 100644 langtools/test/com/sun/javadoc/AuthorDD/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/overview.html
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/p1/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/DocRootSlash/p2/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
 delete mode 100644 langtools/test/com/sun/javadoc/JavascriptWinTitle/overview.html
 delete mode 100644 langtools/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/JavascriptWinTitle/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/MetaTag/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/MetaTag/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
 delete mode 100644 langtools/test/com/sun/javadoc/PackagesHeader/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/PackagesHeader/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/T6735320/T6735320.java
 delete mode 100644 langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java
 delete mode 100644 langtools/test/com/sun/javadoc/ValidHtml/overview.html
 delete mode 100644 langtools/test/com/sun/javadoc/ValidHtml/p1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/ValidHtml/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
 delete mode 100644 langtools/test/com/sun/javadoc/VersionNumber/p1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
 delete mode 100644 langtools/test/com/sun/javadoc/WindowTitles/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/WindowTitles/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/_template/Template.java
 delete mode 100644 langtools/test/com/sun/javadoc/_template/TemplateComplete.java
 delete mode 100644 langtools/test/com/sun/javadoc/constantValues/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/constantValues/TestConstantValues.java
 delete mode 100644 langtools/test/com/sun/javadoc/constantValues/TestConstantValues2.java
 delete mode 100644 langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
 delete mode 100644 langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
 delete mode 100644 langtools/test/com/sun/javadoc/lib/JavadocTester.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbsLinkPath/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbsLinkPath/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbstractMethod/pkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbstractMethod/pkg/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAbstractMethod/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBackSlashInLink/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar
 delete mode 100644 langtools/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBadSourceFile/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBadSourceFile/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBaseClass/Bar.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBaseClass/BaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBaseClass/baz/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
 delete mode 100644 langtools/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCharset/TestCharset.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassCrossReferences/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassCrossReferences/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassTree/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassTree/pkg/Coin.java
 delete mode 100644 langtools/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/C5.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testConstructorIndent/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
 delete mode 100644 langtools/test/com/sun/javadoc/testConstructors/pkg1/Outer.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCustomTag/TagTestClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testCustomTag/taglets/CustomTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFiles/pkg/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootInlineTag/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java
 delete mode 100644 langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEmptyClass/src/Empty.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEnclosingClass/pkg/MyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
 delete mode 100644 langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
 delete mode 100644 langtools/test/com/sun/javadoc/testExternalOverridenMethod/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGroupOption/pkg1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGroupOption/pkg2/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testGroupOption/pkg3/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHeadings/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHeadings/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHref/TestHref.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHref/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testHref/pkg/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHref/pkg/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHref/pkg/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlComments/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDocument/testLink.html
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlDocument/testMarkup.html
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnotherClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestError.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestException.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/NestedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/ProtectedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PublicExcludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/RegClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestAnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestEnum.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestError.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestException.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/pkg3/ClassNoConstants.java
 delete mode 100644 langtools/test/com/sun/javadoc/testHtmlVersion/profile-rtjar-includes.txt
 delete mode 100644 langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndentation/p/Indent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndentation/p/IndentAnnot.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/NoPackage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/TestIndex.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/pkg/Coin.java
 delete mode 100644 langtools/test/com/sun/javadoc/testIndex/pkg/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testInterface/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInterface/pkg/Child.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInterface/pkg/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testInterface/pkg/Parent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
 delete mode 100644 langtools/test/com/sun/javadoc/testJavascript/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLambdaFeature/pkg/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLegacyTaglet/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLegacyTaglet/Check.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/extra/StringBuilder.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/jdk/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/mylib/lang/StringBuilderChild.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/pkg2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkTaglet/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
 delete mode 100644 langtools/test/com/sun/javadoc/testLiteralCodeInPre/pkg/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/diamond/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/diamond/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/diamond/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/diamond/X.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMemberSummary/pkg2/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMethodTypes/pkg1/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMethodTypes/pkg1/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testMethodTypes/pkg1/D.java
 delete mode 100644 langtools/test/com/sun/javadoc/testModifier/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testModifier/ModifierAbstract.java
 delete mode 100644 langtools/test/com/sun/javadoc/testModifier/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testModifier/TestModifier.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNavigation/pkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNavigation/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNavigation/pkg/E.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNavigation/pkg/I.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SubInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNoPackagesFile/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
 delete mode 100644 langtools/test/com/sun/javadoc/testNotifications/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOptions/TestOptions.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/UsedInC.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/MethodOrder.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/pkg1/UsedClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I0.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackagePage/com/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPackagePage/com/pkg/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testPackagePage/pkg2/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testParamTaglet/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/I.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRelativeLinks/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java
 delete mode 100644 langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/TestSearch.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/UnnamedPkgClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/AnotherClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/TestError.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/TestException.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg/package-info.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg1/NestedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg1/PrivateIncludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg1/ProtectedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg1/PublicExcludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg1/RegClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/DeprecatedClassByAnnotation.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestAnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestEnum.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestError.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestException.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg2/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkg3/ClassNoConstants.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSeeTag/pkg/Test.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerialVersionUID/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTag/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTagInherit/p/BaseClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSimpleTagInherit/p/TestClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
 delete mode 100644 langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
 delete mode 100644 langtools/test/com/sun/javadoc/testStylesheet/pkg/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSubTitle/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSubTitle/pkg/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testSummaryHeading/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSupplementary/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTagOutput/pkg1/DeprecatedTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTaglets/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTaglets/Child.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTaglets/Parent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsHead/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsInheritence/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsInheritence/Foo.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsInheritence/I.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsInheritence/Iface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/P.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T5.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T6.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T7.java
 delete mode 100644 langtools/test/com/sun/javadoc/testThrowsTag/pkg/T8.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTitleInHref/package-list
 delete mode 100644 langtools/test/com/sun/javadoc/testTitleInHref/pkg/Class.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTitleInHref/pkg/Links.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTopOption/overview.html
 delete mode 100644 langtools/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTopOption/pkg/Cl.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/pkg/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testTypeParams/pkg/Parent.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUnnamedPackage/BadSource.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUnnamedPackage/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUnnamedPackage/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/UsedInC.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C10.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C4.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C5.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C6.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C7.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C8.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/C9.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterface.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterfaceA.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg1/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg2/C3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/pkg2/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/unique/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testUseOption/unique/UseMe.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/pkg1/Class1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/pkg1/Class2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/pkg2/Class3.java
 delete mode 100644 langtools/test/com/sun/javadoc/testValueTag/pkg2/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testWarnBadParamNames/C.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWarnings/pkg/X.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
 delete mode 100644 langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java
 delete mode 100644 langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java
 delete mode 100644 langtools/test/com/sun/javadoc/testXOption/TestXOption.java
 delete mode 100644 langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
 delete mode 100644 langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
 delete mode 100644 langtools/test/tools/javadoc/6958836/errs/Errors.java
 delete mode 100644 langtools/test/tools/javadoc/6958836/warns/Warnings.java
 delete mode 100644 langtools/test/tools/javadoc/T4696488.java
 delete mode 100644 langtools/test/tools/javadoc/T6551367.java
 delete mode 100644 langtools/test/tools/javadoc/TestScriptInComment.java
 delete mode 100644 langtools/test/tools/javadoc/api/basic/TagletPathTest.java
 delete mode 100644 langtools/test/tools/javadoc/badSuper/BadSuper.java
 delete mode 100644 langtools/test/tools/javadoc/badSuper/p/A.java
 delete mode 100644 langtools/test/tools/javadoc/badSuper/p/B.java
 create mode 100644 langtools/test/tools/javadoc/lib/ToyDoclet.java
 delete mode 100644 langtools/test/tools/javadoc/sampleapi/SampleApiTest.java
 delete mode 100644 langtools/test/tools/javadoc/sampleapi/res/fx.xml
 delete mode 100644 langtools/test/tools/javadoc/sampleapi/res/simple.xml
 delete mode 100644 langtools/test/tools/javadoc/sampleapi/res/sub.xml
 delete mode 100644 langtools/test/tools/javadoc/sampleapi/res/tiny.xml

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
deleted file mode 100644
index a1bf6c016ef..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/Taglet.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2001, 2017, 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.doclets;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for a custom tag used by Doclets. A custom
- * tag must implement this interface.
- *
- * <p style="font-style: italic; font-size:larger">
- * <b>Note:</b> This interface has been superseded by its replacement,
- * {@link jdk.javadoc.doclet.Taglet}.
- * </p>
- *
- * To be loaded and used by
- * doclets at run-time, the taglet must have a static method called
- * <code>register</code> that accepts a {@link java.util.Map} as an
- * argument with the following signature:
- * <pre>
- *   public void register(Map map)
- * </pre>
- * This method should add an instance of the custom taglet to the map
- * with the name of the taglet as the key.  If overriding a taglet,
- * to avoid a name conflict, the overridden taglet must be deleted from
- * the map before an instance of the new taglet is added to the map.
- * <p>
- * It is recommended that the taglet throw an exception when it fails
- * to register itself.  The exception that it throws is up to the user.
- * <p>
- * Here are two sample taglets: <br>
- * <ul>
- *  <li><a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/ToDoTaglet.java">ToDoTaglet.java</a>
- *         - Standalone taglet</li>
- *  <li><a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/UnderlineTaglet.java">UnderlineTaglet.java</a>
- *         - Inline taglet</li>
- * </ul>
- * <p>
- * For more information on how to create your own Taglets, please see the
- * <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/overview.html">Taglet Overview</a>.
- *
- * @since 1.4
- * @author Jamie Ho
- *
- * @deprecated
- * This interface has been superseded by its replacement,
- * {@link jdk.javadoc.doclet.Taglet}.
- */
-@Deprecated
-public interface Taglet {
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in field documentation.  Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public abstract boolean inField();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in constructor documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public abstract boolean inConstructor();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in method documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inMethod();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in overview documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inOverview();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in package documentation. Set to
-     * false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public abstract boolean inPackage();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in type documentation (classes or
-     * interfaces). Set to false for inline tags.
-     * @return true if this <code>Taglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public abstract boolean inType();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag. Return false otherwise.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public abstract boolean isInlineTag();
-
-    /**
-     * Return the name of this custom tag.
-     * @return the name of this custom tag.
-     */
-    public abstract String getName();
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation, which is output
-     * to the generated page.
-     * @param tag the <code>Tag</code> representation of this custom tag.
-     * @return the string representation of this <code>Tag</code>.
-     */
-    public abstract String toString(Tag tag);
-
-    /**
-     * Given an array of <code>Tag</code>s representing this custom
-     * tag, return its string representation, which is output
-     * to the generated page.  This method should
-     * return null if this taglet represents an inline tag.
-     * @param tags the array of <code>Tag</code>s representing of this custom tag.
-     * @return the string representation of this <code>Tag</code>.
-     */
-    public abstract String toString(Tag[] tags);
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
deleted file mode 100644
index b86d03739f8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, 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.doclets.formats.html;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Print method and constructor info.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractExecutableMemberWriter extends AbstractMemberWriter {
-
-    public AbstractExecutableMemberWriter(SubWriterHolderWriter writer,
-            ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public AbstractExecutableMemberWriter(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * Add the type parameters for the executable member.
-     *
-     * @param member the member to write type parameters for.
-     * @param htmltree the content tree to which the parameters will be added.
-     */
-    protected void addTypeParameters(ExecutableMemberDoc member, Content htmltree) {
-        Content typeParameters = getTypeParameters(member);
-        if (!typeParameters.isEmpty()) {
-            htmltree.addContent(typeParameters);
-            htmltree.addContent(writer.getSpace());
-        }
-    }
-
-    /**
-     * Get the type parameters for the executable member.
-     *
-     * @param member the member for which to get the type parameters.
-     * @return the type parameters.
-     */
-    protected Content getTypeParameters(ExecutableMemberDoc member) {
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-            LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS, member);
-        return writer.getTypeParameterLinks(linkInfo);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, (MemberDoc) emd,
-                emd.qualifiedName() + emd.flatSignature());
-    }
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param cd the classDoc that we should link to
-     * @param member the member being linked to
-     * @param tdSummary the content tree to which the link will be added
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-        String name = emd.name();
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, cd, (MemberDoc) emd,
-                name, false));
-        Content code = HtmlTree.CODE(memberLink);
-        addParameters(emd, false, code, name.length() - 1);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * Add the inherited summary link for the member.
-     *
-     * @param cd the classDoc that we should link to
-     * @param member the member being linked to
-     * @param linksTree the content tree to which the link will be added
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        linksTree.addContent(
-                writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc) member,
-                member.name(), false));
-    }
-
-    /**
-     * Add the parameter for the executable member.
-     *
-     * @param member the member to write parameter for.
-     * @param param the parameter that needs to be written.
-     * @param isVarArg true if this is a link to var arg.
-     * @param tree the content tree to which the parameter information will be added.
-     */
-    protected void addParam(ExecutableMemberDoc member, Parameter param,
-            boolean isVarArg, Content tree) {
-        if (param.type() != null) {
-            Content link = writer.getLink(new LinkInfoImpl(
-                    configuration, LinkInfoImpl.Kind.EXECUTABLE_MEMBER_PARAM,
-                    param.type()).varargs(isVarArg));
-            tree.addContent(link);
-        }
-        if(param.name().length() > 0) {
-            tree.addContent(writer.getSpace());
-            tree.addContent(param.name());
-        }
-    }
-
-    /**
-     * Add the receiver annotations information.
-     *
-     * @param member the member to write receiver annotations for.
-     * @param rcvrType the receiver type.
-     * @param descList list of annotation description.
-     * @param tree the content tree to which the information will be added.
-     */
-    protected void addReceiverAnnotations(ExecutableMemberDoc member, Type rcvrType,
-            AnnotationDesc[] descList, Content tree) {
-        writer.addReceiverAnnotationInfo(member, descList, tree);
-        tree.addContent(writer.getSpace());
-        tree.addContent(rcvrType.typeName());
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, rcvrType);
-        tree.addContent(writer.getTypeParameterLinks(linkInfo));
-        tree.addContent(writer.getSpace());
-        tree.addContent("this");
-    }
-
-
-    /**
-     * Add all the parameters for the executable member.
-     *
-     * @param member the member to write parameters for.
-     * @param htmltree the content tree to which the parameters information will be added.
-     */
-    protected void addParameters(ExecutableMemberDoc member, Content htmltree, int indentSize) {
-        addParameters(member, true, htmltree, indentSize);
-    }
-
-    /**
-     * Add all the parameters for the executable member.
-     *
-     * @param member the member to write parameters for.
-     * @param includeAnnotations true if annotation information needs to be added.
-     * @param htmltree the content tree to which the parameters information will be added.
-     */
-    protected void addParameters(ExecutableMemberDoc member,
-            boolean includeAnnotations, Content htmltree, int indentSize) {
-        htmltree.addContent("(");
-        String sep = "";
-        Parameter[] params = member.parameters();
-        String indent = makeSpace(indentSize + 1);
-        Type rcvrType = member.receiverType();
-        if (includeAnnotations && rcvrType instanceof AnnotatedType) {
-            AnnotationDesc[] descList = rcvrType.asAnnotatedType().annotations();
-            if (descList.length > 0) {
-                addReceiverAnnotations(member, rcvrType, descList, htmltree);
-                sep = "," + DocletConstants.NL + indent;
-            }
-        }
-        int paramstart;
-        for (paramstart = 0; paramstart < params.length; paramstart++) {
-            htmltree.addContent(sep);
-            Parameter param = params[paramstart];
-            if (!param.name().startsWith("this$")) {
-                if (includeAnnotations) {
-                    boolean foundAnnotations =
-                            writer.addAnnotationInfo(indent.length(),
-                            member, param, htmltree);
-                    if (foundAnnotations) {
-                        htmltree.addContent(DocletConstants.NL);
-                        htmltree.addContent(indent);
-                    }
-                }
-                addParam(member, param,
-                    (paramstart == params.length - 1) && member.isVarArgs(), htmltree);
-                break;
-            }
-        }
-
-        for (int i = paramstart + 1; i < params.length; i++) {
-            htmltree.addContent(",");
-            htmltree.addContent(DocletConstants.NL);
-            htmltree.addContent(indent);
-            if (includeAnnotations) {
-                boolean foundAnnotations =
-                        writer.addAnnotationInfo(indent.length(), member, params[i],
-                        htmltree);
-                if (foundAnnotations) {
-                    htmltree.addContent(DocletConstants.NL);
-                    htmltree.addContent(indent);
-                }
-            }
-            addParam(member, params[i], (i == params.length - 1) && member.isVarArgs(),
-                    htmltree);
-        }
-        htmltree.addContent(")");
-    }
-
-    /**
-     * Add exceptions for the executable member.
-     *
-     * @param member the member to write exceptions for.
-     * @param htmltree the content tree to which the exceptions information will be added.
-     */
-    protected void addExceptions(ExecutableMemberDoc member, Content htmltree, int indentSize) {
-        Type[] exceptions = member.thrownExceptionTypes();
-        if (exceptions.length > 0) {
-            LinkInfoImpl memberTypeParam = new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.MEMBER, member);
-            String indent = makeSpace(indentSize + 1 - 7);
-            htmltree.addContent(DocletConstants.NL);
-            htmltree.addContent(indent);
-            htmltree.addContent("throws ");
-            indent = makeSpace(indentSize + 1);
-            Content link = writer.getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.MEMBER, exceptions[0]));
-            htmltree.addContent(link);
-            for(int i = 1; i < exceptions.length; i++) {
-                htmltree.addContent(",");
-                htmltree.addContent(DocletConstants.NL);
-                htmltree.addContent(indent);
-                Content exceptionLink = writer.getLink(new LinkInfoImpl(
-                        configuration, LinkInfoImpl.Kind.MEMBER, exceptions[i]));
-                htmltree.addContent(exceptionLink);
-            }
-        }
-    }
-
-    protected ClassDoc implementsMethodInIntfac(MethodDoc method,
-                                                ClassDoc[] intfacs) {
-        for (ClassDoc intf : intfacs) {
-            MethodDoc[] methods = intf.methods();
-            if (methods.length > 0) {
-                for (MethodDoc md : methods) {
-                    if (md.name().equals(method.name()) &&
-                        md.signature().equals(method.signature())) {
-                        return intf;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * For backward compatibility, include an anchor using the erasures of the
-     * parameters.  NOTE:  We won't need this method anymore after we fix
-     * see tags so that they use the type instead of the erasure.
-     *
-     * @param emd the ExecutableMemberDoc to anchor to.
-     * @return the 1.4.x style anchor for the ExecutableMemberDoc.
-     */
-    protected String getErasureAnchor(ExecutableMemberDoc emd) {
-        StringBuilder buf = new StringBuilder(emd.name() + "(");
-        Parameter[] params = emd.parameters();
-        boolean foundTypeVariable = false;
-        for (int i = 0; i < params.length; i++) {
-            if (i > 0) {
-                buf.append(",");
-            }
-            Type t = params[i].type();
-            foundTypeVariable = foundTypeVariable || t.asTypeVariable() != null;
-            buf.append(t.isPrimitive() ?
-                t.typeName() : t.asClassDoc().qualifiedName());
-            buf.append(t.dimension());
-        }
-        buf.append(")");
-        return foundTypeVariable ? writer.getName(buf.toString()) : null;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
deleted file mode 100644
index afcceca1990..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-import java.nio.file.*;
-import java.util.zip.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate Index for all the Member Names with Indexing in
- * Unicode Order. This class is a base class for {@link SingleIndexWriter} and
- * {@link SplitIndexWriter}. It uses the functionality from
- * {@link HtmlDocletWriter} to generate the Index Contents.
- *
- *  <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>
- *
- * @see    IndexBuilder
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AbstractIndexWriter extends HtmlDocletWriter {
-
-    /**
-     * The index of all the members with unicode character.
-     */
-    protected IndexBuilder indexbuilder;
-
-    /**
-     * This constructor will be used by {@link SplitIndexWriter}. Initializes
-     * path to this file and relative path from this file.
-     *
-     * @param configuration  The current configuration
-     * @param path       Path to the file which is getting generated.
-     * @param indexbuilder Unicode based Index from {@link IndexBuilder}
-     */
-    protected AbstractIndexWriter(ConfigurationImpl configuration,
-                                  DocPath path,
-                                  IndexBuilder indexbuilder)
-                                  throws IOException {
-        super(configuration, path);
-        this.indexbuilder = indexbuilder;
-    }
-
-    /**
-     * Get the index label for navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    protected Content getNavLinkIndex() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, indexLabel);
-        return li;
-    }
-
-    /**
-     * Add the member information for the unicode character along with the
-     * list of the members.
-     *
-     * @param uc Unicode for which member list information to be generated
-     * @param memberlist List of members for the unicode character
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addContents(Character uc, List<? extends Doc> memberlist,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        int memberListSize = memberlist.size();
-        // Display the list only if there are elements to be displayed.
-        if (memberListSize > 0) {
-            Content dl = new HtmlTree(HtmlTag.DL);
-            for (Doc element : memberlist) {
-                addDescription(dl, element);
-            }
-            contentTree.addContent(dl);
-        }
-    }
-
-    protected void addSearchContents(Character uc, List<SearchIndexItem> searchList,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        // Display the list only if there are elements to be displayed.
-        if (!searchList.isEmpty()) {
-            Content dl = new HtmlTree(HtmlTag.DL);
-            for (SearchIndexItem sii : searchList) {
-                addDescription(sii, dl);
-            }
-            contentTree.addContent(dl);
-        }
-    }
-
-    protected void addContents(Character uc, List<? extends Doc> memberlist, List<SearchIndexItem> searchList,
-            Content contentTree) {
-        addHeading(uc, contentTree);
-        int memberListSize = memberlist.size();
-        int searchListSize = searchList.size();
-        int i = 0;
-        int j = 0;
-        Content dl = new HtmlTree(HtmlTag.DL);
-        while (i < memberListSize && j < searchListSize) {
-            if (memberlist.get(i).name().compareTo(searchList.get(j).getLabel()) < 0) {
-                addDescription(dl, memberlist.get(i));
-                i++;
-            } else if (memberlist.get(i).name().compareTo(searchList.get(j).getLabel()) > 0) {
-                addDescription(searchList.get(j), dl);
-                j++;
-            } else {
-                addDescription(dl, memberlist.get(i));
-                addDescription(searchList.get(j), dl);
-                j++;
-                i++;
-            }
-        }
-        if (i >= memberListSize) {
-            while (j < searchListSize) {
-                addDescription(searchList.get(j), dl);
-                j++;
-            }
-        }
-        if (j >= searchListSize) {
-            while (i < memberListSize) {
-                addDescription(dl, memberlist.get(i));
-                i++;
-            }
-        }
-        contentTree.addContent(dl);
-    }
-
-    protected void addHeading(Character uc, Content contentTree) {
-        String unicode = uc.toString();
-        contentTree.addContent(getMarkerAnchorForIndex(unicode));
-        Content headContent = new StringContent(unicode);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, false,
-                HtmlStyle.title, headContent);
-        contentTree.addContent(heading);
-    }
-
-    protected void addDescription(Content dl, Doc element) {
-        SearchIndexItem si = new SearchIndexItem();
-        if (element instanceof MemberDoc) {
-            addDescription((MemberDoc) element, dl, si);
-            configuration.memberSearchIndex.add(si);
-        } else if (element instanceof ClassDoc) {
-            addDescription((ClassDoc) element, dl, si);
-            configuration.typeSearchIndex.add(si);
-        } else if (element instanceof PackageDoc) {
-            addDescription((PackageDoc) element, dl, si);
-            configuration.packageSearchIndex.add(si);
-        }
-    }
-    /**
-     * Add one line summary comment for the package.
-     *
-     * @param pkg the package to be documented
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(PackageDoc pkg, Content dlTree, SearchIndexItem si) {
-        Content link = getPackageLink(pkg, new StringContent(utils.getPackageName(pkg)));
-        si.setLabel(utils.getPackageName(pkg));
-        si.setCategory(getResource("doclet.Packages").toString());
-        Content dt = HtmlTree.DT(link);
-        dt.addContent(" - ");
-        dt.addContent(getResource("doclet.package"));
-        dt.addContent(" " + pkg.name());
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addSummaryComment(pkg, dd);
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add one line summary comment for the class.
-     *
-     * @param cd the class being documented
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(ClassDoc cd, Content dlTree, SearchIndexItem si) {
-        Content link = getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.INDEX, cd).strong(true));
-        si.setContainingPackage(utils.getPackageName(cd.containingPackage()));
-        si.setLabel(cd.typeName());
-        si.setCategory(getResource("doclet.Types").toString());
-        Content dt = HtmlTree.DT(link);
-        dt.addContent(" - ");
-        addClassInfo(cd, dt);
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addComment(cd, dd);
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add the classkind (class, interface, exception), error of the class
-     * passed.
-     *
-     * @param cd the class being documented
-     * @param contentTree the content tree to which the class info will be added
-     */
-    protected void addClassInfo(ClassDoc cd, Content contentTree) {
-        contentTree.addContent(getResource("doclet.in",
-                utils.getTypeName(configuration, cd, false),
-                getPackageLink(cd.containingPackage(),
-                    utils.getPackageName(cd.containingPackage()))
-                ));
-    }
-
-    /**
-     * Add description for Class, Field, Method or Constructor.
-     *
-     * @param member MemberDoc for the member of the Class Kind
-     * @param dlTree the content tree to which the description will be added
-     */
-    protected void addDescription(MemberDoc member, Content dlTree, SearchIndexItem si) {
-        String name = (member instanceof ExecutableMemberDoc)?
-            member.name() + ((ExecutableMemberDoc)member).flatSignature() :
-            member.name();
-        si.setContainingPackage(utils.getPackageName((member.containingClass()).containingPackage()));
-        si.setContainingClass((member.containingClass()).typeName());
-        if (member instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-            si.setLabel(member.name() + emd.flatSignature());
-            if (!((emd.signature()).equals(emd.flatSignature()))) {
-                si.setUrl(getName(getAnchor((ExecutableMemberDoc) member)));
-            }
-        } else {
-            si.setLabel(member.name());
-        }
-        si.setCategory(getResource("doclet.Members").toString());
-        Content span = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                getDocLink(LinkInfoImpl.Kind.INDEX, member, name));
-        Content dt = HtmlTree.DT(span);
-        dt.addContent(" - ");
-        addMemberDesc(member, dt);
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        addComment(member, dd);
-        dlTree.addContent(dd);
-    }
-
-    protected void addDescription(SearchIndexItem sii, Content dlTree) {
-        String path = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
-        path += sii.getUrl();
-        HtmlTree labelLink = HtmlTree.A(path, new StringContent(sii.getLabel()));
-        Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.searchTagLink, labelLink));
-        dt.addContent(" - ");
-        dt.addContent(getResource("doclet.Search_tag_in", sii.getHolder()));
-        dlTree.addContent(dt);
-        Content dd = new HtmlTree(HtmlTag.DD);
-        if (sii.getDescription().isEmpty()) {
-            dd.addContent(getSpace());
-        } else {
-            dd.addContent(sii.getDescription());
-        }
-        dlTree.addContent(dd);
-    }
-
-    /**
-     * Add comment for each element in the index. If the element is deprecated
-     * and it has a @deprecated tag, use that comment. Else if the containing
-     * class for this element is deprecated, then add the word "Deprecated." at
-     * the start and then print the normal comment.
-     *
-     * @param element Index element
-     * @param contentTree the content tree to which the comment will be added
-     */
-    protected void addComment(ProgramElementDoc element, Content contentTree) {
-        Tag[] tags;
-        Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.block);
-        if (utils.isDeprecated(element)) {
-            div.addContent(span);
-            if ((tags = element.tags("deprecated")).length > 0)
-                addInlineDeprecatedComment(element, tags[0], div);
-            contentTree.addContent(div);
-        } else {
-            ClassDoc cont = element.containingClass();
-            while (cont != null) {
-                if (utils.isDeprecated(cont)) {
-                    div.addContent(span);
-                    contentTree.addContent(div);
-                    break;
-                }
-                cont = cont.containingClass();
-            }
-            addSummaryComment(element, contentTree);
-        }
-    }
-
-    /**
-     * Add description about the Static Varible/Method/Constructor for a
-     * member.
-     *
-     * @param member MemberDoc for the member within the Class Kind
-     * @param contentTree the content tree to which the member description will be added
-     */
-    protected void addMemberDesc(MemberDoc member, Content contentTree) {
-        ClassDoc containing = member.containingClass();
-        String classdesc = utils.getTypeName(
-                configuration, containing, true) + " ";
-        if (member.isField()) {
-            if (member.isStatic()) {
-                contentTree.addContent(
-                        getResource("doclet.Static_variable_in", classdesc));
-            } else {
-                contentTree.addContent(
-                        getResource("doclet.Variable_in", classdesc));
-            }
-        } else if (member.isConstructor()) {
-            contentTree.addContent(
-                    getResource("doclet.Constructor_for", classdesc));
-        } else if (member.isMethod()) {
-            if (member.isStatic()) {
-                contentTree.addContent(
-                        getResource("doclet.Static_method_in", classdesc));
-            } else {
-                contentTree.addContent(
-                        getResource("doclet.Method_in", classdesc));
-            }
-        }
-        addPreQualifiedClassLink(LinkInfoImpl.Kind.INDEX, containing,
-                false, contentTree);
-    }
-
-    /**
-     * Get the marker anchor which will be added to the index documentation tree.
-     *
-     * @param anchorNameForIndex the anchor name attribute for index page
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchorForIndex(String anchorNameForIndex) {
-        return getMarkerAnchor(getNameForIndex(anchorNameForIndex), null);
-    }
-
-    /**
-     * Generate a valid HTML name for member index page.
-     *
-     * @param unicode the string that needs to be converted to valid HTML name.
-     * @return a valid HTML name string.
-     */
-    public String getNameForIndex(String unicode) {
-        return "I:" + getName(unicode);
-    }
-
-    protected void createSearchIndexFiles() {
-        createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JSON, DocPaths.PACKAGE_SEARCH_INDEX_ZIP,
-                configuration.packageSearchIndex);
-        createSearchIndexFile(DocPaths.TYPE_SEARCH_INDEX_JSON, DocPaths.TYPE_SEARCH_INDEX_ZIP,
-                configuration.typeSearchIndex);
-        createSearchIndexFile(DocPaths.MEMBER_SEARCH_INDEX_JSON, DocPaths.MEMBER_SEARCH_INDEX_ZIP,
-                configuration.memberSearchIndex);
-        createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JSON, DocPaths.TAG_SEARCH_INDEX_ZIP,
-                configuration.tagSearchIndex);
-    }
-
-    protected void createSearchIndexFile(DocPath searchIndexFile, DocPath searchIndexZip,
-            List<SearchIndexItem> searchIndex) {
-        if (!searchIndex.isEmpty()) {
-            try {
-                StringBuilder searchVar = new StringBuilder("[");
-                boolean first = true;
-                DocFile searchFile = DocFile.createFileForOutput(configuration, searchIndexFile);
-                Path p = Paths.get(searchFile.getPath());
-                for (SearchIndexItem item : searchIndex) {
-                    if (first) {
-                        searchVar.append(item.toString());
-                        first = false;
-                    } else {
-                        searchVar.append(",").append(item.toString());
-                    }
-                }
-                searchVar.append("]");
-                Files.write(p, searchVar.toString().getBytes());
-                DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
-                try (FileOutputStream fos = new FileOutputStream(zipFile.getPath());
-                        ZipOutputStream zos = new ZipOutputStream(fos)) {
-                    zipFile(searchFile.getPath(), searchIndexFile, zos);
-                }
-                Files.delete(p);
-            } catch (IOException ie) {
-                throw new DocletAbortException(ie);
-            }
-        }
-    }
-
-    protected void zipFile(String inputFile, DocPath file, ZipOutputStream zos) {
-        try {
-            try {
-                ZipEntry ze = new ZipEntry(file.getPath());
-                zos.putNextEntry(ze);
-                try (FileInputStream fis = new FileInputStream(new File(inputFile))) {
-                    byte[] buf = new byte[2048];
-                    int len = fis.read(buf);
-                    while (len > 0) {
-                        zos.write(buf, 0, len);
-                        len = fis.read(buf);
-                    }
-                }
-            } finally {
-                zos.closeEntry();
-            }
-        } catch (IOException e) {
-            throw new DocletAbortException(e);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
deleted file mode 100644
index b50374e7ba6..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The base class for member writers.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (Re-write)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractMemberWriter {
-
-    protected final ConfigurationImpl configuration;
-    protected final Utils utils;
-    protected final SubWriterHolderWriter writer;
-    protected final ClassDoc classdoc;
-    protected Map<String,Integer> typeMap = new LinkedHashMap<>();
-    protected Set<MethodTypes> methodTypes = EnumSet.noneOf(MethodTypes.class);
-    private int methodTypesOr = 0;
-    public final boolean nodepr;
-
-    protected boolean printedSummaryHeader = false;
-
-    public AbstractMemberWriter(SubWriterHolderWriter writer, ClassDoc classdoc) {
-        this.configuration = writer.configuration;
-        this.writer = writer;
-        this.nodepr = configuration.nodeprecated;
-        this.classdoc = classdoc;
-        this.utils = writer.configuration.utils;
-    }
-
-    public AbstractMemberWriter(SubWriterHolderWriter writer) {
-        this(writer, null);
-    }
-
-    /*** abstracts ***/
-
-    /**
-     * Add the summary label for the member.
-     *
-     * @param memberTree the content tree to which the label will be added
-     */
-    public abstract void addSummaryLabel(Content memberTree);
-
-    /**
-     * Get the summary for the member summary table.
-     *
-     * @return a string for the table summary
-     */
-    public abstract String getTableSummary();
-
-    /**
-     * Get the caption for the member summary table.
-     *
-     * @return a string for the table caption
-     */
-    public abstract Content getCaption();
-
-    /**
-     * Get the summary table header for the member.
-     *
-     * @param member the member to be documented
-     * @return the summary table header
-     */
-    public abstract String[] getSummaryTableHeader(ProgramElementDoc member);
-
-    /**
-     * Add inherited summary lable for the member.
-     *
-     * @param cd the class doc to which to link to
-     * @param inheritedTree the content tree to which the inherited summary label will be added
-     */
-    public abstract void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree);
-
-    /**
-     * Add the anchor for the summary section of the member.
-     *
-     * @param cd the class doc to be documented
-     * @param memberTree the content tree to which the summary anchor will be added
-     */
-    public abstract void addSummaryAnchor(ClassDoc cd, Content memberTree);
-
-    /**
-     * Add the anchor for the inherited summary section of the member.
-     *
-     * @param cd the class doc to be documented
-     * @param inheritedTree the content tree to which the inherited summary anchor will be added
-     */
-    public abstract void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree);
-
-    /**
-     * Add the summary type for the member.
-     *
-     * @param member the member to be documented
-     * @param tdSummaryType the content tree to which the type will be added
-     */
-    protected abstract void addSummaryType(ProgramElementDoc member,
-            Content tdSummaryType);
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param tdSummary the content tree to which the link will be added
-     */
-    protected void addSummaryLink(ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        addSummaryLink(LinkInfoImpl.Kind.MEMBER, cd, member, tdSummary);
-    }
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param tdSummary the content tree to which the summary link will be added
-     */
-    protected abstract void addSummaryLink(LinkInfoImpl.Kind context,
-            ClassDoc cd, ProgramElementDoc member, Content tdSummary);
-
-    /**
-     * Add the inherited summary link for the member.
-     *
-     * @param cd the class doc to be documented
-     * @param member the member to be documented
-     * @param linksTree the content tree to which the inherited summary link will be added
-     */
-    protected abstract void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree);
-
-    /**
-     * Get the deprecated link.
-     *
-     * @param member the member being linked to
-     * @return a content tree representing the link
-     */
-    protected abstract Content getDeprecatedLink(ProgramElementDoc member);
-
-    /**
-     * Get the navigation summary link.
-     *
-     * @param cd the class doc to be documented
-     * @param link true if its a link else the label to be printed
-     * @return a content tree for the navigation summary link.
-     */
-    protected abstract Content getNavSummaryLink(ClassDoc cd, boolean link);
-
-    /**
-     * Add the navigation detail link.
-     *
-     * @param link true if its a link else the label to be printed
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected abstract void addNavDetailLink(boolean link, Content liNav);
-
-    /**
-     * Add the member name to the content tree.
-     *
-     * @param name the member name to be added to the content tree.
-     * @param htmltree the content tree to which the name will be added.
-     */
-    protected void addName(String name, Content htmltree) {
-        htmltree.addContent(name);
-    }
-
-    /**
-     * Return a string describing the access modifier flags.
-     * Don't include native or synchronized.
-     *
-     * The modifier names are returned in canonical order, as
-     * specified by <em>The Java Language Specification</em>.
-     */
-    protected String modifierString(MemberDoc member) {
-        int ms = member.modifierSpecifier();
-        int no = Modifier.NATIVE | Modifier.SYNCHRONIZED;
-    return Modifier.toString(ms & ~no);
-    }
-
-    protected String typeString(MemberDoc member) {
-        String type = "";
-        if (member instanceof MethodDoc) {
-            type = ((MethodDoc)member).returnType().toString();
-        } else if (member instanceof FieldDoc) {
-            type = ((FieldDoc)member).type().toString();
-        }
-        return type;
-    }
-
-    /**
-     * Add the modifier for the member.
-     *
-     * @param member the member for which teh modifier will be added.
-     * @param htmltree the content tree to which the modifier information will be added.
-     */
-    protected void addModifiers(MemberDoc member, Content htmltree) {
-        String mod = modifierString(member);
-        // According to JLS, we should not be showing public modifier for
-        // interface methods.
-        if ((member.isField() || member.isMethod()) &&
-            writer instanceof ClassWriterImpl &&
-            ((ClassWriterImpl) writer).getClassDoc().isInterface()) {
-            // This check for isDefault() and the default modifier needs to be
-            // added for it to appear on the method details section. Once the
-            // default modifier is added to the Modifier list on DocEnv and once
-            // it is updated to use the javax.lang.model.element.Modifier, we
-            // will need to remove this.
-            mod = (member.isMethod() && ((MethodDoc)member).isDefault()) ?
-                    utils.replaceText(mod, "public", "default").trim() :
-                    utils.replaceText(mod, "public", "").trim();
-        }
-        if(mod.length() > 0) {
-            htmltree.addContent(mod);
-            htmltree.addContent(writer.getSpace());
-        }
-    }
-
-    protected String makeSpace(int len) {
-        if (len <= 0) {
-            return "";
-        }
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            sb.append(' ');
-    }
-        return sb.toString();
-    }
-
-    /**
-     * Add the modifier and type for the member in the member summary.
-     *
-     * @param member the member to add the type for
-     * @param type the type to add
-     * @param tdSummaryType the content tree to which the modified and type will be added
-     */
-    protected void addModifierAndType(ProgramElementDoc member, Type type,
-            Content tdSummaryType) {
-        HtmlTree code = new HtmlTree(HtmlTag.CODE);
-        addModifier(member, code);
-        if (type == null) {
-            if (member.isClass()) {
-                code.addContent("class");
-            } else {
-                code.addContent("interface");
-            }
-            code.addContent(writer.getSpace());
-        } else {
-            if (member instanceof ExecutableMemberDoc &&
-                    ((ExecutableMemberDoc) member).typeParameters().length > 0) {
-                Content typeParameters = ((AbstractExecutableMemberWriter) this).getTypeParameters(
-                        (ExecutableMemberDoc) member);
-                    code.addContent(typeParameters);
-                //Code to avoid ugly wrapping in member summary table.
-                if (typeParameters.charCount() > 10) {
-                    code.addContent(new HtmlTree(HtmlTag.BR));
-                } else {
-                    code.addContent(writer.getSpace());
-                }
-                code.addContent(
-                        writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
-            } else {
-                code.addContent(
-                        writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.SUMMARY_RETURN_TYPE, type)));
-            }
-
-        }
-        tdSummaryType.addContent(code);
-    }
-
-    /**
-     * Add the modifier for the member.
-     *
-     * @param member the member to add the type for
-     * @param code the content tree to which the modified will be added
-     */
-    private void addModifier(ProgramElementDoc member, Content code) {
-        if (member.isProtected()) {
-            code.addContent("protected ");
-        } else if (member.isPrivate()) {
-            code.addContent("private ");
-        } else if (!member.isPublic()) { // Package private
-            code.addContent(configuration.getText("doclet.Package_private"));
-            code.addContent(" ");
-        }
-        if (member.isMethod()) {
-            if (!(member.containingClass().isInterface()) &&
-                    ((MethodDoc)member).isAbstract()) {
-                code.addContent("abstract ");
-            }
-            // This check for isDefault() and the default modifier needs to be
-            // added for it to appear on the "Modifier and Type" column in the
-            // method summary section. Once the default modifier is added
-            // to the Modifier list on DocEnv and once it is updated to use the
-            // javax.lang.model.element.Modifier, we will need to remove this.
-            if (((MethodDoc)member).isDefault()) {
-                code.addContent("default ");
-            }
-        }
-        if (member.isStatic()) {
-            code.addContent("static ");
-        }
-    }
-
-    /**
-     * Add the deprecated information for the given member.
-     *
-     * @param member the member being documented.
-     * @param contentTree the content tree to which the deprecated information will be added.
-     */
-    protected void addDeprecatedInfo(ProgramElementDoc member, Content contentTree) {
-        Content output = (new DeprecatedTaglet()).getTagletOutput(member,
-            writer.getTagletWriterInstance(false));
-        if (!output.isEmpty()) {
-            Content deprecatedContent = output;
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprecatedContent);
-            contentTree.addContent(div);
-        }
-    }
-
-    /**
-     * Add the comment for the given member.
-     *
-     * @param member the member being documented.
-     * @param htmltree the content tree to which the comment will be added.
-     */
-    protected void addComment(ProgramElementDoc member, Content htmltree) {
-        if (member.inlineTags().length > 0) {
-            writer.addInlineComment(member, htmltree);
-        }
-    }
-
-    protected String name(ProgramElementDoc member) {
-        return member.name();
-    }
-
-    /**
-     * Get the header for the section.
-     *
-     * @param member the member being documented.
-     * @return a header content for the section.
-     */
-    protected Content getHead(MemberDoc member) {
-        Content memberContent = new StringContent(member.name());
-        Content heading = HtmlTree.HEADING(HtmlConstants.MEMBER_HEADING, memberContent);
-        return heading;
-    }
-
-    /**
-    * Return true if the given <code>ProgramElement</code> is inherited
-    * by the class that is being documented.
-    *
-    * @param ped The <code>ProgramElement</code> being checked.
-    * return true if the <code>ProgramElement</code> is being inherited and
-    * false otherwise.
-    */
-    protected boolean isInherited(ProgramElementDoc ped){
-        if(ped.isPrivate() || (ped.isPackagePrivate() &&
-            ! ped.containingPackage().equals(classdoc.containingPackage()))){
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Add deprecated information to the documentation tree
-     *
-     * @param deprmembers list of deprecated members
-     * @param headingKey the caption for the deprecated members table
-     * @param tableSummary the summary for the deprecated members table
-     * @param tableHeader table headers for the deprecated members table
-     * @param contentTree the content tree to which the deprecated members table will be added
-     */
-    protected void addDeprecatedAPI(List<Doc> deprmembers, String headingKey,
-            String tableSummary, String[] tableHeader, Content contentTree) {
-        if (deprmembers.size() > 0) {
-            Content caption = writer.getTableCaption(configuration.getResource(headingKey));
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
-            table.addContent(writer.getSummaryTableHeader(tableHeader, "col"));
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            for (int i = 0; i < deprmembers.size(); i++) {
-                ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i);
-                HtmlTree td = HtmlTree.TD(HtmlStyle.colOne, getDeprecatedLink(member));
-                if (member.tags("deprecated").length > 0)
-                    writer.addInlineDeprecatedComment(member,
-                            member.tags("deprecated")[0], td);
-                HtmlTree tr = HtmlTree.TR(td);
-                if (i%2 == 0)
-                    tr.addStyle(HtmlStyle.altColor);
-                else
-                    tr.addStyle(HtmlStyle.rowColor);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Add use information to the documentation tree.
-     *
-     * @param mems list of program elements for which the use information will be added
-     * @param heading the section heading
-     * @param tableSummary the summary for the use table
-     * @param contentTree the content tree to which the use information will be added
-     */
-    protected void addUseInfo(List<? extends ProgramElementDoc> mems,
-            Content heading, String tableSummary, Content contentTree) {
-        if (mems == null) {
-            return;
-        }
-        List<? extends ProgramElementDoc> members = mems;
-        boolean printedUseTableHeader = false;
-        if (members.size() > 0) {
-            Content caption = writer.getTableCaption(heading);
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.useSummary, tableSummary, caption);
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            Iterator<? extends ProgramElementDoc> it = members.iterator();
-            for (int i = 0; it.hasNext(); i++) {
-                ProgramElementDoc pgmdoc = it.next();
-                ClassDoc cd = pgmdoc.containingClass();
-                if (!printedUseTableHeader) {
-                    table.addContent(writer.getSummaryTableHeader(
-                            this.getSummaryTableHeader(pgmdoc), "col"));
-                    printedUseTableHeader = true;
-                }
-                HtmlTree tr = new HtmlTree(HtmlTag.TR);
-                if (i % 2 == 0) {
-                    tr.addStyle(HtmlStyle.altColor);
-                } else {
-                    tr.addStyle(HtmlStyle.rowColor);
-                }
-                HtmlTree tdFirst = new HtmlTree(HtmlTag.TD);
-                tdFirst.addStyle(HtmlStyle.colFirst);
-                writer.addSummaryType(this, pgmdoc, tdFirst);
-                tr.addContent(tdFirst);
-                HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-                tdLast.addStyle(HtmlStyle.colLast);
-                if (cd != null && !(pgmdoc instanceof ConstructorDoc)
-                        && !(pgmdoc instanceof ClassDoc)) {
-                    HtmlTree name = new HtmlTree(HtmlTag.SPAN);
-                    name.addStyle(HtmlStyle.typeNameLabel);
-                    name.addContent(cd.name() + ".");
-                    tdLast.addContent(name);
-                }
-                addSummaryLink(pgmdoc instanceof ClassDoc ?
-                    LinkInfoImpl.Kind.CLASS_USE : LinkInfoImpl.Kind.MEMBER,
-                    cd, pgmdoc, tdLast);
-                writer.addSummaryLinkComment(this, pgmdoc, tdLast);
-                tr.addContent(tdLast);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            contentTree.addContent(table);
-        }
-    }
-
-    /**
-     * Add the navigation detail link.
-     *
-     * @param members the members to be linked
-     * @param liNav the content tree to which the navigation detail link will be added
-     */
-    protected void addNavDetailLink(List<?> members, Content liNav) {
-        addNavDetailLink(members.size() > 0 ? true : false, liNav);
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param members members to be linked
-     * @param visibleMemberMap the visible inherited members map
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(List<?> members,
-            VisibleMemberMap visibleMemberMap, Content liNav) {
-        if (members.size() > 0) {
-            liNav.addContent(getNavSummaryLink(null, true));
-            return;
-        }
-        ClassDoc icd = classdoc.superclass();
-        while (icd != null) {
-            List<?> inhmembers = visibleMemberMap.getMembersFor(icd);
-            if (inhmembers.size() > 0) {
-                liNav.addContent(getNavSummaryLink(icd, true));
-                return;
-            }
-            icd = icd.superclass();
-        }
-        liNav.addContent(getNavSummaryLink(null, false));
-    }
-
-    protected void serialWarning(SourcePosition pos, String key, String a1, String a2) {
-        if (configuration.serialwarn) {
-            configuration.getDocletSpecificMsg().warning(pos, key, a1, a2);
-        }
-    }
-
-    public ProgramElementDoc[] eligibleMembers(ProgramElementDoc[] members) {
-        return nodepr? utils.excludeDeprecatedMembers(members): members;
-    }
-
-    /**
-     * Add the member summary for the given class.
-     *
-     * @param classDoc the class that is being documented
-     * @param member the member being documented
-     * @param firstSentenceTags the first sentence tags to be added to the summary
-     * @param tableContents the list of contents to which the documentation will be added
-     * @param counter the counter for determining id and style for the table row
-     */
-    public void addMemberSummary(ClassDoc classDoc, ProgramElementDoc member,
-            Tag[] firstSentenceTags, List<Content> tableContents, int counter) {
-        HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD);
-        tdSummaryType.addStyle(HtmlStyle.colFirst);
-        writer.addSummaryType(this, member, tdSummaryType);
-        HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
-        setSummaryColumnStyle(tdSummary);
-        addSummaryLink(classDoc, member, tdSummary);
-        writer.addSummaryLinkComment(this, member, firstSentenceTags, tdSummary);
-        HtmlTree tr = HtmlTree.TR(tdSummaryType);
-        tr.addContent(tdSummary);
-        if (member instanceof MethodDoc && !member.isAnnotationTypeElement()) {
-            int methodType = (member.isStatic()) ? MethodTypes.STATIC.value() :
-                    MethodTypes.INSTANCE.value();
-            if (member.containingClass().isInterface()) {
-                methodType = (((MethodDoc) member).isAbstract())
-                        ? methodType | MethodTypes.ABSTRACT.value()
-                        : methodType | MethodTypes.DEFAULT.value();
-            } else {
-                methodType = (((MethodDoc) member).isAbstract())
-                        ? methodType | MethodTypes.ABSTRACT.value()
-                        : methodType | MethodTypes.CONCRETE.value();
-            }
-            if (utils.isDeprecated(member) || utils.isDeprecated(classdoc)) {
-                methodType = methodType | MethodTypes.DEPRECATED.value();
-            }
-            methodTypesOr = methodTypesOr | methodType;
-            String tableId = "i" + counter;
-            typeMap.put(tableId, methodType);
-            tr.addAttr(HtmlAttr.ID, tableId);
-        }
-        if (counter%2 == 0)
-            tr.addStyle(HtmlStyle.altColor);
-        else
-            tr.addStyle(HtmlStyle.rowColor);
-        tableContents.add(tr);
-    }
-
-    /**
-     * Generate the method types set and return true if the method summary table
-     * needs to show tabs.
-     *
-     * @return true if the table should show tabs
-     */
-    public boolean showTabs() {
-        int value;
-        for (MethodTypes type : EnumSet.allOf(MethodTypes.class)) {
-            value = type.value();
-            if ((value & methodTypesOr) == value) {
-                methodTypes.add(type);
-            }
-        }
-        boolean showTabs = methodTypes.size() > 1;
-        if (showTabs) {
-            methodTypes.add(MethodTypes.ALL);
-        }
-        return showTabs;
-    }
-
-    /**
-     * Set the style for the summary column.
-     *
-     * @param tdTree the column for which the style will be set
-     */
-    public void setSummaryColumnStyle(HtmlTree tdTree) {
-        tdTree.addStyle(HtmlStyle.colLast);
-    }
-
-    /**
-     * Add inherited member summary for the given class and member.
-     *
-     * @param classDoc the class the inherited member belongs to
-     * @param nestedClass the inherited member that is summarized
-     * @param isFirst true if this is the first member in the list
-     * @param isLast true if this is the last member in the list
-     * @param linksTree the content tree to which the summary will be added
-     */
-    public void addInheritedMemberSummary(ClassDoc classDoc,
-            ProgramElementDoc nestedClass, boolean isFirst, boolean isLast,
-            Content linksTree) {
-        writer.addInheritedMemberSummary(this, classDoc, nestedClass, isFirst,
-                linksTree);
-    }
-
-    /**
-     * Get the inherited summary header for the given class.
-     *
-     * @param classDoc the class the inherited member belongs to
-     * @return a content tree for the inherited summary header
-     */
-    public Content getInheritedSummaryHeader(ClassDoc classDoc) {
-        Content inheritedTree = writer.getMemberTreeHeader();
-        writer.addInheritedSummaryHeader(this, classDoc, inheritedTree);
-        return inheritedTree;
-    }
-
-    /**
-     * Get the inherited summary links tree.
-     *
-     * @return a content tree for the inherited summary links
-     */
-    public Content getInheritedSummaryLinksTree() {
-        return new HtmlTree(HtmlTag.CODE);
-    }
-
-    /**
-     * Get the summary table tree for the given class.
-     *
-     * @param classDoc the class for which the summary table is generated
-     * @param tableContents list of contents to be displayed in the summary table
-     * @return a content tree for the summary table
-     */
-    public Content getSummaryTableTree(ClassDoc classDoc, List<Content> tableContents) {
-        return writer.getSummaryTableTree(this, classDoc, tableContents, showTabs());
-    }
-
-    /**
-     * Get the member tree to be documented.
-     *
-     * @param memberTree the content tree of member to be documented
-     * @return a content tree that will be added to the class documentation
-     */
-    public Content getMemberTree(Content memberTree) {
-        return writer.getMemberTree(memberTree);
-    }
-
-    /**
-     * Get the member tree to be documented.
-     *
-     * @param memberTree the content tree of member to be documented
-     * @param isLastContent true if the content to be added is the last content
-     * @return a content tree that will be added to the class documentation
-     */
-    public Content getMemberTree(Content memberTree, boolean isLastContent) {
-        if (isLastContent)
-            return HtmlTree.UL(HtmlStyle.blockListLast, memberTree);
-        else
-            return HtmlTree.UL(HtmlStyle.blockList, memberTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
deleted file mode 100644
index 23b71ebcdda..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.DocPath;
-
-/**
- * Abstract class to generate the overview files in
- * Frame and Non-Frame format. This will be sub-classed by to
- * generate overview-frame.html as well as overview-summary.html.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class AbstractPackageIndexWriter extends HtmlDocletWriter {
-
-    /**
-     * A Set of Packages to be documented.
-     */
-    protected SortedSet<PackageDoc> packages;
-
-    /**
-     * Constructor. Also initializes the packages variable.
-     *
-     * @param configuration  The current configuration
-     * @param filename Name of the package index file to be generated.
-     */
-    public AbstractPackageIndexWriter(ConfigurationImpl configuration,
-                                      DocPath filename) throws IOException {
-        super(configuration, filename);
-        packages = configuration.packages;
-    }
-
-    /**
-     * Adds the navigation bar header to the documentation tree.
-     *
-     * @param body the document tree to which the navigation bar header will be added
-     */
-    protected abstract void addNavigationBarHeader(Content body);
-
-    /**
-     * Adds the navigation bar footer to the documentation tree.
-     *
-     * @param body the document tree to which the navigation bar footer will be added
-     */
-    protected abstract void addNavigationBarFooter(Content body);
-
-    /**
-     * Adds the overview header to the documentation tree.
-     *
-     * @param body the document tree to which the overview header will be added
-     */
-    protected abstract void addOverviewHeader(Content body);
-
-    /**
-     * Adds the packages list to the documentation tree.
-     *
-     * @param packages a collection of packagedoc objects
-     * @param text caption for the table
-     * @param tableSummary summary for the table
-     * @param body the document tree to which the packages list will be added
-     */
-    protected abstract void addPackagesList(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body);
-
-    /**
-     * Generate and prints the contents in the package index file. Call appropriate
-     * methods from the sub-class in order to generate Frame or Non
-     * Frame format.
-     *
-     * @param title the title of the window.
-     * @param includeScript boolean set true if windowtitle script is to be included
-     */
-    protected void buildPackageIndexFile(String title, boolean includeScript) throws IOException {
-        String windowOverview = configuration.getText(title);
-        Content body = getBody(includeScript, getWindowTitle(windowOverview));
-        addNavigationBarHeader(body);
-        addOverviewHeader(body);
-        addIndex(body);
-        addOverview(body);
-        addNavigationBarFooter(body);
-        printHtmlDocument(configuration.metakeywords.getOverviewMetaKeywords(title,
-                configuration.doctitle), includeScript, body);
-    }
-
-    /**
-     * Default to no overview, override to add overview.
-     *
-     * @param body the document tree to which the overview will be added
-     */
-    protected void addOverview(Content body) throws IOException {
-    }
-
-    /**
-     * Adds the frame or non-frame package index to the documentation tree.
-     *
-     * @param body the document tree to which the index will be added
-     */
-    protected void addIndex(Content body) {
-        addIndexContents(packages, "doclet.Package_Summary",
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Package_Summary"),
-                configuration.getText("doclet.packages")), body);
-    }
-
-    /**
-     * Adds package index contents. Call appropriate methods from
-     * the sub-classes. Adds it to the body HtmlTree
-     *
-     * @param packages a collection of packages to be documented
-     * @param text string which will be used as the heading
-     * @param tableSummary summary for the table
-     * @param body the document tree to which the index contents will be added
-     */
-    protected void addIndexContents(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body) {
-        if (!packages.isEmpty()) {
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.NAV))
-                    ? HtmlTree.NAV()
-                    : new HtmlTree(HtmlTag.DIV);
-            htmlTree.addStyle(HtmlStyle.indexNav);
-            HtmlTree ul = new HtmlTree(HtmlTag.UL);
-            addAllClassesLink(ul);
-            htmlTree.addContent(ul);
-            body.addContent(htmlTree);
-            addPackagesList(packages, text, tableSummary, body);
-        }
-    }
-
-    /**
-     * Adds the doctitle to the documentation tree, if it is specified on the command line.
-     *
-     * @param body the document tree to which the title will be added
-     */
-    protected void addConfigurationTitle(Content body) {
-        if (configuration.doctitle.length() > 0) {
-            Content title = new RawHtml(configuration.doctitle);
-            Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING,
-                    HtmlStyle.title, title);
-            Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-            body.addContent(div);
-        }
-    }
-
-    /**
-     * Returns highlighted "Overview", in the navigation bar as this is the
-     * overview page.
-     *
-     * @return a Content object to be added to the documentation tree
-     */
-    protected Content getNavLinkContents() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, overviewLabel);
-        return li;
-    }
-
-    /**
-     * Do nothing. This will be overridden.
-     *
-     * @param div the document tree to which the all classes link will be added
-     */
-    protected void addAllClassesLink(Content div) {
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
deleted file mode 100644
index 920061c428f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Abstract class to print the class hierarchy page for all the Classes. This
- * is sub-classed by {@link PackageTreeWriter} and {@link TreeWriter} to
- * generate the Package Tree and global Tree(for all the classes and packages)
- * pages.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public abstract class AbstractTreeWriter extends HtmlDocletWriter {
-
-    /**
-     * The class and interface tree built by using {@link ClassTree}
-     */
-    protected final ClassTree classtree;
-
-    /**
-     * Constructor initializes classtree variable. This constructor will be used
-     * while generating global tree file "overview-tree.html".
-     *
-     * @param configuration  The current configuration
-     * @param filename   File to be generated.
-     * @param classtree  Tree built by {@link ClassTree}.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    protected AbstractTreeWriter(ConfigurationImpl configuration,
-                                 DocPath filename, ClassTree classtree)
-                                 throws IOException {
-        super(configuration, filename);
-        this.classtree = classtree;
-    }
-
-    /**
-     * Add each level of the class tree. For each sub-class or
-     * sub-interface indents the next level information.
-     * Recurses itself to add subclasses info.
-     *
-     * @param parent the superclass or superinterface of the list
-     * @param list list of the sub-classes at this level
-     * @param isEnum true if we are generating a tree for enums
-     * @param contentTree the content tree to which the level information will be added
-     */
-    protected void addLevelInfo(ClassDoc parent, Collection<ClassDoc> list,
-            boolean isEnum, Content contentTree) {
-        if (!list.isEmpty()) {
-            Content ul = new HtmlTree(HtmlTag.UL);
-            for (ClassDoc local : list) {
-                HtmlTree li = new HtmlTree(HtmlTag.LI);
-                li.addStyle(HtmlStyle.circle);
-                addPartialInfo(local, li);
-                addExtendsImplements(parent, local, li);
-                addLevelInfo(local, classtree.subs(local, isEnum),
-                             isEnum, li);   // Recurse
-                ul.addContent(li);
-            }
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Add the heading for the tree depending upon tree type if it's a
-     * Class Tree or Interface tree.
-     *
-     * @param list List of classes which are at the most base level, all the
-     * other classes in this run will derive from these classes
-     * @param heading heading for the tree
-     * @param div the content tree to which the tree will be added
-     */
-    protected void addTree(SortedSet<ClassDoc> list, String heading, HtmlTree div) {
-        if (!list.isEmpty()) {
-            ClassDoc firstClassDoc = list.first();
-            Content headingContent = getResource(heading);
-            Content sectionHeading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
-                    headingContent);
-            HtmlTree htmlTree;
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                htmlTree = HtmlTree.SECTION(sectionHeading);
-            } else {
-                div.addContent(sectionHeading);
-                htmlTree = div;
-            }
-            addLevelInfo(!firstClassDoc.isInterface()? firstClassDoc : null,
-                    list, list == classtree.baseEnums(), htmlTree);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                div.addContent(htmlTree);
-            }
-        }
-    }
-
-    /**
-     * Add information regarding the classes which this class extends or
-     * implements.
-     *
-     * @param parent the parent class of the class being documented
-     * @param cd the classdoc under consideration
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addExtendsImplements(ClassDoc parent, ClassDoc cd,
-            Content contentTree) {
-        ClassDoc[] interfaces = cd.interfaces();
-        if (interfaces.length > (cd.isInterface()? 1 : 0)) {
-            Arrays.sort(interfaces);
-            int counter = 0;
-            for (ClassDoc intf : interfaces) {
-                if (parent != intf) {
-                    if (!(intf.isPublic() ||
-                          utils.isLinkable(intf, configuration))) {
-                        continue;
-                    }
-                    if (counter == 0) {
-                        if (cd.isInterface()) {
-                            contentTree.addContent(" (");
-                            contentTree.addContent(getResource("doclet.also"));
-                            contentTree.addContent(" extends ");
-                        } else {
-                            contentTree.addContent(" (implements ");
-                        }
-                    } else {
-                        contentTree.addContent(", ");
-                    }
-                    addPreQualifiedClassLink(LinkInfoImpl.Kind.TREE,
-                                             intf, contentTree);
-                    counter++;
-                }
-            }
-            if (counter > 0) {
-                contentTree.addContent(")");
-            }
-        }
-    }
-
-    /**
-     * Add information about the class kind, if it's a "class" or "interface".
-     *
-     * @param cd the class being documented
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addPartialInfo(ClassDoc cd, Content contentTree) {
-        addPreQualifiedStrongClassLink(LinkInfoImpl.Kind.TREE, cd, contentTree);
-    }
-
-    /**
-     * Get the tree label for the navigation bar.
-     *
-     * @return a content tree for the tree label
-     */
-    protected Content getNavLinkTree() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, treeLabel);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
deleted file mode 100644
index db1fca799fd..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the file with list of all the classes in this run. This page will be
- * used in the left-hand bottom frame, when "All Classes" link is clicked in
- * the left-hand top frame. The name of the generated file is
- * "allclasses-frame.html".
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Doug Kramer
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AllClassesFrameWriter extends HtmlDocletWriter {
-
-    /**
-     * Index of all the classes.
-     */
-    protected IndexBuilder indexbuilder;
-
-    /**
-     * BR tag to be used within a document tree.
-     */
-    final HtmlTree BR = new HtmlTree(HtmlTag.BR);
-
-    /**
-     * Construct AllClassesFrameWriter object. Also initializes the indexbuilder
-     * variable in this class.
-     * @param configuration  The current configuration
-     * @param filename       Path to the file which is getting generated.
-     * @param indexbuilder   Unicode based Index from {@link IndexBuilder}
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public AllClassesFrameWriter(ConfigurationImpl configuration,
-                                 DocPath filename, IndexBuilder indexbuilder)
-                              throws IOException {
-        super(configuration, filename);
-        this.indexbuilder = indexbuilder;
-    }
-
-    /**
-     * Create AllClassesFrameWriter object. Then use it to generate the
-     * "allclasses-frame.html" file. Generate the file in the current or the
-     * destination directory.
-     *
-     * @param indexbuilder IndexBuilder object for all classes index.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                IndexBuilder indexbuilder) {
-        AllClassesFrameWriter allclassgen;
-        DocPath filename = DocPaths.ALLCLASSES_FRAME;
-        try {
-            allclassgen = new AllClassesFrameWriter(configuration,
-                                                    filename, indexbuilder);
-            allclassgen.buildAllClassesFile(true);
-            allclassgen.close();
-            filename = DocPaths.ALLCLASSES_NOFRAME;
-            allclassgen = new AllClassesFrameWriter(configuration,
-                                                    filename, indexbuilder);
-            allclassgen.buildAllClassesFile(false);
-            allclassgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.
-                     error("doclet.exception_encountered",
-                           exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Print all the classes in the file.
-     * @param wantFrames True if we want frames.
-     */
-    protected void buildAllClassesFile(boolean wantFrames) throws IOException {
-        String label = configuration.getText("doclet.All_Classes");
-        Content body = getBody(false, getWindowTitle(label));
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING,
-                HtmlStyle.bar, allclassesLabel);
-        body.addContent(heading);
-        Content ul = new HtmlTree(HtmlTag.UL);
-        // Generate the class links and add it to the tdFont tree.
-        addAllClasses(ul, wantFrames);
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN(HtmlStyle.indexContainer, ul)
-                : HtmlTree.DIV(HtmlStyle.indexContainer, ul);
-        body.addContent(htmlTree);
-        printHtmlDocument(null, false, body);
-    }
-
-    /**
-     * Use the sorted index of all the classes and add all the classes to the
-     * content list.
-     *
-     * @param content HtmlTree content to which all classes information will be added
-     * @param wantFrames True if we want frames.
-     */
-    protected void addAllClasses(Content content, boolean wantFrames) {
-        for (int i = 0; i < indexbuilder.elements().length; i++) {
-            Character unicode = (Character)((indexbuilder.elements())[i]);
-            addContents(indexbuilder.getMemberList(unicode), wantFrames, content);
-        }
-    }
-
-    /**
-     * Given a list of classes, generate links for each class or interface.
-     * If the class kind is interface, print it in the italics font. Also all
-     * links should target the right-hand frame. If clicked on any class name
-     * in this page, appropriate class page should get opened in the right-hand
-     * frame.
-     *
-     * @param classlist Sorted list of classes.
-     * @param wantFrames True if we want frames.
-     * @param content HtmlTree content to which the links will be added
-     */
-    protected void addContents(List<Doc> classlist, boolean wantFrames,
-                               Content content) {
-        for (Doc doc : classlist) {
-            ClassDoc cd = (ClassDoc) doc;
-            if (!utils.isCoreClass(cd)) {
-                continue;
-            }
-            Content label = italicsClassName(cd, false);
-            Content linkContent;
-            if (wantFrames) {
-                linkContent = getLink(new LinkInfoImpl(configuration,
-                                                       LinkInfoImpl.Kind.ALL_CLASSES_FRAME, cd).label(label).target("classFrame"));
-            } else {
-                linkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, cd).label(label));
-            }
-            Content li = HtmlTree.LI(linkContent);
-            content.addContent(li);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
deleted file mode 100644
index 5a35613aadf..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type field documentation in HTML format.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class AnnotationTypeFieldWriterImpl extends AbstractMemberWriter
-    implements AnnotationTypeFieldWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeFieldWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeFieldWriterImpl(SubWriterHolderWriter writer,
-            AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_FIELD_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberTreeHeader() {
-        return writer.getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationFieldDetailsMarker(Content memberDetails) {
-        memberDetails.addContent(HtmlConstants.START_OF_ANNOTATION_TYPE_FIELD_DETAILS);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        if (!writer.printedAnnotationFieldHeading) {
-            memberDetailsTree.addContent(writer.getMarkerAnchor(
-                    SectionName.ANNOTATION_TYPE_FIELD_DETAIL));
-            Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                    writer.fieldDetailsLabel);
-            memberDetailsTree.addContent(heading);
-            writer.printedAnnotationFieldHeading = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree) {
-        annotationDetailsTree.addContent(
-                writer.getMarkerAnchor(member.name()));
-        Content annotationDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(member.name());
-        annotationDocTree.addContent(heading);
-        return annotationDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(MemberDoc member) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(member, pre);
-        addModifiers(member, pre);
-        Content link =
-                writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.MEMBER, getType(member)));
-        pre.addContent(link);
-        pre.addContent(writer.getSpace());
-        if (configuration.linksource) {
-            Content memberName = new StringContent(member.name());
-            writer.addSrcLink(member, memberName, pre);
-        } else {
-            addName(member.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree) {
-        addDeprecatedInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree) {
-        addComment(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree) {
-        writer.addTagsInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(annotationDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(annotationDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Field_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Field_Summary"),
-                configuration.getText("doclet.fields"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Fields");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Fields"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_FIELD_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        //Not applicable.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MemberDoc m = (MemberDoc)member;
-        addModifierAndType(m, getType(m), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((MemberDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_SUMMARY,
-                    writer.getResource("doclet.navField"));
-        } else {
-            return writer.getResource("doclet.navField");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_FIELD_DETAIL,
-                    writer.getResource("doclet.navField")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navField"));
-        }
-    }
-
-    private Type getType(MemberDoc member) {
-        if (member instanceof FieldDoc) {
-            return ((FieldDoc) member).type();
-        } else {
-            return ((MethodDoc) member).returnType();
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
deleted file mode 100644
index 91064762b12..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type optional member documentation in HTML format.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeOptionalMemberWriterImpl extends
-        AnnotationTypeRequiredMemberWriterImpl
-    implements AnnotationTypeOptionalMemberWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeOptionalMemberWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeOptionalMemberWriterImpl(SubWriterHolderWriter writer,
-        AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDefaultValueInfo(MemberDoc member, Content annotationDocTree) {
-        if (((AnnotationTypeElementDoc) member).defaultValue() != null) {
-            Content dt = HtmlTree.DT(writer.getResource("doclet.Default"));
-            Content dl = HtmlTree.DL(dt);
-            Content dd = HtmlTree.DD(new StringContent(
-                    ((AnnotationTypeElementDoc) member).defaultValue().toString()));
-            dl.addContent(dd);
-            annotationDocTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Annotation_Type_Optional_Member_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Annotation_Type_Optional_Member_Summary"),
-                configuration.getText("doclet.annotation_type_optional_members"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Annotation_Type_Optional_Members");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Annotation_Type_Optional_Member"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY,
-                    writer.getResource("doclet.navAnnotationTypeOptionalMember"));
-        } else {
-            return writer.getResource("doclet.navAnnotationTypeOptionalMember");
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
deleted file mode 100644
index 1b6f76d91cc..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Writes annotation type required member documentation in HTML format.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
-    implements AnnotationTypeRequiredMemberWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new AnnotationTypeRequiredMemberWriterImpl.
-     *
-     * @param writer         the writer that will write the output.
-     * @param annotationType the AnnotationType that holds this member.
-     */
-    public AnnotationTypeRequiredMemberWriterImpl(SubWriterHolderWriter writer,
-            AnnotationTypeDoc annotationType) {
-        super(writer, annotationType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(
-                HtmlConstants.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberTreeHeader() {
-        return writer.getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsMarker(Content memberDetails) {
-        memberDetails.addContent(HtmlConstants.START_OF_ANNOTATION_TYPE_DETAILS);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        if (!writer.printedAnnotationHeading) {
-            memberDetailsTree.addContent(writer.getMarkerAnchor(
-                    SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL));
-            Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                    writer.annotationTypeDetailsLabel);
-            memberDetailsTree.addContent(heading);
-            writer.printedAnnotationHeading = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree) {
-        annotationDetailsTree.addContent(
-                writer.getMarkerAnchor(member.name() +
-                ((ExecutableMemberDoc) member).signature()));
-        Content annotationDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(member.name());
-        annotationDocTree.addContent(heading);
-        return annotationDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(MemberDoc member) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(member, pre);
-        addModifiers(member, pre);
-        Content link =
-                writer.getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.MEMBER, getType(member)));
-        pre.addContent(link);
-        pre.addContent(writer.getSpace());
-        if (configuration.linksource) {
-            Content memberName = new StringContent(member.name());
-            writer.addSrcLink(member, memberName, pre);
-        } else {
-            addName(member.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree) {
-        addDeprecatedInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree) {
-        addComment(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree) {
-        writer.addTagsInfo(member, annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(annotationDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(annotationDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationDoc(Content annotationDocTree,
-            boolean isLastContent) {
-        return getMemberTree(annotationDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Annotation_Type_Required_Member_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Annotation_Type_Required_Member_Summary"),
-                configuration.getText("doclet.annotation_type_required_members"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Annotation_Type_Required_Members");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Annotation_Type_Required_Member"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        //Not applicable.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MemberDoc m = (MemberDoc)member;
-        addModifierAndType(m, getType(m), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((MemberDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY,
-                    writer.getResource("doclet.navAnnotationTypeRequiredMember"));
-        } else {
-            return writer.getResource("doclet.navAnnotationTypeRequiredMember");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.ANNOTATION_TYPE_ELEMENT_DETAIL,
-                    writer.getResource("doclet.navAnnotationTypeMember")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navAnnotationTypeMember"));
-        }
-    }
-
-    private Type getType(MemberDoc member) {
-        if (member instanceof FieldDoc) {
-            return ((FieldDoc) member).type();
-        } else {
-            return ((MethodDoc) member).returnType();
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
deleted file mode 100644
index d77902733b0..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.formats.html;
-
-import java.io.IOException;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the Class Information Page.
- *
- *  <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>
- *
- * @see com.sun.javadoc.ClassDoc
- * @see java.util.Collections
- * @see java.util.List
- * @see java.util.ArrayList
- * @see java.util.HashMap
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class AnnotationTypeWriterImpl extends SubWriterHolderWriter
-        implements AnnotationTypeWriter {
-
-    protected AnnotationTypeDoc annotationType;
-
-    protected Type prev;
-
-    protected Type next;
-
-    /**
-     * @param annotationType the annotation type being documented.
-     * @param prevType the previous class that was documented.
-     * @param nextType the next class being documented.
-     */
-    public AnnotationTypeWriterImpl(ConfigurationImpl configuration,
-            AnnotationTypeDoc annotationType, Type prevType, Type nextType)
-            throws Exception {
-        super(configuration, DocPath.forClass(annotationType));
-        this.annotationType = annotationType;
-        configuration.currentcd = annotationType.asClassDoc();
-        this.prev = prevType;
-        this.next = nextType;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to previous class.
-     *
-     * @return a content tree for the previous class link
-     */
-    public Content getNavLinkPrevious() {
-        Content li;
-        if (prev != null) {
-            Content prevLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, prev.asClassDoc())
-                    .label(prevclassLabel).strong(true));
-            li = HtmlTree.LI(prevLink);
-        }
-        else
-            li = HtmlTree.LI(prevclassLabel);
-        return li;
-    }
-
-    /**
-     * Get link to next class.
-     *
-     * @return a content tree for the next class link
-     */
-    public Content getNavLinkNext() {
-        Content li;
-        if (next != null) {
-            Content nextLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, next.asClassDoc())
-                    .label(nextclassLabel).strong(true));
-            li = HtmlTree.LI(nextLink);
-        }
-        else
-            li = HtmlTree.LI(nextclassLabel);
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader(String header) {
-        String pkgname = (annotationType.containingPackage() != null)?
-            annotationType.containingPackage().name(): "";
-        String clname = annotationType.name();
-        HtmlTree bodyTree = getBody(true, getWindowTitle(clname));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.header);
-        if (pkgname.length() > 0) {
-            Content pkgNameContent = new StringContent(pkgname);
-            Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, pkgNameContent);
-            div.addContent(pkgNameDiv);
-        }
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_HEADER, annotationType);
-        Content headerContent = new StringContent(header);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING, true,
-                HtmlStyle.title, headerContent);
-        heading.addContent(getTypeParameterLinks(linkInfo));
-        div.addContent(heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationContentHeader() {
-        return getContentHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        contentTree.addContent(HtmlConstants.END_OF_CLASS_DATA);
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(configuration.metakeywords.getMetaKeywords(annotationType),
-                true, contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationInfoTreeHeader() {
-        return getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getAnnotationInfo(Content annotationInfoTree) {
-        return getMemberTree(HtmlStyle.description, annotationInfoTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeSignature(String modifiers, Content annotationInfoTree) {
-        annotationInfoTree.addContent(new HtmlTree(HtmlTag.BR));
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        addAnnotationInfo(annotationType, pre);
-        pre.addContent(modifiers);
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, annotationType);
-        Content annotationName = new StringContent(annotationType.name());
-        Content parameterLinks = getTypeParameterLinks(linkInfo);
-        if (configuration.linksource) {
-            addSrcLink(annotationType, annotationName, pre);
-            pre.addContent(parameterLinks);
-        } else {
-            Content span = HtmlTree.SPAN(HtmlStyle.memberNameLabel, annotationName);
-            span.addContent(parameterLinks);
-            pre.addContent(span);
-        }
-        annotationInfoTree.addContent(pre);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeDescription(Content annotationInfoTree) {
-        if(!configuration.nocomment) {
-            if (annotationType.inlineTags().length > 0) {
-                addInlineComment(annotationType, annotationInfoTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeTagInfo(Content annotationInfoTree) {
-        if(!configuration.nocomment) {
-            addTagsInfo(annotationType, annotationInfoTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addAnnotationTypeDeprecationInfo(Content annotationInfoTree) {
-        Content hr = new HtmlTree(HtmlTag.HR);
-        annotationInfoTree.addContent(hr);
-        Tag[] deprs = annotationType.tags("deprecated");
-        if (utils.isDeprecated(annotationType)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-            if (deprs.length > 0) {
-                Tag[] commentTags = deprs[0].inlineTags();
-                if (commentTags.length > 0) {
-                    div.addContent(getSpace());
-                    addInlineDeprecatedComment(annotationType, deprs[0], div);
-                }
-            }
-            annotationInfoTree.addContent(div);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    protected void addSummaryDetailLinks(Content subDiv) {
-        try {
-            Content div = HtmlTree.DIV(getNavSummaryLinks());
-            div.addContent(getNavDetailLinks());
-            subDiv.addContent(div);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() throws Exception {
-        Content li = HtmlTree.LI(summaryLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navField",
-                VisibleMemberMap.ANNOTATION_TYPE_FIELDS, liNavField);
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        Content liNavReq = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeRequiredMember",
-                VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED, liNavReq);
-        addNavGap(liNavReq);
-        ulNav.addContent(liNavReq);
-        Content liNavOpt = new HtmlTree(HtmlTag.LI);
-        addNavSummaryLink(memberSummaryBuilder,
-                "doclet.navAnnotationTypeOptionalMember",
-                VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL, liNavOpt);
-        ulNav.addContent(liNavOpt);
-        return ulNav;
-    }
-
-    /**
-     * Add the navigation summary link.
-     *
-     * @param builder builder for the member to be documented
-     * @param label the label for the navigation
-     * @param type type to be documented
-     * @param liNav the content tree to which the navigation summary link will be added
-     */
-    protected void addNavSummaryLink(MemberSummaryBuilder builder,
-            String label, int type, Content liNav) {
-        AbstractMemberWriter writer = ((AbstractMemberWriter) builder.
-                getMemberSummaryWriter(type));
-        if (writer == null) {
-            liNav.addContent(getResource(label));
-        } else {
-            liNav.addContent(writer.getNavSummaryLink(null,
-                    ! builder.getVisibleMemberMap(type).noVisibleMembers()));
-        }
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() throws Exception {
-        Content li = HtmlTree.LI(detailLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        AbstractMemberWriter writerField =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_FIELDS));
-        AbstractMemberWriter writerOptional =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL));
-        AbstractMemberWriter writerRequired =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED));
-        Content liNavField = new HtmlTree(HtmlTag.LI);
-        if (writerField != null){
-            writerField.addNavDetailLink(annotationType.fields().length > 0, liNavField);
-        } else {
-            liNavField.addContent(getResource("doclet.navField"));
-        }
-        addNavGap(liNavField);
-        ulNav.addContent(liNavField);
-        if (writerOptional != null){
-            Content liNavOpt = new HtmlTree(HtmlTag.LI);
-            writerOptional.addNavDetailLink(annotationType.elements().length > 0, liNavOpt);
-            ulNav.addContent(liNavOpt);
-        } else if (writerRequired != null){
-            Content liNavReq = new HtmlTree(HtmlTag.LI);
-            writerRequired.addNavDetailLink(annotationType.elements().length > 0, liNavReq);
-            ulNav.addContent(liNavReq);
-        } else {
-            Content liNav = HtmlTree.LI(getResource("doclet.navAnnotationTypeMember"));
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Add gap between navigation bar elements.
-     *
-     * @param liNav the content tree to which the gap will be added
-     */
-    protected void addNavGap(Content liNav) {
-        liNav.addContent(getSpace());
-        liNav.addContent("|");
-        liNav.addContent(getSpace());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeDoc getAnnotationTypeDoc() {
-        return annotationType;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
deleted file mode 100644
index 04b163155cd..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate class usage information.
- *
- *  <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>
- *
- * @author Robert G. Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ClassUseWriter extends SubWriterHolderWriter {
-
-    final ClassDoc classdoc;
-    Set<PackageDoc> pkgToPackageAnnotations = null;
-    final Map<String,List<ProgramElementDoc>> pkgToClassTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToClassAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodArgTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodReturnTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodParameterAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToFieldTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToFieldAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToSubclass;
-    final Map<String,List<ProgramElementDoc>> pkgToSubinterface;
-    final Map<String,List<ProgramElementDoc>> pkgToImplementingClass;
-    final Map<String,List<ProgramElementDoc>> pkgToField;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodReturn;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodArgs;
-    final Map<String,List<ProgramElementDoc>> pkgToMethodThrows;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorParameterAnnotations;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorArgs;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorArgTypeParameter;
-    final Map<String,List<ProgramElementDoc>> pkgToConstructorThrows;
-    final SortedSet<PackageDoc> pkgSet;
-    final MethodWriterImpl methodSubWriter;
-    final ConstructorWriterImpl constrSubWriter;
-    final FieldWriterImpl fieldSubWriter;
-    final NestedClassWriterImpl classSubWriter;
-    // Summary for various use tables.
-    final String classUseTableSummary;
-    final String subclassUseTableSummary;
-    final String subinterfaceUseTableSummary;
-    final String fieldUseTableSummary;
-    final String methodUseTableSummary;
-    final String constructorUseTableSummary;
-
-    /**
-     * The HTML tree for main tag.
-     */
-    protected HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * Constructor.
-     *
-     * @param filename the file to be generated.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public ClassUseWriter(ConfigurationImpl configuration,
-                          ClassUseMapper mapper, DocPath filename,
-                          ClassDoc classdoc) throws IOException {
-        super(configuration, filename);
-        this.classdoc = classdoc;
-        if (mapper.classToPackageAnnotations.containsKey(classdoc.qualifiedName()))
-                pkgToPackageAnnotations = new TreeSet<>(mapper.classToPackageAnnotations.get(classdoc.qualifiedName()));
-        configuration.currentcd = classdoc;
-        this.pkgSet = new TreeSet<>();
-        this.pkgToClassTypeParameter = pkgDivide(mapper.classToClassTypeParam);
-        this.pkgToClassAnnotations = pkgDivide(mapper.classToClassAnnotations);
-        this.pkgToMethodTypeParameter = pkgDivide(mapper.classToExecMemberDocTypeParam);
-        this.pkgToMethodArgTypeParameter = pkgDivide(mapper.classToExecMemberDocArgTypeParam);
-        this.pkgToFieldTypeParameter = pkgDivide(mapper.classToFieldDocTypeParam);
-        this.pkgToFieldAnnotations = pkgDivide(mapper.annotationToFieldDoc);
-        this.pkgToMethodReturnTypeParameter = pkgDivide(mapper.classToExecMemberDocReturnTypeParam);
-        this.pkgToMethodAnnotations = pkgDivide(mapper.classToExecMemberDocAnnotations);
-        this.pkgToMethodParameterAnnotations = pkgDivide(mapper.classToExecMemberDocParamAnnotation);
-        this.pkgToSubclass = pkgDivide(mapper.classToSubclass);
-        this.pkgToSubinterface = pkgDivide(mapper.classToSubinterface);
-        this.pkgToImplementingClass = pkgDivide(mapper.classToImplementingClass);
-        this.pkgToField = pkgDivide(mapper.classToField);
-        this.pkgToMethodReturn = pkgDivide(mapper.classToMethodReturn);
-        this.pkgToMethodArgs = pkgDivide(mapper.classToMethodArgs);
-        this.pkgToMethodThrows = pkgDivide(mapper.classToMethodThrows);
-        this.pkgToConstructorAnnotations = pkgDivide(mapper.classToConstructorAnnotations);
-        this.pkgToConstructorParameterAnnotations = pkgDivide(mapper.classToConstructorParamAnnotation);
-        this.pkgToConstructorArgs = pkgDivide(mapper.classToConstructorArgs);
-        this.pkgToConstructorArgTypeParameter = pkgDivide(mapper.classToConstructorDocArgTypeParam);
-        this.pkgToConstructorThrows = pkgDivide(mapper.classToConstructorThrows);
-        //tmp test
-        if (pkgSet.size() > 0 &&
-            mapper.classToPackage.containsKey(classdoc.qualifiedName()) &&
-            !pkgSet.equals(mapper.classToPackage.get(classdoc.qualifiedName()))) {
-            configuration.root.printWarning("Internal error: package sets don't match: " + pkgSet + " with: " +
-                                   mapper.classToPackage.get(classdoc.qualifiedName()));
-        }
-        methodSubWriter = new MethodWriterImpl(this);
-        constrSubWriter = new ConstructorWriterImpl(this);
-        fieldSubWriter = new FieldWriterImpl(this);
-        classSubWriter = new NestedClassWriterImpl(this);
-        classUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.classes"));
-        subclassUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.subclasses"));
-        subinterfaceUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.subinterfaces"));
-        fieldUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.fields"));
-        methodUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.methods"));
-        constructorUseTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.constructors"));
-    }
-
-    /**
-     * Write out class use pages.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassTree classtree)  {
-        ClassUseMapper mapper = new ClassUseMapper(configuration, classtree);
-        for (ClassDoc aClass : configuration.root.classes()) {
-            // If -nodeprecated option is set and the containing package is marked
-            // as deprecated, do not generate the class-use page. We will still generate
-            // the class-use page if the class is marked as deprecated but the containing
-            // package is not since it could still be linked from that package-use page.
-            if (!(configuration.nodeprecated &&
-                  configuration.utils.isDeprecated(aClass.containingPackage())))
-                ClassUseWriter.generate(configuration, mapper, aClass);
-        }
-        for (PackageDoc pkg : configuration.packages) {
-            // If -nodeprecated option is set and the package is marked
-            // as deprecated, do not generate the package-use page.
-            if (!(configuration.nodeprecated && configuration.utils.isDeprecated(pkg)))
-                PackageUseWriter.generate(configuration, mapper, pkg);
-        }
-    }
-
-    private Map<String,List<ProgramElementDoc>> pkgDivide(Map<String,? extends List<? extends ProgramElementDoc>> classMap) {
-        Map<String,List<ProgramElementDoc>> map = new HashMap<>();
-        List<? extends ProgramElementDoc> list= classMap.get(classdoc.qualifiedName());
-        if (list != null) {
-            Collections.sort(list, utils.makeComparatorForClassUse());
-            for (ProgramElementDoc doc : list) {
-                PackageDoc pkg = doc.containingPackage();
-                pkgSet.add(pkg);
-                List<ProgramElementDoc> inPkg = map.get(pkg.name());
-                if (inPkg == null) {
-                    inPkg = new ArrayList<>();
-                    map.put(pkg.name(), inPkg);
-                }
-                inPkg.add(doc);
-            }
-        }
-        return map;
-    }
-
-    /**
-     * Generate a class page.
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassUseMapper mapper, ClassDoc classdoc) {
-        ClassUseWriter clsgen;
-        DocPath path = DocPath.forPackage(classdoc)
-                .resolve(DocPaths.CLASS_USE)
-                .resolve(DocPath.forName(classdoc));
-        try {
-            clsgen = new ClassUseWriter(configuration,
-                                        mapper, path,
-                                        classdoc);
-            clsgen.generateClassUseFile();
-            clsgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.
-                error("doclet.exception_encountered",
-                      exc.toString(), path.getPath());
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the class use list.
-     */
-    protected void generateClassUseFile() throws IOException {
-        HtmlTree body = getClassUseHeader();
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.classUseContainer);
-        if (pkgSet.size() > 0) {
-            addClassUse(div);
-        } else {
-            div.addContent(getResource("doclet.ClassUse_No.usage.of.0",
-                    classdoc.qualifiedName()));
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-            body.addContent(mainTree);
-        } else {
-            body.addContent(div);
-        }
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the class use documentation.
-     *
-     * @param contentTree the content tree to which the class use information will be added
-     */
-    protected void addClassUse(Content contentTree) throws IOException {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        if (configuration.packages.size() > 1) {
-            addPackageList(ul);
-            addPackageAnnotationList(ul);
-        }
-        addClassList(ul);
-        contentTree.addContent(ul);
-    }
-
-    /**
-     * Add the packages list that use the given class.
-     *
-     * @param contentTree the content tree to which the packages list will be added
-     */
-    protected void addPackageList(Content contentTree) throws IOException {
-        Content caption = getTableCaption(configuration.getResource(
-                "doclet.ClassUse_Packages.that.use.0",
-                getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc))));
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        Iterator<PackageDoc> it = pkgSet.iterator();
-        for (int i = 0; it.hasNext(); i++) {
-            PackageDoc pkg = it.next();
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i % 2 == 0) {
-                tr.addStyle(HtmlStyle.altColor);
-            } else {
-                tr.addStyle(HtmlStyle.rowColor);
-            }
-            addPackageUse(pkg, tr);
-            tbody.addContent(tr);
-        }
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the package annotation list.
-     *
-     * @param contentTree the content tree to which the package annotation list will be added
-     */
-    protected void addPackageAnnotationList(Content contentTree) throws IOException {
-        if ((!classdoc.isAnnotationType()) ||
-                pkgToPackageAnnotations == null ||
-                pkgToPackageAnnotations.isEmpty()) {
-            return;
-        }
-        Content caption = getTableCaption(configuration.getResource(
-                "doclet.ClassUse_PackageAnnotation",
-                getLink(new LinkInfoImpl(configuration,
-                                LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc))));
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator();
-        for (int i = 0; it.hasNext(); i++) {
-            PackageDoc pkg = it.next();
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i % 2 == 0) {
-                tr.addStyle(HtmlStyle.altColor);
-            } else {
-                tr.addStyle(HtmlStyle.rowColor);
-            }
-            Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
-                    getPackageLink(pkg, new StringContent(pkg.name())));
-            tr.addContent(tdFirst);
-            HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-            tdLast.addStyle(HtmlStyle.colLast);
-            addSummaryComment(pkg, tdLast);
-            tr.addContent(tdLast);
-            tbody.addContent(tr);
-        }
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the class list that use the given class.
-     *
-     * @param contentTree the content tree to which the class list will be added
-     */
-    protected void addClassList(Content contentTree) throws IOException {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        for (PackageDoc pkg : pkgSet) {
-            Content markerAnchor = getMarkerAnchor(getPackageAnchorName(pkg));
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(markerAnchor)
-                    : HtmlTree.LI(HtmlStyle.blockList, markerAnchor);
-            Content link = getResource("doclet.ClassUse_Uses.of.0.in.1",
-                                       getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER,
-                                                                classdoc)),
-                                       getPackageLink(pkg, utils.getPackageName(pkg)));
-            Content heading = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING, link);
-            htmlTree.addContent(heading);
-            addClassUse(pkg, htmlTree);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        Content li = HtmlTree.LI(HtmlStyle.blockList, ul);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the package use information.
-     *
-     * @param pkg the package that uses the given class
-     * @param contentTree the content tree to which the package use information will be added
-     */
-    protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
-        Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
-                getHyperLink(getPackageAnchorName(pkg), new StringContent(utils.getPackageName(pkg))));
-        contentTree.addContent(tdFirst);
-        HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-        tdLast.addStyle(HtmlStyle.colLast);
-        addSummaryComment(pkg, tdLast);
-        contentTree.addContent(tdLast);
-    }
-
-    /**
-     * Add the class use information.
-     *
-     * @param pkg the package that uses the given class
-     * @param contentTree the content tree to which the class use information will be added
-     */
-    protected void addClassUse(PackageDoc pkg, Content contentTree) throws IOException {
-        Content classLink = getLink(new LinkInfoImpl(configuration,
-            LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc));
-        Content pkgLink = getPackageLink(pkg, utils.getPackageName(pkg));
-        classSubWriter.addUseInfo(pkgToClassAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Annotation", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToClassTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_TypeParameter", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToSubclass.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Subclass", classLink,
-                pkgLink), subclassUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToSubinterface.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Subinterface", classLink,
-                pkgLink), subinterfaceUseTableSummary, contentTree);
-        classSubWriter.addUseInfo(pkgToImplementingClass.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ImplementingClass", classLink,
-                pkgLink), classUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToField.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_Field", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToFieldAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_FieldAnnotations", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        fieldSubWriter.addUseInfo(pkgToFieldTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_FieldTypeParameter", classLink,
-                pkgLink), fieldUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodAnnotations", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodParameterAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodParameterAnnotations", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodTypeParameter", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodReturn.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodReturn", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodReturnTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodReturnTypeParameter", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodArgs.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodArgs", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodArgTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodArgsTypeParameters", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        methodSubWriter.addUseInfo(pkgToMethodThrows.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_MethodThrows", classLink,
-                pkgLink), methodUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorAnnotations", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorParameterAnnotations.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorParameterAnnotations", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorArgs.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorArgs", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorArgTypeParameter.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorArgsTypeParameters", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-        constrSubWriter.addUseInfo(pkgToConstructorThrows.get(pkg.name()),
-                configuration.getResource("doclet.ClassUse_ConstructorThrows", classLink,
-                pkgLink), constructorUseTableSummary, contentTree);
-    }
-
-    /**
-     * Get the header for the class use Listing.
-     *
-     * @return a content tree representing the class use header
-     */
-    protected HtmlTree getClassUseHeader() {
-        String cltype = configuration.getText(classdoc.isInterface()?
-            "doclet.Interface":"doclet.Class");
-        String clname = classdoc.qualifiedName();
-        String title = configuration.getText("doclet.Window_ClassUse_Header",
-                cltype, clname);
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        ContentBuilder headContent = new ContentBuilder();
-        headContent.addContent(getResource("doclet.ClassUse_Title", cltype));
-        headContent.addContent(new HtmlTree(HtmlTag.BR));
-        headContent.addContent(clname);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING,
-                true, HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent =
-                getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_SUMMARY), packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get class page link.
-     *
-     * @return a content tree for the class page link
-     */
-    protected Content getNavLinkClass() {
-        Content linkContent = getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.CLASS_USE_HEADER, classdoc)
-                .label(configuration.getText("doclet.Class")));
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the use link.
-     *
-     * @return a content tree for the use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, useLabel);
-        return li;
-    }
-
-    /**
-     * Get the tree link.
-     *
-     * @return a content tree for the tree link
-     */
-    protected Content getNavLinkTree() {
-        Content linkContent = classdoc.containingPackage().isIncluded() ?
-            getHyperLink(DocPath.parent.resolve(DocPaths.PACKAGE_TREE), treeLabel) :
-            getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE), treeLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
deleted file mode 100644
index 8e14be9b376..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, 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.doclets.formats.html;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.javadoc.main.RootDocImpl;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-import java.io.IOException;
-
-/**
- * Generate the Class Information Page.
- *
- *  <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>
- *
- * @see com.sun.javadoc.ClassDoc
- * @see java.util.Collections
- * @see java.util.List
- * @see java.util.ArrayList
- * @see java.util.HashMap
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ClassWriterImpl extends SubWriterHolderWriter
-        implements ClassWriter {
-
-    protected final ClassDoc classDoc;
-
-    protected final ClassTree classtree;
-
-    protected final ClassDoc prev;
-
-    protected final ClassDoc next;
-
-    /**
-     * @param configuration the configuration data for the doclet
-     * @param classDoc the class being documented.
-     * @param prevClass the previous class that was documented.
-     * @param nextClass the next class being documented.
-     * @param classTree the class tree for the given class.
-     */
-    public ClassWriterImpl (ConfigurationImpl configuration, ClassDoc classDoc,
-            ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree)
-            throws IOException {
-        super(configuration, DocPath.forClass(classDoc));
-        this.classDoc = classDoc;
-        configuration.currentcd = classDoc;
-        this.classtree = classTree;
-        this.prev = prevClass;
-        this.next = nextClass;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @return a content tree for the class link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, classLabel);
-        return li;
-    }
-
-    /**
-     * Get the class use link.
-     *
-     * @return a content tree for the class use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content linkContent = getHyperLink(DocPaths.CLASS_USE.resolve(filename), useLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to previous class.
-     *
-     * @return a content tree for the previous class link
-     */
-    public Content getNavLinkPrevious() {
-        Content li;
-        if (prev != null) {
-            Content prevLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, prev)
-                    .label(prevclassLabel).strong(true));
-            li = HtmlTree.LI(prevLink);
-        }
-        else
-            li = HtmlTree.LI(prevclassLabel);
-        return li;
-    }
-
-    /**
-     * Get link to next class.
-     *
-     * @return a content tree for the next class link
-     */
-    public Content getNavLinkNext() {
-        Content li;
-        if (next != null) {
-            Content nextLink = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, next)
-                    .label(nextclassLabel).strong(true));
-            li = HtmlTree.LI(nextLink);
-        }
-        else
-            li = HtmlTree.LI(nextclassLabel);
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader(String header) {
-        String pkgname = (classDoc.containingPackage() != null)?
-            classDoc.containingPackage().name(): "";
-        String clname = classDoc.name();
-        HtmlTree bodyTree = getBody(true, getWindowTitle(clname));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        bodyTree.addContent(HtmlConstants.START_OF_CLASS_DATA);
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.header);
-        if (pkgname.length() > 0) {
-            Content classPackageLabel = HtmlTree.SPAN(HtmlStyle.packageLabelInClass, packageLabel);
-            Content pkgNameDiv = HtmlTree.DIV(HtmlStyle.subTitle, classPackageLabel);
-            pkgNameDiv.addContent(getSpace());
-            Content pkgNameContent = getTargetPackageLink(classDoc.containingPackage(),
-                    "classFrame", new StringContent(pkgname));
-            pkgNameDiv.addContent(pkgNameContent);
-            div.addContent(pkgNameDiv);
-        }
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_HEADER, classDoc);
-        //Let's not link to ourselves in the header.
-        linkInfo.linkToSelf = false;
-        Content headerContent = new StringContent(header);
-        Content heading = HtmlTree.HEADING(HtmlConstants.CLASS_PAGE_HEADING, true,
-                HtmlStyle.title, headerContent);
-        heading.addContent(getTypeParameterLinks(linkInfo));
-        div.addContent(heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassContentHeader() {
-        return getContentHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        contentTree.addContent(HtmlConstants.END_OF_CLASS_DATA);
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(configuration.metakeywords.getMetaKeywords(classDoc),
-                true, contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassInfoTreeHeader() {
-        return getMemberTreeHeader();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassInfo(Content classInfoTree) {
-        return getMemberTree(HtmlStyle.description, classInfoTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassSignature(String modifiers, Content classInfoTree) {
-        boolean isInterface = classDoc.isInterface();
-        classInfoTree.addContent(new HtmlTree(HtmlTag.BR));
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        addAnnotationInfo(classDoc, pre);
-        pre.addContent(modifiers);
-        LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CLASS_SIGNATURE, classDoc);
-        //Let's not link to ourselves in the signature.
-        linkInfo.linkToSelf = false;
-        Content className = new StringContent(classDoc.name());
-        Content parameterLinks = getTypeParameterLinks(linkInfo);
-        if (configuration.linksource) {
-            addSrcLink(classDoc, className, pre);
-            pre.addContent(parameterLinks);
-        } else {
-            Content span = HtmlTree.SPAN(HtmlStyle.typeNameLabel, className);
-            span.addContent(parameterLinks);
-            pre.addContent(span);
-        }
-        if (!isInterface) {
-            Type superclass = utils.getFirstVisibleSuperClass(classDoc,
-                    configuration);
-            if (superclass != null) {
-                pre.addContent(DocletConstants.NL);
-                pre.addContent("extends ");
-                Content link = getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
-                        superclass));
-                pre.addContent(link);
-            }
-        }
-        Type[] implIntfacs = classDoc.interfaceTypes();
-        if (implIntfacs != null && implIntfacs.length > 0) {
-            int counter = 0;
-            for (Type implType : implIntfacs) {
-                ClassDoc classDoc = implType.asClassDoc();
-                if (!(classDoc.isPublic() || utils.isLinkable(classDoc, configuration))) {
-                    continue;
-                }
-                if (counter == 0) {
-                    pre.addContent(DocletConstants.NL);
-                    pre.addContent(isInterface ? "extends " : "implements ");
-                } else {
-                    pre.addContent(", ");
-                }
-                Content link = getLink(new LinkInfoImpl(configuration,
-                                                        LinkInfoImpl.Kind.CLASS_SIGNATURE_PARENT_NAME,
-                                                        implType));
-                pre.addContent(link);
-                counter++;
-            }
-        }
-        classInfoTree.addContent(pre);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassDescription(Content classInfoTree) {
-        if(!configuration.nocomment) {
-            // generate documentation for the class.
-            if (classDoc.inlineTags().length > 0) {
-                addInlineComment(classDoc, classInfoTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassTagInfo(Content classInfoTree) {
-        if(!configuration.nocomment) {
-            // Print Information about all the tags here
-            addTagsInfo(classDoc, classInfoTree);
-        }
-    }
-
-    /**
-     * Get the class hierarchy tree for the given class.
-     *
-     * @param type the class to print the hierarchy for
-     * @return a content tree for class inheritence
-     */
-    private Content getClassInheritenceTree(Type type) {
-        Type sup;
-        HtmlTree classTreeUl = new HtmlTree(HtmlTag.UL);
-        classTreeUl.addStyle(HtmlStyle.inheritance);
-        Content liTree = null;
-        do {
-            sup = utils.getFirstVisibleSuperClass(
-                    type instanceof ClassDoc ? (ClassDoc) type : type.asClassDoc(),
-                    configuration);
-            if (sup != null) {
-                HtmlTree ul = new HtmlTree(HtmlTag.UL);
-                ul.addStyle(HtmlStyle.inheritance);
-                ul.addContent(getTreeForClassHelper(type));
-                if (liTree != null)
-                    ul.addContent(liTree);
-                Content li = HtmlTree.LI(ul);
-                liTree = li;
-                type = sup;
-            }
-            else
-                classTreeUl.addContent(getTreeForClassHelper(type));
-        }
-        while (sup != null);
-        if (liTree != null)
-            classTreeUl.addContent(liTree);
-        return classTreeUl;
-    }
-
-    /**
-     * Get the class helper tree for the given class.
-     *
-     * @param type the class to print the helper for
-     * @return a content tree for class helper
-     */
-    private Content getTreeForClassHelper(Type type) {
-        Content li = new HtmlTree(HtmlTag.LI);
-        if (type.equals(classDoc)) {
-            Content typeParameters = getTypeParameterLinks(
-                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.TREE,
-                    classDoc));
-            if (configuration.shouldExcludeQualifier(
-                    classDoc.containingPackage().name())) {
-                li.addContent(type.asClassDoc().name());
-                li.addContent(typeParameters);
-            } else {
-                li.addContent(type.asClassDoc().qualifiedName());
-                li.addContent(typeParameters);
-            }
-        } else {
-            Content link = getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS_TREE_PARENT, type)
-                    .label(configuration.getClassName(type.asClassDoc())));
-            li.addContent(link);
-        }
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassTree(Content classContentTree) {
-        if (!classDoc.isClass()) {
-            return;
-        }
-        classContentTree.addContent(getClassInheritenceTree(classDoc));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTypeParamInfo(Content classInfoTree) {
-        if (classDoc.typeParamTags().length > 0) {
-            Content typeParam = (new ParamTaglet()).getTagletOutput(classDoc,
-                    getTagletWriterInstance(false));
-            Content dl = HtmlTree.DL(typeParam);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSubClassInfo(Content classInfoTree) {
-        if (classDoc.isClass()) {
-            if (classDoc.qualifiedName().equals("java.lang.Object") ||
-                    classDoc.qualifiedName().equals("org.omg.CORBA.Object")) {
-                return;    // Don't generate the list, too huge
-            }
-            SortedSet<ClassDoc> subclasses = classtree.subs(classDoc, false);
-            if (!subclasses.isEmpty()) {
-                Content label = getResource(
-                        "doclet.Subclasses");
-                Content dt = HtmlTree.DT(label);
-                Content dl = HtmlTree.DL(dt);
-                dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBCLASSES,
-                        subclasses));
-                classInfoTree.addContent(dl);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSubInterfacesInfo(Content classInfoTree) {
-        if (classDoc.isInterface()) {
-            SortedSet<ClassDoc> subInterfaces = classtree.allSubs(classDoc, false);
-            if (!subInterfaces.isEmpty()) {
-                Content label = getResource(
-                        "doclet.Subinterfaces");
-                Content dt = HtmlTree.DT(label);
-                Content dl = HtmlTree.DL(dt);
-                dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUBINTERFACES,
-                        subInterfaces));
-                classInfoTree.addContent(dl);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInterfaceUsageInfo (Content classInfoTree) {
-        if (! classDoc.isInterface()) {
-            return;
-        }
-        if (classDoc.qualifiedName().equals("java.lang.Cloneable") ||
-                classDoc.qualifiedName().equals("java.io.Serializable")) {
-            return;   // Don't generate the list, too big
-        }
-        SortedSet<ClassDoc> implcl = classtree.implementingclasses(classDoc);
-        if (!implcl.isEmpty()) {
-            Content label = getResource(
-                    "doclet.Implementing_Classes");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_CLASSES,
-                    implcl));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addImplementedInterfacesInfo(Content classInfoTree) {
-        //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
-        //       it doesn't walk up the tree like we want it to.
-        List<Type> interfaceArray = utils.getAllInterfaces(classDoc, configuration);
-        if (classDoc.isClass() && interfaceArray.size() > 0) {
-            Content label = getResource(
-                    "doclet.All_Implemented_Interfaces");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.IMPLEMENTED_INTERFACES,
-                    interfaceArray));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSuperInterfacesInfo(Content classInfoTree) {
-        //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
-        //       it doesn't walk up the tree like we want it to.
-        List<Type> interfaceArray = utils.getAllInterfaces(classDoc, configuration);
-        if (classDoc.isInterface() && interfaceArray.size() > 0) {
-            Content label = getResource(
-                    "doclet.All_Superinterfaces");
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            dl.addContent(getClassLinks(LinkInfoImpl.Kind.SUPER_INTERFACES,
-                    interfaceArray));
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addNestedClassInfo(Content classInfoTree) {
-        ClassDoc outerClass = classDoc.containingClass();
-        if (outerClass != null) {
-            Content label;
-            if (outerClass.isInterface()) {
-                label = getResource(
-                        "doclet.Enclosing_Interface");
-            } else {
-                label = getResource(
-                        "doclet.Enclosing_Class");
-            }
-            Content dt = HtmlTree.DT(label);
-            Content dl = HtmlTree.DL(dt);
-            Content dd = new HtmlTree(HtmlTag.DD);
-            dd.addContent(getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CLASS, outerClass)));
-            dl.addContent(dd);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFunctionalInterfaceInfo (Content classInfoTree) {
-        if (isFunctionalInterface()) {
-            Content dt = HtmlTree.DT(getResource("doclet.Functional_Interface"));
-            Content dl = HtmlTree.DL(dt);
-            Content dd = new HtmlTree(HtmlTag.DD);
-            dd.addContent(getResource("doclet.Functional_Interface_Message"));
-            dl.addContent(dd);
-            classInfoTree.addContent(dl);
-        }
-    }
-
-    public boolean isFunctionalInterface() {
-        if (configuration.root instanceof RootDocImpl) {
-            RootDocImpl root = (RootDocImpl) configuration.root;
-            AnnotationDesc[] annotationDescList = classDoc.annotations();
-            for (AnnotationDesc annoDesc : annotationDescList) {
-                if (root.isFunctionalInterface(annoDesc)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassDeprecationInfo(Content classInfoTree) {
-        Content hr = new HtmlTree(HtmlTag.HR);
-        classInfoTree.addContent(hr);
-        Tag[] deprs = classDoc.tags("deprecated");
-        if (utils.isDeprecated(classDoc)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            Content div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-            if (deprs.length > 0) {
-                Tag[] commentTags = deprs[0].inlineTags();
-                if (commentTags.length > 0) {
-                    div.addContent(getSpace());
-                    addInlineDeprecatedComment(classDoc, deprs[0], div);
-                }
-            }
-            classInfoTree.addContent(div);
-        }
-    }
-
-    /**
-     * Get links to the given classes.
-     *
-     * @param context the id of the context where the link will be printed
-     * @param list the list of classes
-     * @return a content tree for the class list
-     */
-    private Content getClassLinks(LinkInfoImpl.Kind context, Collection<?> list) {
-        Object[] typeList = list.toArray();
-        Content dd = new HtmlTree(HtmlTag.DD);
-        boolean isFirst = true;
-        for (Object item : typeList) {
-            if (!isFirst) {
-                Content separator = new StringContent(", ");
-                dd.addContent(separator);
-            } else {
-                isFirst = false;
-            }
-
-            if (item instanceof ClassDoc) {
-                Content link = getLink(new LinkInfoImpl(configuration, context, (ClassDoc)item));
-                dd.addContent(link);
-            } else {
-                Content link = getLink(new LinkInfoImpl(configuration, context, (Type)item));
-                dd.addContent(link);
-            }
-        }
-        return dd;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavLinkTree() {
-        Content treeLinkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel, "", "");
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Add summary details to the navigation bar.
-     *
-     * @param subDiv the content tree to which the summary detail links will be added
-     */
-    protected void addSummaryDetailLinks(Content subDiv) {
-        try {
-            Content div = HtmlTree.DIV(getNavSummaryLinks());
-            div.addContent(getNavDetailLinks());
-            subDiv.addContent(div);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /**
-     * Get summary links for navigation bar.
-     *
-     * @return the content tree for the navigation summary links
-     */
-    protected Content getNavSummaryLinks() throws Exception {
-        Content li = HtmlTree.LI(summaryLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        String[] navLinkLabels =  new String[] {
-            "doclet.navNested", "doclet.navEnum", "doclet.navField", "doclet.navConstructor",
-            "doclet.navMethod"
-        };
-        for (int i = 0; i < navLinkLabels.length; i++ ) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            if (i == VisibleMemberMap.ENUM_CONSTANTS && ! classDoc.isEnum()) {
-                continue;
-            }
-            if (i == VisibleMemberMap.CONSTRUCTORS && classDoc.isEnum()) {
-                continue;
-            }
-            AbstractMemberWriter writer =
-                ((AbstractMemberWriter) memberSummaryBuilder.
-                getMemberSummaryWriter(i));
-            if (writer == null) {
-                liNav.addContent(getResource(navLinkLabels[i]));
-            } else {
-                writer.addNavSummaryLink(
-                        memberSummaryBuilder.members(i),
-                        memberSummaryBuilder.getVisibleMemberMap(i), liNav);
-            }
-            if (i < navLinkLabels.length-1) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Get detail links for the navigation bar.
-     *
-     * @return the content tree for the detail links
-     */
-    protected Content getNavDetailLinks() throws Exception {
-        Content li = HtmlTree.LI(detailLabel);
-        li.addContent(getSpace());
-        Content ulNav = HtmlTree.UL(HtmlStyle.subNavList, li);
-        MemberSummaryBuilder memberSummaryBuilder = (MemberSummaryBuilder)
-                configuration.getBuilderFactory().getMemberSummaryBuilder(this);
-        String[] navLinkLabels =  new String[] {
-            "doclet.navNested", "doclet.navEnum", "doclet.navField", "doclet.navConstructor",
-            "doclet.navMethod"
-        };
-        for (int i = 1; i < navLinkLabels.length; i++ ) {
-            Content liNav = new HtmlTree(HtmlTag.LI);
-            AbstractMemberWriter writer =
-                    ((AbstractMemberWriter) memberSummaryBuilder.
-                    getMemberSummaryWriter(i));
-            if (i == VisibleMemberMap.ENUM_CONSTANTS && ! classDoc.isEnum()) {
-                continue;
-            }
-            if (i == VisibleMemberMap.CONSTRUCTORS && classDoc.isEnum()) {
-                continue;
-            }
-            if (writer == null) {
-                liNav.addContent(getResource(navLinkLabels[i]));
-            } else {
-                writer.addNavDetailLink(memberSummaryBuilder.members(i), liNav);
-            }
-            if (i < navLinkLabels.length - 1) {
-                addNavGap(liNav);
-            }
-            ulNav.addContent(liNav);
-        }
-        return ulNav;
-    }
-
-    /**
-     * Add gap between navigation bar elements.
-     *
-     * @param liNav the content tree to which the gap will be added
-     */
-    protected void addNavGap(Content liNav) {
-        liNav.addContent(getSpace());
-        liNav.addContent("|");
-        liNav.addContent(getSpace());
-    }
-
-    /**
-     * Return the classDoc being documented.
-     *
-     * @return the classDoc being documented.
-     */
-    public ClassDoc getClassDoc() {
-        return classDoc;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
deleted file mode 100644
index 3042dfb86a7..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.formats.html;
-
-import java.net.*;
-import java.util.*;
-
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileManager.Location;
-import javax.tools.StandardLocation;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclint.DocLint;
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.StringUtils;
-import com.sun.tools.javadoc.main.JavaScriptScanner;
-import com.sun.tools.javadoc.main.RootDocImpl;
-
-/**
- * Configure the output based on the command line options.
- * <p>
- * Also determine the length of the command line option. For example,
- * for a option "-header" there will be a string argument associated, then the
- * the length of option "-header" is two. But for option "-nohelp" no argument
- * is needed so it's length is 1.
- * </p>
- * <p>
- * Also do the error checking on the options used. For example it is illegal to
- * use "-helpfile" option when already "-nohelp" option is used.
- * </p>
- *
- *  <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>
- *
- * @author Robert Field.
- * @author Atul Dambalkar.
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ConfigurationImpl extends Configuration {
-
-    /**
-     * The build date.  Note: For now, we will use
-     * a version number instead of a date.
-     */
-    public static final String BUILD_DATE = System.getProperty("java.version");
-
-    /**
-     * Argument for command line option "-header".
-     */
-    public String header = "";
-
-    /**
-     * Argument for command line option "-packagesheader".
-     */
-    public String packagesheader = "";
-
-    /**
-     * Argument for command line option "-footer".
-     */
-    public String footer = "";
-
-    /**
-     * Argument for command line option "-doctitle".
-     */
-    public String doctitle = "";
-
-    /**
-     * Argument for command line option "-windowtitle".
-     */
-    public String windowtitle = "";
-
-    /**
-     * Argument for command line option "-top".
-     */
-    public String top = "";
-
-    /**
-     * Argument for command line option "-bottom".
-     */
-    public String bottom = "";
-
-    /**
-     * Argument for command line option "-helpfile".
-     */
-    public String helpfile = "";
-
-    /**
-     * Argument for command line option "-stylesheetfile".
-     */
-    public String stylesheetfile = "";
-
-    /**
-     * Argument for command line option "-Xdocrootparent".
-     */
-    public String docrootparent = "";
-
-    /**
-     * True if command line option "-nohelp" is used. Default value is false.
-     */
-    public boolean nohelp = false;
-
-    /**
-     * True if command line option "-splitindex" is used. Default value is
-     * false.
-     */
-    public boolean splitindex = false;
-
-    /**
-     * False if command line option "-noindex" is used. Default value is true.
-     */
-    public boolean createindex = true;
-
-    /**
-     * True if command line option "-use" is used. Default value is false.
-     */
-    public boolean classuse = false;
-
-    /**
-     * False if command line option "-notree" is used. Default value is true.
-     */
-    public boolean createtree = true;
-
-    /**
-     * True if command line option "-nodeprecated" is used. Default value is
-     * false.
-     */
-    public boolean nodeprecatedlist = false;
-
-    /**
-     * True if command line option "-nonavbar" is used. Default value is false.
-     */
-    public boolean nonavbar = false;
-
-    /**
-     * True if command line option "-nooverview" is used. Default value is
-     * false
-     */
-    private boolean nooverview = false;
-
-    /**
-     * True if command line option "-overview" is used. Default value is false.
-     */
-    public boolean overview = false;
-
-    /**
-     * This is true if option "-overview" is used or option "-overview" is not
-     * used and number of packages is more than one.
-     */
-    public boolean createoverview = false;
-
-    /**
-     * This is the HTML version of the generated pages. HTML 4.01 is the default output version.
-     */
-    public HtmlVersion htmlVersion = HtmlVersion.HTML4;
-
-    /**
-     * Collected set of doclint options
-     */
-    public Set<String> doclintOpts = new LinkedHashSet<>();
-
-    /**
-     * Whether or not to check for JavaScript in doc comments.
-     */
-    private boolean allowScriptInComments;
-
-    /**
-     * Unique Resource Handler for this package.
-     */
-    public final MessageRetriever standardmessage;
-
-    /**
-     * First file to appear in the right-hand frame in the generated
-     * documentation.
-     */
-    public DocPath topFile = DocPath.empty;
-
-    /**
-     * The classdoc for the class file getting generated.
-     */
-    public ClassDoc currentcd = null;  // Set this classdoc in the ClassWriter.
-
-    protected List<SearchIndexItem> memberSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> packageSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> tagSearchIndex = new ArrayList<>();
-
-    protected List<SearchIndexItem> typeSearchIndex = new ArrayList<>();
-
-    protected Map<Character,List<SearchIndexItem>> tagSearchIndexMap = new HashMap<>();
-
-    protected Set<Character> tagSearchIndexKeys;
-
-    /**
-     * Constructor. Initializes resource for the
-     * {@link com.sun.tools.doclets.internal.toolkit.util.MessageRetriever MessageRetriever}.
-     */
-    public ConfigurationImpl() {
-        standardmessage = new MessageRetriever(this,
-            "com.sun.tools.doclets.formats.html.resources.standard");
-    }
-
-    private final String versionRBName = "com.sun.tools.javadoc.resources.version";
-    private ResourceBundle versionRB;
-
-    /**
-     * Return the build date for the doclet.
-     */
-    @Override
-    public String getDocletSpecificBuildDate() {
-        if (versionRB == null) {
-            try {
-                versionRB = ResourceBundle.getBundle(versionRBName);
-            } catch (MissingResourceException e) {
-                return BUILD_DATE;
-            }
-        }
-
-        try {
-            return versionRB.getString("release");
-        } catch (MissingResourceException e) {
-            return BUILD_DATE;
-        }
-    }
-
-    /**
-     * Depending upon the command line options provided by the user, set
-     * configure the output generation environment.
-     *
-     * @param options The array of option names and values.
-     */
-    @Override
-    public void setSpecificDocletOptions(String[][] options) {
-        for (int oi = 0; oi < options.length; ++oi) {
-            String[] os = options[oi];
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-footer")) {
-                footer = os[1];
-            } else if (opt.equals("-header")) {
-                header = os[1];
-            } else if (opt.equals("-packagesheader")) {
-                packagesheader = os[1];
-            } else if (opt.equals("-doctitle")) {
-                doctitle = os[1];
-            } else if (opt.equals("-windowtitle")) {
-                windowtitle = os[1].replaceAll("\\<.*?>", "");
-            } else if (opt.equals("-top")) {
-                top = os[1];
-            } else if (opt.equals("-bottom")) {
-                bottom = os[1];
-            } else if (opt.equals("-helpfile")) {
-                helpfile = os[1];
-            } else if (opt.equals("-stylesheetfile")) {
-                stylesheetfile = os[1];
-            } else if (opt.equals("-charset")) {
-                charset = os[1];
-            } else if (opt.equals("-xdocrootparent")) {
-                docrootparent = os[1];
-            } else if (opt.equals("-nohelp")) {
-                nohelp = true;
-            } else if (opt.equals("-splitindex")) {
-                splitindex = true;
-            } else if (opt.equals("-noindex")) {
-                createindex = false;
-            } else if (opt.equals("-use")) {
-                classuse = true;
-            } else if (opt.equals("-notree")) {
-                createtree = false;
-            } else if (opt.equals("-nodeprecatedlist")) {
-                nodeprecatedlist = true;
-            } else if (opt.equals("-nonavbar")) {
-                nonavbar = true;
-            } else if (opt.equals("-nooverview")) {
-                nooverview = true;
-            } else if (opt.equals("-overview")) {
-                overview = true;
-            } else if (opt.equals("-html4")) {
-                htmlVersion = HtmlVersion.HTML4;
-            } else if (opt.equals("-html5")) {
-                htmlVersion = HtmlVersion.HTML5;
-            } else if (opt.equals("-xdoclint")) {
-                doclintOpts.add(DocLint.XMSGS_OPTION);
-            } else if (opt.startsWith("-xdoclint:")) {
-                doclintOpts.add(DocLint.XMSGS_CUSTOM_PREFIX + opt.substring(opt.indexOf(":") + 1));
-            } else if (opt.startsWith("-xdoclint/package:")) {
-                doclintOpts.add(DocLint.XCHECK_PACKAGE + opt.substring(opt.indexOf(":") + 1));
-            } else if (opt.equals("--allow-script-in-comments")) {
-                allowScriptInComments = true;
-            }
-        }
-
-        if (root.specifiedClasses().length > 0) {
-            Map<String,PackageDoc> map = new HashMap<>();
-            PackageDoc pd;
-            ClassDoc[] classes = root.classes();
-            for (ClassDoc aClass : classes) {
-                pd = aClass.containingPackage();
-                if (!map.containsKey(pd.name())) {
-                    map.put(pd.name(), pd);
-                }
-            }
-        }
-
-        setCreateOverview();
-        setTopFile(root);
-
-        if (root instanceof RootDocImpl) {
-            ((RootDocImpl) root).initDocLint(doclintOpts, tagletManager.getCustomTagNames(),
-                    StringUtils.toLowerCase(htmlVersion.name()));
-            JavaScriptScanner jss = ((RootDocImpl) root).initJavaScriptScanner(isAllowScriptInComments());
-            if (jss != null) {
-                // In a more object-oriented world, this would be done by methods on the Option objects.
-                // Note that -windowtitle silently removes any and all HTML elements, and so does not need
-                // to be handled here.
-                checkJavaScript(jss, "-header", header);
-                checkJavaScript(jss, "-footer", footer);
-                checkJavaScript(jss, "-top", top);
-                checkJavaScript(jss, "-bottom", bottom);
-                checkJavaScript(jss, "-doctitle", doctitle);
-                checkJavaScript(jss, "-packagesheader", packagesheader);
-            }
-        }
-    }
-
-    private void checkJavaScript(JavaScriptScanner jss, final String opt, String value) {
-        jss.parse(value, new JavaScriptScanner.Reporter() {
-            public void report() {
-                root.printError(getText("doclet.JavaScript_in_option", opt));
-                throw new FatalError();
-            }
-        });
-    }
-
-    /**
-     * Returns the "length" of a given option. If an option takes no
-     * arguments, its length is one. If it takes one argument, it's
-     * length is two, and so on. This method is called by JavaDoc to
-     * parse the options it does not recognize. It then calls
-     * {@link #validOptions(String[][], DocErrorReporter)} to
-     * validate them.
-     * <b>Note:</b><br>
-     * The options arrive as case-sensitive strings. For options that
-     * are not case-sensitive, use toLowerCase() on the option string
-     * before comparing it.
-     *
-     * @return number of arguments + 1 for a option. Zero return means
-     * option not known.  Negative value means error occurred.
-     */
-    public int optionLength(String option) {
-        int result = -1;
-        if ((result = super.optionLength(option)) > 0) {
-            return result;
-        }
-        // otherwise look for the options we have added
-        option = StringUtils.toLowerCase(option);
-        if (option.equals("-nodeprecatedlist") ||
-            option.equals("-noindex") ||
-            option.equals("-notree") ||
-            option.equals("-nohelp") ||
-            option.equals("-splitindex") ||
-            option.equals("-serialwarn") ||
-            option.equals("-use") ||
-            option.equals("-nonavbar") ||
-            option.equals("-nooverview") ||
-            option.equals("-html4") ||
-            option.equals("-html5") ||
-            option.equals("-xdoclint") ||
-            option.startsWith("-xdoclint:") ||
-            option.startsWith("-xdoclint/package:") ||
-            option.startsWith("--allow-script-in-comments")) {
-            return 1;
-        } else if (option.equals("-help")) {
-            // Uugh: first, this should not be hidden inside optionLength,
-            // and second, we should not be writing directly to stdout.
-            // But we have no access to a DocErrorReporter, which would
-            // allow use of reporter.printNotice
-            System.out.println(getText("doclet.usage"));
-            return 1;
-        } else if (option.equals("-x")) {
-            // Uugh: first, this should not be hidden inside optionLength,
-            // and second, we should not be writing directly to stdout.
-            // But we have no access to a DocErrorReporter, which would
-            // allow use of reporter.printNotice
-            System.out.println(getText("doclet.X.usage"));
-            return 1;
-        } else if (option.equals("-footer") ||
-                   option.equals("-header") ||
-                   option.equals("-packagesheader") ||
-                   option.equals("-doctitle") ||
-                   option.equals("-windowtitle") ||
-                   option.equals("-top") ||
-                   option.equals("-bottom") ||
-                   option.equals("-helpfile") ||
-                   option.equals("-stylesheetfile") ||
-                   option.equals("-charset") ||
-                   option.equals("-overview") ||
-                   option.equals("-xdocrootparent")) {
-            return 2;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean validOptions(String options[][],
-            DocErrorReporter reporter) {
-        boolean helpfile = false;
-        boolean nohelp = false;
-        boolean overview = false;
-        boolean nooverview = false;
-        boolean splitindex = false;
-        boolean noindex = false;
-        // check shared options
-        if (!generalValidOptions(options, reporter)) {
-            return false;
-        }
-        // otherwise look at our options
-        for (int oi = 0; oi < options.length; ++oi) {
-            String[] os = options[oi];
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-helpfile")) {
-                if (nohelp == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-helpfile", "-nohelp"));
-                    return false;
-                }
-                if (helpfile == true) {
-                    reporter.printError(getText("doclet.Option_reuse",
-                        "-helpfile"));
-                    return false;
-                }
-                DocFile help = DocFile.createFileForInput(this, os[1]);
-                if (!help.exists()) {
-                    reporter.printError(getText("doclet.File_not_found", os[1]));
-                    return false;
-                }
-                helpfile = true;
-            } else  if (opt.equals("-nohelp")) {
-                if (helpfile == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-nohelp", "-helpfile"));
-                    return false;
-                }
-                nohelp = true;
-            } else if (opt.equals("-xdocrootparent")) {
-                try {
-                    new URL(os[1]);
-                } catch (MalformedURLException e) {
-                    reporter.printError(getText("doclet.MalformedURL", os[1]));
-                    return false;
-                }
-            } else if (opt.equals("-overview")) {
-                if (nooverview == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-overview", "-nooverview"));
-                    return false;
-                }
-                if (overview == true) {
-                    reporter.printError(getText("doclet.Option_reuse",
-                        "-overview"));
-                    return false;
-                }
-                overview = true;
-            } else  if (opt.equals("-nooverview")) {
-                if (overview == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-nooverview", "-overview"));
-                    return false;
-                }
-                nooverview = true;
-            } else if (opt.equals("-splitindex")) {
-                if (noindex == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-splitindex", "-noindex"));
-                    return false;
-                }
-                splitindex = true;
-            } else if (opt.equals("-noindex")) {
-                if (splitindex == true) {
-                    reporter.printError(getText("doclet.Option_conflict",
-                        "-noindex", "-splitindex"));
-                    return false;
-                }
-                noindex = true;
-            } else if (opt.startsWith("-xdoclint:")) {
-                if (opt.contains("/")) {
-                    reporter.printError(getText("doclet.Option_doclint_no_qualifiers"));
-                    return false;
-                }
-                if (!DocLint.isValidOption(
-                        opt.replace("-xdoclint:", DocLint.XMSGS_CUSTOM_PREFIX))) {
-                    reporter.printError(getText("doclet.Option_doclint_invalid_arg"));
-                    return false;
-                }
-            } else if (opt.startsWith("-xdoclint/package:")) {
-                if (!DocLint.isValidOption(
-                        opt.replace("-xdoclint/package:", DocLint.XCHECK_PACKAGE))) {
-                    reporter.printError(getText("doclet.Option_doclint_package_invalid_arg"));
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return true if the generated output is HTML5.
-     */
-    public boolean isOutputHtml5() {
-        return htmlVersion == HtmlVersion.HTML5;
-    }
-
-    /**
-     * Return true if the tag is allowed for this specific version of HTML.
-     */
-    public boolean allowTag(HtmlTag htmlTag) {
-        return htmlTag.allowTag(this.htmlVersion);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public MessageRetriever getDocletSpecificMsg() {
-        return standardmessage;
-    }
-
-    /**
-     * Decide the page which will appear first in the right-hand frame. It will
-     * be "overview-summary.html" if "-overview" option is used or no
-     * "-overview" but the number of packages is more than one. It will be
-     * "package-summary.html" of the respective package if there is only one
-     * package to document. It will be a class page(first in the sorted order),
-     * if only classes are provided on the command line.
-     *
-     * @param root Root of the program structure.
-     */
-    protected void setTopFile(RootDoc root) {
-        if (!checkForDeprecation(root)) {
-            return;
-        }
-        if (createoverview) {
-            topFile = DocPaths.OVERVIEW_SUMMARY;
-        } else {
-            if (packages.size() == 1 && packages.first().name().equals("")) {
-                if (root.classes().length > 0) {
-                    ClassDoc[] classarr = root.classes();
-                    Arrays.sort(classarr);
-                    ClassDoc cd = getValidClass(classarr);
-                    topFile = DocPath.forClass(cd);
-                }
-            } else if (!packages.isEmpty()) {
-                topFile = DocPath.forPackage(packages.first()).resolve(DocPaths.PACKAGE_SUMMARY);
-            }
-        }
-    }
-
-    protected ClassDoc getValidClass(ClassDoc[] classarr) {
-        if (!nodeprecated) {
-            return classarr[0];
-        }
-        for (ClassDoc cd : classarr) {
-            if (cd.tags("deprecated").length == 0) {
-                return cd;
-            }
-        }
-        return null;
-    }
-
-    protected boolean checkForDeprecation(RootDoc root) {
-        for (ClassDoc cd : root.classes()) {
-            if (isGeneratedDoc(cd)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Generate "overview.html" page if option "-overview" is used or number of
-     * packages is more than one. Sets {@link #createoverview} field to true.
-     */
-    protected void setCreateOverview() {
-        if ((overview || packages.size() > 1) && !nooverview) {
-            createoverview = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public WriterFactory getWriterFactory() {
-        return new WriterFactoryImpl(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Comparator<ProgramElementDoc> getMemberComparator() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Locale getLocale() {
-        if (root instanceof RootDocImpl)
-            return ((RootDocImpl)root).getLocale();
-        else
-            return Locale.getDefault();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public JavaFileManager getFileManager() {
-        if (fileManager == null) {
-            if (root instanceof RootDocImpl)
-                fileManager = ((RootDocImpl) root).getFileManager();
-            else
-                fileManager = new JavacFileManager(new Context(), false, null);
-        }
-        return fileManager;
-    }
-
-    private JavaFileManager fileManager;
-
-    @Override
-    public boolean showMessage(SourcePosition pos, String key) {
-        if (root instanceof RootDocImpl) {
-            return pos == null || ((RootDocImpl) root).showTagMessages();
-        }
-        return true;
-    }
-
-    @Override
-    public Content newContent() {
-        return new ContentBuilder();
-    }
-
-    @Override
-    public Location getLocationForPackage(PackageDoc pd) {
-        JavaFileManager fm = getFileManager();
-        return StandardLocation.SOURCE_PATH;
-    }
-
-    protected void buildSearchTagIndex() {
-        for (SearchIndexItem sii : tagSearchIndex) {
-            String tagLabel = sii.getLabel();
-            char ch = (tagLabel.length() == 0)
-                    ? '*'
-                    : Character.toUpperCase(tagLabel.charAt(0));
-            Character unicode = ch;
-            List<SearchIndexItem> list = tagSearchIndexMap.get(unicode);
-            if (list == null) {
-                list = new ArrayList<>();
-                tagSearchIndexMap.put(unicode, list);
-            }
-            list.add(sii);
-        }
-        tagSearchIndexKeys = tagSearchIndexMap.keySet();
-    }
-
-    /**
-     * Returns whether or not to allow JavaScript in comments.
-     * Default is off; can be set true from a command line option.
-     * @return the allowScriptInComments
-     */
-    public boolean isAllowScriptInComments() {
-        return allowScriptInComments;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
deleted file mode 100644
index 733a8179d0c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Write the Constants Summary Page in HTML format.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.4
- */
-@Deprecated
-public class ConstantsSummaryWriterImpl extends HtmlDocletWriter
-        implements ConstantsSummaryWriter {
-
-    /**
-     * The configuration used in this run of the standard doclet.
-     */
-    ConfigurationImpl configuration;
-
-    /**
-     * The current class being documented.
-     */
-    private ClassDoc currentClassDoc;
-
-    private final String constantsTableSummary;
-
-    private final String[] constantsTableHeader;
-
-    /**
-     * The HTML tree for main tag.
-     */
-    private HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * The HTML tree for constant values summary.
-     */
-    private HtmlTree summaryTree;
-
-    /**
-     * Construct a ConstantsSummaryWriter.
-     * @param configuration the configuration used in this run
-     *        of the standard doclet.
-     */
-    public ConstantsSummaryWriterImpl(ConfigurationImpl configuration)
-            throws IOException {
-        super(configuration, DocPaths.CONSTANT_VALUES);
-        this.configuration = configuration;
-        constantsTableSummary = configuration.getText("doclet.Constants_Table_Summary",
-                configuration.getText("doclet.Constants_Summary"));
-        constantsTableHeader = new String[] {
-            getModifierTypeHeader(),
-            configuration.getText("doclet.ConstantField"),
-            configuration.getText("doclet.Value")
-        };
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getHeader() {
-        String label = configuration.getText("doclet.Constants_Summary");
-        HtmlTree bodyTree = getBody(true, getWindowTitle(label));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getContentsHeader() {
-        return new HtmlTree(HtmlTag.UL);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addLinkToPackageContent(PackageDoc pkg, String parsedPackageName,
-            Set<String> printedPackageHeaders, Content contentListTree) {
-        String packageName = pkg.name();
-        //add link to summary
-        Content link;
-        if (packageName.length() == 0) {
-            link = getHyperLink(getDocLink(
-                    SectionName.UNNAMED_PACKAGE_ANCHOR),
-                    defaultPackageLabel, "", "");
-        } else {
-            Content packageNameContent = getPackageLabel(parsedPackageName);
-            packageNameContent.addContent(".*");
-            link = getHyperLink(DocLink.fragment(parsedPackageName),
-                    packageNameContent, "", "");
-            printedPackageHeaders.add(parsedPackageName);
-        }
-        contentListTree.addContent(HtmlTree.LI(link));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addContentsList(Content contentTree, Content contentListTree) {
-        Content titleContent = getResource(
-                "doclet.Constants_Summary");
-        Content pHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, titleContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, pHeading);
-        Content headingContent = getResource(
-                "doclet.Contents");
-        Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
-                headingContent);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree section = HtmlTree.SECTION(heading);
-            section.addContent(contentListTree);
-            div.addContent(section);
-            mainTree.addContent(div);
-        } else {
-            div.addContent(heading);
-            div.addContent(contentListTree);
-            contentTree.addContent(div);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstantSummaries() {
-        HtmlTree summariesDiv = new HtmlTree(HtmlTag.DIV);
-        summariesDiv.addStyle(HtmlStyle.constantValuesContainer);
-        return summariesDiv;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageName(String parsedPackageName, Content summariesTree, boolean first) {
-        Content pkgNameContent;
-        if (!first && configuration.allowTag(HtmlTag.SECTION)) {
-            summariesTree.addContent(summaryTree);
-        }
-        if (parsedPackageName.length() == 0) {
-            summariesTree.addContent(getMarkerAnchor(
-                    SectionName.UNNAMED_PACKAGE_ANCHOR));
-            pkgNameContent = defaultPackageLabel;
-        } else {
-            summariesTree.addContent(getMarkerAnchor(
-                    parsedPackageName));
-            pkgNameContent = getPackageLabel(parsedPackageName);
-        }
-        Content headingContent = new StringContent(".*");
-        Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
-                pkgNameContent);
-        heading.addContent(headingContent);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            summaryTree = HtmlTree.SECTION(heading);
-        } else {
-            summariesTree.addContent(heading);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getClassConstantHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassConstant(Content summariesTree, Content classConstantTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            summaryTree.addContent(classConstantTree);
-        } else {
-            summariesTree.addContent(classConstantTree);
-        }
-    }
-
-    /**
-     * Get the table caption and header for the constant summary table
-     *
-     * @param cd classdoc to be documented
-     * @return constant members header content
-     */
-    public Content getConstantMembersHeader(ClassDoc cd) {
-        //generate links backward only to public classes.
-        Content classlink = (cd.isPublic() || cd.isProtected()) ?
-            getLink(new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.CONSTANT_SUMMARY, cd)) :
-            new StringContent(cd.qualifiedName());
-        String name = cd.containingPackage().name();
-        if (name.length() > 0) {
-            Content cb = new ContentBuilder();
-            cb.addContent(name);
-            cb.addContent(".");
-            cb.addContent(classlink);
-            return getClassName(cb);
-        } else {
-            return getClassName(classlink);
-        }
-    }
-
-    /**
-     * Get the class name in the table caption and the table header.
-     *
-     * @param classStr the class name to print.
-     * @return the table caption and header
-     */
-    protected Content getClassName(Content classStr) {
-        Content caption = getTableCaption(classStr);
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.constantsSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.constantsSummary, constantsTableSummary, caption);
-        table.addContent(getSummaryTableHeader(constantsTableHeader, "col"));
-        return table;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addConstantMembers(ClassDoc cd, List<FieldDoc> fields,
-            Content classConstantTree) {
-        currentClassDoc = cd;
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        for (int i = 0; i < fields.size(); ++i) {
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i%2 == 0)
-                tr.addStyle(HtmlStyle.altColor);
-            else
-                tr.addStyle(HtmlStyle.rowColor);
-            addConstantMember(fields.get(i), tr);
-            tbody.addContent(tr);
-        }
-        Content table = getConstantMembersHeader(cd);
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        classConstantTree.addContent(li);
-    }
-
-    /**
-     * Add the row for the constant summary table.
-     *
-     * @param member the field to be documented.
-     * @param trTree an htmltree object for the table row
-     */
-    private void addConstantMember(FieldDoc member, HtmlTree trTree) {
-        trTree.addContent(getTypeColumn(member));
-        trTree.addContent(getNameColumn(member));
-        trTree.addContent(getValue(member));
-    }
-
-    /**
-     * Get the type column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the type column of the constant table row
-     */
-    private Content getTypeColumn(FieldDoc member) {
-        Content anchor = getMarkerAnchor(currentClassDoc.qualifiedName() +
-                "." + member.name());
-        Content tdType = HtmlTree.TD(HtmlStyle.colFirst, anchor);
-        Content code = new HtmlTree(HtmlTag.CODE);
-        StringTokenizer mods = new StringTokenizer(member.modifiers());
-        while(mods.hasMoreTokens()) {
-            Content modifier = new StringContent(mods.nextToken());
-            code.addContent(modifier);
-            code.addContent(getSpace());
-        }
-        Content type = getLink(new LinkInfoImpl(configuration,
-                LinkInfoImpl.Kind.CONSTANT_SUMMARY, member.type()));
-        code.addContent(type);
-        tdType.addContent(code);
-        return tdType;
-    }
-
-    /**
-     * Get the name column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the name column of the constant table row
-     */
-    private Content getNameColumn(FieldDoc member) {
-        Content nameContent = getDocLink(
-                LinkInfoImpl.Kind.CONSTANT_SUMMARY, member, member.name(), false);
-        Content code = HtmlTree.CODE(nameContent);
-        return HtmlTree.TD(code);
-    }
-
-    /**
-     * Get the value column for the constant summary table row.
-     *
-     * @param member the field to be documented.
-     * @return the value column of the constant table row
-     */
-    private Content getValue(FieldDoc member) {
-        Content valueContent = new StringContent(member.constantValueExpression());
-        Content code = HtmlTree.CODE(valueContent);
-        return HtmlTree.TD(HtmlStyle.colLast, code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addConstantSummaries(Content contentTree, Content summariesTree) {
-        if (configuration.allowTag(HtmlTag.SECTION) && summaryTree != null) {
-            summariesTree.addContent(summaryTree);
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(summariesTree);
-            contentTree.addContent(mainTree);
-        } else {
-            contentTree.addContent(summariesTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addFooter(Content contentTree) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(null, true, contentTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
deleted file mode 100644
index 4f1f770b1e7..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes constructor documentation.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class ConstructorWriterImpl extends AbstractExecutableMemberWriter
-    implements ConstructorWriter, MemberSummaryWriter {
-
-    private boolean foundNonPubConstructor = false;
-
-    /**
-     * Construct a new ConstructorWriterImpl.
-     *
-     * @param writer The writer for the class that the constructors belong to.
-     * @param classDoc the class being documented.
-     */
-    public ConstructorWriterImpl(SubWriterHolderWriter writer,
-            ClassDoc classDoc) {
-        super(writer, classDoc);
-        VisibleMemberMap visibleMemberMap = new VisibleMemberMap(classDoc,
-            VisibleMemberMap.CONSTRUCTORS, configuration);
-        List<ProgramElementDoc> constructors = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc));
-        for (ProgramElementDoc constructor : constructors) {
-            if (constructor.isProtected() || constructor.isPrivate()) {
-                setFoundNonPubConstructor(true);
-            }
-        }
-    }
-
-    /**
-     * Construct a new ConstructorWriterImpl.
-     *
-     * @param writer The writer for the class that the constructors belong to.
-     */
-    public ConstructorWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_CONSTRUCTOR_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_CONSTRUCTOR_DETAILS);
-        Content constructorDetailsTree = writer.getMemberTreeHeader();
-        constructorDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.CONSTRUCTOR_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.constructorDetailsLabel);
-        constructorDetailsTree.addContent(heading);
-        return constructorDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDocTreeHeader(ConstructorDoc constructor,
-            Content constructorDetailsTree) {
-        String erasureAnchor;
-        if ((erasureAnchor = getErasureAnchor(constructor)) != null) {
-            constructorDetailsTree.addContent(writer.getMarkerAnchor((erasureAnchor)));
-        }
-        constructorDetailsTree.addContent(
-                writer.getMarkerAnchor(writer.getAnchor(constructor)));
-        Content constructorDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(constructor.name());
-        constructorDocTree.addContent(heading);
-        return constructorDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(ConstructorDoc constructor) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(constructor, pre);
-        int annotationLength = pre.charCount();
-        addModifiers(constructor, pre);
-        if (configuration.linksource) {
-            Content constructorName = new StringContent(constructor.name());
-            writer.addSrcLink(constructor, constructorName, pre);
-        } else {
-            addName(constructor.name(), pre);
-        }
-        int indent = pre.charCount() - annotationLength;
-        addParameters(constructor, pre, indent);
-        addExceptions(constructor, pre, indent);
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setSummaryColumnStyle(HtmlTree tdTree) {
-        if (foundNonPubConstructor)
-            tdTree.addStyle(HtmlStyle.colLast);
-        else
-            tdTree.addStyle(HtmlStyle.colOne);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(ConstructorDoc constructor, Content constructorDocTree) {
-        addDeprecatedInfo(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(ConstructorDoc constructor, Content constructorDocTree) {
-        addComment(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(ConstructorDoc constructor, Content constructorDocTree) {
-        writer.addTagsInfo(constructor, constructorDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDetails(Content constructorDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(constructorDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(constructorDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getConstructorDoc(Content constructorDocTree,
-            boolean isLastContent) {
-        return getMemberTree(constructorDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * Let the writer know whether a non public constructor was found.
-     *
-     * @param foundNonPubConstructor true if we found a non public constructor.
-     */
-    public void setFoundNonPubConstructor(boolean foundNonPubConstructor) {
-        this.foundNonPubConstructor = foundNonPubConstructor;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Constructor_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Constructor_Summary"),
-                configuration.getText("doclet.constructors"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Constructors");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header;
-        if (foundNonPubConstructor) {
-            header = new String[] {
-                configuration.getText("doclet.Modifier"),
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Constructor"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        else {
-            header = new String[] {
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Constructor"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.CONSTRUCTOR_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.CONSTRUCTORS;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            return writer.getHyperLink(SectionName.CONSTRUCTOR_SUMMARY,
-                    writer.getResource("doclet.navConstructor"));
-        } else {
-            return writer.getResource("doclet.navConstructor");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.CONSTRUCTOR_DETAIL,
-                    writer.getResource("doclet.navConstructor")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navConstructor"));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        if (foundNonPubConstructor) {
-            Content code = new HtmlTree(HtmlTag.CODE);
-            if (member.isProtected()) {
-                code.addContent("protected ");
-            } else if (member.isPrivate()) {
-                code.addContent("private ");
-            } else if (member.isPublic()) {
-                code.addContent(writer.getSpace());
-            } else {
-                code.addContent(
-                        configuration.getText("doclet.Package_private"));
-            }
-            tdSummaryType.addContent(code);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
deleted file mode 100644
index c77961a9bec..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate File to list all the deprecated classes and class members with the
- * appropriate links.
- *
- *  <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>
- *
- * @see java.util.List
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class DeprecatedListWriter extends SubWriterHolderWriter {
-
-    private static final String[] ANCHORS = new String[] {
-        "package", "interface", "class", "enum", "exception", "error",
-        "annotation.type", "field", "method", "constructor", "enum.constant",
-        "annotation.type.member"
-    };
-
-    private static final String[] HEADING_KEYS = new String[] {
-        "doclet.Deprecated_Packages", "doclet.Deprecated_Interfaces",
-        "doclet.Deprecated_Classes", "doclet.Deprecated_Enums",
-        "doclet.Deprecated_Exceptions", "doclet.Deprecated_Errors",
-        "doclet.Deprecated_Annotation_Types",
-        "doclet.Deprecated_Fields",
-        "doclet.Deprecated_Methods", "doclet.Deprecated_Constructors",
-        "doclet.Deprecated_Enum_Constants",
-        "doclet.Deprecated_Annotation_Type_Members"
-    };
-
-    private static final String[] SUMMARY_KEYS = new String[] {
-        "doclet.deprecated_packages", "doclet.deprecated_interfaces",
-        "doclet.deprecated_classes", "doclet.deprecated_enums",
-        "doclet.deprecated_exceptions", "doclet.deprecated_errors",
-        "doclet.deprecated_annotation_types",
-        "doclet.deprecated_fields",
-        "doclet.deprecated_methods", "doclet.deprecated_constructors",
-        "doclet.deprecated_enum_constants",
-        "doclet.deprecated_annotation_type_members"
-    };
-
-    private static final String[] HEADER_KEYS = new String[] {
-        "doclet.Package", "doclet.Interface", "doclet.Class",
-        "doclet.Enum", "doclet.Exceptions",
-        "doclet.Errors",
-        "doclet.AnnotationType",
-        "doclet.Field",
-        "doclet.Method", "doclet.Constructor",
-        "doclet.Enum_Constant",
-        "doclet.Annotation_Type_Member"
-    };
-
-    private AbstractMemberWriter[] writers;
-
-    private ConfigurationImpl configuration;
-
-    /**
-     * Constructor.
-     *
-     * @param filename the file to be generated.
-     */
-    public DeprecatedListWriter(ConfigurationImpl configuration,
-                                DocPath filename) throws IOException {
-        super(configuration, filename);
-        this.configuration = configuration;
-        NestedClassWriterImpl classW = new NestedClassWriterImpl(this);
-        writers = new AbstractMemberWriter[]
-            {classW, classW, classW, classW, classW, classW,
-            new FieldWriterImpl(this),
-            new MethodWriterImpl(this),
-            new ConstructorWriterImpl(this),
-            new EnumConstantWriterImpl(this),
-            new AnnotationTypeOptionalMemberWriterImpl(this, null)};
-    }
-
-    /**
-     * Get list of all the deprecated classes and members in all the Packages
-     * specified on the Command Line.
-     * Then instantiate DeprecatedListWriter and generate File.
-     *
-     * @param configuration the current configuration of the doclet.
-     */
-    public static void generate(ConfigurationImpl configuration) {
-        DocPath filename = DocPaths.DEPRECATED_LIST;
-        try {
-            DeprecatedListWriter depr =
-                   new DeprecatedListWriter(configuration, filename);
-            depr.generateDeprecatedListFile(
-                   new DeprecatedAPIListBuilder(configuration));
-            depr.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the deprecated API list.
-     *
-     * @param deprapi list of deprecated API built already.
-     */
-    protected void generateDeprecatedListFile(DeprecatedAPIListBuilder deprapi)
-            throws IOException {
-        HtmlTree body = getHeader();
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN()
-                : body;
-        htmlTree.addContent(getContentsList(deprapi));
-        String memberTableSummary;
-        String[] memberTableHeader = new String[1];
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.contentContainer);
-        for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) {
-            if (deprapi.hasDocumentation(i)) {
-                addAnchor(deprapi, i, div);
-                memberTableSummary =
-                        configuration.getText("doclet.Member_Table_Summary",
-                        configuration.getText(HEADING_KEYS[i]),
-                        configuration.getText(SUMMARY_KEYS[i]));
-                memberTableHeader[0] = configuration.getText("doclet.0_and_1",
-                        configuration.getText(HEADER_KEYS[i]),
-                        configuration.getText("doclet.Description"));
-                // DeprecatedAPIListBuilder.PACKAGE == 0, so if i == 0, it is
-                // a PackageDoc.
-                if (i == DeprecatedAPIListBuilder.PACKAGE)
-                    addPackageDeprecatedAPI(deprapi.getList(i),
-                            HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
-                else
-                    writers[i - 1].addDeprecatedAPI(deprapi.getList(i),
-                            HEADING_KEYS[i], memberTableSummary, memberTableHeader, div);
-            }
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            htmlTree.addContent(div);
-            body.addContent(htmlTree);
-        } else {
-            body.addContent(div);
-        }
-        htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the index link.
-     *
-     * @param builder the deprecated list builder
-     * @param type the type of list being documented
-     * @param contentTree the content tree to which the index link will be added
-     */
-    private void addIndexLink(DeprecatedAPIListBuilder builder,
-            int type, Content contentTree) {
-        if (builder.hasDocumentation(type)) {
-            Content li = HtmlTree.LI(getHyperLink(ANCHORS[type],
-                    getResource(HEADING_KEYS[type])));
-            contentTree.addContent(li);
-        }
-    }
-
-    /**
-     * Get the contents list.
-     *
-     * @param deprapi the deprecated list builder
-     * @return a content tree for the contents list
-     */
-    public Content getContentsList(DeprecatedAPIListBuilder deprapi) {
-        Content headContent = getResource("doclet.Deprecated_API");
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        Content headingContent = getResource("doclet.Contents");
-        div.addContent(HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, true,
-                headingContent));
-        Content ul = new HtmlTree(HtmlTag.UL);
-        for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) {
-            addIndexLink(deprapi, i, ul);
-        }
-        div.addContent(ul);
-        return div;
-    }
-
-    /**
-     * Add the anchor.
-     *
-     * @param builder the deprecated list builder
-     * @param type the type of list being documented
-     * @param htmlTree the content tree to which the anchor will be added
-     */
-    private void addAnchor(DeprecatedAPIListBuilder builder, int type, Content htmlTree) {
-        if (builder.hasDocumentation(type)) {
-            htmlTree.addContent(getMarkerAnchor(ANCHORS[type]));
-        }
-    }
-
-    /**
-     * Get the header for the deprecated API Listing.
-     *
-     * @return a content tree for the header
-     */
-    public HtmlTree getHeader() {
-        String title = configuration.getText("doclet.Window_Deprecated_List");
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Get the deprecated label.
-     *
-     * @return a content tree for the deprecated label
-     */
-    protected Content getNavLinkDeprecated() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, deprecatedLabel);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
deleted file mode 100644
index 9c280caf90a..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes enum constant documentation in HTML format.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class EnumConstantWriterImpl extends AbstractMemberWriter
-    implements EnumConstantWriter, MemberSummaryWriter {
-
-    public EnumConstantWriterImpl(SubWriterHolderWriter writer,
-        ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public EnumConstantWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_ENUM_CONSTANT_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getEnumConstantsDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_ENUM_CONSTANT_DETAILS);
-        Content enumConstantsDetailsTree = writer.getMemberTreeHeader();
-        enumConstantsDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.ENUM_CONSTANT_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.enumConstantsDetailsLabel);
-        enumConstantsDetailsTree.addContent(heading);
-        return enumConstantsDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getEnumConstantsTreeHeader(FieldDoc enumConstant,
-            Content enumConstantsDetailsTree) {
-        enumConstantsDetailsTree.addContent(
-                writer.getMarkerAnchor(enumConstant.name()));
-        Content enumConstantsTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(enumConstant.name());
-        enumConstantsTree.addContent(heading);
-        return enumConstantsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(FieldDoc enumConstant) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(enumConstant, pre);
-        addModifiers(enumConstant, pre);
-        Content enumConstantLink = writer.getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.MEMBER, enumConstant.type()));
-        pre.addContent(enumConstantLink);
-        pre.addContent(" ");
-        if (configuration.linksource) {
-            Content enumConstantName = new StringContent(enumConstant.name());
-            writer.addSrcLink(enumConstant, enumConstantName, pre);
-        } else {
-            addName(enumConstant.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(FieldDoc enumConstant, Content enumConstantsTree) {
-        addDeprecatedInfo(enumConstant, enumConstantsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(FieldDoc enumConstant, Content enumConstantsTree) {
-        addComment(enumConstant, enumConstantsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(FieldDoc enumConstant, Content enumConstantsTree) {
-        writer.addTagsInfo(enumConstant, enumConstantsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getEnumConstantsDetails(Content enumConstantsDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(enumConstantsDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(enumConstantsDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getEnumConstants(Content enumConstantsTree,
-            boolean isLastContent) {
-        return getMemberTree(enumConstantsTree, isLastContent);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.ENUM_CONSTANTS;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Enum_Constant_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Enum_Constant_Summary"),
-                configuration.getText("doclet.enum_constants"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Enum_Constants");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Enum_Constant"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.ENUM_CONSTANT_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setSummaryColumnStyle(HtmlTree tdTree) {
-        tdTree.addStyle(HtmlStyle.colOne);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        //Not applicable.
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((FieldDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            if (cd == null) {
-                return writer.getHyperLink(SectionName.ENUM_CONSTANT_SUMMARY,
-                        writer.getResource("doclet.navEnum"));
-            } else {
-                return writer.getHyperLink(
-                        SectionName.ENUM_CONSTANTS_INHERITANCE,
-                        configuration.getClassName(cd), writer.getResource("doclet.navEnum"));
-            }
-        } else {
-            return writer.getResource("doclet.navEnum");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.ENUM_CONSTANT_DETAIL,
-                    writer.getResource("doclet.navEnum")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navEnum"));
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
deleted file mode 100644
index a823bef9bbd..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes field documentation in HTML format.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (rewrite)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class FieldWriterImpl extends AbstractMemberWriter
-    implements FieldWriter, MemberSummaryWriter {
-
-    public FieldWriterImpl(SubWriterHolderWriter writer, ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public FieldWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_FIELD_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getFieldDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_FIELD_DETAILS);
-        Content fieldDetailsTree = writer.getMemberTreeHeader();
-        fieldDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.FIELD_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.fieldDetailsLabel);
-        fieldDetailsTree.addContent(heading);
-        return fieldDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getFieldDocTreeHeader(FieldDoc field,
-            Content fieldDetailsTree) {
-        fieldDetailsTree.addContent(
-                writer.getMarkerAnchor(field.name()));
-        Content fieldDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(field.name());
-        fieldDocTree.addContent(heading);
-        return fieldDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(FieldDoc field) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(field, pre);
-        addModifiers(field, pre);
-        Content fieldlink = writer.getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.MEMBER, field.type()));
-        pre.addContent(fieldlink);
-        pre.addContent(" ");
-        if (configuration.linksource) {
-            Content fieldName = new StringContent(field.name());
-            writer.addSrcLink(field, fieldName, pre);
-        } else {
-            addName(field.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(FieldDoc field, Content fieldDocTree) {
-        addDeprecatedInfo(field, fieldDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(FieldDoc field, Content fieldDocTree) {
-        ClassDoc holder = field.containingClass();
-        if (field.inlineTags().length > 0) {
-            if (holder.equals(classdoc) ||
-                    (! (holder.isPublic() || utils.isLinkable(holder, configuration)))) {
-                writer.addInlineComment(field, fieldDocTree);
-            } else {
-                Content link =
-                        writer.getDocLink(LinkInfoImpl.Kind.FIELD_DOC_COPY,
-                        holder, field,
-                        holder.isIncluded() ?
-                            holder.typeName() : holder.qualifiedTypeName(),
-                            false);
-                Content codeLink = HtmlTree.CODE(link);
-                Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()?
-                   writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
-                descfrmLabel.addContent(writer.getSpace());
-                descfrmLabel.addContent(codeLink);
-                fieldDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
-                writer.addInlineComment(field, fieldDocTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(FieldDoc field, Content fieldDocTree) {
-        writer.addTagsInfo(field, fieldDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getFieldDetails(Content fieldDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(fieldDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(fieldDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getFieldDoc(Content fieldDocTree,
-            boolean isLastContent) {
-        return getMemberTree(fieldDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.FIELDS;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Field_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Field_Summary"),
-                configuration.getText("doclet.fields"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Fields");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Field"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.FIELD_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-        inheritedTree.addContent(writer.getMarkerAnchor(
-                SectionName.FIELDS_INHERITANCE, configuration.getClassName(cd)));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-        Content classLink = writer.getPreQualifiedClassLink(
-                LinkInfoImpl.Kind.MEMBER, cd, false);
-        Content label = new StringContent(cd.isClass() ?
-            configuration.getText("doclet.Fields_Inherited_From_Class") :
-            configuration.getText("doclet.Fields_Inherited_From_Interface"));
-        Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
-                label);
-        labelHeading.addContent(writer.getSpace());
-        labelHeading.addContent(classLink);
-        inheritedTree.addContent(labelHeading);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, cd , (MemberDoc) member, member.name(), false));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        linksTree.addContent(
-                writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc)member,
-                member.name(), false));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        FieldDoc field = (FieldDoc)member;
-        addModifierAndType(field, field.type(), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((FieldDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            if (cd == null) {
-                return writer.getHyperLink(
-                        SectionName.FIELD_SUMMARY,
-                        writer.getResource("doclet.navField"));
-            } else {
-                return writer.getHyperLink(
-                        SectionName.FIELDS_INHERITANCE,
-                        configuration.getClassName(cd), writer.getResource("doclet.navField"));
-            }
-        } else {
-            return writer.getResource("doclet.navField");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.FIELD_DETAIL,
-                    writer.getResource("doclet.navField")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navField"));
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
deleted file mode 100644
index adf2f0f90a6..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the documentation in the Html "frame" format in the browser. The
- * generated documentation will have two or three frames depending upon the
- * number of packages on the command line. In general there will be three frames
- * in the output, a left-hand top frame will have a list of all packages with
- * links to target left-hand bottom frame. The left-hand bottom frame will have
- * the particular package contents or the all-classes list, where as the single
- * right-hand frame will have overview or package summary or class file. Also
- * take care of browsers which do not support Html frames.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class FrameOutputWriter extends HtmlDocletWriter {
-
-    /**
-     * Number of packages specified on the command line.
-     */
-    int noOfPackages;
-
-    /**
-     * Constructor to construct FrameOutputWriter object.
-     *
-     * @param filename File to be generated.
-     */
-    public FrameOutputWriter(ConfigurationImpl configuration,
-                             DocPath filename) throws IOException {
-        super(configuration, filename);
-        noOfPackages = configuration.packages.size();
-    }
-
-    /**
-     * Construct FrameOutputWriter object and then use it to generate the Html
-     * file which will have the description of all the frames in the
-     * documentation. The name of the generated file is "index.html" which is
-     * the default first file for Html documents.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration) {
-        FrameOutputWriter framegen;
-        DocPath filename = DocPath.empty;
-        try {
-            filename = DocPaths.INDEX;
-            framegen = new FrameOutputWriter(configuration, filename);
-            framegen.generateFrameFile();
-            framegen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the constants in the "index.html" file. Print the frame details
-     * as well as warning if browser is not supporting the Html frames.
-     */
-    protected void generateFrameFile() throws IOException {
-        Content frame = getFrameDetails();
-        HtmlTree body = new HtmlTree(HtmlTag.BODY);
-        body.addAttr(HtmlAttr.ONLOAD, "loadFrames()");
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            HtmlTree main = HtmlTree.MAIN(frame);
-            body.addContent(main);
-        } else {
-            body.addContent(frame);
-        }
-        if (configuration.windowtitle.length() > 0) {
-            printFramesDocument(configuration.windowtitle, configuration,
-                    body);
-        } else {
-            printFramesDocument(configuration.getText("doclet.Generated_Docs_Untitled"),
-                    configuration, body);
-        }
-    }
-
-    /**
-     * Get the frame sizes and their contents.
-     *
-     * @return a content tree for the frame details
-     */
-    protected Content getFrameDetails() {
-        HtmlTree leftContainerDiv = new HtmlTree(HtmlTag.DIV);
-        HtmlTree rightContainerDiv = new HtmlTree(HtmlTag.DIV);
-        leftContainerDiv.addStyle(HtmlStyle.leftContainer);
-        rightContainerDiv.addStyle(HtmlStyle.rightContainer);
-        if (noOfPackages <= 1) {
-            addAllClassesFrameTag(leftContainerDiv);
-        } else if (noOfPackages > 1) {
-            addAllPackagesFrameTag(leftContainerDiv);
-            addAllClassesFrameTag(leftContainerDiv);
-        }
-        addClassFrameTag(rightContainerDiv);
-        HtmlTree mainContainer = HtmlTree.DIV(HtmlStyle.mainContainer, leftContainerDiv);
-        mainContainer.addContent(rightContainerDiv);
-        return mainContainer;
-    }
-
-    /**
-     * Add the IFRAME tag for the frame that lists all packages.
-     *
-     * @param contentTree the content tree to which the information will be added
-     */
-    private void addAllPackagesFrameTag(Content contentTree) {
-        HtmlTree frame = HtmlTree.IFRAME(DocPaths.OVERVIEW_FRAME.getPath(),
-                "packageListFrame", configuration.getText("doclet.All_Packages"));
-        HtmlTree leftTop = HtmlTree.DIV(HtmlStyle.leftTop, frame);
-        contentTree.addContent(leftTop);
-    }
-
-    /**
-     * Add the IFRAME tag for the frame that lists all classes.
-     *
-     * @param contentTree the content tree to which the information will be added
-     */
-    private void addAllClassesFrameTag(Content contentTree) {
-        HtmlTree frame = HtmlTree.IFRAME(DocPaths.ALLCLASSES_FRAME.getPath(),
-                "packageFrame", configuration.getText("doclet.All_classes_and_interfaces"));
-        HtmlTree leftBottom = HtmlTree.DIV(HtmlStyle.leftBottom, frame);
-        contentTree.addContent(leftBottom);
-    }
-
-    /**
-     * Add the IFRAME tag for the frame that describes the class in detail.
-     *
-     * @param contentTree the content tree to which the information will be added
-     */
-    private void addClassFrameTag(Content contentTree) {
-        HtmlTree frame = HtmlTree.IFRAME(configuration.topFile.getPath(), "classFrame",
-                configuration.getText("doclet.Package_class_and_interface_descriptions"));
-        frame.addStyle(HtmlStyle.rightIframe);
-        contentTree.addContent(frame);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
deleted file mode 100644
index d4d685834ad..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the Help File for the generated API documentation. The help file
- * contents are helpful for browsing the generated documentation.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class HelpWriter extends HtmlDocletWriter {
-
-    HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * Constructor to construct HelpWriter object.
-     * @param filename File to be generated.
-     */
-    public HelpWriter(ConfigurationImpl configuration,
-                      DocPath filename) throws IOException {
-        super(configuration, filename);
-    }
-
-    /**
-     * Construct the HelpWriter object and then use it to generate the help
-     * file. The name of the generated file is "help-doc.html". The help file
-     * will get generated if and only if "-helpfile" and "-nohelp" is not used
-     * on the command line.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration) {
-        HelpWriter helpgen;
-        DocPath filename = DocPath.empty;
-        try {
-            filename = DocPaths.HELP_DOC;
-            helpgen = new HelpWriter(configuration, filename);
-            helpgen.generateHelpFile();
-            helpgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the help file contents.
-     */
-    protected void generateHelpFile() throws IOException {
-        String title = configuration.getText("doclet.Window_Help_title");
-        HtmlTree body = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : body;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            body.addContent(htmlTree);
-        }
-        addHelpFileContents(body);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            htmlTree = HtmlTree.FOOTER();
-        }
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the help file contents from the resource file to the content tree. While adding the
-     * help file contents it also keeps track of user options. If "-notree"
-     * is used, then the "overview-tree.html" will not get added and hence
-     * help information also will not get added.
-     *
-     * @param contentTree the content tree to which the help file contents will be added
-     */
-    protected void addHelpFileContents(Content contentTree) {
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false, HtmlStyle.title,
-                getResource("doclet.Help_line_1"));
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        Content line2 = HtmlTree.DIV(HtmlStyle.subTitle,
-                getResource("doclet.Help_line_2"));
-        div.addContent(line2);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            contentTree.addContent(div);
-        }
-        HtmlTree htmlTree;
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        if (configuration.createoverview) {
-            Content overviewHeading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Overview"));
-            htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(overviewHeading)
-                    : HtmlTree.LI(HtmlStyle.blockList, overviewHeading);
-            Content line3 = getResource("doclet.Help_line_3",
-                    getHyperLink(DocPaths.OVERVIEW_SUMMARY,
-                    configuration.getText("doclet.Overview")));
-            Content overviewPara = HtmlTree.P(line3);
-            htmlTree.addContent(overviewPara);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        Content packageHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Package"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(packageHead)
-                : HtmlTree.LI(HtmlStyle.blockList, packageHead);
-        Content line4 = getResource("doclet.Help_line_4");
-        Content packagePara = HtmlTree.P(line4);
-        htmlTree.addContent(packagePara);
-        HtmlTree ulPackage = new HtmlTree(HtmlTag.UL);
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.Interfaces_Italic")));
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.Classes")));
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.Enums")));
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.Exceptions")));
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.Errors")));
-        ulPackage.addContent(HtmlTree.LI(
-                getResource("doclet.AnnotationTypes")));
-        htmlTree.addContent(ulPackage);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content classHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Help_line_5"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(classHead)
-                : HtmlTree.LI(HtmlStyle.blockList, classHead);
-        Content line6 = getResource("doclet.Help_line_6");
-        Content classPara = HtmlTree.P(line6);
-        htmlTree.addContent(classPara);
-        HtmlTree ul1 = new HtmlTree(HtmlTag.UL);
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_7")));
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_8")));
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_9")));
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_10")));
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_11")));
-        ul1.addContent(HtmlTree.LI(
-                getResource("doclet.Help_line_12")));
-        htmlTree.addContent(ul1);
-        HtmlTree ul2 = new HtmlTree(HtmlTag.UL);
-        ul2.addContent(HtmlTree.LI(
-                getResource("doclet.Nested_Class_Summary")));
-        ul2.addContent(HtmlTree.LI(
-                getResource("doclet.Field_Summary")));
-        ul2.addContent(HtmlTree.LI(
-                getResource("doclet.Constructor_Summary")));
-        ul2.addContent(HtmlTree.LI(
-                getResource("doclet.Method_Summary")));
-        htmlTree.addContent(ul2);
-        HtmlTree ul3 = new HtmlTree(HtmlTag.UL);
-        ul3.addContent(HtmlTree.LI(
-                getResource("doclet.Field_Detail")));
-        ul3.addContent(HtmlTree.LI(
-                getResource("doclet.Constructor_Detail")));
-        ul3.addContent(HtmlTree.LI(
-                getResource("doclet.Method_Detail")));
-        htmlTree.addContent(ul3);
-        Content line13 = getResource("doclet.Help_line_13");
-        Content para = HtmlTree.P(line13);
-        htmlTree.addContent(para);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        //Annotation Types
-        Content aHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.AnnotationType"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(aHead)
-                : HtmlTree.LI(HtmlStyle.blockList, aHead);
-        Content aline1 = getResource("doclet.Help_annotation_type_line_1");
-        Content aPara = HtmlTree.P(aline1);
-        htmlTree.addContent(aPara);
-        HtmlTree aul = new HtmlTree(HtmlTag.UL);
-        aul.addContent(HtmlTree.LI(
-                getResource("doclet.Help_annotation_type_line_2")));
-        aul.addContent(HtmlTree.LI(
-                getResource("doclet.Help_annotation_type_line_3")));
-        aul.addContent(HtmlTree.LI(
-                getResource("doclet.Annotation_Type_Required_Member_Summary")));
-        aul.addContent(HtmlTree.LI(
-                getResource("doclet.Annotation_Type_Optional_Member_Summary")));
-        aul.addContent(HtmlTree.LI(
-                getResource("doclet.Annotation_Type_Member_Detail")));
-        htmlTree.addContent(aul);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        //Enums
-        Content enumHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Enum"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(enumHead)
-                : HtmlTree.LI(HtmlStyle.blockList, enumHead);
-        Content eline1 = getResource("doclet.Help_enum_line_1");
-        Content enumPara = HtmlTree.P(eline1);
-        htmlTree.addContent(enumPara);
-        HtmlTree eul = new HtmlTree(HtmlTag.UL);
-        eul.addContent(HtmlTree.LI(
-                getResource("doclet.Help_enum_line_2")));
-        eul.addContent(HtmlTree.LI(
-                getResource("doclet.Help_enum_line_3")));
-        eul.addContent(HtmlTree.LI(
-                getResource("doclet.Enum_Constant_Summary")));
-        eul.addContent(HtmlTree.LI(
-                getResource("doclet.Enum_Constant_Detail")));
-        htmlTree.addContent(eul);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        if (configuration.classuse) {
-            Content useHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                    getResource("doclet.Help_line_14"));
-            htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(useHead)
-                    : HtmlTree.LI(HtmlStyle.blockList, useHead);
-            Content line15 = getResource("doclet.Help_line_15");
-            Content usePara = HtmlTree.P(line15);
-            htmlTree.addContent(usePara);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        if (configuration.createtree) {
-            Content treeHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                    getResource("doclet.Help_line_16"));
-            htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(treeHead)
-                    : HtmlTree.LI(HtmlStyle.blockList, treeHead);
-            Content line17 = getResource("doclet.Help_line_17_with_tree_link",
-                    getHyperLink(DocPaths.OVERVIEW_TREE,
-                    configuration.getText("doclet.Class_Hierarchy")),
-                    HtmlTree.CODE(new StringContent("java.lang.Object")));
-            Content treePara = HtmlTree.P(line17);
-            htmlTree.addContent(treePara);
-            HtmlTree tul = new HtmlTree(HtmlTag.UL);
-            tul.addContent(HtmlTree.LI(
-                    getResource("doclet.Help_line_18")));
-            tul.addContent(HtmlTree.LI(
-                    getResource("doclet.Help_line_19")));
-            htmlTree.addContent(tul);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        if (!(configuration.nodeprecatedlist ||
-                  configuration.nodeprecated)) {
-            Content dHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                    getResource("doclet.Deprecated_API"));
-            htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(dHead)
-                    : HtmlTree.LI(HtmlStyle.blockList, dHead);
-            Content line20 = getResource("doclet.Help_line_20_with_deprecated_api_link",
-                    getHyperLink(DocPaths.DEPRECATED_LIST,
-                    configuration.getText("doclet.Deprecated_API")));
-            Content dPara = HtmlTree.P(line20);
-            htmlTree.addContent(dPara);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        if (configuration.createindex) {
-            Content indexlink;
-            if (configuration.splitindex) {
-                indexlink = getHyperLink(DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1)),
-                        configuration.getText("doclet.Index"));
-            } else {
-                indexlink = getHyperLink(DocPaths.INDEX_ALL,
-                        configuration.getText("doclet.Index"));
-            }
-            Content indexHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                    getResource("doclet.Help_line_21"));
-            htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION(indexHead)
-                    : HtmlTree.LI(HtmlStyle.blockList, indexHead);
-            Content line22 = getResource("doclet.Help_line_22", indexlink);
-            Content indexPara = HtmlTree.P(line22);
-            htmlTree.addContent(indexPara);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-            } else {
-                ul.addContent(htmlTree);
-            }
-        }
-        Content prevHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Help_line_23"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(prevHead)
-                : HtmlTree.LI(HtmlStyle.blockList, prevHead);
-        Content line24 = getResource("doclet.Help_line_24");
-        Content prevPara = HtmlTree.P(line24);
-        htmlTree.addContent(prevPara);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content frameHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Help_line_25"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(frameHead)
-                : HtmlTree.LI(HtmlStyle.blockList, frameHead);
-        Content line26 = getResource("doclet.Help_line_26");
-        Content framePara = HtmlTree.P(line26);
-        htmlTree.addContent(framePara);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content allclassesHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.All_Classes"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(allclassesHead)
-                : HtmlTree.LI(HtmlStyle.blockList, allclassesHead);
-        Content line27 = getResource("doclet.Help_line_27",
-                getHyperLink(DocPaths.ALLCLASSES_NOFRAME,
-                configuration.getText("doclet.All_Classes")));
-        Content allclassesPara = HtmlTree.P(line27);
-        htmlTree.addContent(allclassesPara);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content sHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Serialized_Form"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(sHead)
-                : HtmlTree.LI(HtmlStyle.blockList, sHead);
-        Content line28 = getResource("doclet.Help_line_28");
-        Content serialPara = HtmlTree.P(line28);
-        htmlTree.addContent(serialPara);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content constHead = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                getResource("doclet.Constants_Summary"));
-        htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.SECTION(constHead)
-                : HtmlTree.LI(HtmlStyle.blockList, constHead);
-        Content line29 = getResource("doclet.Help_line_29",
-                getHyperLink(DocPaths.CONSTANT_VALUES,
-                configuration.getText("doclet.Constants_Summary")));
-        Content constPara = HtmlTree.P(line29);
-        htmlTree.addContent(constPara);
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            ul.addContent(HtmlTree.LI(HtmlStyle.blockList, htmlTree));
-        } else {
-            ul.addContent(htmlTree);
-        }
-        Content divContent = HtmlTree.DIV(HtmlStyle.contentContainer, ul);
-        Content line30 = HtmlTree.SPAN(HtmlStyle.emphasizedPhrase, getResource("doclet.Help_line_30"));
-        divContent.addContent(line30);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(divContent);
-            contentTree.addContent(mainTree);
-        } else {
-            contentTree.addContent(divContent);
-        }
-    }
-
-    /**
-     * Get the help label.
-     *
-     * @return a content tree for the help label
-     */
-    @Override
-    protected Content getNavLinkHelp() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, helpLabel);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
deleted file mode 100644
index e95bb227a41..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The class with "start" method, calls individual Writers.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Jamie Ho
- *
- */
-@Deprecated
-public class HtmlDoclet extends AbstractDoclet {
-    // An instance will be created by validOptions, and used by start.
-    private static HtmlDoclet docletToStart = null;
-
-    public HtmlDoclet() {
-        configuration = new ConfigurationImpl();
-    }
-
-    /**
-     * The global configuration information for this run.
-     */
-    public final ConfigurationImpl configuration;
-
-    /**
-     * The "start" method as required by Javadoc.
-     *
-     * @param root the root of the documentation tree.
-     * @see com.sun.javadoc.RootDoc
-     * @return true if the doclet ran without encountering any errors.
-     */
-    public static boolean start(RootDoc root) {
-        // In typical use, options will have been set up by calling validOptions,
-        // which will create an HtmlDoclet for use here.
-        HtmlDoclet doclet;
-        if (docletToStart != null) {
-            doclet = docletToStart;
-            docletToStart = null;
-        } else {
-            doclet = new HtmlDoclet();
-        }
-        return doclet.startDoclet(root);
-    }
-
-    /**
-     * Create the configuration instance.
-     * Override this method to use a different
-     * configuration.
-     */
-    public Configuration configuration() {
-        return configuration;
-    }
-
-    /**
-     * Start the generation of files. Call generate methods in the individual
-     * writers, which will in turn genrate the documentation files. Call the
-     * TreeWriter generation first to ensure the Class Hierarchy is built
-     * first and then can be used in the later generation.
-     *
-     * For new format.
-     *
-     * @see com.sun.javadoc.RootDoc
-     */
-    protected void generateOtherFiles(RootDoc root, ClassTree classtree)
-            throws Exception {
-        super.generateOtherFiles(root, classtree);
-        if (configuration.linksource) {
-            SourceToHTMLConverter.convertRoot(configuration,
-                root, DocPaths.SOURCE_OUTPUT);
-        }
-
-        if (configuration.topFile.isEmpty()) {
-            configuration.standardmessage.
-                error("doclet.No_Non_Deprecated_Classes_To_Document");
-            return;
-        }
-        boolean nodeprecated = configuration.nodeprecated;
-        performCopy(configuration.helpfile);
-        performCopy(configuration.stylesheetfile);
-        // do early to reduce memory footprint
-        if (configuration.classuse) {
-            ClassUseWriter.generate(configuration, classtree);
-        }
-        IndexBuilder indexbuilder = new IndexBuilder(configuration, nodeprecated);
-
-        if (configuration.createtree) {
-            TreeWriter.generate(configuration, classtree);
-        }
-        if (configuration.createindex) {
-            configuration.buildSearchTagIndex();
-            if (configuration.splitindex) {
-                SplitIndexWriter.generate(configuration, indexbuilder);
-            } else {
-                SingleIndexWriter.generate(configuration, indexbuilder);
-            }
-        }
-
-        if (!(configuration.nodeprecatedlist || nodeprecated)) {
-            DeprecatedListWriter.generate(configuration);
-        }
-
-        AllClassesFrameWriter.generate(configuration,
-            new IndexBuilder(configuration, nodeprecated, true));
-
-        FrameOutputWriter.generate(configuration);
-
-        if (configuration.createoverview) {
-            PackageIndexWriter.generate(configuration);
-        }
-        if (configuration.helpfile.length() == 0 &&
-            !configuration.nohelp) {
-            HelpWriter.generate(configuration);
-        }
-        // If a stylesheet file is not specified, copy the default stylesheet
-        // and replace newline with platform-specific newline.
-        DocFile f;
-        if (configuration.stylesheetfile.length() == 0) {
-            f = DocFile.createFileForOutput(configuration, DocPaths.STYLESHEET);
-            f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.STYLESHEET), false, true);
-        }
-        f = DocFile.createFileForOutput(configuration, DocPaths.JAVASCRIPT);
-        f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.JAVASCRIPT), true, true);
-        if (configuration.createindex) {
-            f = DocFile.createFileForOutput(configuration, DocPaths.SEARCH_JS);
-            f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.SEARCH_JS), true, true);
-            f = DocFile.createFileForOutput(configuration, DocPaths.RESOURCES.resolve(DocPaths.GLASS_IMG));
-            f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.GLASS_IMG), true, false);
-            f = DocFile.createFileForOutput(configuration, DocPaths.RESOURCES.resolve(DocPaths.X_IMG));
-            f.copyResource(DocPaths.RESOURCES.resolve(DocPaths.X_IMG), true, false);
-            copyJqueryFiles();
-        }
-    }
-
-    protected void copyJqueryFiles() {
-        List<String> files = Arrays.asList(
-                "jquery-1.10.2.js",
-                "jquery-ui.js",
-                "jquery-ui.css",
-                "jquery-ui.min.js",
-                "jquery-ui.min.css",
-                "jquery-ui.structure.min.css",
-                "jquery-ui.structure.css",
-                "external/jquery/jquery.js",
-                "jszip/dist/jszip.js",
-                "jszip/dist/jszip.min.js",
-                "jszip-utils/dist/jszip-utils.js",
-                "jszip-utils/dist/jszip-utils.min.js",
-                "jszip-utils/dist/jszip-utils-ie.js",
-                "jszip-utils/dist/jszip-utils-ie.min.js",
-                "images/ui-bg_flat_0_aaaaaa_40x100.png",
-                "images/ui-icons_454545_256x240.png",
-                "images/ui-bg_glass_95_fef1ec_1x400.png",
-                "images/ui-bg_glass_75_dadada_1x400.png",
-                "images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-                "images/ui-icons_888888_256x240.png",
-                "images/ui-icons_2e83ff_256x240.png",
-                "images/ui-bg_glass_65_ffffff_1x400.png",
-                "images/ui-icons_cd0a0a_256x240.png",
-                "images/ui-bg_glass_55_fbf9ee_1x400.png",
-                "images/ui-icons_222222_256x240.png",
-                "images/ui-bg_glass_75_e6e6e6_1x400.png",
-                "images/ui-bg_flat_75_ffffff_40x100.png");
-        DocFile f;
-        for (String file : files) {
-            DocPath filePath = DocPaths.JQUERY_FILES.resolve(file);
-            f = DocFile.createFileForOutput(configuration, filePath);
-            f.copyResource(DocPaths.RESOURCES.resolve(filePath), true, false);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void generateClassFiles(ClassDoc[] arr, ClassTree classtree) {
-        Arrays.sort(arr);
-        for(int i = 0; i < arr.length; i++) {
-            if (!(configuration.isGeneratedDoc(arr[i]) && arr[i].isIncluded())) {
-                continue;
-            }
-            ClassDoc prev = (i == 0)?
-                null:
-                arr[i-1];
-            ClassDoc curr = arr[i];
-            ClassDoc next = (i+1 == arr.length)?
-                null:
-                arr[i+1];
-            try {
-                if (curr.isAnnotationType()) {
-                    AbstractBuilder annotationTypeBuilder =
-                        configuration.getBuilderFactory()
-                            .getAnnotationTypeBuilder((AnnotationTypeDoc) curr,
-                                prev, next);
-                    annotationTypeBuilder.build();
-                } else {
-                    AbstractBuilder classBuilder =
-                        configuration.getBuilderFactory()
-                            .getClassBuilder(curr, prev, next, classtree);
-                    classBuilder.build();
-                }
-            } catch (IOException e) {
-                throw new DocletAbortException(e);
-            } catch (FatalError fe) {
-                throw fe;
-            } catch (DocletAbortException de) {
-                de.printStackTrace();
-                throw de;
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new DocletAbortException(e);
-            }
-        }
-    }
-
-    PackageDoc getNamedPackage(List<PackageDoc> list, int idx) {
-        if (idx < list.size()) {
-            PackageDoc pkg = list.get(idx);
-            if (!pkg.name().isEmpty()) {
-                return pkg;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void generatePackageFiles(ClassTree classtree) throws Exception {
-        Set<PackageDoc> packages = configuration.packages;
-        if (packages.size() > 1) {
-            PackageIndexFrameWriter.generate(configuration);
-        }
-        List<PackageDoc> pList = new ArrayList<>(configuration.packages);
-        PackageDoc prev = null, next;
-        for (int i = 0; i < pList.size(); i++) {
-            // if -nodeprecated option is set and the package is marked as
-            // deprecated, do not generate the package-summary.html, package-frame.html
-            // and package-tree.html pages for that package.
-            PackageDoc pkg = pList.get(i);
-            if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
-                PackageFrameWriter.generate(configuration, pkg);
-                next = getNamedPackage(pList, i + 1);
-                //If the next package is unnamed package, skip 2 ahead if possible
-                if (next == null)
-                    next = getNamedPackage(pList, i + 2);
-                AbstractBuilder packageSummaryBuilder =
-                        configuration.getBuilderFactory().getPackageSummaryBuilder(
-                        pkg, prev, next);
-                packageSummaryBuilder.build();
-                if (configuration.createtree) {
-                    PackageTreeWriter.generate(configuration,
-                            pkg, prev, next,
-                            configuration.nodeprecated);
-                }
-                prev = pkg;
-            }
-        }
-    }
-
-    public static final ConfigurationImpl sharedInstanceForOptions =
-            new ConfigurationImpl();
-
-    /**
-     * Check for doclet added options here.
-     *
-     * @return number of arguments to option. Zero return means
-     * option not known.  Negative value means error occurred.
-     */
-    public static int optionLength(String option) {
-        // Construct temporary configuration for check
-        return sharedInstanceForOptions.optionLength(option);
-    }
-
-    /**
-     * Check that options have the correct arguments here.
-     * <P>
-     * This method is not required and will default gracefully
-     * (to true) if absent.
-     * <P>
-     * Printing option related error messages (using the provided
-     * DocErrorReporter) is the responsibility of this method.
-     *
-     * @return true if the options are valid.
-     */
-    public static boolean validOptions(String options[][],
-            DocErrorReporter reporter) {
-        docletToStart = new HtmlDoclet();
-        return docletToStart.configuration.validOptions(options, reporter);
-    }
-
-    private void performCopy(String filename) {
-        if (filename.isEmpty())
-            return;
-
-        try {
-            DocFile fromfile = DocFile.createFileForInput(configuration, filename);
-            DocPath path = DocPath.create(fromfile.getName());
-            DocFile toFile = DocFile.createFileForOutput(configuration, path);
-            if (toFile.isSameFile(fromfile))
-                return;
-
-            configuration.message.notice((SourcePosition) null,
-                    "doclet.Copying_File_0_To_File_1",
-                    fromfile.toString(), path.getPath());
-            toFile.copyFile(fromfile);
-        } catch (IOException exc) {
-            configuration.message.error((SourcePosition) null,
-                    "doclet.perform_copy_exception_encountered",
-                    exc.toString());
-            throw new DocletAbortException(exc);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
deleted file mode 100644
index 5f2107d4196..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
+++ /dev/null
@@ -1,2148 +0,0 @@
-/*
- * Copyright (c) 1998, 2017, 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.doclets.formats.html;
-
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Class for the Html Format Code Generation specific to JavaDoc.
- * This Class contains methods related to the Html Code Generation which
- * are used extensively while generating the entire documentation.
- *
- *  <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>
- *
- * @since 1.2
- * @author Atul M Dambalkar
- * @author Robert Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class HtmlDocletWriter extends HtmlDocWriter {
-
-    /**
-     * Relative path from the file getting generated to the destination
-     * directory. For example, if the file getting generated is
-     * "java/lang/Object.html", then the path to the root is "../..".
-     * This string can be empty if the file getting generated is in
-     * the destination directory.
-     */
-    public final DocPath pathToRoot;
-
-    /**
-     * Platform-independent path from the current or the
-     * destination directory to the file getting generated.
-     * Used when creating the file.
-     */
-    public final DocPath path;
-
-    /**
-     * Name of the file getting generated. If the file getting generated is
-     * "java/lang/Object.html", then the filename is "Object.html".
-     */
-    public final DocPath filename;
-
-    /**
-     * The global configuration information for this run.
-     */
-    public final ConfigurationImpl configuration;
-
-    protected final Utils utils;
-
-    /**
-     * To check whether annotation heading is printed or not.
-     */
-    protected boolean printedAnnotationHeading = false;
-
-    /**
-     * To check whether annotation field heading is printed or not.
-     */
-    protected boolean printedAnnotationFieldHeading = false;
-
-    /**
-     * To check whether the repeated annotations is documented or not.
-     */
-    private boolean isAnnotationDocumented = false;
-
-    /**
-     * To check whether the container annotations is documented or not.
-     */
-    private boolean isContainerDocumented = false;
-
-    HtmlTree fixedNavDiv = new HtmlTree(HtmlTag.DIV);
-
-    /**
-     * Constructor to construct the HtmlStandardWriter object.
-     *
-     * @param path File to be generated.
-     */
-    public HtmlDocletWriter(ConfigurationImpl configuration, DocPath path)
-            throws IOException {
-        super(configuration, path);
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        this.path = path;
-        this.pathToRoot = path.parent().invert();
-        this.filename = path.basename();
-    }
-
-    /**
-     * Replace {&#064;docRoot} tag used in options that accept HTML text, such
-     * as -header, -footer, -top and -bottom, and when converting a relative
-     * HREF where commentTagsToString inserts a {&#064;docRoot} where one was
-     * missing.  (Also see DocRootTaglet for {&#064;docRoot} tags in doc
-     * comments.)
-     * <p>
-     * Replace {&#064;docRoot} tag in htmlstr with the relative path to the
-     * destination directory from the directory where the file is being
-     * written, looping to handle all such tags in htmlstr.
-     * <p>
-     * For example, for "-d docs" and -header containing {&#064;docRoot}, when
-     * the HTML page for source file p/C1.java is being generated, the
-     * {&#064;docRoot} tag would be inserted into the header as "../",
-     * the relative path from docs/p/ to docs/ (the document root).
-     * <p>
-     * Note: This doc comment was written with '&amp;#064;' representing '@'
-     * to prevent the inline tag from being interpreted.
-     */
-    public String replaceDocRootDir(String htmlstr) {
-        // Return if no inline tags exist
-        int index = htmlstr.indexOf("{@");
-        if (index < 0) {
-            return htmlstr;
-        }
-        Matcher docrootMatcher = docrootPattern.matcher(htmlstr);
-        if (!docrootMatcher.find()) {
-            return htmlstr;
-        }
-        StringBuilder buf = new StringBuilder();
-        int prevEnd = 0;
-        do {
-            int match = docrootMatcher.start();
-            // append htmlstr up to start of next {@docroot}
-            buf.append(htmlstr.substring(prevEnd, match));
-            prevEnd = docrootMatcher.end();
-            if (configuration.docrootparent.length() > 0 && htmlstr.startsWith("/..", prevEnd)) {
-                // Insert the absolute link if {@docRoot} is followed by "/..".
-                buf.append(configuration.docrootparent);
-                prevEnd += 3;
-            } else {
-                // Insert relative path where {@docRoot} was located
-                buf.append(pathToRoot.isEmpty() ? "." : pathToRoot.getPath());
-            }
-            // Append slash if next character is not a slash
-            if (prevEnd < htmlstr.length() && htmlstr.charAt(prevEnd) != '/') {
-                buf.append('/');
-            }
-        } while (docrootMatcher.find());
-        buf.append(htmlstr.substring(prevEnd));
-        return buf.toString();
-    }
-    //where:
-        // Note: {@docRoot} is not case sensitive when passed in w/command line option:
-        private static final Pattern docrootPattern =
-                Pattern.compile(Pattern.quote("{@docroot}"), Pattern.CASE_INSENSITIVE);
-
-    /**
-     * Get the script to show or hide the All classes link.
-     *
-     * @param id id of the element to show or hide
-     * @return a content tree for the script
-     */
-    public Content getAllClassesLinkScript(String id) {
-        HtmlTree script = HtmlTree.SCRIPT();
-        String scriptCode = "<!--" + DocletConstants.NL +
-                "  allClassesLink = document.getElementById(\"" + id + "\");" + DocletConstants.NL +
-                "  if(window==top) {" + DocletConstants.NL +
-                "    allClassesLink.style.display = \"block\";" + DocletConstants.NL +
-                "  }" + DocletConstants.NL +
-                "  else {" + DocletConstants.NL +
-                "    allClassesLink.style.display = \"none\";" + DocletConstants.NL +
-                "  }" + DocletConstants.NL +
-                "  //-->" + DocletConstants.NL;
-        Content scriptContent = new RawHtml(scriptCode);
-        script.addContent(scriptContent);
-        Content div = HtmlTree.DIV(script);
-        Content div_noscript = HtmlTree.DIV(getResource("doclet.No_Script_Message"));
-        Content noScript = HtmlTree.NOSCRIPT(div_noscript);
-        div.addContent(noScript);
-        return div;
-    }
-
-    /**
-     * Add method information.
-     *
-     * @param method the method to be documented
-     * @param dl the content tree to which the method information will be added
-     */
-    private void addMethodInfo(MethodDoc method, Content dl) {
-        ClassDoc[] intfacs = method.containingClass().interfaces();
-        MethodDoc overriddenMethod = method.overriddenMethod();
-        // Check whether there is any implementation or overridden info to be
-        // printed. If no overridden or implementation info needs to be
-        // printed, do not print this section.
-        if ((intfacs.length > 0 &&
-                new ImplementedMethods(method, this.configuration).build().length > 0) ||
-                overriddenMethod != null) {
-            MethodWriterImpl.addImplementsInfo(this, method, dl);
-            if (overriddenMethod != null) {
-                MethodWriterImpl.addOverridden(this,
-                        method.overriddenType(), overriddenMethod, dl);
-            }
-        }
-    }
-
-    /**
-     * Adds the tags information.
-     *
-     * @param doc the doc for which the tags will be generated
-     * @param htmltree the documentation tree to which the tags will be added
-     */
-    protected void addTagsInfo(Doc doc, Content htmltree) {
-        if (configuration.nocomment) {
-            return;
-        }
-        Content dl = new HtmlTree(HtmlTag.DL);
-        if (doc instanceof MethodDoc) {
-            addMethodInfo((MethodDoc) doc, dl);
-        }
-        Content output = new ContentBuilder();
-        TagletWriter.genTagOuput(configuration.tagletManager, doc,
-            configuration.tagletManager.getCustomTaglets(doc),
-                getTagletWriterInstance(false), output);
-        dl.addContent(output);
-        htmltree.addContent(dl);
-    }
-
-    /**
-     * Check whether there are any tags for Serialization Overview
-     * section to be printed.
-     *
-     * @param field the FieldDoc object to check for tags.
-     * @return true if there are tags to be printed else return false.
-     */
-    protected boolean hasSerializationOverviewTags(FieldDoc field) {
-        Content output = new ContentBuilder();
-        TagletWriter.genTagOuput(configuration.tagletManager, field,
-            configuration.tagletManager.getCustomTaglets(field),
-                getTagletWriterInstance(false), output);
-        return !output.isEmpty();
-    }
-
-    /**
-     * Returns a TagletWriter that knows how to write HTML.
-     *
-     * @return a TagletWriter that knows how to write HTML.
-     */
-    public TagletWriter getTagletWriterInstance(boolean isFirstSentence) {
-        return new TagletWriterImpl(this, isFirstSentence);
-    }
-
-    /**
-     * Get Package link, with target frame.
-     *
-     * @param pd The link will be to the "package-summary.html" page for this package
-     * @param target name of the target frame
-     * @param label tag for the link
-     * @return a content for the target package link
-     */
-    public Content getTargetPackageLink(PackageDoc pd, String target,
-            Content label) {
-        return getHyperLink(pathString(pd, DocPaths.PACKAGE_SUMMARY), label, "", target);
-    }
-
-    /**
-     * Generates the HTML document tree and prints it out.
-     *
-     * @param metakeywords Array of String keywords for META tag. Each element
-     *                     of the array is assigned to a separate META tag.
-     *                     Pass in null for no array
-     * @param includeScript true if printing windowtitle script
-     *                      false for files that appear in the left-hand frames
-     * @param body the body htmltree to be included in the document
-     */
-    public void printHtmlDocument(String[] metakeywords, boolean includeScript,
-            Content body) throws IOException {
-        Content htmlDocType = configuration.isOutputHtml5()
-                ? DocType.HTML5
-                : DocType.TRANSITIONAL;
-        Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
-        Content head = new HtmlTree(HtmlTag.HEAD);
-        head.addContent(getGeneratedBy(!configuration.notimestamp));
-        head.addContent(getTitle());
-        Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
-                (configuration.charset.length() > 0) ?
-                        configuration.charset : HtmlConstants.HTML_DEFAULT_CHARSET);
-        head.addContent(meta);
-        if (!configuration.notimestamp) {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            meta = HtmlTree.META(configuration.isOutputHtml5()
-                    ? "dc.created"
-                    : "date", dateFormat.format(new Date()));
-            head.addContent(meta);
-        }
-        if (metakeywords != null) {
-            for (String metakeyword : metakeywords) {
-                meta = HtmlTree.META("keywords", metakeyword);
-                head.addContent(meta);
-            }
-        }
-        addStyleSheetProperties(head);
-        addScriptProperties(head);
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(),
-                head, body);
-        Content htmlDocument = new HtmlDocument(htmlDocType,
-                htmlComment, htmlTree);
-        write(htmlDocument);
-    }
-
-    /**
-     * Get the window title.
-     *
-     * @param title the title string to construct the complete window title
-     * @return the window title string
-     */
-    public String getWindowTitle(String title) {
-        if (configuration.windowtitle.length() > 0) {
-            title += " (" + configuration.windowtitle  + ")";
-        }
-        return title;
-    }
-
-    /**
-     * Get user specified header and the footer.
-     *
-     * @param header if true print the user provided header else print the
-     * user provided footer.
-     */
-    public Content getUserHeaderFooter(boolean header) {
-        String content;
-        if (header) {
-            content = replaceDocRootDir(configuration.header);
-        } else {
-            if (configuration.footer.length() != 0) {
-                content = replaceDocRootDir(configuration.footer);
-            } else {
-                content = replaceDocRootDir(configuration.header);
-            }
-        }
-        Content rawContent = new RawHtml(content);
-        return rawContent;
-    }
-
-    /**
-     * Adds the user specified top.
-     *
-     * @param htmlTree the content tree to which user specified top will be added
-     */
-    public void addTop(Content htmlTree) {
-        Content top = new RawHtml(replaceDocRootDir(configuration.top));
-        fixedNavDiv.addContent(top);
-    }
-
-    /**
-     * Adds the user specified bottom.
-     *
-     * @param htmlTree the content tree to which user specified bottom will be added
-     */
-    public void addBottom(Content htmlTree) {
-        Content bottom = new RawHtml(replaceDocRootDir(configuration.bottom));
-        Content small = HtmlTree.SMALL(bottom);
-        Content p = HtmlTree.P(HtmlStyle.legalCopy, small);
-        htmlTree.addContent(p);
-    }
-
-    /**
-     * Adds the navigation bar for the Html page at the top and and the bottom.
-     *
-     * @param header If true print navigation bar at the top of the page else
-     * @param htmlTree the HtmlTree to which the nav links will be added
-     */
-    protected void addNavLinks(boolean header, Content htmlTree) {
-        if (!configuration.nonavbar) {
-            Content tree = (configuration.allowTag(HtmlTag.NAV))
-                    ? HtmlTree.NAV()
-                    : htmlTree;
-            String allClassesId = "allclasses_";
-            HtmlTree navDiv = new HtmlTree(HtmlTag.DIV);
-            fixedNavDiv.addStyle(HtmlStyle.fixedNav);
-            Content skipNavLinks = configuration.getResource("doclet.Skip_navigation_links");
-            if (header) {
-                fixedNavDiv.addContent(HtmlConstants.START_OF_TOP_NAVBAR);
-                navDiv.addStyle(HtmlStyle.topNav);
-                allClassesId += "navbar_top";
-                Content a = getMarkerAnchor(SectionName.NAVBAR_TOP);
-                //WCAG - Hyperlinks should contain text or an image with alt text - for AT tools
-                navDiv.addContent(a);
-                Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav, getHyperLink(
-                    getDocLink(SectionName.SKIP_NAVBAR_TOP), skipNavLinks,
-                    skipNavLinks.toString(), ""));
-                navDiv.addContent(skipLinkContent);
-            } else {
-                tree.addContent(HtmlConstants.START_OF_BOTTOM_NAVBAR);
-                navDiv.addStyle(HtmlStyle.bottomNav);
-                allClassesId += "navbar_bottom";
-                Content a = getMarkerAnchor(SectionName.NAVBAR_BOTTOM);
-                navDiv.addContent(a);
-                Content skipLinkContent = HtmlTree.DIV(HtmlStyle.skipNav, getHyperLink(
-                    getDocLink(SectionName.SKIP_NAVBAR_BOTTOM), skipNavLinks,
-                    skipNavLinks.toString(), ""));
-                navDiv.addContent(skipLinkContent);
-            }
-            if (header) {
-                navDiv.addContent(getMarkerAnchor(SectionName.NAVBAR_TOP_FIRSTROW));
-            } else {
-                navDiv.addContent(getMarkerAnchor(SectionName.NAVBAR_BOTTOM_FIRSTROW));
-            }
-            HtmlTree navList = new HtmlTree(HtmlTag.UL);
-            navList.addStyle(HtmlStyle.navList);
-            navList.addAttr(HtmlAttr.TITLE,
-                            configuration.getText("doclet.Navigation"));
-            if (configuration.createoverview) {
-                navList.addContent(getNavLinkContents());
-            }
-            if (configuration.packages.size() == 1) {
-                navList.addContent(getNavLinkPackage(configuration.packages.first()));
-            } else if (configuration.packages.size() > 1) {
-                navList.addContent(getNavLinkPackage());
-            }
-            navList.addContent(getNavLinkClass());
-            if(configuration.classuse) {
-                navList.addContent(getNavLinkClassUse());
-            }
-            if(configuration.createtree) {
-                navList.addContent(getNavLinkTree());
-            }
-            if(!(configuration.nodeprecated ||
-                     configuration.nodeprecatedlist)) {
-                navList.addContent(getNavLinkDeprecated());
-            }
-            if(configuration.createindex) {
-                navList.addContent(getNavLinkIndex());
-            }
-            if (!configuration.nohelp) {
-                navList.addContent(getNavLinkHelp());
-            }
-            navDiv.addContent(navList);
-            Content aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, getUserHeaderFooter(header));
-            navDiv.addContent(aboutDiv);
-            if (header) {
-                fixedNavDiv.addContent(navDiv);
-            } else {
-                tree.addContent(navDiv);
-            }
-            Content ulNav = HtmlTree.UL(HtmlStyle.navList, getNavLinkPrevious());
-            ulNav.addContent(getNavLinkNext());
-            Content subDiv = HtmlTree.DIV(HtmlStyle.subNav, ulNav);
-            Content ulFrames = HtmlTree.UL(HtmlStyle.navList, getNavShowLists());
-            ulFrames.addContent(getNavHideLists(filename));
-            subDiv.addContent(ulFrames);
-            HtmlTree ulAllClasses = HtmlTree.UL(HtmlStyle.navList, getNavLinkClassIndex());
-            ulAllClasses.addAttr(HtmlAttr.ID, allClassesId.toString());
-            subDiv.addContent(ulAllClasses);
-            if (header && configuration.createindex) {
-                HtmlTree inputText = HtmlTree.INPUT("text", "search");
-                HtmlTree inputReset = HtmlTree.INPUT("reset", "reset");
-                Content searchTxt = configuration.getResource("doclet.search");
-                searchTxt.addContent(getSpace());
-                HtmlTree liInput = HtmlTree.LI(HtmlTree.SPAN(searchTxt));
-                liInput.addContent(inputText);
-                liInput.addContent(inputReset);
-                HtmlTree ulSearch = HtmlTree.UL(HtmlStyle.navListSearch, liInput);
-                subDiv.addContent(ulSearch);
-            }
-            subDiv.addContent(getAllClassesLinkScript(allClassesId.toString()));
-            addSummaryDetailLinks(subDiv);
-            if (header) {
-                subDiv.addContent(getMarkerAnchor(SectionName.SKIP_NAVBAR_TOP));
-                fixedNavDiv.addContent(subDiv);
-                fixedNavDiv.addContent(HtmlConstants.END_OF_TOP_NAVBAR);
-                tree.addContent(fixedNavDiv);
-                HtmlTree paddingDiv = HtmlTree.DIV(HtmlStyle.navPadding, getSpace());
-                tree.addContent(paddingDiv);
-            } else {
-                subDiv.addContent(getMarkerAnchor(SectionName.SKIP_NAVBAR_BOTTOM));
-                tree.addContent(subDiv);
-                tree.addContent(HtmlConstants.END_OF_BOTTOM_NAVBAR);
-            }
-            if (configuration.allowTag(HtmlTag.NAV)) {
-                htmlTree.addContent(tree);
-            }
-        }
-    }
-
-    /**
-     * Get the word "NEXT" to indicate that no link is available.  Override
-     * this method to customize next link.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkNext() {
-        return getNavLinkNext(null);
-    }
-
-    /**
-     * Get the word "PREV" to indicate that no link is available.  Override
-     * this method to customize prev link.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPrevious() {
-        return getNavLinkPrevious(null);
-    }
-
-    /**
-     * Do nothing. This is the default method.
-     */
-    protected void addSummaryDetailLinks(Content navDiv) {
-    }
-
-    /**
-     * Get link to the "overview-summary.html" page.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkContents() {
-        Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_SUMMARY),
-                overviewLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link to the "package-summary.html" page for the package passed.
-     *
-     * @param pkg Package to which link will be generated
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPackage(PackageDoc pkg) {
-        Content linkContent = getPackageLink(pkg,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the word "Package" , to indicate that link is not available here.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPackage() {
-        Content li = HtmlTree.LI(packageLabel);
-        return li;
-    }
-
-    /**
-     * Get the word "Use", to indicate that link is not available.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(useLabel);
-        return li;
-    }
-
-    /**
-     * Get link for previous file.
-     *
-     * @param prev File name for the prev link
-     * @return a content tree for the link
-     */
-    public Content getNavLinkPrevious(DocPath prev) {
-        Content li;
-        if (prev != null) {
-            li = HtmlTree.LI(getHyperLink(prev, prevLabel, "", ""));
-        }
-        else
-            li = HtmlTree.LI(prevLabel);
-        return li;
-    }
-
-    /**
-     * Get link for next file.  If next is null, just print the label
-     * without linking it anywhere.
-     *
-     * @param next File name for the next link
-     * @return a content tree for the link
-     */
-    public Content getNavLinkNext(DocPath next) {
-        Content li;
-        if (next != null) {
-            li = HtmlTree.LI(getHyperLink(next, nextLabel, "", ""));
-        }
-        else
-            li = HtmlTree.LI(nextLabel);
-        return li;
-    }
-
-    /**
-     * Get "FRAMES" link, to switch to the frame version of the output.
-     *
-     * @param link File to be linked, "index.html"
-     * @return a content tree for the link
-     */
-    protected Content getNavShowLists(DocPath link) {
-        DocLink dl = new DocLink(link, path.getPath(), null);
-        Content framesContent = getHyperLink(dl, framesLabel, "", "_top");
-        Content li = HtmlTree.LI(framesContent);
-        return li;
-    }
-
-    /**
-     * Get "FRAMES" link, to switch to the frame version of the output.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavShowLists() {
-        return getNavShowLists(pathToRoot.resolve(DocPaths.INDEX));
-    }
-
-    /**
-     * Get "NO FRAMES" link, to switch to the non-frame version of the output.
-     *
-     * @param link File to be linked
-     * @return a content tree for the link
-     */
-    protected Content getNavHideLists(DocPath link) {
-        Content noFramesContent = getHyperLink(link, noframesLabel, "", "_top");
-        Content li = HtmlTree.LI(noFramesContent);
-        return li;
-    }
-
-    /**
-     * Get "Tree" link in the navigation bar. If there is only one package
-     * specified on the command line, then the "Tree" link will be to the
-     * only "package-tree.html" file otherwise it will be to the
-     * "overview-tree.html" file.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkTree() {
-        Content treeLinkContent;
-        PackageDoc[] packages = configuration.root.specifiedPackages();
-        if (packages.length == 1 && configuration.root.specifiedClasses().length == 0) {
-            treeLinkContent = getHyperLink(pathString(packages[0],
-                    DocPaths.PACKAGE_TREE), treeLabel,
-                    "", "");
-        } else {
-            treeLinkContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
-                    treeLabel, "", "");
-        }
-        Content li = HtmlTree.LI(treeLinkContent);
-        return li;
-    }
-
-    /**
-     * Get the overview tree link for the main tree.
-     *
-     * @param label the label for the link
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkMainTree(String label) {
-        Content mainTreeContent = getHyperLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
-                new StringContent(label));
-        Content li = HtmlTree.LI(mainTreeContent);
-        return li;
-    }
-
-    /**
-     * Get the word "Class", to indicate that class link is not available.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClass() {
-        Content li = HtmlTree.LI(classLabel);
-        return li;
-    }
-
-    /**
-     * Get "Deprecated" API link in the navigation bar.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkDeprecated() {
-        Content linkContent = getHyperLink(pathToRoot.resolve(DocPaths.DEPRECATED_LIST),
-                deprecatedLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get link for generated index. If the user has used "-splitindex"
-     * command line option, then link to file "index-files/index-1.html" is
-     * generated otherwise link to file "index-all.html" is generated.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkClassIndex() {
-        Content allClassesContent = getHyperLink(pathToRoot.resolve(
-                DocPaths.ALLCLASSES_NOFRAME),
-                allclassesLabel, "", "");
-        Content li = HtmlTree.LI(allClassesContent);
-        return li;
-    }
-
-    /**
-     * Get link for generated class index.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkIndex() {
-        Content linkContent = getHyperLink(pathToRoot.resolve(
-                (configuration.splitindex
-                    ? DocPaths.INDEX_FILES.resolve(DocPaths.indexN(1))
-                    : DocPaths.INDEX_ALL)),
-            indexLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get help file link. If user has provided a help file, then generate a
-     * link to the user given file, which is already copied to current or
-     * destination directory.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkHelp() {
-        String helpfile = configuration.helpfile;
-        DocPath helpfilenm;
-        if (helpfile.isEmpty()) {
-            helpfilenm = DocPaths.HELP_DOC;
-        } else {
-            DocFile file = DocFile.createFileForInput(configuration, helpfile);
-            helpfilenm = DocPath.create(file.getName());
-        }
-        Content linkContent = getHyperLink(pathToRoot.resolve(helpfilenm),
-                helpLabel, "", "");
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get summary table header.
-     *
-     * @param header the header for the table
-     * @param scope the scope of the headers
-     * @return a content tree for the header
-     */
-    public Content getSummaryTableHeader(String[] header, String scope) {
-        Content tr = new HtmlTree(HtmlTag.TR);
-        int size = header.length;
-        Content tableHeader;
-        if (size == 1) {
-            tableHeader = new StringContent(header[0]);
-            tr.addContent(HtmlTree.TH(HtmlStyle.colOne, scope, tableHeader));
-            return tr;
-        }
-        for (int i = 0; i < size; i++) {
-            tableHeader = new StringContent(header[i]);
-            if(i == 0)
-                tr.addContent(HtmlTree.TH(HtmlStyle.colFirst, scope, tableHeader));
-            else if(i == (size - 1))
-                tr.addContent(HtmlTree.TH(HtmlStyle.colLast, scope, tableHeader));
-            else
-                tr.addContent(HtmlTree.TH(scope, tableHeader));
-        }
-        return tr;
-    }
-
-    /**
-     * Get table caption.
-     *
-     * @param rawText the caption for the table which could be raw Html
-     * @return a content tree for the caption
-     */
-    public Content getTableCaption(Content title) {
-        Content captionSpan = HtmlTree.SPAN(title);
-        Content space = getSpace();
-        Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, space);
-        Content caption = HtmlTree.CAPTION(captionSpan);
-        caption.addContent(tabSpan);
-        return caption;
-    }
-
-    /**
-     * Get the marker anchor which will be added to the documentation tree.
-     *
-     * @param anchorName the anchor name attribute
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchor(String anchorName) {
-        return getMarkerAnchor(getName(anchorName), null);
-    }
-
-    /**
-     * Get the marker anchor which will be added to the documentation tree.
-     *
-     * @param sectionName the section name anchor attribute for page
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchor(SectionName sectionName) {
-        return getMarkerAnchor(sectionName.getName(), null);
-    }
-
-    /**
-     * Get the marker anchor which will be added to the documentation tree.
-     *
-     * @param sectionName the section name anchor attribute for page
-     * @param anchorName the anchor name combined with section name attribute for the page
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchor(SectionName sectionName, String anchorName) {
-        return getMarkerAnchor(sectionName.getName() + getName(anchorName), null);
-    }
-
-    /**
-     * Get the marker anchor which will be added to the documentation tree.
-     *
-     * @param anchorName the anchor name or id attribute
-     * @param anchorContent the content that should be added to the anchor
-     * @return a content tree for the marker anchor
-     */
-    public Content getMarkerAnchor(String anchorName, Content anchorContent) {
-        if (anchorContent == null)
-            anchorContent = new Comment(" ");
-        Content markerAnchor = HtmlTree.A(configuration.htmlVersion, anchorName, anchorContent);
-        return markerAnchor;
-    }
-
-    /**
-     * Returns a packagename content.
-     *
-     * @param packageDoc the package to check
-     * @return package name content
-     */
-    public Content getPackageName(PackageDoc packageDoc) {
-        return packageDoc == null || packageDoc.name().isEmpty() ?
-            defaultPackageLabel :
-            getPackageLabel(packageDoc.name());
-    }
-
-    /**
-     * Returns a package name label.
-     *
-     * @param packageName the package name
-     * @return the package name content
-     */
-    public Content getPackageLabel(String packageName) {
-        return new StringContent(packageName);
-    }
-
-    /**
-     * Add package deprecation information to the documentation tree
-     *
-     * @param deprPkgs list of deprecated packages
-     * @param headingKey the caption for the deprecated package table
-     * @param tableSummary the summary for the deprecated package table
-     * @param tableHeader table headers for the deprecated package table
-     * @param contentTree the content tree to which the deprecated package table will be added
-     */
-    protected void addPackageDeprecatedAPI(List<Doc> deprPkgs, String headingKey,
-            String tableSummary, String[] tableHeader, Content contentTree) {
-        if (deprPkgs.size() > 0) {
-            Content caption = getTableCaption(configuration.getResource(headingKey));
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption);
-            table.addContent(getSummaryTableHeader(tableHeader, "col"));
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            for (int i = 0; i < deprPkgs.size(); i++) {
-                PackageDoc pkg = (PackageDoc) deprPkgs.get(i);
-                HtmlTree td = HtmlTree.TD(HtmlStyle.colOne,
-                        getPackageLink(pkg, getPackageName(pkg)));
-                if (pkg.tags("deprecated").length > 0) {
-                    addInlineDeprecatedComment(pkg, pkg.tags("deprecated")[0], td);
-                }
-                HtmlTree tr = HtmlTree.TR(td);
-                if (i % 2 == 0) {
-                    tr.addStyle(HtmlStyle.altColor);
-                } else {
-                    tr.addStyle(HtmlStyle.rowColor);
-                }
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            Content ul = HtmlTree.UL(HtmlStyle.blockList, li);
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Return the path to the class page for a classdoc.
-     *
-     * @param cd   Class to which the path is requested.
-     * @param name Name of the file(doesn't include path).
-     */
-    protected DocPath pathString(ClassDoc cd, DocPath name) {
-        return pathString(cd.containingPackage(), name);
-    }
-
-    /**
-     * Return path to the given file name in the given package. So if the name
-     * passed is "Object.html" and the name of the package is "java.lang", and
-     * if the relative path is "../.." then returned string will be
-     * "../../java/lang/Object.html"
-     *
-     * @param pd Package in which the file name is assumed to be.
-     * @param name File name, to which path string is.
-     */
-    protected DocPath pathString(PackageDoc pd, DocPath name) {
-        return pathToRoot.resolve(DocPath.forPackage(pd).resolve(name));
-    }
-
-    /**
-     * Given a package, return the name to be used in HTML anchor tag.
-     * @param packageDoc the package.
-     * @return the name to be used in HTML anchor tag.
-     */
-    public String getPackageAnchorName(PackageDoc packageDoc) {
-        return packageDoc == null || packageDoc.name().length() == 0 ?
-            SectionName.UNNAMED_PACKAGE_ANCHOR.getName() : packageDoc.name();
-    }
-
-    /**
-     * Return the link to the given package.
-     *
-     * @param pkg the package to link to.
-     * @param label the label for the link.
-     * @return a content tree for the package link.
-     */
-    public Content getPackageLink(PackageDoc pkg, String label) {
-        return getPackageLink(pkg, new StringContent(label));
-    }
-
-    /**
-     * Return the link to the given package.
-     *
-     * @param pkg the package to link to.
-     * @param label the label for the link.
-     * @return a content tree for the package link.
-     */
-    public Content getPackageLink(PackageDoc pkg, Content label) {
-        boolean included = pkg != null && pkg.isIncluded();
-        if (! included) {
-            for (PackageDoc p : configuration.packages) {
-                if (p.equals(pkg)) {
-                    included = true;
-                    break;
-                }
-            }
-        }
-        if (included || pkg == null) {
-            return getHyperLink(pathString(pkg, DocPaths.PACKAGE_SUMMARY),
-                    label);
-        } else {
-            DocLink crossPkgLink = getCrossPackageLink(utils.getPackageName(pkg));
-            if (crossPkgLink != null) {
-                return getHyperLink(crossPkgLink, label);
-            } else {
-                return label;
-            }
-        }
-    }
-
-    public Content italicsClassName(ClassDoc cd, boolean qual) {
-        Content name = new StringContent((qual)? cd.qualifiedName(): cd.name());
-        return (cd.isInterface())?  HtmlTree.SPAN(HtmlStyle.interfaceName, name): name;
-    }
-
-    /**
-     * Add the link to the content tree.
-     *
-     * @param doc program element doc for which the link will be added
-     * @param label label for the link
-     * @param htmltree the content tree to which the link will be added
-     */
-    public void addSrcLink(ProgramElementDoc doc, Content label, Content htmltree) {
-        if (doc == null) {
-            return;
-        }
-        ClassDoc cd = doc.containingClass();
-        if (cd == null) {
-            //d must be a class doc since in has no containing class.
-            cd = (ClassDoc) doc;
-        }
-        DocPath href = pathToRoot
-                .resolve(DocPaths.SOURCE_OUTPUT)
-                .resolve(DocPath.forClass(cd));
-        Content linkContent = getHyperLink(href.fragment(SourceToHTMLConverter.getAnchorName(doc)), label, "", "");
-        htmltree.addContent(linkContent);
-    }
-
-    /**
-     * Return the link to the given class.
-     *
-     * @param linkInfo the information about the link.
-     *
-     * @return the link for the given class.
-     */
-    public Content getLink(LinkInfoImpl linkInfo) {
-        LinkFactoryImpl factory = new LinkFactoryImpl(this);
-        return factory.getLink(linkInfo);
-    }
-
-    /**
-     * Return the type parameters for the given class.
-     *
-     * @param linkInfo the information about the link.
-     * @return the type for the given class.
-     */
-    public Content getTypeParameterLinks(LinkInfoImpl linkInfo) {
-        LinkFactoryImpl factory = new LinkFactoryImpl(this);
-        return factory.getTypeParameterLinks(linkInfo, false);
-    }
-
-    /*************************************************************
-     * Return a class cross link to external class documentation.
-     * The name must be fully qualified to determine which package
-     * the class is in.  The -link option does not allow users to
-     * link to external classes in the "default" package.
-     *
-     * @param qualifiedClassName the qualified name of the external class.
-     * @param refMemName the name of the member being referenced.  This should
-     * be null or empty string if no member is being referenced.
-     * @param label the label for the external link.
-     * @param strong true if the link should be strong.
-     * @param style the style of the link.
-     * @param code true if the label should be code font.
-     */
-    public Content getCrossClassLink(String qualifiedClassName, String refMemName,
-                                    Content label, boolean strong, String style,
-                                    boolean code) {
-        String className = "";
-        String packageName = qualifiedClassName == null ? "" : qualifiedClassName;
-        int periodIndex;
-        while ((periodIndex = packageName.lastIndexOf('.')) != -1) {
-            className = packageName.substring(periodIndex + 1, packageName.length()) +
-                (className.length() > 0 ? "." + className : "");
-            Content defaultLabel = new StringContent(className);
-            if (code)
-                defaultLabel = HtmlTree.CODE(defaultLabel);
-            packageName = packageName.substring(0, periodIndex);
-            if (getCrossPackageLink(packageName) != null) {
-                //The package exists in external documentation, so link to the external
-                //class (assuming that it exists).  This is definitely a limitation of
-                //the -link option.  There are ways to determine if an external package
-                //exists, but no way to determine if the external class exists.  We just
-                //have to assume that it does.
-                DocLink link = configuration.extern.getExternalLink(packageName, pathToRoot,
-                                className + ".html", refMemName);
-                return getHyperLink(link,
-                    (label == null) || label.isEmpty() ? defaultLabel : label,
-                    strong, style,
-                    configuration.getText("doclet.Href_Class_Or_Interface_Title", packageName),
-                    "");
-            }
-        }
-        return null;
-    }
-
-    public boolean isClassLinkable(ClassDoc cd) {
-        if (cd.isIncluded()) {
-            return configuration.isGeneratedDoc(cd);
-        }
-        return configuration.extern.isExternal(cd);
-    }
-
-    public DocLink getCrossPackageLink(String pkgName) {
-        return configuration.extern.getExternalLink(pkgName, pathToRoot,
-            DocPaths.PACKAGE_SUMMARY.getPath());
-    }
-
-    /**
-     * Get the class link.
-     *
-     * @param context the id of the context where the link will be added
-     * @param cd the class doc to link to
-     * @return a content tree for the link
-     */
-    public Content getQualifiedClassLink(LinkInfoImpl.Kind context, ClassDoc cd) {
-        return getLink(new LinkInfoImpl(configuration, context, cd)
-                .label(configuration.getClassName(cd)));
-    }
-
-    /**
-     * Add the class link.
-     *
-     * @param context the id of the context where the link will be added
-     * @param cd the class doc to link to
-     * @param contentTree the content tree to which the link will be added
-     */
-    public void addPreQualifiedClassLink(LinkInfoImpl.Kind context, ClassDoc cd, Content contentTree) {
-        addPreQualifiedClassLink(context, cd, false, contentTree);
-    }
-
-    /**
-     * Retrieve the class link with the package portion of the label in
-     * plain text.  If the qualifier is excluded, it will not be included in the
-     * link label.
-     *
-     * @param cd the class to link to.
-     * @param isStrong true if the link should be strong.
-     * @return the link with the package portion of the label in plain text.
-     */
-    public Content getPreQualifiedClassLink(LinkInfoImpl.Kind context,
-            ClassDoc cd, boolean isStrong) {
-        ContentBuilder classlink = new ContentBuilder();
-        PackageDoc pd = cd.containingPackage();
-        if (pd != null && ! configuration.shouldExcludeQualifier(pd.name())) {
-            classlink.addContent(getPkgName(cd));
-        }
-        classlink.addContent(getLink(new LinkInfoImpl(configuration,
-                context, cd).label(cd.name()).strong(isStrong)));
-        return classlink;
-    }
-
-    /**
-     * Add the class link with the package portion of the label in
-     * plain text. If the qualifier is excluded, it will not be included in the
-     * link label.
-     *
-     * @param context the id of the context where the link will be added
-     * @param cd the class to link to
-     * @param isStrong true if the link should be strong
-     * @param contentTree the content tree to which the link with be added
-     */
-    public void addPreQualifiedClassLink(LinkInfoImpl.Kind context,
-            ClassDoc cd, boolean isStrong, Content contentTree) {
-        PackageDoc pd = cd.containingPackage();
-        if(pd != null && ! configuration.shouldExcludeQualifier(pd.name())) {
-            contentTree.addContent(getPkgName(cd));
-        }
-        contentTree.addContent(getLink(new LinkInfoImpl(configuration,
-                context, cd).label(cd.name()).strong(isStrong)));
-    }
-
-    /**
-     * Add the class link, with only class name as the strong link and prefixing
-     * plain package name.
-     *
-     * @param context the id of the context where the link will be added
-     * @param cd the class to link to
-     * @param contentTree the content tree to which the link with be added
-     */
-    public void addPreQualifiedStrongClassLink(LinkInfoImpl.Kind context, ClassDoc cd, Content contentTree) {
-        addPreQualifiedClassLink(context, cd, true, contentTree);
-    }
-
-    /**
-     * Get the link for the given member.
-     *
-     * @param context the id of the context where the link will be added
-     * @param doc the member being linked to
-     * @param label the label for the link
-     * @return a content tree for the doc link
-     */
-    public Content getDocLink(LinkInfoImpl.Kind context, MemberDoc doc, String label) {
-        return getDocLink(context, doc.containingClass(), doc,
-                new StringContent(label));
-    }
-
-    /**
-     * Return the link for the given member.
-     *
-     * @param context the id of the context where the link will be printed.
-     * @param doc the member being linked to.
-     * @param label the label for the link.
-     * @param strong true if the link should be strong.
-     * @return the link for the given member.
-     */
-    public Content getDocLink(LinkInfoImpl.Kind context, MemberDoc doc, String label,
-            boolean strong) {
-        return getDocLink(context, doc.containingClass(), doc, label, strong);
-    }
-
-    /**
-     * Return the link for the given member.
-     *
-     * @param context the id of the context where the link will be printed.
-     * @param classDoc the classDoc that we should link to.  This is not
-     *                 necessarily equal to doc.containingClass().  We may be
-     *                 inheriting comments.
-     * @param doc the member being linked to.
-     * @param label the label for the link.
-     * @param strong true if the link should be strong.
-     * @return the link for the given member.
-     */
-    public Content getDocLink(LinkInfoImpl.Kind context, ClassDoc classDoc, MemberDoc doc,
-            String label, boolean strong) {
-        return getDocLink(context, classDoc, doc, label, strong, false);
-    }
-    public Content getDocLink(LinkInfoImpl.Kind context, ClassDoc classDoc, MemberDoc doc,
-            Content label, boolean strong) {
-        return getDocLink(context, classDoc, doc, label, strong, false);
-    }
-
-   /**
-     * Return the link for the given member.
-     *
-     * @param context the id of the context where the link will be printed.
-     * @param classDoc the classDoc that we should link to.  This is not
-     *                 necessarily equal to doc.containingClass().  We may be
-     *                 inheriting comments.
-     * @param doc the member being linked to.
-     * @param label the label for the link.
-     * @param strong true if the link should be strong.
-     * @param isProperty true if the doc parameter is a JavaFX property.
-     * @return the link for the given member.
-     */
-    public Content getDocLink(LinkInfoImpl.Kind context, ClassDoc classDoc, MemberDoc doc,
-            String label, boolean strong, boolean isProperty) {
-        return getDocLink(context, classDoc, doc, new StringContent(check(label)), strong, isProperty);
-    }
-
-    String check(String s) {
-        if (s.matches(".*[&<>].*"))throw new IllegalArgumentException(s);
-        return s;
-    }
-
-    public Content getDocLink(LinkInfoImpl.Kind context, ClassDoc classDoc, MemberDoc doc,
-            Content label, boolean strong, boolean isProperty) {
-        if (! (doc.isIncluded() ||
-            utils.isLinkable(classDoc, configuration))) {
-            return label;
-        } else if (doc instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
-            return getLink(new LinkInfoImpl(configuration, context, classDoc)
-                .label(label).where(getName(getAnchor(emd, isProperty))).strong(strong));
-        } else if (doc instanceof MemberDoc) {
-            return getLink(new LinkInfoImpl(configuration, context, classDoc)
-                .label(label).where(getName(doc.name())).strong(strong));
-        } else {
-            return label;
-        }
-    }
-
-    /**
-     * Return the link for the given member.
-     *
-     * @param context the id of the context where the link will be added
-     * @param classDoc the classDoc that we should link to.  This is not
-     *                 necessarily equal to doc.containingClass().  We may be
-     *                 inheriting comments
-     * @param doc the member being linked to
-     * @param label the label for the link
-     * @return the link for the given member
-     */
-    public Content getDocLink(LinkInfoImpl.Kind context, ClassDoc classDoc, MemberDoc doc,
-            Content label) {
-        if (! (doc.isIncluded() ||
-            utils.isLinkable(classDoc, configuration))) {
-            return label;
-        } else if (doc instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc emd = (ExecutableMemberDoc) doc;
-            return getLink(new LinkInfoImpl(configuration, context, classDoc)
-                .label(label).where(getName(getAnchor(emd))));
-        } else if (doc instanceof MemberDoc) {
-            return getLink(new LinkInfoImpl(configuration, context, classDoc)
-                .label(label).where(getName(doc.name())));
-        } else {
-            return label;
-        }
-    }
-
-    public String getAnchor(ExecutableMemberDoc emd) {
-        return getAnchor(emd, false);
-    }
-
-    public String getAnchor(ExecutableMemberDoc emd, boolean isProperty) {
-        if (isProperty) {
-            return emd.name();
-        }
-        StringBuilder signature = new StringBuilder(emd.signature());
-        StringBuilder signatureParsed = new StringBuilder();
-        int counter = 0;
-        for (int i = 0; i < signature.length(); i++) {
-            char c = signature.charAt(i);
-            if (c == '<') {
-                counter++;
-            } else if (c == '>') {
-                counter--;
-            } else if (counter == 0) {
-                signatureParsed.append(c);
-            }
-        }
-        return emd.name() + signatureParsed.toString();
-    }
-
-    public Content seeTagToContent(SeeTag see) {
-        String tagName = see.name();
-        if (! (tagName.startsWith("@link") || tagName.equals("@see"))) {
-            return new ContentBuilder();
-        }
-
-        String seetext = replaceDocRootDir(utils.normalizeNewlines(see.text()));
-
-        //Check if @see is an href or "string"
-        if (seetext.startsWith("<") || seetext.startsWith("\"")) {
-            return new RawHtml(seetext);
-        }
-
-        boolean plain = tagName.equalsIgnoreCase("@linkplain");
-        Content label = plainOrCode(plain, new RawHtml(see.label()));
-
-        //The text from the @see tag.  We will output this text when a label is not specified.
-        Content text = plainOrCode(plain, new RawHtml(seetext));
-
-        ClassDoc refClass = see.referencedClass();
-        String refClassName = see.referencedClassName();
-        MemberDoc refMem = see.referencedMember();
-        String refMemName = see.referencedMemberName();
-
-        if (refClass == null) {
-            //@see is not referencing an included class
-            PackageDoc refPackage = see.referencedPackage();
-            if (refPackage != null && refPackage.isIncluded()) {
-                //@see is referencing an included package
-                if (label.isEmpty())
-                    label = plainOrCode(plain, new StringContent(refPackage.name()));
-                return getPackageLink(refPackage, label);
-            } else {
-                //@see is not referencing an included class or package.  Check for cross links.
-                Content classCrossLink;
-                DocLink packageCrossLink = getCrossPackageLink(refClassName);
-                if (packageCrossLink != null) {
-                    //Package cross link found
-                    return getHyperLink(packageCrossLink,
-                        (label.isEmpty() ? text : label));
-                } else if ((classCrossLink = getCrossClassLink(refClassName,
-                        refMemName, label, false, "", !plain)) != null) {
-                    //Class cross link found (possibly to a member in the class)
-                    return classCrossLink;
-                } else {
-                    //No cross link found so print warning
-                    configuration.getDocletSpecificMsg().warning(see.position(), "doclet.see.class_or_package_not_found",
-                            tagName, seetext);
-                    return (label.isEmpty() ? text: label);
-                }
-            }
-        } else if (refMemName == null) {
-            // Must be a class reference since refClass is not null and refMemName is null.
-            if (label.isEmpty()) {
-                label = plainOrCode(plain, new StringContent(refClass.name()));
-            }
-            return getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, refClass)
-                    .label(label));
-        } else if (refMem == null) {
-            // Must be a member reference since refClass is not null and refMemName is not null.
-            // However, refMem is null, so this referenced member does not exist.
-            return (label.isEmpty() ? text: label);
-        } else {
-            // Must be a member reference since refClass is not null and refMemName is not null.
-            // refMem is not null, so this @see tag must be referencing a valid member.
-            ClassDoc containing = refMem.containingClass();
-            if (see.text().trim().startsWith("#") &&
-                ! (containing.isPublic() ||
-                utils.isLinkable(containing, configuration))) {
-                // Since the link is relative and the holder is not even being
-                // documented, this must be an inherited link.  Redirect it.
-                // The current class either overrides the referenced member or
-                // inherits it automatically.
-                if (this instanceof ClassWriterImpl) {
-                    containing = ((ClassWriterImpl) this).getClassDoc();
-                } else if (!containing.isPublic()){
-                    configuration.getDocletSpecificMsg().warning(
-                        see.position(), "doclet.see.class_or_package_not_accessible",
-                        tagName, containing.qualifiedName());
-                } else {
-                    configuration.getDocletSpecificMsg().warning(
-                        see.position(), "doclet.see.class_or_package_not_found",
-                        tagName, seetext);
-                }
-            }
-            if (configuration.currentcd != containing) {
-                refMemName = (refMem instanceof ConstructorDoc) ?
-                        refMemName : containing.name() + "." + refMemName;
-            }
-            if (refMem instanceof ExecutableMemberDoc) {
-                if (refMemName.indexOf('(') < 0) {
-                    refMemName += ((ExecutableMemberDoc)refMem).signature();
-                }
-            }
-
-            text = plainOrCode(plain, new StringContent(refMemName));
-
-            return getDocLink(LinkInfoImpl.Kind.SEE_TAG, containing,
-                refMem, (label.isEmpty() ? text: label), false);
-        }
-    }
-
-    private Content plainOrCode(boolean plain, Content body) {
-        return (plain || body.isEmpty()) ? body : HtmlTree.CODE(body);
-    }
-
-    /**
-     * Add the inline comment.
-     *
-     * @param doc the doc for which the inline comment will be added
-     * @param tag the inline tag to be added
-     * @param htmltree the content tree to which the comment will be added
-     */
-    public void addInlineComment(Doc doc, Tag tag, Content htmltree) {
-        addCommentTags(doc, tag, tag.inlineTags(), false, false, htmltree);
-    }
-
-    /**
-     * Add the inline deprecated comment.
-     *
-     * @param doc the doc for which the inline deprecated comment will be added
-     * @param tag the inline tag to be added
-     * @param htmltree the content tree to which the comment will be added
-     */
-    public void addInlineDeprecatedComment(Doc doc, Tag tag, Content htmltree) {
-        addCommentTags(doc, tag.inlineTags(), true, false, htmltree);
-    }
-
-    /**
-     * Adds the summary content.
-     *
-     * @param doc the doc for which the summary will be generated
-     * @param htmltree the documentation tree to which the summary will be added
-     */
-    public void addSummaryComment(Doc doc, Content htmltree) {
-        addSummaryComment(doc, doc.firstSentenceTags(), htmltree);
-    }
-
-    /**
-     * Adds the summary content.
-     *
-     * @param doc the doc for which the summary will be generated
-     * @param firstSentenceTags the first sentence tags for the doc
-     * @param htmltree the documentation tree to which the summary will be added
-     */
-    public void addSummaryComment(Doc doc, Tag[] firstSentenceTags, Content htmltree) {
-        addCommentTags(doc, firstSentenceTags, false, true, htmltree);
-    }
-
-    public void addSummaryDeprecatedComment(Doc doc, Tag tag, Content htmltree) {
-        addCommentTags(doc, tag.firstSentenceTags(), true, true, htmltree);
-    }
-
-    /**
-     * Adds the inline comment.
-     *
-     * @param doc the doc for which the inline comments will be generated
-     * @param htmltree the documentation tree to which the inline comments will be added
-     */
-    public void addInlineComment(Doc doc, Content htmltree) {
-        addCommentTags(doc, doc.inlineTags(), false, false, htmltree);
-    }
-
-    /**
-     * Adds the comment tags.
-     *
-     * @param doc the doc for which the comment tags will be generated
-     * @param tags the first sentence tags for the doc
-     * @param depr true if it is deprecated
-     * @param first true if the first sentence tags should be added
-     * @param htmltree the documentation tree to which the comment tags will be added
-     */
-    private void addCommentTags(Doc doc, Tag[] tags, boolean depr,
-            boolean first, Content htmltree) {
-        addCommentTags(doc, null, tags, depr, first, htmltree);
-    }
-
-    /**
-     * Adds the comment tags.
-     *
-     * @param doc the doc for which the comment tags will be generated
-     * @param holderTag the block tag context for the inline tags
-     * @param tags the first sentence tags for the doc
-     * @param depr true if it is deprecated
-     * @param first true if the first sentence tags should be added
-     * @param htmltree the documentation tree to which the comment tags will be added
-     */
-    private void addCommentTags(Doc doc, Tag holderTag, Tag[] tags, boolean depr,
-            boolean first, Content htmltree) {
-        if(configuration.nocomment){
-            return;
-        }
-        Content div;
-        Content result = commentTagsToContent(null, doc, tags, first);
-        if (depr) {
-            Content italic = HtmlTree.SPAN(HtmlStyle.deprecationComment, result);
-            div = HtmlTree.DIV(HtmlStyle.block, italic);
-            htmltree.addContent(div);
-        }
-        else {
-            div = HtmlTree.DIV(HtmlStyle.block, result);
-            htmltree.addContent(div);
-        }
-        if (tags.length == 0) {
-            htmltree.addContent(getSpace());
-        }
-    }
-
-    /**
-     * Converts inline tags and text to text strings, expanding the
-     * inline tags along the way.  Called wherever text can contain
-     * an inline tag, such as in comments or in free-form text arguments
-     * to non-inline tags.
-     *
-     * @param holderTag    specific tag where comment resides
-     * @param doc    specific doc where comment resides
-     * @param tags   array of text tags and inline tags (often alternating)
-     *               present in the text of interest for this doc
-     * @param isFirstSentence  true if text is first sentence
-     */
-    public Content commentTagsToContent(Tag holderTag, Doc doc, Tag[] tags,
-            boolean isFirstSentence) {
-        Content result = new ContentBuilder();
-        boolean textTagChange = false;
-        // Array of all possible inline tags for this javadoc run
-        configuration.tagletManager.checkTags(doc, tags, true);
-        for (int i = 0; i < tags.length; i++) {
-            Tag tagelem = tags[i];
-            String tagName = tagelem.name();
-            if (tagelem instanceof SeeTag) {
-                result.addContent(seeTagToContent((SeeTag) tagelem));
-            } else if (! tagName.equals("Text")) {
-                boolean wasEmpty = result.isEmpty();
-                Content output;
-                if (configuration.docrootparent.length() > 0
-                        && tagelem.name().equals("@docRoot")
-                        && ((tags[i + 1]).text()).startsWith("/..")) {
-                    // If Xdocrootparent switch ON, set the flag to remove the /.. occurrence after
-                    // {@docRoot} tag in the very next Text tag.
-                    textTagChange = true;
-                    // Replace the occurrence of {@docRoot}/.. with the absolute link.
-                    output = new StringContent(configuration.docrootparent);
-                } else {
-                    output = TagletWriter.getInlineTagOuput(
-                            configuration.tagletManager, holderTag,
-                            tagelem, getTagletWriterInstance(isFirstSentence));
-                }
-                if (output != null)
-                    result.addContent(output);
-                if (wasEmpty && isFirstSentence && tagelem.name().equals("@inheritDoc") && !result.isEmpty()) {
-                    break;
-                } else {
-                    continue;
-                }
-            } else {
-                String text = tagelem.text();
-                //If Xdocrootparent switch ON, remove the /.. occurrence after {@docRoot} tag.
-                if (textTagChange) {
-                    text = text.replaceFirst("/..", "");
-                    textTagChange = false;
-                }
-                //This is just a regular text tag.  The text may contain html links (<a>)
-                //or inline tag {@docRoot}, which will be handled as special cases.
-                text = redirectRelativeLinks(tagelem.holder(), text);
-
-                // Replace @docRoot only if not represented by an instance of DocRootTaglet,
-                // that is, only if it was not present in a source file doc comment.
-                // This happens when inserted by the doclet (a few lines
-                // above in this method).  [It might also happen when passed in on the command
-                // line as a text argument to an option (like -header).]
-                text = replaceDocRootDir(text);
-                if (isFirstSentence) {
-                    text = removeNonInlineHtmlTags(text);
-                }
-                text = utils.replaceTabs(configuration, text);
-                text = utils.normalizeNewlines(text);
-                result.addContent(new RawHtml(text));
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return true if relative links should not be redirected.
-     *
-     * @return Return true if a relative link should not be redirected.
-     */
-    private boolean shouldNotRedirectRelativeLinks() {
-        return  this instanceof AnnotationTypeWriter ||
-                this instanceof ClassWriter ||
-                this instanceof PackageSummaryWriter;
-    }
-
-    /**
-     * Suppose a piece of documentation has a relative link.  When you copy
-     * that documentation to another place such as the index or class-use page,
-     * that relative link will no longer work.  We should redirect those links
-     * so that they will work again.
-     * <p>
-     * Here is the algorithm used to fix the link:
-     * <p>
-     * {@literal <relative link> => docRoot + <relative path to file> + <relative link> }
-     * <p>
-     * For example, suppose com.sun.javadoc.RootDoc has this link:
-     * {@literal <a href="package-summary.html">The package Page</a> }
-     * <p>
-     * If this link appeared in the index, we would redirect
-     * the link like this:
-     *
-     * {@literal <a href="./com/sun/javadoc/package-summary.html">The package Page</a>}
-     *
-     * @param doc the Doc object whose documentation is being written.
-     * @param text the text being written.
-     *
-     * @return the text, with all the relative links redirected to work.
-     */
-    private String redirectRelativeLinks(Doc doc, String text) {
-        if (doc == null || shouldNotRedirectRelativeLinks()) {
-            return text;
-        }
-
-        DocPath redirectPathFromRoot;
-        if (doc instanceof ClassDoc) {
-            redirectPathFromRoot = DocPath.forPackage(((ClassDoc) doc).containingPackage());
-        } else if (doc instanceof MemberDoc) {
-            redirectPathFromRoot = DocPath.forPackage(((MemberDoc) doc).containingPackage());
-        } else if (doc instanceof PackageDoc) {
-            redirectPathFromRoot = DocPath.forPackage((PackageDoc) doc);
-        } else {
-            return text;
-        }
-
-        //Redirect all relative links.
-        int end, begin = StringUtils.indexOfIgnoreCase(text, "<a");
-        if(begin >= 0){
-            StringBuilder textBuff = new StringBuilder(text);
-
-            while(begin >=0){
-                if (textBuff.length() > begin + 2 && ! Character.isWhitespace(textBuff.charAt(begin+2))) {
-                    begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
-                    continue;
-                }
-
-                begin = textBuff.indexOf("=", begin) + 1;
-                end = textBuff.indexOf(">", begin +1);
-                if(begin == 0){
-                    //Link has no equal symbol.
-                    configuration.root.printWarning(
-                        doc.position(),
-                        configuration.getText("doclet.malformed_html_link_tag", text));
-                    break;
-                }
-                if (end == -1) {
-                    //Break without warning.  This <a> tag is not necessarily malformed.  The text
-                    //might be missing '>' character because the href has an inline tag.
-                    break;
-                }
-
-                String quote = textBuff.substring(begin, end);
-                quote = quote.contains("\"") ? "\"" :
-                        quote.contains("\'") ? "\'" : null;
-                if (quote != null) {
-                    begin = textBuff.indexOf(quote, begin) + 1;
-                    end = textBuff.indexOf(quote, begin +1);
-                    if (begin == 0 || end == -1){
-                        //Link is missing a quote.
-                        break;
-                    }
-                }
-                String relativeLink = textBuff.substring(begin, end);
-                String relativeLinkLowerCase = StringUtils.toLowerCase(relativeLink);
-                if (!(relativeLinkLowerCase.startsWith("mailto:") ||
-                        relativeLinkLowerCase.startsWith("http:") ||
-                        relativeLinkLowerCase.startsWith("https:") ||
-                        relativeLinkLowerCase.startsWith("file:"))) {
-                    relativeLink = "{@"+(new DocRootTaglet()).getName() + "}/"
-                        + redirectPathFromRoot.resolve(relativeLink).getPath();
-                    textBuff.replace(begin, end, relativeLink);
-                }
-                begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
-            }
-            return textBuff.toString();
-        }
-        return text;
-    }
-
-    static final Set<String> blockTags = new HashSet<>();
-    static {
-        for (HtmlTag t: HtmlTag.values()) {
-            if (t.blockType == HtmlTag.BlockType.BLOCK)
-                blockTags.add(t.value);
-        }
-    }
-
-    public static String removeNonInlineHtmlTags(String text) {
-        final int len = text.length();
-
-        int startPos = 0;                     // start of text to copy
-        int lessThanPos = text.indexOf('<');  // position of latest '<'
-        if (lessThanPos < 0) {
-            return text;
-        }
-        StringBuilder result = new StringBuilder();
-    main: while (lessThanPos != -1) {
-            int currPos = lessThanPos + 1;
-            if (currPos == len)
-                break;
-            char ch = text.charAt(currPos);
-            if (ch == '/') {
-                if (++currPos == len)
-                    break;
-                ch = text.charAt(currPos);
-            }
-            int tagPos = currPos;
-            while (isHtmlTagLetterOrDigit(ch)) {
-                if (++currPos == len)
-                    break main;
-                ch = text.charAt(currPos);
-            }
-            String tagFound = StringUtils.toLowerCase(text.substring(tagPos, currPos));
-            if (blockTags.contains(tagFound)) {
-                result.append(text, startPos, lessThanPos);
-                currPos = tagPos + tagFound.length();
-                boolean foundGT = false;
-                Character quoteKind = null;
-                while (!foundGT) {
-                    if (ch == '\"' || ch == '\'') {
-                        if (quoteKind == null) {
-                            quoteKind = ch;
-                        } else if (quoteKind == ch) {
-                            quoteKind = null;
-                        }
-                    }
-                    if (ch == '>' && quoteKind == null) {
-                        foundGT = true;
-                    }
-                    if (++currPos == len) {
-                        break;
-                    }
-                    ch = text.charAt(currPos);
-                }
-                startPos = currPos;
-            }
-            lessThanPos = text.indexOf('<', currPos);
-        }
-        result.append(text.substring(startPos));
-        return result.toString();
-    }
-
-    private static boolean isHtmlTagLetterOrDigit(char ch) {
-        return ('a' <= ch && ch <= 'z') ||
-                ('A' <= ch && ch <= 'Z') ||
-                ('1' <= ch && ch <= '6');
-    }
-
-    /**
-     * Add a link to the stylesheet file.
-     *
-     * @param head the content tree to which the files will be added
-     */
-    public void addStyleSheetProperties(Content head) {
-        String stylesheetfile = configuration.stylesheetfile;
-        DocPath stylesheet;
-        if (stylesheetfile.isEmpty()) {
-            stylesheet = DocPaths.STYLESHEET;
-        } else {
-            DocFile file = DocFile.createFileForInput(configuration, stylesheetfile);
-            stylesheet = DocPath.create(file.getName());
-        }
-        HtmlTree link = HtmlTree.LINK("stylesheet", "text/css",
-                pathToRoot.resolve(stylesheet).getPath(),
-                "Style");
-        head.addContent(link);
-        if (configuration.createindex) {
-            HtmlTree jq_link = HtmlTree.LINK("stylesheet", "text/css",
-                    pathToRoot.resolve(DocPaths.JQUERY_FILES.resolve(DocPaths.JQUERY_STYLESHEET_FILE)).getPath(),
-                    "Style");
-            head.addContent(jq_link);
-        }
-    }
-
-    /**
-     * Add a link to the JavaScript file.
-     *
-     * @param head the content tree to which the files will be added
-     */
-    public void addScriptProperties(Content head) {
-        HtmlTree javascript = HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.JAVASCRIPT).getPath());
-        head.addContent(javascript);
-        if (configuration.createindex) {
-            if (pathToRoot != null && script != null) {
-                String path = pathToRoot.isEmpty() ? "." : pathToRoot.getPath();
-                script.addContent(new RawHtml("var pathtoroot = \"" + path + "/\";loadScripts(document, \'script\');"));
-            }
-            addJQueryFile(head, DocPaths.JSZIP_MIN);
-            addJQueryFile(head, DocPaths.JSZIPUTILS_MIN);
-            head.addContent(new RawHtml("<!--[if IE]>"));
-            addJQueryFile(head, DocPaths.JSZIPUTILS_IE_MIN);
-            head.addContent(new RawHtml("<![endif]-->"));
-            addJQueryFile(head, DocPaths.JQUERY_JS_1_10);
-            addJQueryFile(head, DocPaths.JQUERY_JS);
-        }
-    }
-
-    /**
-     * Add a link to the JQuery javascript file.
-     *
-     * @param head the content tree to which the files will be added
-     * @param filePath the DocPath of the file that needs to be added
-     */
-    private void addJQueryFile(Content head, DocPath filePath) {
-        HtmlTree jqyeryScriptFile = HtmlTree.SCRIPT(
-                pathToRoot.resolve(DocPaths.JQUERY_FILES.resolve(filePath)).getPath());
-        head.addContent(jqyeryScriptFile);
-    }
-
-    /**
-     * According to
-     * <cite>The Java&trade; Language Specification</cite>,
-     * all the outer classes and static nested classes are core classes.
-     */
-    public boolean isCoreClass(ClassDoc cd) {
-        return cd.containingClass() == null || cd.isStatic();
-    }
-
-    /**
-     * Adds the annotatation types for the given packageDoc.
-     *
-     * @param packageDoc the package to write annotations for.
-     * @param htmltree the documentation tree to which the annotation info will be
-     *        added
-     */
-    public void addAnnotationInfo(PackageDoc packageDoc, Content htmltree) {
-        addAnnotationInfo(packageDoc, packageDoc.annotations(), htmltree);
-    }
-
-    /**
-     * Add the annotation types of the executable receiver.
-     *
-     * @param method the executable to write the receiver annotations for.
-     * @param descList list of annotation description.
-     * @param htmltree the documentation tree to which the annotation info will be
-     *        added
-     */
-    public void addReceiverAnnotationInfo(ExecutableMemberDoc method, AnnotationDesc[] descList,
-            Content htmltree) {
-        addAnnotationInfo(0, method, descList, false, htmltree);
-    }
-
-    /**
-     * Adds the annotatation types for the given doc.
-     *
-     * @param doc the package to write annotations for
-     * @param htmltree the content tree to which the annotation types will be added
-     */
-    public void addAnnotationInfo(ProgramElementDoc doc, Content htmltree) {
-        addAnnotationInfo(doc, doc.annotations(), htmltree);
-    }
-
-    /**
-     * Add the annotatation types for the given doc and parameter.
-     *
-     * @param indent the number of spaces to indent the parameters.
-     * @param doc the doc to write annotations for.
-     * @param param the parameter to write annotations for.
-     * @param tree the content tree to which the annotation types will be added
-     */
-    public boolean addAnnotationInfo(int indent, Doc doc, Parameter param,
-            Content tree) {
-        return addAnnotationInfo(indent, doc, param.annotations(), false, tree);
-    }
-
-    /**
-     * Adds the annotatation types for the given doc.
-     *
-     * @param doc the doc to write annotations for.
-     * @param descList the array of {@link AnnotationDesc}.
-     * @param htmltree the documentation tree to which the annotation info will be
-     *        added
-     */
-    private void addAnnotationInfo(Doc doc, AnnotationDesc[] descList,
-            Content htmltree) {
-        addAnnotationInfo(0, doc, descList, true, htmltree);
-    }
-
-    /**
-     * Adds the annotation types for the given doc.
-     *
-     * @param indent the number of extra spaces to indent the annotations.
-     * @param doc the doc to write annotations for.
-     * @param descList the array of {@link AnnotationDesc}.
-     * @param htmltree the documentation tree to which the annotation info will be
-     *        added
-     */
-    private boolean addAnnotationInfo(int indent, Doc doc,
-            AnnotationDesc[] descList, boolean lineBreak, Content htmltree) {
-        List<Content> annotations = getAnnotations(indent, descList, lineBreak);
-        String sep ="";
-        if (annotations.isEmpty()) {
-            return false;
-        }
-        for (Content annotation: annotations) {
-            htmltree.addContent(sep);
-            htmltree.addContent(annotation);
-            if (!lineBreak) {
-                sep = " ";
-            }
-        }
-        return true;
-    }
-
-   /**
-     * Return the string representations of the annotation types for
-     * the given doc.
-     *
-     * @param indent the number of extra spaces to indent the annotations.
-     * @param descList the array of {@link AnnotationDesc}.
-     * @param linkBreak if true, add new line between each member value.
-     * @return an array of strings representing the annotations being
-     *         documented.
-     */
-    private List<Content> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak) {
-        return getAnnotations(indent, descList, linkBreak, true);
-    }
-
-    /**
-     * Return the string representations of the annotation types for
-     * the given doc.
-     *
-     * A {@code null} {@code elementType} indicates that all the
-     * annotations should be returned without any filtering.
-     *
-     * @param indent the number of extra spaces to indent the annotations.
-     * @param descList the array of {@link AnnotationDesc}.
-     * @param linkBreak if true, add new line between each member value.
-     * @param elementType the type of targeted element (used for filtering
-     *        type annotations from declaration annotations)
-     * @return an array of strings representing the annotations being
-     *         documented.
-     */
-    public List<Content> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak,
-            boolean isJava5DeclarationLocation) {
-        List<Content> results = new ArrayList<>();
-        ContentBuilder annotation;
-        for (AnnotationDesc aDesc : descList) {
-            AnnotationTypeDoc annotationDoc = aDesc.annotationType();
-            // If an annotation is not documented, do not add it to the list. If
-            // the annotation is of a repeatable type, and if it is not documented
-            // and also if its container annotation is not documented, do not add it
-            // to the list. If an annotation of a repeatable type is not documented
-            // but its container is documented, it will be added to the list.
-            if (!utils.isDocumentedAnnotation(annotationDoc) &&
-                (!isAnnotationDocumented && !isContainerDocumented)) {
-                continue;
-            }
-            /* TODO: check logic here to correctly handle declaration
-             * and type annotations.
-            if  (util.isDeclarationAnnotation(annotationDoc, isJava5DeclarationLocation)) {
-                continue;
-            }*/
-            annotation = new ContentBuilder();
-            isAnnotationDocumented = false;
-            LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                                                     LinkInfoImpl.Kind.ANNOTATION, annotationDoc);
-            AnnotationDesc.ElementValuePair[] pairs = aDesc.elementValues();
-            // If the annotation is synthesized, do not print the container.
-            if (aDesc.isSynthesized()) {
-                for (AnnotationDesc.ElementValuePair pair : pairs) {
-                    AnnotationValue annotationValue = pair.value();
-                    List<AnnotationValue> annotationTypeValues = new ArrayList<>();
-                    if (annotationValue.value() instanceof AnnotationValue[]) {
-                        AnnotationValue[] annotationArray =
-                                (AnnotationValue[]) annotationValue.value();
-                        annotationTypeValues.addAll(Arrays.asList(annotationArray));
-                    } else {
-                        annotationTypeValues.add(annotationValue);
-                    }
-                    String sep = "";
-                    for (AnnotationValue av : annotationTypeValues) {
-                        annotation.addContent(sep);
-                        annotation.addContent(annotationValueToContent(av));
-                        sep = " ";
-                    }
-                }
-            }
-            else if (isAnnotationArray(pairs)) {
-                // If the container has 1 or more value defined and if the
-                // repeatable type annotation is not documented, do not print
-                // the container.
-                if (pairs.length == 1 && isAnnotationDocumented) {
-                    AnnotationValue[] annotationArray =
-                            (AnnotationValue[]) (pairs[0].value()).value();
-                    List<AnnotationValue> annotationTypeValues = new ArrayList<>();
-                    annotationTypeValues.addAll(Arrays.asList(annotationArray));
-                    String sep = "";
-                    for (AnnotationValue av : annotationTypeValues) {
-                        annotation.addContent(sep);
-                        annotation.addContent(annotationValueToContent(av));
-                        sep = " ";
-                    }
-                }
-                // If the container has 1 or more value defined and if the
-                // repeatable type annotation is not documented, print the container.
-                else {
-                    addAnnotations(annotationDoc, linkInfo, annotation, pairs,
-                                   indent, false);
-                }
-            }
-            else {
-                addAnnotations(annotationDoc, linkInfo, annotation, pairs,
-                               indent, linkBreak);
-            }
-            annotation.addContent(linkBreak ? DocletConstants.NL : "");
-            results.add(annotation);
-        }
-        return results;
-    }
-
-    /**
-     * Add annotation to the annotation string.
-     *
-     * @param annotationDoc the annotation being documented
-     * @param linkInfo the information about the link
-     * @param annotation the annotation string to which the annotation will be added
-     * @param pairs annotation type element and value pairs
-     * @param indent the number of extra spaces to indent the annotations.
-     * @param linkBreak if true, add new line between each member value
-     */
-    private void addAnnotations(AnnotationTypeDoc annotationDoc, LinkInfoImpl linkInfo,
-            ContentBuilder annotation, AnnotationDesc.ElementValuePair[] pairs,
-            int indent, boolean linkBreak) {
-        linkInfo.label = new StringContent("@" + annotationDoc.name());
-        annotation.addContent(getLink(linkInfo));
-        if (pairs.length > 0) {
-            annotation.addContent("(");
-            for (int j = 0; j < pairs.length; j++) {
-                if (j > 0) {
-                    annotation.addContent(",");
-                    if (linkBreak) {
-                        annotation.addContent(DocletConstants.NL);
-                        int spaces = annotationDoc.name().length() + 2;
-                        for (int k = 0; k < (spaces + indent); k++) {
-                            annotation.addContent(" ");
-                        }
-                    }
-                }
-                annotation.addContent(getDocLink(LinkInfoImpl.Kind.ANNOTATION,
-                        pairs[j].element(), pairs[j].element().name(), false));
-                annotation.addContent("=");
-                AnnotationValue annotationValue = pairs[j].value();
-                List<AnnotationValue> annotationTypeValues = new ArrayList<>();
-                if (annotationValue.value() instanceof AnnotationValue[]) {
-                    AnnotationValue[] annotationArray =
-                            (AnnotationValue[]) annotationValue.value();
-                    annotationTypeValues.addAll(Arrays.asList(annotationArray));
-                } else {
-                    annotationTypeValues.add(annotationValue);
-                }
-                annotation.addContent(annotationTypeValues.size() == 1 ? "" : "{");
-                String sep = "";
-                for (AnnotationValue av : annotationTypeValues) {
-                    annotation.addContent(sep);
-                    annotation.addContent(annotationValueToContent(av));
-                    sep = ",";
-                }
-                annotation.addContent(annotationTypeValues.size() == 1 ? "" : "}");
-                isContainerDocumented = false;
-            }
-            annotation.addContent(")");
-        }
-    }
-
-    /**
-     * Check if the annotation contains an array of annotation as a value. This
-     * check is to verify if a repeatable type annotation is present or not.
-     *
-     * @param pairs annotation type element and value pairs
-     *
-     * @return true if the annotation contains an array of annotation as a value.
-     */
-    private boolean isAnnotationArray(AnnotationDesc.ElementValuePair[] pairs) {
-        AnnotationValue annotationValue;
-        for (AnnotationDesc.ElementValuePair pair : pairs) {
-            annotationValue = pair.value();
-            if (annotationValue.value() instanceof AnnotationValue[]) {
-                AnnotationValue[] annotationArray =
-                        (AnnotationValue[]) annotationValue.value();
-                if (annotationArray.length > 1) {
-                    if (annotationArray[0].value() instanceof AnnotationDesc) {
-                        AnnotationTypeDoc annotationDoc =
-                                ((AnnotationDesc) annotationArray[0].value()).annotationType();
-                        isContainerDocumented = true;
-                        if (utils.isDocumentedAnnotation(annotationDoc)) {
-                            isAnnotationDocumented = true;
-                        }
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private Content annotationValueToContent(AnnotationValue annotationValue) {
-        if (annotationValue.value() instanceof Type) {
-            Type type = (Type) annotationValue.value();
-            if (type.asClassDoc() != null) {
-                LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
-                    LinkInfoImpl.Kind.ANNOTATION, type);
-                linkInfo.label = new StringContent((type.asClassDoc().isIncluded() ?
-                    type.typeName() :
-                    type.qualifiedTypeName()) + type.dimension() + ".class");
-                return getLink(linkInfo);
-            } else {
-                return new StringContent(type.typeName() + type.dimension() + ".class");
-            }
-        } else if (annotationValue.value() instanceof AnnotationDesc) {
-            List<Content> list = getAnnotations(0,
-                new AnnotationDesc[]{(AnnotationDesc) annotationValue.value()},
-                    false);
-            ContentBuilder buf = new ContentBuilder();
-            for (Content c: list) {
-                buf.addContent(c);
-            }
-            return buf;
-        } else if (annotationValue.value() instanceof MemberDoc) {
-            return getDocLink(LinkInfoImpl.Kind.ANNOTATION,
-                (MemberDoc) annotationValue.value(),
-                ((MemberDoc) annotationValue.value()).name(), false);
-         } else {
-            return new StringContent(annotationValue.toString());
-         }
-    }
-
-    /**
-     * Return the configuation for this doclet.
-     *
-     * @return the configuration for this doclet.
-     */
-    public Configuration configuration() {
-        return configuration;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
deleted file mode 100644
index d9317c40812..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 1998, 2013, 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.doclets.formats.html;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-
-/**
- * Generate serialized form for serializable fields.
- * Documentation denoted by the tags <code>serial</code> and
- * <code>serialField</code> is processed.
- *
- *  <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>
- *
- * @author Joe Fialli
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class HtmlSerialFieldWriter extends FieldWriterImpl
-        implements SerializedFormWriter.SerialFieldWriter {
-    ProgramElementDoc[] members = null;
-
-    public HtmlSerialFieldWriter(SubWriterHolderWriter writer,
-                                    ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public List<FieldDoc> members(ClassDoc cd) {
-        return Arrays.asList(cd.serializableFields());
-    }
-
-    /**
-     * Return the header for serializable fields section.
-     *
-     * @return a content tree for the header
-     */
-    public Content getSerializableFieldsHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * Return the header for serializable fields content section.
-     *
-     * @param isLastContent true if the cotent being documented is the last content.
-     * @return a content tree for the header
-     */
-    public Content getFieldsContentHeader(boolean isLastContent) {
-        HtmlTree li = new HtmlTree(HtmlTag.LI);
-        if (isLastContent)
-            li.addStyle(HtmlStyle.blockListLast);
-        else
-            li.addStyle(HtmlStyle.blockList);
-        return li;
-    }
-
-    /**
-     * Add serializable fields.
-     *
-     * @param heading the heading for the section
-     * @param serializableFieldsTree the tree to be added to the serializable fileds
-     *        content tree
-     * @return a content tree for the serializable fields content
-     */
-    public Content getSerializableFields(String heading, Content serializableFieldsTree) {
-        HtmlTree li = new HtmlTree(HtmlTag.LI);
-        li.addStyle(HtmlStyle.blockList);
-        if (serializableFieldsTree.isValid()) {
-            Content headingContent = new StringContent(heading);
-            Content serialHeading = HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,
-                    headingContent);
-            li.addContent(serialHeading);
-            li.addContent(serializableFieldsTree);
-        }
-        return li;
-    }
-
-    /**
-     * Add the member header.
-     *
-     * @param fieldType the class document to be listed
-     * @param fieldTypeStr the string for the field type to be documented
-     * @param fieldDimensions the dimensions of the field string to be added
-     * @param fieldName name of the field to be added
-     * @param contentTree the content tree to which the member header will be added
-     */
-    public void addMemberHeader(ClassDoc fieldType, String fieldTypeStr,
-            String fieldDimensions, String fieldName, Content contentTree) {
-        Content nameContent = new RawHtml(fieldName);
-        Content heading = HtmlTree.HEADING(HtmlConstants.MEMBER_HEADING, nameContent);
-        contentTree.addContent(heading);
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        if (fieldType == null) {
-            pre.addContent(fieldTypeStr);
-        } else {
-            Content fieldContent = writer.getLink(new LinkInfoImpl(
-                    configuration, LinkInfoImpl.Kind.SERIAL_MEMBER, fieldType));
-            pre.addContent(fieldContent);
-        }
-        pre.addContent(fieldDimensions + " ");
-        pre.addContent(fieldName);
-        contentTree.addContent(pre);
-    }
-
-    /**
-     * Add the deprecated information for this member.
-     *
-     * @param field the field to document.
-     * @param contentTree the tree to which the deprecated info will be added
-     */
-    public void addMemberDeprecatedInfo(FieldDoc field, Content contentTree) {
-        addDeprecatedInfo(field, contentTree);
-    }
-
-    /**
-     * Add the description text for this member.
-     *
-     * @param field the field to document.
-     * @param contentTree the tree to which the deprecated info will be added
-     */
-    public void addMemberDescription(FieldDoc field, Content contentTree) {
-        if (field.inlineTags().length > 0) {
-            writer.addInlineComment(field, contentTree);
-        }
-        Tag[] tags = field.tags("serial");
-        if (tags.length > 0) {
-            writer.addInlineComment(field, tags[0], contentTree);
-        }
-    }
-
-    /**
-     * Add the description text for this member represented by the tag.
-     *
-     * @param serialFieldTag the field to document (represented by tag)
-     * @param contentTree the tree to which the deprecated info will be added
-     */
-    public void addMemberDescription(SerialFieldTag serialFieldTag, Content contentTree) {
-        String serialFieldTagDesc = serialFieldTag.description().trim();
-        if (!serialFieldTagDesc.isEmpty()) {
-            Content serialFieldContent = new RawHtml(serialFieldTagDesc);
-            Content div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
-            contentTree.addContent(div);
-        }
-    }
-
-    /**
-     * Add the tag information for this member.
-     *
-     * @param field the field to document.
-     * @param contentTree the tree to which the member tags info will be added
-     */
-    public void addMemberTags(FieldDoc field, Content contentTree) {
-        Content tagContent = new ContentBuilder();
-        TagletWriter.genTagOuput(configuration.tagletManager, field,
-                configuration.tagletManager.getCustomTaglets(field),
-                writer.getTagletWriterInstance(false), tagContent);
-        Content dlTags = new HtmlTree(HtmlTag.DL);
-        dlTags.addContent(tagContent);
-        contentTree.addContent(dlTags);  // TODO: what if empty?
-    }
-
-    /**
-     * Check to see if overview details should be printed. If
-     * nocomment option set or if there is no text to be printed
-     * for deprecation info, comment or tags, do not print overview details.
-     *
-     * @param field the field to check overview details for.
-     * @return true if overview details need to be printed
-     */
-    public boolean shouldPrintOverview(FieldDoc field) {
-        if (!configuration.nocomment) {
-            if(!field.commentText().isEmpty() ||
-                    writer.hasSerializationOverviewTags(field))
-                return true;
-        }
-        if (field.tags("deprecated").length > 0)
-            return true;
-        return false;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
deleted file mode 100644
index 5e8b94fc286..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-
-/**
- * Generate serialized form for Serializable/Externalizable methods.
- * Documentation denoted by the <code>serialData</code> tag is processed.
- *
- *  <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>
- *
- * @author Joe Fialli
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class HtmlSerialMethodWriter extends MethodWriterImpl implements
-        SerializedFormWriter.SerialMethodWriter{
-
-    public HtmlSerialMethodWriter(SubWriterHolderWriter writer,
-            ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    /**
-     * Return the header for serializable methods section.
-     *
-     * @return a content tree for the header
-     */
-    public Content getSerializableMethodsHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * Return the header for serializable methods content section.
-     *
-     * @param isLastContent true if the cotent being documented is the last content.
-     * @return a content tree for the header
-     */
-    public Content getMethodsContentHeader(boolean isLastContent) {
-        HtmlTree li = new HtmlTree(HtmlTag.LI);
-        if (isLastContent)
-            li.addStyle(HtmlStyle.blockListLast);
-        else
-            li.addStyle(HtmlStyle.blockList);
-        return li;
-    }
-
-    /**
-     * Add serializable methods.
-     *
-     * @param heading the heading for the section
-     * @param serializableMethodContent the tree to be added to the serializable methods
-     *        content tree
-     * @return a content tree for the serializable methods content
-     */
-    public Content getSerializableMethods(String heading, Content serializableMethodContent) {
-        Content headingContent = new StringContent(heading);
-        Content serialHeading = HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,
-                headingContent);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, serialHeading);
-        li.addContent(serializableMethodContent);
-        return li;
-    }
-
-    /**
-     * Return the no customization message.
-     *
-     * @param msg the message to be displayed
-     * @return no customization message content
-     */
-    public Content getNoCustomizationMsg(String msg) {
-        Content noCustomizationMsg = new StringContent(msg);
-        return noCustomizationMsg;
-    }
-
-    /**
-     * Add the member header.
-     *
-     * @param member the method document to be listed
-     * @param methodsContentTree the content tree to which the member header will be added
-     */
-    public void addMemberHeader(MethodDoc member, Content methodsContentTree) {
-        methodsContentTree.addContent(getHead(member));
-        methodsContentTree.addContent(getSignature(member));
-    }
-
-    /**
-     * Add the deprecated information for this member.
-     *
-     * @param member the method to document.
-     * @param methodsContentTree the tree to which the deprecated info will be added
-     */
-    public void addDeprecatedMemberInfo(MethodDoc member, Content methodsContentTree) {
-        addDeprecatedInfo(member, methodsContentTree);
-    }
-
-    /**
-     * Add the description text for this member.
-     *
-     * @param member the method to document.
-     * @param methodsContentTree the tree to which the deprecated info will be added
-     */
-    public void addMemberDescription(MethodDoc member, Content methodsContentTree) {
-        addComment(member, methodsContentTree);
-    }
-
-    /**
-     * Add the tag information for this member.
-     *
-     * @param member the method to document.
-     * @param methodsContentTree the tree to which the member tags info will be added
-     */
-    public void addMemberTags(MethodDoc member, Content methodsContentTree) {
-        Content tagContent = new ContentBuilder();
-        TagletManager tagletManager =
-            configuration.tagletManager;
-        TagletWriter.genTagOuput(tagletManager, member,
-            tagletManager.getSerializedFormTaglets(),
-            writer.getTagletWriterInstance(false), tagContent);
-        Content dlTags = new HtmlTree(HtmlTag.DL);
-        dlTags.addContent(tagContent);
-        methodsContentTree.addContent(dlTags);
-        MethodDoc method = member;
-        if (method.name().compareTo("writeExternal") == 0
-                && method.tags("serialData").length == 0) {
-            serialWarning(member.position(), "doclet.MissingSerialDataTag",
-                method.containingClass().qualifiedName(), method.name());
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
deleted file mode 100644
index 059ab6bd81f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import java.util.List;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.ContentBuilder;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.links.*;
-
-/**
- * A factory that returns a link given the information about it.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class LinkFactoryImpl extends LinkFactory {
-
-    private HtmlDocletWriter m_writer;
-
-    public LinkFactoryImpl(HtmlDocletWriter writer) {
-        m_writer = writer;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content newContent() {
-        return new ContentBuilder();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getClassLink(LinkInfo linkInfo) {
-        LinkInfoImpl classLinkInfo = (LinkInfoImpl) linkInfo;
-        boolean noLabel = linkInfo.label == null || linkInfo.label.isEmpty();
-        ClassDoc classDoc = classLinkInfo.classDoc;
-        //Create a tool tip if we are linking to a class or interface.  Don't
-        //create one if we are linking to a member.
-        String title =
-            (classLinkInfo.where == null || classLinkInfo.where.length() == 0) ?
-                getClassToolTip(classDoc,
-                    classLinkInfo.type != null &&
-                    !classDoc.qualifiedTypeName().equals(classLinkInfo.type.qualifiedTypeName())) :
-            "";
-        Content label = classLinkInfo.getClassLinkLabel(m_writer.configuration);
-        Configuration configuration = m_writer.configuration;
-        Content link = new ContentBuilder();
-        if (classDoc.isIncluded()) {
-            if (configuration.isGeneratedDoc(classDoc)) {
-                DocPath filename = getPath(classLinkInfo);
-                if (linkInfo.linkToSelf ||
-                                !(DocPath.forName(classDoc)).equals(m_writer.filename)) {
-                        link.addContent(m_writer.getHyperLink(
-                                filename.fragment(classLinkInfo.where),
-                            label,
-                            classLinkInfo.isStrong, classLinkInfo.styleName,
-                            title, classLinkInfo.target));
-                        if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
-                            link.addContent(getTypeParameterLinks(linkInfo));
-                        }
-                        return link;
-                }
-            }
-        } else {
-            Content crossLink = m_writer.getCrossClassLink(
-                classDoc.qualifiedName(), classLinkInfo.where,
-                label, classLinkInfo.isStrong, classLinkInfo.styleName,
-                true);
-            if (crossLink != null) {
-                link.addContent(crossLink);
-                if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
-                    link.addContent(getTypeParameterLinks(linkInfo));
-                }
-                return link;
-            }
-        }
-        // Can't link so just write label.
-        link.addContent(label);
-        if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
-            link.addContent(getTypeParameterLinks(linkInfo));
-        }
-        return link;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getTypeParameterLink(LinkInfo linkInfo,
-        Type typeParam) {
-        LinkInfoImpl typeLinkInfo = new LinkInfoImpl(m_writer.configuration,
-                ((LinkInfoImpl) linkInfo).getContext(), typeParam);
-        typeLinkInfo.excludeTypeBounds = linkInfo.excludeTypeBounds;
-        typeLinkInfo.excludeTypeParameterLinks = linkInfo.excludeTypeParameterLinks;
-        typeLinkInfo.linkToSelf = linkInfo.linkToSelf;
-        typeLinkInfo.isJava5DeclarationLocation = false;
-        return getLink(typeLinkInfo);
-    }
-
-    protected Content getTypeAnnotationLink(LinkInfo linkInfo,
-            AnnotationDesc annotation) {
-        throw new RuntimeException("Not implemented yet!");
-    }
-
-    public Content getTypeAnnotationLinks(LinkInfo linkInfo) {
-        ContentBuilder links = new ContentBuilder();
-        AnnotationDesc[] annotations;
-        if (linkInfo.type instanceof AnnotatedType) {
-            annotations = linkInfo.type.asAnnotatedType().annotations();
-        } else if (linkInfo.type instanceof TypeVariable) {
-            annotations = linkInfo.type.asTypeVariable().annotations();
-        } else {
-            return links;
-        }
-
-        if (annotations.length == 0)
-            return links;
-
-        List<Content> annos = m_writer.getAnnotations(0, annotations, false, linkInfo.isJava5DeclarationLocation);
-
-        boolean isFirst = true;
-        for (Content anno : annos) {
-            if (!isFirst) {
-                links.addContent(" ");
-            }
-            links.addContent(anno);
-            isFirst = false;
-        }
-        if (!annos.isEmpty()) {
-            links.addContent(" ");
-        }
-
-        return links;
-    }
-
-    /**
-     * Given a class, return the appropriate tool tip.
-     *
-     * @param classDoc the class to get the tool tip for.
-     * @return the tool tip for the appropriate class.
-     */
-    private String getClassToolTip(ClassDoc classDoc, boolean isTypeLink) {
-        Configuration configuration = m_writer.configuration;
-        Utils utils = configuration.utils;
-        if (isTypeLink) {
-            return configuration.getText("doclet.Href_Type_Param_Title",
-                classDoc.name());
-        } else if (classDoc.isInterface()){
-            return configuration.getText("doclet.Href_Interface_Title",
-                utils.getPackageName(classDoc.containingPackage()));
-        } else if (classDoc.isAnnotationType()) {
-            return configuration.getText("doclet.Href_Annotation_Title",
-                utils.getPackageName(classDoc.containingPackage()));
-        } else if (classDoc.isEnum()) {
-            return configuration.getText("doclet.Href_Enum_Title",
-                utils.getPackageName(classDoc.containingPackage()));
-        } else {
-            return configuration.getText("doclet.Href_Class_Title",
-                utils.getPackageName(classDoc.containingPackage()));
-        }
-    }
-
-    /**
-     * Return path to the given file name in the given package. So if the name
-     * passed is "Object.html" and the name of the package is "java.lang", and
-     * if the relative path is "../.." then returned string will be
-     * "../../java/lang/Object.html"
-     *
-     * @param linkInfo the information about the link.
-     */
-    private DocPath getPath(LinkInfoImpl linkInfo) {
-        if (linkInfo.context == LinkInfoImpl.Kind.PACKAGE_FRAME) {
-            //Not really necessary to do this but we want to be consistent
-            //with 1.4.2 output.
-            return DocPath.forName(linkInfo.classDoc);
-        }
-        return m_writer.pathToRoot.resolve(DocPath.forClass(linkInfo.classDoc));
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
deleted file mode 100644
index e0660d7a130..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.ContentBuilder;
-import com.sun.tools.doclets.formats.html.markup.StringContent;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.links.*;
-
-/**
- *  <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>
- */
-@Deprecated
-public class LinkInfoImpl extends LinkInfo {
-
-    public enum Kind {
-        DEFAULT,
-
-        /**
-         * Indicate that the link appears in a class list.
-         */
-        ALL_CLASSES_FRAME,
-
-        /**
-         * Indicate that the link appears in a class documentation.
-         */
-        CLASS,
-
-        /**
-         * Indicate that the link appears in member documentation.
-         */
-        MEMBER,
-
-        /**
-         * Indicate that the link appears in class use documentation.
-         */
-        CLASS_USE,
-
-        /**
-         * Indicate that the link appears in index documentation.
-         */
-        INDEX,
-
-        /**
-         * Indicate that the link appears in constant value summary.
-         */
-        CONSTANT_SUMMARY,
-
-        /**
-         * Indicate that the link appears in serialized form documentation.
-         */
-        SERIALIZED_FORM,
-
-        /**
-         * Indicate that the link appears in serial member documentation.
-         */
-        SERIAL_MEMBER,
-
-        /**
-         * Indicate that the link appears in package documentation.
-         */
-        PACKAGE,
-
-        /**
-         * Indicate that the link appears in see tag documentation.
-         */
-        SEE_TAG,
-
-        /**
-         * Indicate that the link appears in value tag documentation.
-         */
-        VALUE_TAG,
-
-        /**
-         * Indicate that the link appears in tree documentation.
-         */
-        TREE,
-
-        /**
-         * Indicate that the link appears in a class list.
-         */
-        PACKAGE_FRAME,
-
-        /**
-         * The header in the class documentation.
-         */
-        CLASS_HEADER,
-
-        /**
-         * The signature in the class documentation.
-         */
-        CLASS_SIGNATURE,
-
-        /**
-         * The return type of a method.
-         */
-        RETURN_TYPE,
-
-        /**
-         * The return type of a method in a member summary.
-         */
-        SUMMARY_RETURN_TYPE,
-
-        /**
-         * The type of a method/constructor parameter.
-         */
-        EXECUTABLE_MEMBER_PARAM,
-
-        /**
-         * Super interface links.
-         */
-        SUPER_INTERFACES,
-
-        /**
-         * Implemented interface links.
-         */
-        IMPLEMENTED_INTERFACES,
-
-        /**
-         * Implemented class links.
-         */
-        IMPLEMENTED_CLASSES,
-
-        /**
-         * Subinterface links.
-         */
-        SUBINTERFACES,
-
-        /**
-         * Subclasses links.
-         */
-        SUBCLASSES,
-
-        /**
-         * The signature in the class documentation (implements/extends portion).
-         */
-        CLASS_SIGNATURE_PARENT_NAME,
-
-        /**
-         * The header for method documentation copied from parent.
-         */
-        METHOD_DOC_COPY,
-
-        /**
-         * Method "specified by" link.
-         */
-        METHOD_SPECIFIED_BY,
-
-        /**
-         * Method "overrides" link.
-         */
-        METHOD_OVERRIDES,
-
-        /**
-         * Annotation link.
-         */
-        ANNOTATION,
-
-        /**
-         * The header for field documentation copied from parent.
-         */
-        FIELD_DOC_COPY,
-
-        /**
-         * The parent nodes in the class tree.
-         */
-        CLASS_TREE_PARENT,
-
-        /**
-         * The type parameters of a method or constructor.
-         */
-        MEMBER_TYPE_PARAMS,
-
-        /**
-         * Indicate that the link appears in class use documentation.
-         */
-        CLASS_USE_HEADER,
-
-        /**
-         * The header for property documentation copied from parent.
-         */
-        PROPERTY_DOC_COPY
-    }
-
-    public final ConfigurationImpl configuration;
-
-    /**
-     * The location of the link.
-     */
-    public Kind context = Kind.DEFAULT;
-
-    /**
-     * The value of the marker #.
-     */
-    public String where = "";
-
-    /**
-     * String style of text defined in style sheet.
-     */
-    public String styleName = "";
-
-    /**
-     * The value of the target.
-     */
-    public String target = "";
-
-    /**
-     * Construct a LinkInfo object.
-     *
-     * @param configuration the configuration data for the doclet
-     * @param context    the context of the link.
-     * @param context               the context of the link.
-     * @param executableMemberDoc   the member to link to.
-     */
-    public LinkInfoImpl(ConfigurationImpl configuration,
-            Kind context, ExecutableMemberDoc executableMemberDoc) {
-        this.configuration = configuration;
-        this.executableMemberDoc = executableMemberDoc;
-        setContext(context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content newContent() {
-        return new ContentBuilder();
-    }
-
-    /**
-     * Construct a LinkInfo object.
-     *
-     * @param configuration the configuration data for the doclet
-     * @param context    the context of the link.
-     * @param classDoc   the class to link to.
-     */
-    public LinkInfoImpl(ConfigurationImpl configuration,
-            Kind context, ClassDoc classDoc) {
-        this.configuration = configuration;
-        this.classDoc = classDoc;
-        setContext(context);
-    }
-
-    /**
-     * Construct a LinkInfo object.
-     *
-     * @param configuration the configuration data for the doclet
-     * @param context    the context of the link.
-     * @param type       the class to link to.
-     */
-    public LinkInfoImpl(ConfigurationImpl configuration,
-            Kind context, Type type) {
-        this.configuration = configuration;
-        this.type = type;
-        setContext(context);
-    }
-
-
-    /**
-     * Set the label for the link.
-     * @param label plain-text label for the link
-     */
-    public LinkInfoImpl label(String label) {
-        this.label = new StringContent(label);
-        return this;
-    }
-
-    /**
-     * Set the label for the link.
-     */
-    public LinkInfoImpl label(Content label) {
-        this.label = label;
-        return this;
-    }
-
-    /**
-     * Set whether or not the link should be strong.
-     */
-    public LinkInfoImpl strong(boolean strong) {
-        this.isStrong = strong;
-        return this;
-    }
-
-    /**
-     * Set the style to be used for the link.
-     * @param styleName  String style of text defined in style sheet.
-     */
-    public LinkInfoImpl styleName(String styleName) {
-        this.styleName = styleName;
-        return this;
-    }
-
-    /**
-     * Set the target to be used for the link.
-     * @param styleName  String style of text defined in style sheet.
-     */
-    public LinkInfoImpl target(String target) {
-        this.target = target;
-        return this;
-    }
-
-    /**
-     * Set whether or not this is a link to a varargs parameter.
-     */
-    public LinkInfoImpl varargs(boolean varargs) {
-        this.isVarArg = varargs;
-        return this;
-    }
-
-    /**
-     * Set the fragment specifier for the link.
-     */
-    public LinkInfoImpl where(String where) {
-        this.where = where;
-        return this;
-     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Kind getContext() {
-        return context;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * This method sets the link attributes to the appropriate values
-     * based on the context.
-     *
-     * @param c the context id to set.
-     */
-    public final void setContext(Kind c) {
-        //NOTE:  Put context specific link code here.
-        switch (c) {
-            case ALL_CLASSES_FRAME:
-            case PACKAGE_FRAME:
-            case IMPLEMENTED_CLASSES:
-            case SUBCLASSES:
-            case METHOD_DOC_COPY:
-            case FIELD_DOC_COPY:
-            case PROPERTY_DOC_COPY:
-            case CLASS_USE_HEADER:
-                includeTypeInClassLinkLabel = false;
-                break;
-
-            case ANNOTATION:
-                excludeTypeParameterLinks = true;
-                excludeTypeBounds = true;
-                break;
-
-            case IMPLEMENTED_INTERFACES:
-            case SUPER_INTERFACES:
-            case SUBINTERFACES:
-            case CLASS_TREE_PARENT:
-            case TREE:
-            case CLASS_SIGNATURE_PARENT_NAME:
-                excludeTypeParameterLinks = true;
-                excludeTypeBounds = true;
-                includeTypeInClassLinkLabel = false;
-                includeTypeAsSepLink = true;
-                break;
-
-            case PACKAGE:
-            case CLASS_USE:
-            case CLASS_HEADER:
-            case CLASS_SIGNATURE:
-                excludeTypeParameterLinks = true;
-                includeTypeAsSepLink = true;
-                includeTypeInClassLinkLabel = false;
-                break;
-
-            case MEMBER_TYPE_PARAMS:
-                includeTypeAsSepLink = true;
-                includeTypeInClassLinkLabel = false;
-                break;
-
-            case RETURN_TYPE:
-            case SUMMARY_RETURN_TYPE:
-                excludeTypeBounds = true;
-                break;
-            case EXECUTABLE_MEMBER_PARAM:
-                excludeTypeBounds = true;
-                break;
-        }
-        context = c;
-        if (type != null &&
-            type.asTypeVariable()!= null &&
-            type.asTypeVariable().owner() instanceof ExecutableMemberDoc) {
-            excludeTypeParameterLinks = true;
-        }
-    }
-
-    /**
-     * Return true if this link is linkable and false if we can't link to the
-     * desired place.
-     *
-     * @return true if this link is linkable and false if we can't link to the
-     * desired place.
-     */
-    public boolean isLinkable() {
-        return configuration.utils.isLinkable(classDoc, configuration);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
deleted file mode 100644
index cca252c7b6d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.formats.html;
-
-import com.sun.tools.doclets.internal.toolkit.util.links.*;
-
-/**
- * Stores output of a link.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class LinkOutputImpl implements LinkOutput {
-
-    /**
-     * The output of the link.
-     */
-    public StringBuilder output;
-
-    /**
-     * Construct a new LinkOutputImpl.
-     */
-    public LinkOutputImpl() {
-        output = new StringBuilder();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void append(Object o) {
-        output.append(o instanceof String ?
-            (String) o : ((LinkOutputImpl)o).toString());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void insert(int offset, Object o) {
-        output.insert(offset, o.toString());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String toString() {
-        return output.toString();
-    }
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
deleted file mode 100644
index 7603ec30351..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Writes method documentation in HTML format.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (rewrite)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class MethodWriterImpl extends AbstractExecutableMemberWriter
-        implements MethodWriter, MemberSummaryWriter {
-
-    /**
-     * Construct a new MethodWriterImpl.
-     *
-     * @param writer the writer for the class that the methods belong to.
-     * @param classDoc the class being documented.
-     */
-    public MethodWriterImpl(SubWriterHolderWriter writer, ClassDoc classDoc) {
-        super(writer, classDoc);
-    }
-
-    /**
-     * Construct a new MethodWriterImpl.
-     *
-     * @param writer The writer for the class that the methods belong to.
-     */
-    public MethodWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_METHOD_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMethodDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_METHOD_DETAILS);
-        Content methodDetailsTree = writer.getMemberTreeHeader();
-        methodDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.METHOD_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.methodDetailsLabel);
-        methodDetailsTree.addContent(heading);
-        return methodDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMethodDocTreeHeader(MethodDoc method,
-            Content methodDetailsTree) {
-        String erasureAnchor;
-        if ((erasureAnchor = getErasureAnchor(method)) != null) {
-            methodDetailsTree.addContent(writer.getMarkerAnchor((erasureAnchor)));
-        }
-        methodDetailsTree.addContent(
-                writer.getMarkerAnchor(writer.getAnchor(method)));
-        Content methodDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(method.name());
-        methodDocTree.addContent(heading);
-        return methodDocTree;
-    }
-
-    /**
-     * Get the signature for the given method.
-     *
-     * @param method the method being documented.
-     * @return a content object for the signature
-     */
-    public Content getSignature(MethodDoc method) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(method, pre);
-        int annotationLength = pre.charCount();
-        addModifiers(method, pre);
-        addTypeParameters(method, pre);
-        addReturnType(method, pre);
-        if (configuration.linksource) {
-            Content methodName = new StringContent(method.name());
-            writer.addSrcLink(method, methodName, pre);
-        } else {
-            addName(method.name(), pre);
-        }
-        int indent = pre.charCount() - annotationLength;
-        addParameters(method, pre, indent);
-        addExceptions(method, pre, indent);
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MethodDoc method, Content methodDocTree) {
-        addDeprecatedInfo(method, methodDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(Type holder, MethodDoc method, Content methodDocTree) {
-        ClassDoc holderClassDoc = holder.asClassDoc();
-        if (method.inlineTags().length > 0) {
-            if (holder.asClassDoc().equals(classdoc) ||
-                    (! (holderClassDoc.isPublic() ||
-                    utils.isLinkable(holderClassDoc, configuration)))) {
-                writer.addInlineComment(method, methodDocTree);
-            } else {
-                Content link =
-                        writer.getDocLink(LinkInfoImpl.Kind.METHOD_DOC_COPY,
-                        holder.asClassDoc(), method,
-                        holder.asClassDoc().isIncluded() ?
-                            holder.typeName() : holder.qualifiedTypeName(),
-                            false);
-                Content codelLink = HtmlTree.CODE(link);
-                Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.asClassDoc().isClass()?
-                    writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
-                descfrmLabel.addContent(writer.getSpace());
-                descfrmLabel.addContent(codelLink);
-                methodDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
-                writer.addInlineComment(method, methodDocTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MethodDoc method, Content methodDocTree) {
-        writer.addTagsInfo(method, methodDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMethodDetails(Content methodDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(methodDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(methodDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMethodDoc(Content methodDocTree,
-            boolean isLastContent) {
-        return getMemberTree(methodDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.METHODS;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Method_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Method_Summary"),
-                configuration.getText("doclet.methods"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Methods");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            writer.getModifierTypeHeader(),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Method"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.METHOD_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-        inheritedTree.addContent(writer.getMarkerAnchor(
-                SectionName.METHODS_INHERITANCE, configuration.getClassName(cd)));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-        Content classLink = writer.getPreQualifiedClassLink(
-                LinkInfoImpl.Kind.MEMBER, cd, false);
-        Content label = new StringContent(cd.isClass() ?
-            configuration.getText("doclet.Methods_Inherited_From_Class") :
-            configuration.getText("doclet.Methods_Inherited_From_Interface"));
-        Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
-                label);
-        labelHeading.addContent(writer.getSpace());
-        labelHeading.addContent(classLink);
-        inheritedTree.addContent(labelHeading);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MethodDoc meth = (MethodDoc)member;
-        addModifierAndType(meth, meth.returnType(), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected static void addOverridden(HtmlDocletWriter writer,
-            Type overriddenType, MethodDoc method, Content dl) {
-        if (writer.configuration.nocomment) {
-            return;
-        }
-        ClassDoc holderClassDoc = overriddenType.asClassDoc();
-        if (! (holderClassDoc.isPublic() ||
-            writer.configuration.utils.isLinkable(holderClassDoc, writer.configuration))) {
-            //This is an implementation detail that should not be documented.
-            return;
-        }
-        if (overriddenType.asClassDoc().isIncluded() && ! method.isIncluded()) {
-            //The class is included but the method is not.  That means that it
-            //is not visible so don't document this.
-            return;
-        }
-        Content label = writer.overridesLabel;
-        LinkInfoImpl.Kind context = LinkInfoImpl.Kind.METHOD_OVERRIDES;
-
-        if (method != null) {
-            if (overriddenType.asClassDoc().isAbstract() && method.isAbstract()){
-                //Abstract method is implemented from abstract class,
-                //not overridden
-                label = writer.specifiedByLabel;
-                context = LinkInfoImpl.Kind.METHOD_SPECIFIED_BY;
-            }
-            Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, label));
-            dl.addContent(dt);
-            Content overriddenTypeLink =
-                    writer.getLink(new LinkInfoImpl(writer.configuration, context, overriddenType));
-            Content codeOverridenTypeLink = HtmlTree.CODE(overriddenTypeLink);
-            String name = method.name();
-            Content methlink = writer.getLink(
-                    new LinkInfoImpl(writer.configuration, LinkInfoImpl.Kind.MEMBER,
-                    overriddenType.asClassDoc())
-                    .where(writer.getName(writer.getAnchor(method))).label(name));
-            Content codeMethLink = HtmlTree.CODE(methlink);
-            Content dd = HtmlTree.DD(codeMethLink);
-            dd.addContent(writer.getSpace());
-            dd.addContent(writer.getResource("doclet.in_class"));
-            dd.addContent(writer.getSpace());
-            dd.addContent(codeOverridenTypeLink);
-            dl.addContent(dd);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected static void addImplementsInfo(HtmlDocletWriter writer,
-            MethodDoc method, Content dl) {
-        if(writer.configuration.nocomment){
-            return;
-        }
-        ImplementedMethods implementedMethodsFinder =
-                new ImplementedMethods(method, writer.configuration);
-        MethodDoc[] implementedMethods = implementedMethodsFinder.build();
-        for (MethodDoc implementedMeth : implementedMethods) {
-            Type intfac = implementedMethodsFinder.getMethodHolder(implementedMeth);
-            Content intfaclink = writer.getLink(new LinkInfoImpl(
-                    writer.configuration, LinkInfoImpl.Kind.METHOD_SPECIFIED_BY, intfac));
-            Content codeIntfacLink = HtmlTree.CODE(intfaclink);
-            Content dt = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.overrideSpecifyLabel, writer.specifiedByLabel));
-            dl.addContent(dt);
-            Content methlink = writer.getDocLink(
-                    LinkInfoImpl.Kind.MEMBER, implementedMeth,
-                    implementedMeth.name(), false);
-            Content codeMethLink = HtmlTree.CODE(methlink);
-            Content dd = HtmlTree.DD(codeMethLink);
-            dd.addContent(writer.getSpace());
-            dd.addContent(writer.getResource("doclet.in_interface"));
-            dd.addContent(writer.getSpace());
-            dd.addContent(codeIntfacLink);
-            dl.addContent(dd);
-        }
-    }
-
-    /**
-     * Add the return type.
-     *
-     * @param method the method being documented.
-     * @param htmltree the content tree to which the return type will be added
-     */
-    protected void addReturnType(MethodDoc method, Content htmltree) {
-        Type type = method.returnType();
-        if (type != null) {
-            Content linkContent = writer.getLink(
-                    new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
-            htmltree.addContent(linkContent);
-            htmltree.addContent(writer.getSpace());
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            if (cd == null) {
-                return writer.getHyperLink(
-                        SectionName.METHOD_SUMMARY,
-                        writer.getResource("doclet.navMethod"));
-            } else {
-                return writer.getHyperLink(
-                        SectionName.METHODS_INHERITANCE,
-                        configuration.getClassName(cd), writer.getResource("doclet.navMethod"));
-            }
-        } else {
-            return writer.getResource("doclet.navMethod");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.METHOD_DETAIL, writer.getResource("doclet.navMethod")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navMethod"));
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
deleted file mode 100644
index f1f05e99522..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes nested class documentation in HTML format.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (rewrite)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class NestedClassWriterImpl extends AbstractMemberWriter
-    implements MemberSummaryWriter {
-
-    public NestedClassWriterImpl(SubWriterHolderWriter writer,
-            ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    public NestedClassWriterImpl(SubWriterHolderWriter writer) {
-        super(writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_NESTED_CLASS_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.INNERCLASSES;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Nested_Class_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Nested_Class_Summary"),
-                configuration.getText("doclet.nested_classes"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Nested_Classes");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header;
-        if (member.isInterface()) {
-            header = new String[] {
-                writer.getModifierTypeHeader(),
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Interface"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        else {
-            header = new String[] {
-                writer.getModifierTypeHeader(),
-                configuration.getText("doclet.0_and_1",
-                        configuration.getText("doclet.Class"),
-                        configuration.getText("doclet.Description"))
-            };
-        }
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.NESTED_CLASS_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-        inheritedTree.addContent(writer.getMarkerAnchor(
-                SectionName.NESTED_CLASSES_INHERITANCE,
-                cd.qualifiedName()));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-        Content classLink = writer.getPreQualifiedClassLink(
-                LinkInfoImpl.Kind.MEMBER, cd, false);
-        Content label = new StringContent(cd.isInterface() ?
-            configuration.getText("doclet.Nested_Classes_Interface_Inherited_From_Interface") :
-            configuration.getText("doclet.Nested_Classes_Interfaces_Inherited_From_Class"));
-        Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
-                label);
-        labelHeading.addContent(writer.getSpace());
-        labelHeading.addContent(classLink);
-        inheritedTree.addContent(labelHeading);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getLink(new LinkInfoImpl(configuration, context, (ClassDoc)member)));
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        linksTree.addContent(
-                writer.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER,
-                (ClassDoc)member)));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member,
-            Content tdSummaryType) {
-        ClassDoc cd = (ClassDoc)member;
-        addModifierAndType(cd, null, tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getQualifiedClassLink(LinkInfoImpl.Kind.MEMBER,
-                (ClassDoc)member);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            if (cd == null) {
-                return writer.getHyperLink(
-                        SectionName.NESTED_CLASS_SUMMARY,
-                        writer.getResource("doclet.navNested"));
-            } else {
-                return writer.getHyperLink(
-                        SectionName.NESTED_CLASSES_INHERITANCE,
-                        cd.qualifiedName(), writer.getResource("doclet.navNested"));
-            }
-        } else {
-            return writer.getResource("doclet.navNested");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
deleted file mode 100644
index d6192063ba3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class to generate file for each package contents in the left-hand bottom
- * frame. This will list all the Class Kinds in the package. A click on any
- * class-kind will update the right-hand frame with the clicked class-kind page.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PackageFrameWriter extends HtmlDocletWriter {
-
-    /**
-     * The package being documented.
-     */
-    private PackageDoc packageDoc;
-
-    /**
-     * The classes to be documented.  Use this to filter out classes
-     * that will not be documented.
-     */
-    private Set<ClassDoc> documentedClasses;
-
-    /**
-     * Constructor to construct PackageFrameWriter object and to generate
-     * "package-frame.html" file in the respective package directory.
-     * For example for package "java.lang" this will generate file
-     * "package-frame.html" file in the "java/lang" directory. It will also
-     * create "java/lang" directory in the current or the destination directory
-     * if it doesn't exist.
-     *
-     * @param configuration the configuration of the doclet.
-     * @param packageDoc PackageDoc under consideration.
-     */
-    public PackageFrameWriter(ConfigurationImpl configuration,
-                              PackageDoc packageDoc)
-                              throws IOException {
-        super(configuration, DocPath.forPackage(packageDoc).resolve(DocPaths.PACKAGE_FRAME));
-        this.packageDoc = packageDoc;
-        if (configuration.root.specifiedPackages().length == 0) {
-            documentedClasses = new HashSet<>(Arrays.asList(configuration.root.classes()));
-        }
-    }
-
-    /**
-     * Generate a package summary page for the left-hand bottom frame. Construct
-     * the PackageFrameWriter object and then uses it generate the file.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @param packageDoc The package for which "pacakge-frame.html" is to be generated.
-     */
-    public static void generate(ConfigurationImpl configuration,
-            PackageDoc packageDoc) {
-        PackageFrameWriter packgen;
-        try {
-            packgen = new PackageFrameWriter(configuration, packageDoc);
-            String pkgName = configuration.utils.getPackageName(packageDoc);
-            HtmlTree body = packgen.getBody(false, packgen.getWindowTitle(pkgName));
-            Content pkgNameContent = new StringContent(pkgName);
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                    ? HtmlTree.MAIN()
-                    : body;
-            Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar,
-                    packgen.getTargetPackageLink(packageDoc, "classFrame", pkgNameContent));
-            htmlTree.addContent(heading);
-            HtmlTree div = new HtmlTree(HtmlTag.DIV);
-            div.addStyle(HtmlStyle.indexContainer);
-            packgen.addClassListing(div);
-            htmlTree.addContent(div);
-            if (configuration.allowTag(HtmlTag.MAIN)) {
-                body.addContent(htmlTree);
-            }
-            packgen.printHtmlDocument(
-                    configuration.metakeywords.getMetaKeywords(packageDoc), false, body);
-            packgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                    "doclet.exception_encountered",
-                    exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Add class listing for all the classes in this package. Divide class
-     * listing as per the class kind and generate separate listing for
-     * Classes, Interfaces, Exceptions and Errors.
-     *
-     * @param contentTree the content tree to which the listing will be added
-     */
-    protected void addClassListing(HtmlTree contentTree) {
-        Configuration config = configuration;
-        if (packageDoc.isIncluded()) {
-            addClassKindListing(packageDoc.interfaces(),
-                getResource("doclet.Interfaces"), contentTree);
-            addClassKindListing(packageDoc.ordinaryClasses(),
-                getResource("doclet.Classes"), contentTree);
-            addClassKindListing(packageDoc.enums(),
-                getResource("doclet.Enums"), contentTree);
-            addClassKindListing(packageDoc.exceptions(),
-                getResource("doclet.Exceptions"), contentTree);
-            addClassKindListing(packageDoc.errors(),
-                getResource("doclet.Errors"), contentTree);
-            addClassKindListing(packageDoc.annotationTypes(),
-                getResource("doclet.AnnotationTypes"), contentTree);
-        } else {
-            String name = utils.getPackageName(packageDoc);
-            addClassKindListing(config.classDocCatalog.interfaces(name),
-                getResource("doclet.Interfaces"), contentTree);
-            addClassKindListing(config.classDocCatalog.ordinaryClasses(name),
-                getResource("doclet.Classes"), contentTree);
-            addClassKindListing(config.classDocCatalog.enums(name),
-                getResource("doclet.Enums"), contentTree);
-            addClassKindListing(config.classDocCatalog.exceptions(name),
-                getResource("doclet.Exceptions"), contentTree);
-            addClassKindListing(config.classDocCatalog.errors(name),
-                getResource("doclet.Errors"), contentTree);
-            addClassKindListing(config.classDocCatalog.annotationTypes(name),
-                getResource("doclet.AnnotationTypes"), contentTree);
-        }
-    }
-
-    /**
-     * Add specific class kind listing. Also add label to the listing.
-     *
-     * @param arr Array of specific class kinds, namely Class or Interface or Exception or Error
-     * @param labelContent content tree of the label to be added
-     * @param contentTree the content tree to which the class kind listing will be added
-     */
-    protected void addClassKindListing(ClassDoc[] arr, Content labelContent,
-            HtmlTree contentTree) {
-        arr = utils.filterOutPrivateClasses(arr, configuration.javafx);
-        if(arr.length > 0) {
-            Arrays.sort(arr);
-            boolean printedHeader = false;
-            HtmlTree htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                    ? HtmlTree.SECTION()
-                    : contentTree;
-            HtmlTree ul = new HtmlTree(HtmlTag.UL);
-            ul.setTitle(labelContent);
-            for (ClassDoc classDoc : arr) {
-                if (documentedClasses != null && !documentedClasses.contains(classDoc)) {
-                    continue;
-                }
-                if (!utils.isCoreClass(classDoc) || !configuration.isGeneratedDoc(classDoc)) {
-                    continue;
-                }
-                if (!printedHeader) {
-                    Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING,
-                                                       true, labelContent);
-                    htmlTree.addContent(heading);
-                    printedHeader = true;
-                }
-                Content arr_i_name = new StringContent(classDoc.name());
-                if (classDoc.isInterface())
-                    arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name);
-                Content link = getLink(new LinkInfoImpl(configuration,
-                                                        LinkInfoImpl.Kind.PACKAGE_FRAME, classDoc).label(arr_i_name).target("classFrame"));
-                Content li = HtmlTree.LI(link);
-                ul.addContent(li);
-            }
-            htmlTree.addContent(ul);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                contentTree.addContent(htmlTree);
-            }
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
deleted file mode 100644
index 21b65fcc810..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.formats.html;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the package index for the left-hand frame in the generated output.
- * A click on the package name in this frame will update the page in the bottom
- * left hand frame with the listing of contents of the clicked package.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class PackageIndexFrameWriter extends AbstractPackageIndexWriter {
-
-    /**
-     * Construct the PackageIndexFrameWriter object.
-     *
-     * @param filename Name of the package index file to be generated.
-     */
-    public PackageIndexFrameWriter(ConfigurationImpl configuration,
-                                   DocPath filename) throws IOException {
-        super(configuration, filename);
-    }
-
-    /**
-     * Generate the package index file named "overview-frame.html".
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration) {
-        PackageIndexFrameWriter packgen;
-        DocPath filename = DocPaths.OVERVIEW_FRAME;
-        try {
-            packgen = new PackageIndexFrameWriter(configuration, filename);
-            packgen.buildPackageIndexFile("doclet.Window_Overview", false);
-            packgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addPackagesList(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body) {
-        Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
-                packagesLabel);
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN(HtmlStyle.indexContainer, heading)
-                : HtmlTree.DIV(HtmlStyle.indexContainer, heading);
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.setTitle(packagesLabel);
-        for (PackageDoc aPackage : packages) {
-            // Do not list the package if -nodeprecated option is set and the
-            // package is marked as deprecated.
-            if (aPackage != null &&
-                (!(configuration.nodeprecated && utils.isDeprecated(aPackage)))) {
-                ul.addContent(getPackage(aPackage));
-            }
-        }
-        htmlTree.addContent(ul);
-        body.addContent(htmlTree);
-    }
-
-    /**
-     * Returns each package name as a separate link.
-     *
-     * @param pd PackageDoc
-     * @return content for the package link
-     */
-    protected Content getPackage(PackageDoc pd) {
-        Content packageLinkContent;
-        Content packageLabel;
-        if (!pd.name().isEmpty()) {
-            packageLabel = getPackageLabel(pd.name());
-            packageLinkContent = getHyperLink(pathString(pd,
-                     DocPaths.PACKAGE_FRAME), packageLabel, "",
-                    "packageFrame");
-        } else {
-            packageLabel = new StringContent("<unnamed package>");
-            packageLinkContent = getHyperLink(DocPaths.PACKAGE_FRAME,
-                    packageLabel, "", "packageFrame");
-        }
-        Content li = HtmlTree.LI(packageLinkContent);
-        return li;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavigationBarHeader(Content body) {
-        Content headerContent;
-        if (configuration.packagesheader.length() > 0) {
-            headerContent = new RawHtml(replaceDocRootDir(configuration.packagesheader));
-        } else {
-            headerContent = new RawHtml(replaceDocRootDir(configuration.header));
-        }
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.bar, headerContent);
-        body.addContent(heading);
-    }
-
-    /**
-     * Do nothing as there is no overview information in this page.
-     */
-    protected void addOverviewHeader(Content body) {
-    }
-
-    /**
-     * Adds "All Classes" link for the top of the left-hand frame page to the
-     * documentation tree.
-     *
-     * @param ul the Content object to which the "All Classes" link should be added
-     */
-    protected void addAllClassesLink(Content ul) {
-        Content linkContent = getHyperLink(DocPaths.ALLCLASSES_FRAME,
-                allclassesLabel, "", "packageFrame");
-        Content li = HtmlTree.LI(linkContent);
-        ul.addContent(li);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavigationBarFooter(Content body) {
-        Content p = HtmlTree.P(getSpace());
-        body.addContent(p);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
deleted file mode 100644
index ef8c1cc5f4e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate the package index page "overview-summary.html" for the right-hand
- * frame. A click on the package name on this page will update the same frame
- * with the "package-summary.html" file for the clicked package.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PackageIndexWriter extends AbstractPackageIndexWriter {
-
-    /**
-     * Root of the program structure. Used for "overview" documentation.
-     */
-    private RootDoc root;
-
-    /**
-     * Map representing the group of packages as specified on the command line.
-     *
-     * @see Group
-     */
-    private Map<String,List<PackageDoc>> groupPackageMap;
-
-    /**
-     * List to store the order groups as specified on the command line.
-     */
-    private List<String> groupList;
-
-    /**
-     * HTML tree for main tag.
-     */
-    private HtmlTree htmlTree = HtmlTree.MAIN();
-
-    /**
-     * Construct the PackageIndexWriter. Also constructs the grouping
-     * information as provided on the command line by "-group" option. Stores
-     * the order of groups specified by the user.
-     *
-     * @see Group
-     */
-    public PackageIndexWriter(ConfigurationImpl configuration,
-                              DocPath filename)
-                       throws IOException {
-        super(configuration, filename);
-        this.root = configuration.root;
-        groupPackageMap = configuration.group.groupPackages(packages);
-        groupList = configuration.group.getGroupList();
-    }
-
-    /**
-     * Generate the package index page for the right-hand frame.
-     *
-     * @param configuration the current configuration of the doclet.
-     */
-    public static void generate(ConfigurationImpl configuration) {
-        PackageIndexWriter packgen;
-        DocPath filename = DocPaths.OVERVIEW_SUMMARY;
-        try {
-            packgen = new PackageIndexWriter(configuration, filename);
-            packgen.buildPackageIndexFile("doclet.Window_Overview_Summary", true);
-            packgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Depending upon the grouping information and their titles, add
-     * separate table indices for each package group.
-     *
-     * @param body the documentation tree to which the index will be added
-     */
-    protected void addIndex(Content body) {
-        for (String groupname : groupList) {
-            List<PackageDoc> list = groupPackageMap.get(groupname);
-            if (list != null && !list.isEmpty()) {
-                addIndexContents(list,
-                                 groupname, configuration.getText("doclet.Member_Table_Summary",
-                                                                  groupname, configuration.getText("doclet.packages")), body);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addPackagesList(Collection<PackageDoc> packages, String text,
-            String tableSummary, Content body) {
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.overviewSummary, getTableCaption(new RawHtml(text)))
-                : HtmlTree.TABLE(HtmlStyle.overviewSummary, tableSummary, getTableCaption(new RawHtml(text)));
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        addPackagesList(packages, tbody);
-        table.addContent(tbody);
-        Content div = HtmlTree.DIV(HtmlStyle.contentContainer, table);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            htmlTree.addContent(div);
-        } else {
-            body.addContent(div);
-        }
-    }
-
-    /**
-     * Adds list of packages in the index table. Generate link to each package.
-     *
-     * @param packages Packages to which link is to be generated
-     * @param tbody the documentation tree to which the list will be added
-     */
-    protected void addPackagesList(Collection<PackageDoc> packages, Content tbody) {
-        boolean altColor = true;
-        for (PackageDoc pkg : packages) {
-            if (pkg != null && !pkg.name().isEmpty()) {
-                if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
-                    Content packageLinkContent = getPackageLink(pkg, getPackageName(pkg));
-                    Content tdPackage = HtmlTree.TD(HtmlStyle.colFirst, packageLinkContent);
-                    HtmlTree tdSummary = new HtmlTree(HtmlTag.TD);
-                    tdSummary.addStyle(HtmlStyle.colLast);
-                    addSummaryComment(pkg, tdSummary);
-                    HtmlTree tr = HtmlTree.TR(tdPackage);
-                    tr.addContent(tdSummary);
-                    tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor);
-                    tbody.addContent(tr);
-                }
-            }
-            altColor = !altColor;
-        }
-    }
-
-    /**
-     * Adds the overview summary comment for this documentation. Add one line
-     * summary at the top of the page and generate a link to the description,
-     * which is added at the end of this page.
-     *
-     * @param body the documentation tree to which the overview header will be added
-     */
-    protected void addOverviewHeader(Content body) {
-        addConfigurationTitle(body);
-        if (root.inlineTags().length > 0) {
-            HtmlTree subTitleDiv = new HtmlTree(HtmlTag.DIV);
-            subTitleDiv.addStyle(HtmlStyle.subTitle);
-            addSummaryComment(root, subTitleDiv);
-            Content div = HtmlTree.DIV(HtmlStyle.header, subTitleDiv);
-            Content see = seeLabel;
-            see.addContent(" ");
-            Content descPara = HtmlTree.P(see);
-            Content descLink = getHyperLink(getDocLink(
-                    SectionName.OVERVIEW_DESCRIPTION),
-                    descriptionLabel, "", "");
-            descPara.addContent(descLink);
-            div.addContent(descPara);
-            if (configuration.allowTag(HtmlTag.MAIN)) {
-                htmlTree.addContent(div);
-            } else {
-                body.addContent(div);
-            }
-        }
-    }
-
-    /**
-     * Adds the overview comment as provided in the file specified by the
-     * "-overview" option on the command line.
-     *
-     * @param htmltree the documentation tree to which the overview comment will
-     *                 be added
-     */
-    protected void addOverviewComment(Content htmltree) {
-        if (root.inlineTags().length > 0) {
-            htmltree.addContent(
-                    getMarkerAnchor(SectionName.OVERVIEW_DESCRIPTION));
-            addInlineComment(root, htmltree);
-        }
-    }
-
-    /**
-     * Adds the tag information as provided in the file specified by the
-     * "-overview" option on the command line.
-     *
-     * @param body the documentation tree to which the overview will be added
-     */
-    protected void addOverview(Content body) throws IOException {
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.contentContainer);
-        addOverviewComment(div);
-        addTagsInfo(root, div);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            htmlTree.addContent(div);
-            body.addContent(htmlTree);
-        } else {
-            body.addContent(div);
-        }
-    }
-
-    /**
-     * Adds the top text (from the -top option), the upper
-     * navigation bar, and then the title (from the"-title"
-     * option), at the top of page.
-     *
-     * @param body the documentation tree to which the navigation bar header will be added
-     */
-    protected void addNavigationBarHeader(Content body) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : body;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            body.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * Adds the lower navigation bar and the bottom text
-     * (from the -bottom option) at the bottom of page.
-     *
-     * @param body the documentation tree to which the navigation bar footer will be added
-     */
-    protected void addNavigationBarFooter(Content body) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
deleted file mode 100644
index ac13d789fcf..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class to generate Tree page for a package. The name of the file generated is
- * "package-tree.html" and it is generated in the respective package directory.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PackageTreeWriter extends AbstractTreeWriter {
-
-    /**
-     * Package for which tree is to be generated.
-     */
-    protected PackageDoc packagedoc;
-
-    /**
-     * The previous package name in the alpha-order list.
-     */
-    protected PackageDoc prev;
-
-    /**
-     * The next package name in the alpha-order list.
-     */
-    protected PackageDoc next;
-
-    /**
-     * Constructor.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public PackageTreeWriter(ConfigurationImpl configuration,
-                             DocPath path,
-                             PackageDoc packagedoc,
-                             PackageDoc prev, PackageDoc next)
-                      throws IOException {
-        super(configuration, path,
-              new ClassTree(
-                configuration.classDocCatalog.allClasses(packagedoc),
-                configuration));
-        this.packagedoc = packagedoc;
-        this.prev = prev;
-        this.next = next;
-    }
-
-    /**
-     * Construct a PackageTreeWriter object and then use it to generate the
-     * package tree page.
-     *
-     * @param pkg      Package for which tree file is to be generated.
-     * @param prev     Previous package in the alpha-ordered list.
-     * @param next     Next package in the alpha-ordered list.
-     * @param noDeprecated  If true, do not generate any information for
-     * deprecated classe or interfaces.
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                PackageDoc pkg, PackageDoc prev,
-                                PackageDoc next, boolean noDeprecated) {
-        PackageTreeWriter packgen;
-        DocPath path = DocPath.forPackage(pkg).resolve(DocPaths.PACKAGE_TREE);
-        try {
-            packgen = new PackageTreeWriter(configuration, path, pkg,
-                prev, next);
-            packgen.generatePackageTreeFile();
-            packgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), path.getPath());
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate a separate tree file for each package.
-     */
-    protected void generatePackageTreeFile() throws IOException {
-        HtmlTree body = getPackageTreeHeader();
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN()
-                : body;
-        Content headContent = getResource("doclet.Hierarchy_For_Package",
-                utils.getPackageName(packagedoc));
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false,
-                HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        if (configuration.packages.size() > 1) {
-            addLinkToMainTree(div);
-        }
-        htmlTree.addContent(div);
-        HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
-        divTree.addStyle(HtmlStyle.contentContainer);
-        addTree(classtree.baseclasses(), "doclet.Class_Hierarchy", divTree);
-        addTree(classtree.baseinterfaces(), "doclet.Interface_Hierarchy", divTree);
-        addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
-        addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree);
-        htmlTree.addContent(divTree);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            body.addContent(htmlTree);
-        }
-        HtmlTree tree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, tree);
-        addBottom(tree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(tree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Get the package tree header.
-     *
-     * @return a content tree for the header
-     */
-    protected HtmlTree getPackageTreeHeader() {
-        String title = packagedoc.name() + " " +
-                configuration.getText("doclet.Window_Class_Hierarchy");
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Add a link to the tree for all the packages.
-     *
-     * @param div the content tree to which the link will be added
-     */
-    protected void addLinkToMainTree(Content div) {
-        Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
-                getResource("doclet.Package_Hierarchies"));
-        div.addContent(span);
-        HtmlTree ul = new HtmlTree (HtmlTag.UL);
-        ul.addStyle(HtmlStyle.horizontal);
-        ul.addContent(getNavLinkMainTree(configuration.getText("doclet.All_Packages")));
-        div.addContent(ul);
-    }
-
-    /**
-     * Get link for the previous package tree file.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkPrevious() {
-        if (prev == null) {
-            return getNavLinkPrevious(null);
-        } else {
-            DocPath path = DocPath.relativePath(packagedoc, prev);
-            return getNavLinkPrevious(path.resolve(DocPaths.PACKAGE_TREE));
-        }
-    }
-
-    /**
-     * Get link for the next package tree file.
-     *
-     * @return a content tree for the link
-     */
-    protected Content getNavLinkNext() {
-        if (next == null) {
-            return getNavLinkNext(null);
-        } else {
-            DocPath path = DocPath.relativePath(packagedoc, next);
-            return getNavLinkNext(path.resolve(DocPaths.PACKAGE_TREE));
-        }
-    }
-
-    /**
-     * Get link to the package summary page for the package of this tree.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
deleted file mode 100644
index ef01f9a3a38..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate package usage information.
- *
- *  <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>
- *
- * @author Robert G. Field
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PackageUseWriter extends SubWriterHolderWriter {
-
-    final PackageDoc pkgdoc;
-    final SortedMap<String,Set<ClassDoc>> usingPackageToUsedClasses = new TreeMap<>();
-    protected HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * Constructor.
-     *
-     * @param filename the file to be generated.
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public PackageUseWriter(ConfigurationImpl configuration,
-                            ClassUseMapper mapper, DocPath filename,
-                            PackageDoc pkgdoc) throws IOException {
-        super(configuration, DocPath.forPackage(pkgdoc).resolve(filename));
-        this.pkgdoc = pkgdoc;
-
-        // by examining all classes in this package, find what packages
-        // use these classes - produce a map between using package and
-        // used classes.
-        for (ClassDoc usedClass : pkgdoc.allClasses()) {
-            Set<ClassDoc> usingClasses = mapper.classToClass.get(usedClass.qualifiedName());
-            if (usingClasses != null) {
-                for (ClassDoc usingClass : usingClasses) {
-                    PackageDoc usingPackage = usingClass.containingPackage();
-                    Set<ClassDoc> usedClasses = usingPackageToUsedClasses
-                            .get(usingPackage.name());
-                    if (usedClasses == null) {
-                        usedClasses = new TreeSet<>();
-                        usingPackageToUsedClasses.put(utils.getPackageName(usingPackage),
-                                                      usedClasses);
-                    }
-                    usedClasses.add(usedClass);
-                }
-            }
-        }
-    }
-
-    /**
-     * Generate a class page.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @param mapper        the mapping of the class usage.
-     * @param pkgdoc        the package doc being documented.
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassUseMapper mapper, PackageDoc pkgdoc) {
-        PackageUseWriter pkgusegen;
-        DocPath filename = DocPaths.PACKAGE_USE;
-        try {
-            pkgusegen = new PackageUseWriter(configuration,
-                                             mapper, filename, pkgdoc);
-            pkgusegen.generatePackageUseFile();
-            pkgusegen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                "doclet.exception_encountered",
-                exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-
-    /**
-     * Generate the package use list.
-     */
-    protected void generatePackageUseFile() throws IOException {
-        HtmlTree body = getPackageUseHeader();
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.contentContainer);
-        if (usingPackageToUsedClasses.isEmpty()) {
-            div.addContent(getResource(
-                    "doclet.ClassUse_No.usage.of.0", pkgdoc.name()));
-        } else {
-            addPackageUse(div);
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-            body.addContent(mainTree);
-        } else {
-            body.addContent(div);
-        }
-        HtmlTree tree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : body;
-        addNavLinks(false, tree);
-        addBottom(tree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(tree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the package use information.
-     *
-     * @param contentTree the content tree to which the package use information will be added
-     */
-    protected void addPackageUse(Content contentTree) throws IOException {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        if (configuration.packages.size() > 1) {
-            addPackageList(ul);
-        }
-        addClassList(ul);
-        contentTree.addContent(ul);
-    }
-
-    /**
-     * Add the list of packages that use the given package.
-     *
-     * @param contentTree the content tree to which the package list will be added
-     */
-    protected void addPackageList(Content contentTree) throws IOException {
-        Content caption = getTableCaption(configuration.getResource(
-                "doclet.ClassUse_Packages.that.use.0",
-                getPackageLink(pkgdoc, utils.getPackageName(pkgdoc))));
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.useSummary, useTableSummary, caption);
-        table.addContent(getSummaryTableHeader(packageTableHeader, "col"));
-        Content tbody = new HtmlTree(HtmlTag.TBODY);
-        Iterator<String> it = usingPackageToUsedClasses.keySet().iterator();
-        for (int i = 0; it.hasNext(); i++) {
-            PackageDoc pkg = configuration.root.packageNamed(it.next());
-            HtmlTree tr = new HtmlTree(HtmlTag.TR);
-            if (i % 2 == 0) {
-                tr.addStyle(HtmlStyle.altColor);
-            } else {
-                tr.addStyle(HtmlStyle.rowColor);
-            }
-            addPackageUse(pkg, tr);
-            tbody.addContent(tr);
-        }
-        table.addContent(tbody);
-        Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-        contentTree.addContent(li);
-    }
-
-    /**
-     * Add the list of classes that use the given package.
-     *
-     * @param contentTree the content tree to which the class list will be added
-     */
-    protected void addClassList(Content contentTree) throws IOException {
-        String[] classTableHeader = new String[] {
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Class"),
-                    configuration.getText("doclet.Description"))
-        };
-        for (String packageName : usingPackageToUsedClasses.keySet()) {
-            PackageDoc usingPackage = configuration.root.packageNamed(packageName);
-            HtmlTree li = new HtmlTree(HtmlTag.LI);
-            li.addStyle(HtmlStyle.blockList);
-            if (usingPackage != null) {
-                li.addContent(getMarkerAnchor(usingPackage.name()));
-            }
-            String tableSummary = configuration.getText("doclet.Use_Table_Summary",
-                                                        configuration.getText("doclet.classes"));
-            Content caption = getTableCaption(configuration.getResource(
-                    "doclet.ClassUse_Classes.in.0.used.by.1",
-                    getPackageLink(pkgdoc, utils.getPackageName(pkgdoc)),
-                    getPackageLink(usingPackage, utils.getPackageName(usingPackage))));
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.useSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.useSummary, tableSummary, caption);
-            table.addContent(getSummaryTableHeader(classTableHeader, "col"));
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            Iterator<ClassDoc> itc =
-                    usingPackageToUsedClasses.get(packageName).iterator();
-            for (int i = 0; itc.hasNext(); i++) {
-                HtmlTree tr = new HtmlTree(HtmlTag.TR);
-                if (i % 2 == 0) {
-                    tr.addStyle(HtmlStyle.altColor);
-                } else {
-                    tr.addStyle(HtmlStyle.rowColor);
-                }
-                addClassRow(itc.next(), usingPackage, tr);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            li.addContent(table);
-            contentTree.addContent(li);
-        }
-    }
-
-    /**
-     * Add a row for the class that uses the given package.
-     *
-     * @param usedClass the class that uses the given package
-     * @param pkg the package to which the class belongs
-     * @param contentTree the content tree to which the row will be added
-     */
-    protected void addClassRow(ClassDoc usedClass, PackageDoc pkg,
-            Content contentTree) {
-        DocPath dp = pathString(usedClass,
-                DocPaths.CLASS_USE.resolve(DocPath.forName(usedClass)));
-        Content td = HtmlTree.TD(HtmlStyle.colOne,
-                getHyperLink(dp.fragment(getPackageAnchorName(pkg)), new StringContent(usedClass.name())));
-        addIndexComment(usedClass, td);
-        contentTree.addContent(td);
-    }
-
-    /**
-     * Add the package use information.
-     *
-     * @param pkg the package that used the given package
-     * @param contentTree the content tree to which the information will be added
-     */
-    protected void addPackageUse(PackageDoc pkg, Content contentTree) throws IOException {
-        Content tdFirst = HtmlTree.TD(HtmlStyle.colFirst,
-                getHyperLink(utils.getPackageName(pkg),
-                new StringContent(utils.getPackageName(pkg))));
-        contentTree.addContent(tdFirst);
-        HtmlTree tdLast = new HtmlTree(HtmlTag.TD);
-        tdLast.addStyle(HtmlStyle.colLast);
-        if (pkg != null && pkg.name().length() != 0) {
-            addSummaryComment(pkg, tdLast);
-        } else {
-            tdLast.addContent(getSpace());
-        }
-        contentTree.addContent(tdLast);
-    }
-
-    /**
-     * Get the header for the package use listing.
-     *
-     * @return a content tree representing the package use header
-     */
-    protected HtmlTree getPackageUseHeader() {
-        String packageText = configuration.getText("doclet.Package");
-        String name = pkgdoc.name();
-        String title = configuration.getText("doclet.Window_ClassUse_Header",
-                packageText, name);
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        ContentBuilder headContent = new ContentBuilder();
-        headContent.addContent(getResource("doclet.ClassUse_Title", packageText));
-        headContent.addContent(new HtmlTree(HtmlTag.BR));
-        headContent.addContent(name);
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Get this package link.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_SUMMARY,
-                packageLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-
-    /**
-     * Get the use link.
-     *
-     * @return a content tree for the use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, useLabel);
-        return li;
-    }
-
-    /**
-     * Get the tree link.
-     *
-     * @return a content tree for the tree link
-     */
-    protected Content getNavLinkTree() {
-        Content linkContent = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel);
-        Content li = HtmlTree.LI(linkContent);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
deleted file mode 100644
index f9732f90084..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class to generate file for each package contents in the right-hand
- * frame. This will list all the Class Kinds in the package. A click on any
- * class-kind will update the frame with the clicked class-kind page.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PackageWriterImpl extends HtmlDocletWriter
-    implements PackageSummaryWriter {
-
-    /**
-     * The prev package name in the alpha-order list.
-     */
-    protected PackageDoc prev;
-
-    /**
-     * The next package name in the alpha-order list.
-     */
-    protected PackageDoc next;
-
-    /**
-     * The package being documented.
-     */
-    protected PackageDoc packageDoc;
-
-    /**
-     * The HTML tree for main tag.
-     */
-    protected HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * The HTML tree for section tag.
-     */
-    protected HtmlTree sectionTree = HtmlTree.SECTION();
-
-    /**
-     * Constructor to construct PackageWriter object and to generate
-     * "package-summary.html" file in the respective package directory.
-     * For example for package "java.lang" this will generate file
-     * "package-summary.html" file in the "java/lang" directory. It will also
-     * create "java/lang" directory in the current or the destination directory
-     * if it doesn't exist.
-     *
-     * @param configuration the configuration of the doclet.
-     * @param packageDoc    PackageDoc under consideration.
-     * @param prev          Previous package in the sorted array.
-     * @param next            Next package in the sorted array.
-     */
-    public PackageWriterImpl(ConfigurationImpl configuration,
-            PackageDoc packageDoc, PackageDoc prev, PackageDoc next)
-            throws IOException {
-        super(configuration, DocPath.forPackage(packageDoc).resolve(DocPaths.PACKAGE_SUMMARY));
-        this.prev = prev;
-        this.next = next;
-        this.packageDoc = packageDoc;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getPackageHeader(String heading) {
-        HtmlTree bodyTree = getBody(true, getWindowTitle(utils.getPackageName(packageDoc)));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.header);
-        Content annotationContent = new HtmlTree(HtmlTag.P);
-        addAnnotationInfo(packageDoc, annotationContent);
-        div.addContent(annotationContent);
-        Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, packageLabel);
-        tHeading.addContent(getSpace());
-        Content packageHead = new StringContent(heading);
-        tHeading.addContent(packageHead);
-        div.addContent(tHeading);
-        addDeprecationInfo(div);
-        if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) {
-            HtmlTree docSummaryDiv = new HtmlTree(HtmlTag.DIV);
-            docSummaryDiv.addStyle(HtmlStyle.docSummary);
-            addSummaryComment(packageDoc, docSummaryDiv);
-            div.addContent(docSummaryDiv);
-            Content space = getSpace();
-            Content descLink = getHyperLink(getDocLink(
-                    SectionName.PACKAGE_DESCRIPTION),
-                    descriptionLabel, "", "");
-            Content descPara = new HtmlTree(HtmlTag.P, seeLabel, space, descLink);
-            div.addContent(descPara);
-        }
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getContentHeader() {
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.contentContainer);
-        return div;
-    }
-
-    /**
-     * Add the package deprecation information to the documentation tree.
-     *
-     * @param div the content tree to which the deprecation information will be added
-     */
-    public void addDeprecationInfo(Content div) {
-        Tag[] deprs = packageDoc.tags("deprecated");
-        if (utils.isDeprecated(packageDoc)) {
-            HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV);
-            deprDiv.addStyle(HtmlStyle.deprecatedContent);
-            Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            deprDiv.addContent(deprPhrase);
-            if (deprs.length > 0) {
-                Tag[] commentTags = deprs[0].inlineTags();
-                if (commentTags.length > 0) {
-                    addInlineDeprecatedComment(packageDoc, deprs[0], deprDiv);
-                }
-            }
-            div.addContent(deprDiv);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSummaryHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addClassesSummary(ClassDoc[] classes, String label,
-            String tableSummary, String[] tableHeader, Content summaryContentTree) {
-        if(classes.length > 0) {
-            Arrays.sort(classes);
-            Content caption = getTableCaption(new RawHtml(label));
-            Content table = (configuration.isOutputHtml5())
-                    ? HtmlTree.TABLE(HtmlStyle.typeSummary, caption)
-                    : HtmlTree.TABLE(HtmlStyle.typeSummary, tableSummary, caption);
-            table.addContent(getSummaryTableHeader(tableHeader, "col"));
-            Content tbody = new HtmlTree(HtmlTag.TBODY);
-            for (int i = 0; i < classes.length; i++) {
-                if (!utils.isCoreClass(classes[i]) ||
-                    !configuration.isGeneratedDoc(classes[i])) {
-                    continue;
-                }
-                Content classContent = getLink(new LinkInfoImpl(
-                        configuration, LinkInfoImpl.Kind.PACKAGE, classes[i]));
-                Content tdClass = HtmlTree.TD(HtmlStyle.colFirst, classContent);
-                HtmlTree tr = HtmlTree.TR(tdClass);
-                if (i%2 == 0)
-                    tr.addStyle(HtmlStyle.altColor);
-                else
-                    tr.addStyle(HtmlStyle.rowColor);
-                HtmlTree tdClassDescription = new HtmlTree(HtmlTag.TD);
-                tdClassDescription.addStyle(HtmlStyle.colLast);
-                if (utils.isDeprecated(classes[i])) {
-                    tdClassDescription.addContent(deprecatedLabel);
-                    if (classes[i].tags("deprecated").length > 0) {
-                        addSummaryDeprecatedComment(classes[i],
-                            classes[i].tags("deprecated")[0], tdClassDescription);
-                    }
-                }
-                else
-                    addSummaryComment(classes[i], tdClassDescription);
-                tr.addContent(tdClassDescription);
-                tbody.addContent(tr);
-            }
-            table.addContent(tbody);
-            Content li = HtmlTree.LI(HtmlStyle.blockList, table);
-            summaryContentTree.addContent(li);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageDescription(Content packageContentTree) {
-        if (packageDoc.inlineTags().length > 0) {
-            packageContentTree.addContent(
-                    getMarkerAnchor(SectionName.PACKAGE_DESCRIPTION));
-            Content h2Content = new StringContent(
-                    configuration.getText("doclet.Package_Description",
-                    packageDoc.name()));
-            Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true, h2Content);
-            if (configuration.allowTag(HtmlTag.SECTION)) {
-                sectionTree.addContent(heading);
-                addInlineComment(packageDoc, sectionTree);
-            } else {
-                packageContentTree.addContent(heading);
-                addInlineComment(packageDoc, packageContentTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageTags(Content packageContentTree) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.SECTION))
-                ? sectionTree
-                : packageContentTree;
-        addTagsInfo(packageDoc, htmlTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageContent(Content contentTree, Content packageContentTree) {
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            packageContentTree.addContent(sectionTree);
-            mainTree.addContent(packageContentTree);
-            contentTree.addContent(mainTree);
-        } else {
-            contentTree.addContent(packageContentTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageFooter(Content contentTree) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : contentTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            contentTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content contentTree) throws IOException {
-        printHtmlDocument(configuration.metakeywords.getMetaKeywords(packageDoc),
-                true, contentTree);
-    }
-
-    /**
-     * Get "Use" link for this pacakge in the navigation bar.
-     *
-     * @return a content tree for the class use link
-     */
-    protected Content getNavLinkClassUse() {
-        Content useLink = getHyperLink(DocPaths.PACKAGE_USE,
-                useLabel, "", "");
-        Content li = HtmlTree.LI(useLink);
-        return li;
-    }
-
-    /**
-     * Get "PREV PACKAGE" link in the navigation bar.
-     *
-     * @return a content tree for the previous link
-     */
-    public Content getNavLinkPrevious() {
-        Content li;
-        if (prev == null) {
-            li = HtmlTree.LI(prevpackageLabel);
-        } else {
-            DocPath path = DocPath.relativePath(packageDoc, prev);
-            li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY),
-                prevpackageLabel, "", ""));
-        }
-        return li;
-    }
-
-    /**
-     * Get "NEXT PACKAGE" link in the navigation bar.
-     *
-     * @return a content tree for the next link
-     */
-    public Content getNavLinkNext() {
-        Content li;
-        if (next == null) {
-            li = HtmlTree.LI(nextpackageLabel);
-        } else {
-            DocPath path = DocPath.relativePath(packageDoc, next);
-            li = HtmlTree.LI(getHyperLink(path.resolve(DocPaths.PACKAGE_SUMMARY),
-                nextpackageLabel, "", ""));
-        }
-        return li;
-    }
-
-    /**
-     * Get "Tree" link in the navigation bar. This will be link to the package
-     * tree file.
-     *
-     * @return a content tree for the tree link
-     */
-    protected Content getNavLinkTree() {
-        Content useLink = getHyperLink(DocPaths.PACKAGE_TREE,
-                treeLabel, "", "");
-        Content li = HtmlTree.LI(useLink);
-        return li;
-    }
-
-    /**
-     * Highlight "Package" in the navigation bar, as this is the package page.
-     *
-     * @return a content tree for the package link
-     */
-    protected Content getNavLinkPackage() {
-        Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, packageLabel);
-        return li;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
deleted file mode 100644
index 1ce8e81fa20..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Writes property documentation in HTML format.
- *
- *  <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>
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Jamie Ho (rewrite)
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class PropertyWriterImpl extends AbstractMemberWriter
-    implements PropertyWriter, MemberSummaryWriter {
-
-    public PropertyWriterImpl(SubWriterHolderWriter writer, ClassDoc classdoc) {
-        super(writer, classdoc);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree) {
-        memberSummaryTree.addContent(HtmlConstants.START_OF_PROPERTY_SUMMARY);
-        Content memberTree = writer.getMemberTreeHeader();
-        writer.addSummaryHeader(this, classDoc, memberTree);
-        return memberTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        writer.addMemberTree(memberSummaryTree, memberTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getPropertyDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree) {
-        memberDetailsTree.addContent(HtmlConstants.START_OF_PROPERTY_DETAILS);
-        Content propertyDetailsTree = writer.getMemberTreeHeader();
-        propertyDetailsTree.addContent(writer.getMarkerAnchor(
-                SectionName.PROPERTY_DETAIL));
-        Content heading = HtmlTree.HEADING(HtmlConstants.DETAILS_HEADING,
-                writer.propertyDetailsLabel);
-        propertyDetailsTree.addContent(heading);
-        return propertyDetailsTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getPropertyDocTreeHeader(MethodDoc property,
-            Content propertyDetailsTree) {
-        propertyDetailsTree.addContent(
-                writer.getMarkerAnchor(property.name()));
-        Content propertyDocTree = writer.getMemberTreeHeader();
-        Content heading = new HtmlTree(HtmlConstants.MEMBER_HEADING);
-        heading.addContent(property.name().substring(0, property.name().lastIndexOf("Property")));
-        propertyDocTree.addContent(heading);
-        return propertyDocTree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getSignature(MethodDoc property) {
-        Content pre = new HtmlTree(HtmlTag.PRE);
-        writer.addAnnotationInfo(property, pre);
-        addModifiers(property, pre);
-        Content propertylink = writer.getLink(new LinkInfoImpl(
-                configuration, LinkInfoImpl.Kind.MEMBER,
-                property.returnType()));
-        pre.addContent(propertylink);
-        pre.addContent(" ");
-        if (configuration.linksource) {
-            Content propertyName = new StringContent(property.name());
-            writer.addSrcLink(property, propertyName, pre);
-        } else {
-            addName(property.name(), pre);
-        }
-        return pre;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addDeprecated(MethodDoc property, Content propertyDocTree) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addComments(MethodDoc property, Content propertyDocTree) {
-        ClassDoc holder = property.containingClass();
-        if (property.inlineTags().length > 0) {
-            if (holder.equals(classdoc) ||
-                    (! (holder.isPublic() || utils.isLinkable(holder, configuration)))) {
-                writer.addInlineComment(property, propertyDocTree);
-            } else {
-                Content link =
-                        writer.getDocLink(LinkInfoImpl.Kind.PROPERTY_DOC_COPY,
-                        holder, property,
-                        holder.isIncluded() ?
-                            holder.typeName() : holder.qualifiedTypeName(),
-                            false);
-                Content codeLink = HtmlTree.CODE(link);
-                Content descfrmLabel = HtmlTree.SPAN(HtmlStyle.descfrmTypeLabel, holder.isClass()?
-                   writer.descfrmClassLabel : writer.descfrmInterfaceLabel);
-                descfrmLabel.addContent(writer.getSpace());
-                descfrmLabel.addContent(codeLink);
-                propertyDocTree.addContent(HtmlTree.DIV(HtmlStyle.block, descfrmLabel));
-                writer.addInlineComment(property, propertyDocTree);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addTags(MethodDoc property, Content propertyDocTree) {
-        writer.addTagsInfo(property, propertyDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getPropertyDetails(Content propertyDetailsTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(propertyDetailsTree));
-            return htmlTree;
-        }
-        return getMemberTree(propertyDetailsTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getPropertyDoc(Content propertyDocTree,
-            boolean isLastContent) {
-        return getMemberTree(propertyDocTree, isLastContent);
-    }
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    public int getMemberKind() {
-        return VisibleMemberMap.PROPERTIES;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryLabel(Content memberTree) {
-        Content label = HtmlTree.HEADING(HtmlConstants.SUMMARY_HEADING,
-                writer.getResource("doclet.Property_Summary"));
-        memberTree.addContent(label);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getTableSummary() {
-        return configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Property_Summary"),
-                configuration.getText("doclet.properties"));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getCaption() {
-        return configuration.getResource("doclet.Properties");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String[] getSummaryTableHeader(ProgramElementDoc member) {
-        String[] header = new String[] {
-            configuration.getText("doclet.Type"),
-            configuration.getText("doclet.0_and_1",
-                    configuration.getText("doclet.Property"),
-                    configuration.getText("doclet.Description"))
-        };
-        return header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addSummaryAnchor(ClassDoc cd, Content memberTree) {
-        memberTree.addContent(writer.getMarkerAnchor(
-                SectionName.PROPERTY_SUMMARY));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryAnchor(ClassDoc cd, Content inheritedTree) {
-        inheritedTree.addContent(writer.getMarkerAnchor(
-                SectionName.PROPERTIES_INHERITANCE,
-                configuration.getClassName(cd)));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addInheritedSummaryLabel(ClassDoc cd, Content inheritedTree) {
-        Content classLink = writer.getPreQualifiedClassLink(
-                LinkInfoImpl.Kind.MEMBER, cd, false);
-        Content label = new StringContent(cd.isClass() ?
-            configuration.getText("doclet.Properties_Inherited_From_Class") :
-            configuration.getText("doclet.Properties_Inherited_From_Interface"));
-        Content labelHeading = HtmlTree.HEADING(HtmlConstants.INHERITED_SUMMARY_HEADING,
-                label);
-        labelHeading.addContent(writer.getSpace());
-        labelHeading.addContent(classLink);
-        inheritedTree.addContent(labelHeading);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryLink(LinkInfoImpl.Kind context, ClassDoc cd, ProgramElementDoc member,
-            Content tdSummary) {
-        Content memberLink = HtmlTree.SPAN(HtmlStyle.memberNameLink,
-                writer.getDocLink(context, cd,
-                (MemberDoc) member,
-                member.name().substring(0, member.name().lastIndexOf("Property")),
-                false,
-                true));
-
-        Content code = HtmlTree.CODE(memberLink);
-        tdSummary.addContent(code);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addInheritedSummaryLink(ClassDoc cd,
-            ProgramElementDoc member, Content linksTree) {
-        linksTree.addContent(
-                writer.getDocLink(LinkInfoImpl.Kind.MEMBER, cd, (MemberDoc)member,
-                ((member.name().lastIndexOf("Property") != -1) && configuration.javafx)
-                        ? member.name().substring(0, member.name().length() - "Property".length())
-                        : member.name(),
-                false, true));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addSummaryType(ProgramElementDoc member, Content tdSummaryType) {
-        MethodDoc property = (MethodDoc)member;
-        addModifierAndType(property, property.returnType(), tdSummaryType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getDeprecatedLink(ProgramElementDoc member) {
-        return writer.getDocLink(LinkInfoImpl.Kind.MEMBER,
-                (MemberDoc) member, ((MethodDoc)member).qualifiedName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content getNavSummaryLink(ClassDoc cd, boolean link) {
-        if (link) {
-            if (cd == null) {
-                return writer.getHyperLink(
-                SectionName.PROPERTY_SUMMARY,
-                writer.getResource("doclet.navProperty"));
-            } else {
-                return writer.getHyperLink(
-                SectionName.PROPERTIES_INHERITANCE,
-                configuration.getClassName(cd), writer.getResource("doclet.navProperty"));
-            }
-        } else {
-            return writer.getResource("doclet.navProperty");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected void addNavDetailLink(boolean link, Content liNav) {
-        if (link) {
-            liNav.addContent(writer.getHyperLink(
-                    SectionName.PROPERTY_DETAIL,
-                    writer.getResource("doclet.navProperty")));
-        } else {
-            liNav.addContent(writer.getResource("doclet.navProperty"));
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java
deleted file mode 100644
index e4e76c99bcc..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SearchIndexItem.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015, 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.doclets.formats.html;
-
-/**
- * Index item for search.
- *
- *  <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>
- */
-@Deprecated
-public class SearchIndexItem {
-
-    private String label = "";
-    private String url = "";
-    private String category = "";
-    private String containingPackage = "";
-    private String containingClass = "";
-    private String holder = "";
-    private String description = "";
-
-    public void setLabel(String l) {
-        label = l;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setUrl(String u) {
-        url = u;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setContainingPackage(String p) {
-        containingPackage = p;
-    }
-
-    public void setContainingClass(String c) {
-        containingClass = c;
-    }
-
-    public void setCategory(String c) {
-        category = c;
-    }
-
-    public void setHolder(String h) {
-        holder = h;
-    }
-
-    public String getHolder() {
-        return holder;
-    }
-
-    public void setDescription(String d) {
-        description = d;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String toString() {
-        StringBuilder item = new StringBuilder("");
-        if (category.equals("Packages")) {
-            item.append("{")
-                    .append("\"l\":\"").append(label).append("\"")
-                    .append("}");
-        } else if (category.equals("Types")) {
-            item.append("{")
-                    .append("\"p\":\"").append(containingPackage).append("\",")
-                    .append("\"l\":\"").append(label).append("\"")
-                    .append("}");
-        } else if (category.equals("Members")) {
-            item.append("{")
-                    .append("\"p\":\"").append(containingPackage).append("\",")
-                    .append("\"c\":\"").append(containingClass).append("\",")
-                    .append("\"l\":\"").append(label).append("\"");
-            if (!url.equals("")) {
-                item.append(",\"url\":\"").append(url).append("\"");
-            }
-            item.append("}");
-        } else {
-            item.append("{")
-                    .append("\"l\":\"").append(label).append("\",")
-                    .append("\"h\":\"").append(holder).append("\",");
-            if (!description.equals("")) {
-                item.append("\"d\":\"").append(description).append("\",");
-            }
-            item.append("\"u\":\"").append(url).append("\"")
-                    .append("}");
-        }
-        return item.toString();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
deleted file mode 100644
index b281e4eb2ef..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2013, 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.doclets.formats.html;
-
-/**
- * Enum representing various section names of generated API documentation.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum SectionName {
-
-    ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.type.element.detail"),
-    ANNOTATION_TYPE_FIELD_DETAIL("annotation.type.field.detail"),
-    ANNOTATION_TYPE_FIELD_SUMMARY("annotation.type.field.summary"),
-    ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY("annotation.type.optional.element.summary"),
-    ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY("annotation.type.required.element.summary"),
-    CONSTRUCTOR_DETAIL("constructor.detail"),
-    CONSTRUCTOR_SUMMARY("constructor.summary"),
-    ENUM_CONSTANT_DETAIL("enum.constant.detail"),
-    ENUM_CONSTANTS_INHERITANCE("enum.constants.inherited.from.class."),
-    ENUM_CONSTANT_SUMMARY("enum.constant.summary"),
-    FIELD_DETAIL("field.detail"),
-    FIELDS_INHERITANCE("fields.inherited.from.class."),
-    FIELD_SUMMARY("field.summary"),
-    METHOD_DETAIL("method.detail"),
-    METHODS_INHERITANCE("methods.inherited.from.class."),
-    METHOD_SUMMARY("method.summary"),
-    NAVBAR_BOTTOM("navbar.bottom"),
-    NAVBAR_BOTTOM_FIRSTROW("navbar.bottom.firstrow"),
-    NAVBAR_TOP("navbar.top"),
-    NAVBAR_TOP_FIRSTROW("navbar.top.firstrow"),
-    NESTED_CLASSES_INHERITANCE("nested.classes.inherited.from.class."),
-    NESTED_CLASS_SUMMARY("nested.class.summary"),
-    OVERVIEW_DESCRIPTION("overview.description"),
-    PACKAGE_DESCRIPTION("package.description"),
-    PROPERTY_DETAIL("property.detail"),
-    PROPERTIES_INHERITANCE("properties.inherited.from.class."),
-    PROPERTY_SUMMARY("property.summary"),
-    SKIP_NAVBAR_BOTTOM("skip.navbar.bottom"),
-    SKIP_NAVBAR_TOP("skip.navbar.top"),
-    UNNAMED_PACKAGE_ANCHOR("unnamed.package");
-
-    private final String value;
-
-    SectionName(String sName) {
-        this.value = sName;
-    }
-
-    public String getName() {
-        return this.value;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
deleted file mode 100644
index f9de12b0b8d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.DocPaths;
-import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException;
-
-/**
- * Generate the Serialized Form Information Page.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class SerializedFormWriterImpl extends SubWriterHolderWriter
-    implements SerializedFormWriter {
-
-    List<ClassDoc> visibleClasses;
-
-    /**
-     * HTML tree for main tag.
-     */
-    private HtmlTree mainTree = HtmlTree.MAIN();
-
-    /**
-     * @param configuration the configuration data for the doclet
-     * @throws IOException
-     * @throws DocletAbortException
-     */
-    public SerializedFormWriterImpl(ConfigurationImpl configuration)
-            throws IOException {
-        super(configuration, DocPaths.SERIALIZED_FORM);
-        visibleClasses = Arrays.asList(configuration.root.classes());
-    }
-
-    /**
-     * Get the given header.
-     *
-     * @param header the header to write
-     * @return the body content tree
-     */
-    public Content getHeader(String header) {
-        HtmlTree bodyTree = getBody(true, getWindowTitle(header));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        Content h1Content = new StringContent(header);
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true,
-                HtmlStyle.title, h1Content);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(div);
-        } else {
-            bodyTree.addContent(div);
-        }
-        return bodyTree;
-    }
-
-    /**
-     * Get the serialized form summaries header.
-     *
-     * @return the serialized form summary header tree
-     */
-    public Content getSerializedSummariesHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * Get the package serialized form header.
-     *
-     * @return the package serialized form header tree
-     */
-    public Content getPackageSerializedHeader() {
-        HtmlTree htmlTree;
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            htmlTree = HtmlTree.SECTION();
-        } else {
-            htmlTree = new HtmlTree(HtmlTag.LI);
-            htmlTree.addStyle(HtmlStyle.blockList);
-        }
-        return htmlTree;
-    }
-
-    /**
-     * Get the given package header.
-     *
-     * @param packageName the package header to write
-     * @return a content tree for the package header
-     */
-    public Content getPackageHeader(String packageName) {
-        Content heading = HtmlTree.HEADING(HtmlConstants.PACKAGE_HEADING, true,
-                packageLabel);
-        heading.addContent(getSpace());
-        heading.addContent(packageName);
-        return heading;
-    }
-
-    /**
-     * Get the serialized class header.
-     *
-     * @return a content tree for the serialized class header
-     */
-    public Content getClassSerializedHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * Checks if a class is generated and is visible.
-     *
-     * @param classDoc the class being processed.
-     * @return true if the class, that is being processed, is generated and is visible.
-     */
-    public boolean isVisibleClass(ClassDoc classDoc) {
-        return visibleClasses.contains(classDoc) && configuration.isGeneratedDoc(classDoc);
-    }
-
-    /**
-     * Get the serializable class heading.
-     *
-     * @param classDoc the class being processed
-     * @return a content tree for the class header
-     */
-    public Content getClassHeader(ClassDoc classDoc) {
-        Content classLink = (isVisibleClass(classDoc)) ?
-            getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.DEFAULT, classDoc)
-            .label(configuration.getClassName(classDoc))) :
-            new StringContent(classDoc.qualifiedName());
-        Content li = HtmlTree.LI(HtmlStyle.blockList, getMarkerAnchor(
-                classDoc.qualifiedName()));
-        Content superClassLink =
-            classDoc.superclassType() != null ?
-                getLink(new LinkInfoImpl(configuration,
-                        LinkInfoImpl.Kind.SERIALIZED_FORM,
-                        classDoc.superclassType())) :
-                null;
-
-        //Print the heading.
-        Content className = superClassLink == null ?
-            configuration.getResource(
-            "doclet.Class_0_implements_serializable", classLink) :
-            configuration.getResource(
-            "doclet.Class_0_extends_implements_serializable", classLink,
-            superClassLink);
-        li.addContent(HtmlTree.HEADING(HtmlConstants.SERIALIZED_MEMBER_HEADING,
-                className));
-        return li;
-    }
-
-    /**
-     * Get the serial UID info header.
-     *
-     * @return a content tree for the serial uid info header
-     */
-    public Content getSerialUIDInfoHeader() {
-        HtmlTree dl = new HtmlTree(HtmlTag.DL);
-        dl.addStyle(HtmlStyle.nameValue);
-        return dl;
-    }
-
-    /**
-     * Adds the serial UID info.
-     *
-     * @param header the header that will show up before the UID.
-     * @param serialUID the serial UID to print.
-     * @param serialUidTree the serial UID content tree to which the serial UID
-     *                      content will be added
-     */
-    public void addSerialUIDInfo(String header, String serialUID,
-            Content serialUidTree) {
-        Content headerContent = new StringContent(header);
-        serialUidTree.addContent(HtmlTree.DT(headerContent));
-        Content serialContent = new StringContent(serialUID);
-        serialUidTree.addContent(HtmlTree.DD(serialContent));
-    }
-
-    /**
-     * Get the class serialize content header.
-     *
-     * @return a content tree for the class serialize content header
-     */
-    public Content getClassContentHeader() {
-        HtmlTree ul = new HtmlTree(HtmlTag.UL);
-        ul.addStyle(HtmlStyle.blockList);
-        return ul;
-    }
-
-    /**
-     * Get the serialized content tree section.
-     *
-     * @param serializedTreeContent the serialized content tree to be added
-     * @return a div content tree
-     */
-    public Content getSerializedContent(Content serializedTreeContent) {
-        HtmlTree divContent = HtmlTree.DIV(HtmlStyle.serializedFormContainer,
-                serializedTreeContent);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(divContent);
-            return mainTree;
-        } else {
-            return divContent;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void addPackageSerializedTree(Content serializedSummariesTree,
-            Content packageSerializedTree) {
-        serializedSummariesTree.addContent((configuration.allowTag(HtmlTag.SECTION))
-                ? HtmlTree.LI(HtmlStyle.blockList, packageSerializedTree)
-                : packageSerializedTree);
-    }
-
-    /**
-     * Add the footer.
-     *
-     * @param serializedTree the serialized tree to be added
-     */
-    public void addFooter(Content serializedTree) {
-        Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER))
-                ? HtmlTree.FOOTER()
-                : serializedTree;
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            serializedTree.addContent(htmlTree);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printDocument(Content serializedTree) throws IOException {
-        printHtmlDocument(null, true, serializedTree);
-    }
-
-    /**
-     * Return an instance of a SerialFieldWriter.
-     *
-     * @return an instance of a SerialFieldWriter.
-     */
-    public SerialFieldWriter getSerialFieldWriter(ClassDoc classDoc) {
-        return new HtmlSerialFieldWriter(this, classDoc);
-    }
-
-    /**
-     * Return an instance of a SerialMethodWriter.
-     *
-     * @return an instance of a SerialMethodWriter.
-     */
-    public SerialMethodWriter getSerialMethodWriter(ClassDoc classDoc) {
-        return new HtmlSerialMethodWriter(this, classDoc);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
deleted file mode 100644
index 6d1176e3645..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate only one index file for all the Member Names with Indexing in
- * Unicode Order. The name of the generated file is "index-all.html" and it is
- * generated in current or the destination directory.
- *
- *  <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>
- *
- * @see java.lang.Character
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class SingleIndexWriter extends AbstractIndexWriter {
-
-    private List<Object> elements;
-
-    /**
-     * Construct the SingleIndexWriter with filename "index-all.html" and the
-     * {@link IndexBuilder}
-     *
-     * @param filename     Name of the index file to be generated.
-     * @param indexbuilder Unicode based Index from {@link IndexBuilder}
-     */
-    public SingleIndexWriter(ConfigurationImpl configuration,
-                             DocPath filename,
-                             IndexBuilder indexbuilder) throws IOException {
-        super(configuration, filename, indexbuilder);
-    }
-
-    /**
-     * Generate single index file, for all Unicode characters.
-     *
-     * @param indexbuilder IndexBuilder built by {@link IndexBuilder}
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                IndexBuilder indexbuilder) {
-        SingleIndexWriter indexgen;
-        DocPath filename = DocPaths.INDEX_ALL;
-        try {
-            indexgen = new SingleIndexWriter(configuration,
-                                             filename, indexbuilder);
-            indexgen.generateIndexFile();
-            indexgen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the contents of each index file, with Header, Footer,
-     * Member Field, Method and Constructor Description.
-     */
-    protected void generateIndexFile() throws IOException {
-        String title = configuration.getText("doclet.Window_Single_Index");
-        HtmlTree body = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : body;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            body.addContent(htmlTree);
-        }
-        HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
-        divTree.addStyle(HtmlStyle.contentContainer);
-        Set<Object> keys = new TreeSet<>(Arrays.asList(indexbuilder.elements()));
-        keys.addAll(configuration.tagSearchIndexKeys);
-        elements = new ArrayList<>(keys);
-        addLinksForIndexes(divTree);
-        for (Object ch : elements) {
-            Character unicode = (Character) ch;
-            if (configuration.tagSearchIndexMap.get(unicode) == null) {
-                addContents(unicode, indexbuilder.getMemberList(unicode), divTree);
-            } else if (indexbuilder.getMemberList(unicode) == null) {
-                addSearchContents(unicode, configuration.tagSearchIndexMap.get(unicode), divTree);
-            } else {
-                addContents(unicode, indexbuilder.getMemberList(unicode),
-                        configuration.tagSearchIndexMap.get(unicode), divTree);
-            }
-        }
-        addLinksForIndexes(divTree);
-        body.addContent((configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN(divTree)
-                : divTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            htmlTree = HtmlTree.FOOTER();
-        }
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        createSearchIndexFiles();
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add links for all the Index Files per unicode character.
-     *
-     * @param contentTree the content tree to which the links for indexes will be added
-     */
-    protected void addLinksForIndexes(Content contentTree) {
-        for (Object ch : elements) {
-            String unicode = ch.toString();
-            contentTree.addContent(
-                    getHyperLink(getNameForIndex(unicode),
-                            new StringContent(unicode)));
-            contentTree.addContent(getSpace());
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
deleted file mode 100644
index fb2233d0d3c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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.doclets.formats.html;
-
-import java.io.*;
-
-import javax.tools.FileObject;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javadoc.main.SourcePositionImpl;
-
-/**
- * Converts Java Source Code to HTML.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.4
- */
-@Deprecated
-public class SourceToHTMLConverter {
-
-    /**
-     * The number of trailing blank lines at the end of the page.
-     * This is inserted so that anchors at the bottom of small pages
-     * can be reached.
-     */
-    private static final int NUM_BLANK_LINES = 60;
-
-    /**
-     * New line to be added to the documentation.
-     */
-    private static final String NEW_LINE = DocletConstants.NL;
-
-    private final ConfigurationImpl configuration;
-    private final Utils utils;
-
-    private final RootDoc rootDoc;
-
-    private DocPath outputdir;
-
-    /**
-     * Relative path from the documentation root to the file that is being
-     * generated.
-     */
-    private DocPath relativePath = DocPath.empty;
-
-    private SourceToHTMLConverter(ConfigurationImpl configuration, RootDoc rd,
-            DocPath outputdir) {
-        this.configuration  = configuration;
-        this.utils = configuration.utils;
-        this.rootDoc = rd;
-        this.outputdir = outputdir;
-    }
-
-    /**
-     * Convert the Classes in the given RootDoc to an HTML.
-     *
-     * @param configuration the configuration.
-     * @param rd the RootDoc to convert.
-     * @param outputdir the name of the directory to output to.
-     */
-    public static void convertRoot(ConfigurationImpl configuration, RootDoc rd,
-            DocPath outputdir) {
-        new SourceToHTMLConverter(configuration, rd, outputdir).generate();
-    }
-
-    void generate() {
-        if (rootDoc == null || outputdir == null) {
-            return;
-        }
-        for (PackageDoc pd : rootDoc.specifiedPackages()) {
-            // If -nodeprecated option is set and the package is marked as deprecated,
-            // do not convert the package files to HTML.
-            if (!(configuration.nodeprecated && utils.isDeprecated(pd)))
-                convertPackage(pd, outputdir);
-        }
-        for (ClassDoc cd : rootDoc.specifiedClasses()) {
-            // If -nodeprecated option is set and the class is marked as deprecated
-            // or the containing package is deprecated, do not convert the
-            // package files to HTML.
-            if (!(configuration.nodeprecated &&
-                  (utils.isDeprecated(cd) || utils.isDeprecated(cd.containingPackage()))))
-                convertClass(cd, outputdir);
-        }
-    }
-
-    /**
-     * Convert the Classes in the given Package to an HTML.
-     *
-     * @param pd the Package to convert.
-     * @param outputdir the name of the directory to output to.
-     */
-    public void convertPackage(PackageDoc pd, DocPath outputdir) {
-        if (pd == null) {
-            return;
-        }
-        for (ClassDoc cd : pd.allClasses()) {
-            // If -nodeprecated option is set and the class is marked as deprecated,
-            // do not convert the package files to HTML. We do not check for
-            // containing package deprecation since it is already check in
-            // the calling method above.
-            if (!(configuration.nodeprecated && utils.isDeprecated(cd)))
-                convertClass(cd, outputdir);
-        }
-    }
-
-    /**
-     * Convert the given Class to an HTML.
-     *
-     * @param cd the class to convert.
-     * @param outputdir the name of the directory to output to.
-     */
-    public void convertClass(ClassDoc cd, DocPath outputdir) {
-        if (cd == null) {
-            return;
-        }
-        try {
-            SourcePosition sp = cd.position();
-            if (sp == null)
-                return;
-            Reader r;
-            // temp hack until we can update SourcePosition API.
-            if (sp instanceof SourcePositionImpl) {
-                FileObject fo = ((SourcePositionImpl) sp).fileObject();
-                if (fo == null)
-                    return;
-                r = fo.openReader(true);
-            } else {
-                File file = sp.file();
-                if (file == null)
-                    return;
-                r = new FileReader(file);
-            }
-            int lineno = 1;
-            String line;
-            relativePath = DocPaths.SOURCE_OUTPUT
-                    .resolve(DocPath.forPackage(cd))
-                    .invert();
-            Content body = getHeader();
-            Content pre = new HtmlTree(HtmlTag.PRE);
-            try (LineNumberReader reader = new LineNumberReader(r)) {
-                while ((line = reader.readLine()) != null) {
-                    addLineNo(pre, lineno);
-                    addLine(pre, line, lineno);
-                    lineno++;
-                }
-            }
-            addBlankLines(pre);
-            Content div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre);
-            body.addContent((configuration.allowTag(HtmlTag.MAIN)) ? HtmlTree.MAIN(div) : div);
-            writeToFile(body, outputdir.resolve(DocPath.forClass(cd)));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Write the output to the file.
-     *
-     * @param body the documentation content to be written to the file.
-     * @param path the path for the file.
-     */
-    private void writeToFile(Content body, DocPath path) throws IOException {
-        Content htmlDocType = configuration.isOutputHtml5()
-                ? DocType.HTML5
-                : DocType.TRANSITIONAL;
-        Content head = new HtmlTree(HtmlTag.HEAD);
-        head.addContent(HtmlTree.TITLE(new StringContent(
-                configuration.getText("doclet.Window_Source_title"))));
-        head.addContent(getStyleSheetProperties());
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(),
-                head, body);
-        Content htmlDocument = new HtmlDocument(htmlDocType, htmlTree);
-        configuration.message.notice("doclet.Generating_0", path.getPath());
-        DocFile df = DocFile.createFileForOutput(configuration, path);
-        try (Writer w = df.openWriter()) {
-            htmlDocument.write(w, true);
-        }
-
-    }
-
-    /**
-     * Returns a link to the stylesheet file.
-     *
-     * @return an HtmlTree for the lINK tag which provides the stylesheet location
-     */
-    public HtmlTree getStyleSheetProperties() {
-        String filename = configuration.stylesheetfile;
-        DocPath stylesheet;
-        if (filename.length() > 0) {
-            DocFile file = DocFile.createFileForInput(configuration, filename);
-            stylesheet = DocPath.create(file.getName());
-        } else {
-            stylesheet = DocPaths.STYLESHEET;
-        }
-        DocPath p = relativePath.resolve(stylesheet);
-        HtmlTree link = HtmlTree.LINK("stylesheet", "text/css", p.getPath(), "Style");
-        return link;
-    }
-
-    /**
-     * Get the header.
-     *
-     * @return the header content for the HTML file
-     */
-    private static Content getHeader() {
-        return new HtmlTree(HtmlTag.BODY);
-    }
-
-    /**
-     * Add the line numbers for the source code.
-     *
-     * @param pre the content tree to which the line number will be added
-     * @param lineno The line number
-     */
-    private static void addLineNo(Content pre, int lineno) {
-        HtmlTree span = new HtmlTree(HtmlTag.SPAN);
-        span.addStyle(HtmlStyle.sourceLineNo);
-        if (lineno < 10) {
-            span.addContent("00" + Integer.toString(lineno));
-        } else if (lineno < 100) {
-            span.addContent("0" + Integer.toString(lineno));
-        } else {
-            span.addContent(Integer.toString(lineno));
-        }
-        pre.addContent(span);
-    }
-
-    /**
-     * Add a line from source to the HTML file that is generated.
-     *
-     * @param pre the content tree to which the line will be added.
-     * @param line the string to format.
-     * @param currentLineNo the current number.
-     */
-    private void addLine(Content pre, String line, int currentLineNo) {
-        if (line != null) {
-            Content anchor = HtmlTree.A(configuration.htmlVersion,
-                    "line." + Integer.toString(currentLineNo),
-                    new StringContent(utils.replaceTabs(configuration, line)));
-            pre.addContent(anchor);
-            pre.addContent(NEW_LINE);
-        }
-    }
-
-    /**
-     * Add trailing blank lines at the end of the page.
-     *
-     * @param pre the content tree to which the blank lines will be added.
-     */
-    private static void addBlankLines(Content pre) {
-        for (int i = 0; i < NUM_BLANK_LINES; i++) {
-            pre.addContent(NEW_LINE);
-        }
-    }
-
-    /**
-     * Given a <code>Doc</code>, return an anchor name for it.
-     *
-     * @param d the <code>Doc</code> to check.
-     * @return the name of the anchor.
-     */
-    public static String getAnchorName(Doc d) {
-        return "line." + d.position().line();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
deleted file mode 100644
index 2d819866d10..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate Separate Index Files for all the member names with Indexing in
- * Unicode Order. This will create "index-files" directory in the current or
- * destination directory and will generate separate file for each unicode index.
- *
- *  <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>
- *
- * @see java.lang.Character
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class SplitIndexWriter extends AbstractIndexWriter {
-
-    /**
-     * Previous unicode character index in the built index.
-     */
-    protected int prev;
-
-    /**
-     * Next unicode character in the built index.
-     */
-    protected int next;
-
-    private List<Object> indexElements;
-
-    /**
-     * Construct the SplitIndexWriter. Uses path to this file and relative path
-     * from this file.
-     *
-     * @param path       Path to the file which is getting generated.
-     * @param indexbuilder Unicode based Index from {@link IndexBuilder}
-     */
-    public SplitIndexWriter(ConfigurationImpl configuration,
-                            DocPath path,
-                            IndexBuilder indexbuilder, List<Object> elements,
-                            int prev, int next) throws IOException {
-        super(configuration, path, indexbuilder);
-        this.indexElements = elements;
-        this.prev = prev;
-        this.next = next;
-    }
-
-    /**
-     * Generate separate index files, for each Unicode character, listing all
-     * the members starting with the particular unicode character.
-     *
-     * @param indexbuilder IndexBuilder built by {@link IndexBuilder}
-     * @throws DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                IndexBuilder indexbuilder) {
-        SplitIndexWriter indexgen;
-        DocPath filename = DocPath.empty;
-        DocPath path = DocPaths.INDEX_FILES;
-        try {
-            Set<Object> keys = new TreeSet<>(Arrays.asList(indexbuilder.elements()));
-            keys.addAll(configuration.tagSearchIndexKeys);
-            List<Object> elements = new ArrayList<>(keys);
-            ListIterator<Object> li = elements.listIterator();
-            while (li.hasNext()) {
-                Object ch = li.next();
-                filename = DocPaths.indexN(li.nextIndex());
-                indexgen = new SplitIndexWriter(configuration,
-                        path.resolve(filename),
-                        indexbuilder, elements, li.previousIndex(), li.nextIndex());
-                indexgen.generateIndexFile((Character) ch);
-                if (!li.hasNext()) {
-                    indexgen.createSearchIndexFiles();
-                }
-                indexgen.close();
-            }
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename.getPath());
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the contents of each index file, with Header, Footer,
-     * Member Field, Method and Constructor Description.
-     *
-     * @param unicode Unicode character referring to the character for the
-     * index.
-     */
-    protected void generateIndexFile(Character unicode) throws IOException {
-        String title = configuration.getText("doclet.Window_Split_Index",
-                unicode.toString());
-        HtmlTree body = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : body;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            body.addContent(htmlTree);
-        }
-        HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
-        divTree.addStyle(HtmlStyle.contentContainer);
-        addLinksForIndexes(divTree);
-        if (configuration.tagSearchIndexMap.get(unicode) == null) {
-            addContents(unicode, indexbuilder.getMemberList(unicode), divTree);
-        } else if (indexbuilder.getMemberList(unicode) == null) {
-            addSearchContents(unicode, configuration.tagSearchIndexMap.get(unicode), divTree);
-        } else {
-            addContents(unicode, indexbuilder.getMemberList(unicode),
-                    configuration.tagSearchIndexMap.get(unicode), divTree);
-        }
-        addLinksForIndexes(divTree);
-        body.addContent((configuration.allowTag(HtmlTag.MAIN)) ? HtmlTree.MAIN(divTree) : divTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            htmlTree = HtmlTree.FOOTER();
-        }
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add links for all the Index Files per unicode character.
-     *
-     * @param contentTree the content tree to which the links for indexes will be added
-     */
-    protected void addLinksForIndexes(Content contentTree) {
-        for (int i = 0; i < indexElements.size(); i++) {
-            int j = i + 1;
-            contentTree.addContent(getHyperLink(DocPaths.indexN(j),
-                    new StringContent(indexElements.get(i).toString())));
-            contentTree.addContent(getSpace());
-        }
-    }
-
-    /**
-     * Get link to the previous unicode character.
-     *
-     * @return a content tree for the link
-     */
-    public Content getNavLinkPrevious() {
-        Content prevletterLabel = getResource("doclet.Prev_Letter");
-        if (prev == -1) {
-            return HtmlTree.LI(prevletterLabel);
-        }
-        else {
-            Content prevLink = getHyperLink(DocPaths.indexN(prev),
-                    prevletterLabel);
-            return HtmlTree.LI(prevLink);
-        }
-    }
-
-    /**
-     * Get link to the next unicode character.
-     *
-     * @return a content tree for the link
-     */
-    public Content getNavLinkNext() {
-        Content nextletterLabel = getResource("doclet.Next_Letter");
-        if (next == -1) {
-            return HtmlTree.LI(nextletterLabel);
-        }
-        else {
-            Content nextLink = getHyperLink(DocPaths.indexN(next),
-                    nextletterLabel);
-            return HtmlTree.LI(nextLink);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
deleted file mode 100644
index d519320847c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * This abstract class exists to provide functionality needed in the
- * the formatting of member information.  Since AbstractSubWriter and its
- * subclasses control this, they would be the logical place to put this.
- * However, because each member type has its own subclass, subclassing
- * can not be used effectively to change formatting.  The concrete
- * class subclass of this class can be subclassed to change formatting.
- *
- *  <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>
- *
- * @see AbstractMemberWriter
- * @see ClassWriterImpl
- *
- * @author Robert Field
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
-
-    /**
-     * The HTML tree for main tag.
-     */
-    protected HtmlTree mainTree = HtmlTree.MAIN();
-
-    public SubWriterHolderWriter(ConfigurationImpl configuration, DocPath filename)
-            throws IOException {
-        super(configuration, filename);
-    }
-
-    /**
-     * Add the summary header.
-     *
-     * @param mw the writer for the member being documented
-     * @param cd the classdoc to be documented
-     * @param memberTree the content tree to which the summary header will be added
-     */
-    public void addSummaryHeader(AbstractMemberWriter mw, ClassDoc cd,
-            Content memberTree) {
-        mw.addSummaryAnchor(cd, memberTree);
-        mw.addSummaryLabel(memberTree);
-    }
-
-    /**
-     * Get the summary table.
-     *
-     * @param mw the writer for the member being documented
-     * @param cd the classdoc to be documented
-     * @param tableContents list of summary table contents
-     * @param showTabs true if the table needs to show tabs
-     * @return the content tree for the summary table
-     */
-    public Content getSummaryTableTree(AbstractMemberWriter mw, ClassDoc cd,
-            List<Content> tableContents, boolean showTabs) {
-        Content caption;
-        if (showTabs) {
-            caption = getTableCaption(mw.methodTypes);
-            generateMethodTypesScript(mw.typeMap, mw.methodTypes);
-        }
-        else {
-            caption = getTableCaption(mw.getCaption());
-        }
-        Content table = (configuration.isOutputHtml5())
-                ? HtmlTree.TABLE(HtmlStyle.memberSummary, caption)
-                : HtmlTree.TABLE(HtmlStyle.memberSummary, mw.getTableSummary(), caption);
-        table.addContent(getSummaryTableHeader(mw.getSummaryTableHeader(cd), "col"));
-        for (Content tableContent : tableContents) {
-            table.addContent(tableContent);
-        }
-        return table;
-    }
-
-    /**
-     * Get the summary table caption.
-     *
-     * @param methodTypes set comprising of method types to show as table caption
-     * @return the caption for the summary table
-     */
-    public Content getTableCaption(Set<MethodTypes> methodTypes) {
-        Content tabbedCaption = new HtmlTree(HtmlTag.CAPTION);
-        for (MethodTypes type : methodTypes) {
-            Content captionSpan;
-            Content span;
-            if (type.isDefaultTab()) {
-                captionSpan = HtmlTree.SPAN(configuration.getResource(type.resourceKey()));
-                span = HtmlTree.SPAN(type.tabId(),
-                        HtmlStyle.activeTableTab, captionSpan);
-            } else {
-                captionSpan = HtmlTree.SPAN(getMethodTypeLinks(type));
-                span = HtmlTree.SPAN(type.tabId(),
-                        HtmlStyle.tableTab, captionSpan);
-            }
-            Content tabSpan = HtmlTree.SPAN(HtmlStyle.tabEnd, getSpace());
-            span.addContent(tabSpan);
-            tabbedCaption.addContent(span);
-        }
-        return tabbedCaption;
-    }
-
-    /**
-     * Get the method type links for the table caption.
-     *
-     * @param methodType the method type to be displayed as link
-     * @return the content tree for the method type link
-     */
-    public Content getMethodTypeLinks(MethodTypes methodType) {
-        String jsShow = "javascript:show(" + methodType.value() +");";
-        HtmlTree link = HtmlTree.A(jsShow, configuration.getResource(methodType.resourceKey()));
-        return link;
-    }
-
-    /**
-     * Add the inherited summary header.
-     *
-     * @param mw the writer for the member being documented
-     * @param cd the classdoc to be documented
-     * @param inheritedTree the content tree to which the inherited summary header will be added
-     */
-    public void addInheritedSummaryHeader(AbstractMemberWriter mw, ClassDoc cd,
-            Content inheritedTree) {
-        mw.addInheritedSummaryAnchor(cd, inheritedTree);
-        mw.addInheritedSummaryLabel(cd, inheritedTree);
-    }
-
-    /**
-     * Add the index comment.
-     *
-     * @param member the member being documented
-     * @param contentTree the content tree to which the comment will be added
-     */
-    protected void addIndexComment(Doc member, Content contentTree) {
-        addIndexComment(member, member.firstSentenceTags(), contentTree);
-    }
-
-    /**
-     * Add the index comment.
-     *
-     * @param member the member being documented
-     * @param firstSentenceTags the first sentence tags for the member to be documented
-     * @param tdSummary the content tree to which the comment will be added
-     */
-    protected void addIndexComment(Doc member, Tag[] firstSentenceTags,
-            Content tdSummary) {
-        Tag[] deprs = member.tags("deprecated");
-        Content div;
-        if (utils.isDeprecated((ProgramElementDoc) member)) {
-            Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-            div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-            div.addContent(getSpace());
-            if (deprs.length > 0) {
-                addInlineDeprecatedComment(member, deprs[0], div);
-            }
-            tdSummary.addContent(div);
-            return;
-        } else {
-            ClassDoc cd = ((ProgramElementDoc)member).containingClass();
-            if (cd != null && utils.isDeprecated(cd)) {
-                Content deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, deprecatedPhrase);
-                div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
-                div.addContent(getSpace());
-                tdSummary.addContent(div);
-            }
-        }
-        addSummaryComment(member, firstSentenceTags, tdSummary);
-    }
-
-    /**
-     * Add the summary type for the member.
-     *
-     * @param mw the writer for the member being documented
-     * @param member the member to be documented
-     * @param tdSummaryType the content tree to which the type will be added
-     */
-    public void addSummaryType(AbstractMemberWriter mw, ProgramElementDoc member,
-            Content tdSummaryType) {
-        mw.addSummaryType(member, tdSummaryType);
-    }
-
-    /**
-     * Add the summary link for the member.
-     *
-     * @param mw the writer for the member being documented
-     * @param member the member to be documented
-     * @param contentTree the content tree to which the link will be added
-     */
-    public void addSummaryLinkComment(AbstractMemberWriter mw,
-            ProgramElementDoc member, Content contentTree) {
-        addSummaryLinkComment(mw, member, member.firstSentenceTags(), contentTree);
-    }
-
-    /**
-     * Add the summary link comment.
-     *
-     * @param mw the writer for the member being documented
-     * @param member the member being documented
-     * @param firstSentenceTags the first sentence tags for the member to be documented
-     * @param tdSummary the content tree to which the comment will be added
-     */
-    public void addSummaryLinkComment(AbstractMemberWriter mw,
-            ProgramElementDoc member, Tag[] firstSentenceTags, Content tdSummary) {
-        addIndexComment(member, firstSentenceTags, tdSummary);
-    }
-
-    /**
-     * Add the inherited member summary.
-     *
-     * @param mw the writer for the member being documented
-     * @param cd the class being documented
-     * @param member the member being documented
-     * @param isFirst true if its the first link being documented
-     * @param linksTree the content tree to which the summary will be added
-     */
-    public void addInheritedMemberSummary(AbstractMemberWriter mw, ClassDoc cd,
-            ProgramElementDoc member, boolean isFirst, Content linksTree) {
-        if (! isFirst) {
-            linksTree.addContent(", ");
-        }
-        mw.addInheritedSummaryLink(cd, member, linksTree);
-    }
-
-    /**
-     * Get the document content header tree
-     *
-     * @return a content tree the document content header
-     */
-    public Content getContentHeader() {
-        HtmlTree div = new HtmlTree(HtmlTag.DIV);
-        div.addStyle(HtmlStyle.contentContainer);
-        return div;
-    }
-
-    /**
-     * Add the class content tree.
-     *
-     * @param contentTree content tree to which the class content will be added
-     * @param classContentTree class content tree which will be added to the content tree
-     */
-    public void addClassContentTree(Content contentTree, Content classContentTree) {
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            mainTree.addContent(classContentTree);
-            contentTree.addContent(mainTree);
-        } else {
-            contentTree.addContent(classContentTree);
-        }
-    }
-
-    /**
-     * Add the annotation content tree.
-     *
-     * @param contentTree content tree to which the annotation content will be added
-     * @param annotationContentTree annotation content tree which will be added to the content tree
-     */
-    public void addAnnotationContentTree(Content contentTree, Content annotationContentTree) {
-        addClassContentTree(contentTree, annotationContentTree);
-    }
-
-    /**
-     * Get the member header tree
-     *
-     * @return a content tree the member header
-     */
-    public Content getMemberTreeHeader() {
-        HtmlTree li = new HtmlTree(HtmlTag.LI);
-        li.addStyle(HtmlStyle.blockList);
-        return li;
-    }
-
-    /**
-     * Add the member tree.
-     *
-     * @param memberSummaryTree the content tree representing the member summary
-     * @param memberTree the content tree representing the member
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree) {
-        if (configuration.allowTag(HtmlTag.SECTION)) {
-            HtmlTree htmlTree = HtmlTree.SECTION(getMemberTree(memberTree));
-            memberSummaryTree.addContent(htmlTree);
-        } else {
-            memberSummaryTree.addContent(getMemberTree(memberTree));
-        }
-    }
-
-    /**
-     * Get the member tree
-     *
-     * @param contentTree the tree used to generate the complete member tree
-     * @return a content tree for the member
-     */
-    public Content getMemberTree(Content contentTree) {
-        Content ul = HtmlTree.UL(HtmlStyle.blockList, contentTree);
-        return ul;
-    }
-
-    /**
-     * Get the member summary tree
-     *
-     * @param contentTree the tree used to generate the member summary tree
-     * @return a content tree for the member summary
-     */
-    public Content getMemberSummaryTree(Content contentTree) {
-        return getMemberTree(HtmlStyle.summary, contentTree);
-    }
-
-    /**
-     * Get the member details tree
-     *
-     * @param contentTree the tree used to generate the member details tree
-     * @return a content tree for the member details
-     */
-    public Content getMemberDetailsTree(Content contentTree) {
-        return getMemberTree(HtmlStyle.details, contentTree);
-    }
-
-    /**
-     * Get the member tree
-     *
-     * @param style the style class to be added to the content tree
-     * @param contentTree the tree used to generate the complete member tree
-     */
-    public Content getMemberTree(HtmlStyle style, Content contentTree) {
-        Content div = HtmlTree.DIV(style, getMemberTree(contentTree));
-        return div;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
deleted file mode 100644
index 1c8be3f8717..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.formats.html;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.ContentBuilder;
-import com.sun.tools.doclets.formats.html.markup.HtmlStyle;
-import com.sun.tools.doclets.formats.html.markup.HtmlTree;
-import com.sun.tools.doclets.formats.html.markup.RawHtml;
-import com.sun.tools.doclets.formats.html.markup.StringContent;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.builders.SerializedFormBuilder;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The taglet writer that writes HTML.
- *
- *  <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>
- *
- * @since 1.5
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- */
-
-@Deprecated
-public class TagletWriterImpl extends TagletWriter {
-
-    private final HtmlDocletWriter htmlWriter;
-    private final ConfigurationImpl configuration;
-    private final Utils utils;
-
-    public TagletWriterImpl(HtmlDocletWriter htmlWriter, boolean isFirstSentence) {
-        super(isFirstSentence);
-        this.htmlWriter = htmlWriter;
-        configuration = htmlWriter.configuration;
-        this.utils = configuration.utils;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getOutputInstance() {
-        return new ContentBuilder();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content codeTagOutput(Tag tag) {
-        Content result = HtmlTree.CODE(new StringContent(utils.normalizeNewlines(tag.text())));
-        return result;
-    }
-
-    protected Content indexTagOutput(Tag tag) {
-        String text = tag.text();
-        String tagText = "";
-        String desc = "";
-        if (text.isEmpty() || text.trim().isEmpty()) {
-            configuration.message.warning(tag.position(), "doclet.invalid_usage_of_tag", tag.name());
-        } else {
-            int len = text.length();
-            int tagTextEnd = 0;
-            int descstart = 0;
-            int start = 0;
-            Character term = ' ';
-            int cp = text.codePointAt(0);
-            if (cp == '"') {
-                term = '"';
-                start++;
-            }
-            for (int i = start; i < len; i += Character.charCount(cp)) {
-                cp = text.codePointAt(i);
-                if (cp == term) {
-                    tagTextEnd = i;
-                    break;
-                }
-            }
-            if (tagTextEnd < len - 1 && tagTextEnd != 0) {
-                descstart = tagTextEnd + 1;
-            }
-            String desctext = "";
-            if (descstart > 0) {
-                tagText = text.substring(start, tagTextEnd).trim();
-                desctext = text.substring(descstart, len).trim();
-                // strip off the white space which can be between tag description and the
-                // actual label.
-                for (int i = 0; i < desctext.length(); i++) {
-                    char ch2 = desctext.charAt(i);
-                    if (!(ch2 == ' ' || ch2 == '\t' || ch2 == '\n')) {
-                        desc = desctext.substring(i);
-                        break;
-                    }
-                }
-            } else {
-                if (term == '"') {
-                    if (tagTextEnd == 0) {
-                        // If unclosed quote, print out a warning and ignore the invalid tag text.
-                        configuration.message.warning(tag.position(), "doclet.invalid_usage_of_tag", tag.name());
-                        tagText = "";
-                    } else {
-                        tagText = text.substring(start, tagTextEnd).trim();
-                    }
-                } else {
-                    tagText = text.trim();
-                }
-                desc = "";
-            }
-        }
-        String anchorName = htmlWriter.getName(tagText);
-        Content result = HtmlTree.A_ID(anchorName, new StringContent(tagText));
-        if (configuration.createindex && !tagText.isEmpty()) {
-            SearchIndexItem si = new SearchIndexItem();
-            si.setLabel(tagText);
-            si.setDescription(desc);
-            if (tag.holder() instanceof ProgramElementDoc) {
-                if (tag.holder() instanceof MemberDoc) {
-                    si.setUrl(DocPath.forClass(((MemberDoc) tag.holder()).containingClass()).getPath()
-                            + "#" + anchorName);
-                    si.setHolder(((MemberDoc) tag.holder()).qualifiedName());
-                } else {
-                    si.setUrl(DocPath.forClass((ClassDoc) tag.holder()).getPath() + "#" + anchorName);
-                    si.setHolder(((ClassDoc) tag.holder()).qualifiedName());
-                }
-            } else if (tag.holder() instanceof PackageDoc) {
-                si.setUrl(DocPath.forPackage((PackageDoc) tag.holder()).getPath()
-                        + "/" + DocPaths.PACKAGE_SUMMARY.getPath() + "#" + anchorName);
-                si.setHolder(((PackageDoc) tag.holder()).name());
-            }
-            si.setCategory(configuration.getResource("doclet.SearchTags").toString());
-            configuration.tagSearchIndex.add(si);
-        }
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getDocRootOutput() {
-        String path;
-        if (htmlWriter.pathToRoot.isEmpty())
-            path = ".";
-        else
-            path = htmlWriter.pathToRoot.getPath();
-        return new StringContent(path);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content deprecatedTagOutput(Doc doc) {
-        ContentBuilder result = new ContentBuilder();
-        Tag[] deprs = doc.tags("deprecated");
-        if (doc instanceof ClassDoc) {
-            if (utils.isDeprecated((ProgramElementDoc) doc)) {
-                result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
-                        new StringContent(configuration.getText("doclet.Deprecated"))));
-                result.addContent(RawHtml.nbsp);
-                if (deprs.length > 0) {
-                    Tag[] commentTags = deprs[0].inlineTags();
-                    if (commentTags.length > 0) {
-                        result.addContent(commentTagsToOutput(null, doc,
-                            deprs[0].inlineTags(), false)
-                        );
-                    }
-                }
-            }
-        } else {
-            MemberDoc member = (MemberDoc) doc;
-            if (utils.isDeprecated((ProgramElementDoc) doc)) {
-                result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
-                        new StringContent(configuration.getText("doclet.Deprecated"))));
-                result.addContent(RawHtml.nbsp);
-                if (deprs.length > 0) {
-                    Content body = commentTagsToOutput(null, doc,
-                        deprs[0].inlineTags(), false);
-                    if (!body.isEmpty())
-                        result.addContent(HtmlTree.SPAN(HtmlStyle.deprecationComment, body));
-                }
-            } else {
-                if (utils.isDeprecated(member.containingClass())) {
-                    result.addContent(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
-                            new StringContent(configuration.getText("doclet.Deprecated"))));
-                    result.addContent(RawHtml.nbsp);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Content literalTagOutput(Tag tag) {
-        Content result = new StringContent(utils.normalizeNewlines(tag.text()));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public MessageRetriever getMsgRetriever() {
-        return configuration.message;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getParamHeader(String header) {
-        HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.paramLabel,
-                new StringContent(header)));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content paramTagOutput(ParamTag paramTag, String paramName) {
-        ContentBuilder body = new ContentBuilder();
-        body.addContent(HtmlTree.CODE(new RawHtml(paramName)));
-        body.addContent(" - ");
-        body.addContent(htmlWriter.commentTagsToContent(paramTag, null, paramTag.inlineTags(), false));
-        HtmlTree result = HtmlTree.DD(body);
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content propertyTagOutput(Tag tag, String prefix) {
-        Content body = new ContentBuilder();
-        body.addContent(new RawHtml(prefix));
-        body.addContent(" ");
-        body.addContent(HtmlTree.CODE(new RawHtml(tag.text())));
-        body.addContent(".");
-        Content result = HtmlTree.P(body);
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content returnTagOutput(Tag returnTag) {
-        ContentBuilder result = new ContentBuilder();
-        result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.returnLabel,
-                new StringContent(configuration.getText("doclet.Returns")))));
-        result.addContent(HtmlTree.DD(htmlWriter.commentTagsToContent(
-                returnTag, null, returnTag.inlineTags(), false)));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content seeTagOutput(Doc holder, SeeTag[] seeTags) {
-        ContentBuilder body = new ContentBuilder();
-        if (seeTags.length > 0) {
-            for (SeeTag seeTag : seeTags) {
-                appendSeparatorIfNotEmpty(body);
-                body.addContent(htmlWriter.seeTagToContent(seeTag));
-            }
-        }
-        if (holder.isField() && ((FieldDoc)holder).constantValue() != null &&
-                htmlWriter instanceof ClassWriterImpl) {
-            //Automatically add link to constant values page for constant fields.
-            appendSeparatorIfNotEmpty(body);
-            DocPath constantsPath =
-                    htmlWriter.pathToRoot.resolve(DocPaths.CONSTANT_VALUES);
-            String whichConstant =
-                    ((ClassWriterImpl) htmlWriter).getClassDoc().qualifiedName() + "." + ((FieldDoc) holder).name();
-            DocLink link = constantsPath.fragment(whichConstant);
-            body.addContent(htmlWriter.getHyperLink(link,
-                    new StringContent(configuration.getText("doclet.Constants_Summary"))));
-        }
-        if (holder.isClass() && ((ClassDoc)holder).isSerializable()) {
-            //Automatically add link to serialized form page for serializable classes.
-            if ((SerializedFormBuilder.serialInclude(holder) &&
-                      SerializedFormBuilder.serialInclude(((ClassDoc)holder).containingPackage()))) {
-                appendSeparatorIfNotEmpty(body);
-                DocPath serialPath = htmlWriter.pathToRoot.resolve(DocPaths.SERIALIZED_FORM);
-                DocLink link = serialPath.fragment(((ClassDoc)holder).qualifiedName());
-                body.addContent(htmlWriter.getHyperLink(link,
-                        new StringContent(configuration.getText("doclet.Serialized_Form"))));
-            }
-        }
-        if (body.isEmpty())
-            return body;
-
-        ContentBuilder result = new ContentBuilder();
-        result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel,
-                new StringContent(configuration.getText("doclet.See_Also")))));
-        result.addContent(HtmlTree.DD(body));
-        return result;
-
-    }
-
-    private void appendSeparatorIfNotEmpty(ContentBuilder body) {
-        if (!body.isEmpty()) {
-            body.addContent(", ");
-            body.addContent(DocletConstants.NL);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content simpleTagOutput(Tag[] simpleTags, String header) {
-        ContentBuilder result = new ContentBuilder();
-        result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
-        ContentBuilder body = new ContentBuilder();
-        for (int i = 0; i < simpleTags.length; i++) {
-            if (i > 0) {
-                body.addContent(", ");
-            }
-            body.addContent(htmlWriter.commentTagsToContent(
-                    simpleTags[i], null, simpleTags[i].inlineTags(), false));
-        }
-        result.addContent(HtmlTree.DD(body));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content simpleTagOutput(Tag simpleTag, String header) {
-        ContentBuilder result = new ContentBuilder();
-        result.addContent(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.simpleTagLabel, new RawHtml(header))));
-        Content body = htmlWriter.commentTagsToContent(
-                simpleTag, null, simpleTag.inlineTags(), false);
-        result.addContent(HtmlTree.DD(body));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getThrowsHeader() {
-        HtmlTree result = HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.throwsLabel,
-                new StringContent(configuration.getText("doclet.Throws"))));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content throwsTagOutput(ThrowsTag throwsTag) {
-        ContentBuilder body = new ContentBuilder();
-        Content excName = (throwsTag.exceptionType() == null) ?
-                new RawHtml(throwsTag.exceptionName()) :
-                htmlWriter.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER,
-                throwsTag.exceptionType()));
-        body.addContent(HtmlTree.CODE(excName));
-        Content desc = htmlWriter.commentTagsToContent(throwsTag, null,
-            throwsTag.inlineTags(), false);
-        if (desc != null && !desc.isEmpty()) {
-            body.addContent(" - ");
-            body.addContent(desc);
-        }
-        HtmlTree result = HtmlTree.DD(body);
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content throwsTagOutput(Type throwsType) {
-        HtmlTree result = HtmlTree.DD(HtmlTree.CODE(htmlWriter.getLink(
-                new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER, throwsType))));
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content valueTagOutput(FieldDoc field, String constantVal,
-            boolean includeLink) {
-        return includeLink ?
-            htmlWriter.getDocLink(LinkInfoImpl.Kind.VALUE_TAG, field,
-                constantVal, false) : new RawHtml(constantVal);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content commentTagsToOutput(Tag holderTag, Tag[] tags) {
-        return commentTagsToOutput(holderTag, null, tags, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content commentTagsToOutput(Doc holderDoc, Tag[] tags) {
-        return commentTagsToOutput(null, holderDoc, tags, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content commentTagsToOutput(Tag holderTag,
-        Doc holderDoc, Tag[] tags, boolean isFirstSentence) {
-        return htmlWriter.commentTagsToContent(
-            holderTag, holderDoc, tags, isFirstSentence);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Configuration configuration() {
-        return configuration;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
deleted file mode 100644
index 8f62376c075..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html;
-
-import java.io.IOException;
-import java.util.SortedSet;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Generate Class Hierarchy page for all the Classes in this run.  Use
- * ClassTree for building the Tree. The name of
- * the generated file is "overview-tree.html" and it is generated in the
- * current or the destination directory.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class TreeWriter extends AbstractTreeWriter {
-
-    /**
-     * Packages in this run.
-     */
-    SortedSet<PackageDoc> packages;
-
-    /**
-     * True if there are no packages specified on the command line,
-     * False otherwise.
-     */
-    private boolean classesonly;
-
-    /**
-     * Constructor to construct TreeWriter object.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @param filename String filename
-     * @param classtree the tree being built.
-     */
-    public TreeWriter(ConfigurationImpl configuration,
-            DocPath filename, ClassTree classtree) throws IOException {
-        super(configuration, filename, classtree);
-        packages = configuration.packages;
-        classesonly = packages.isEmpty();
-    }
-
-    /**
-     * Create a TreeWriter object and use it to generate the
-     * "overview-tree.html" file.
-     *
-     * @param classtree the class tree being documented.
-     * @throws  DocletAbortException
-     */
-    public static void generate(ConfigurationImpl configuration,
-                                ClassTree classtree) {
-        TreeWriter treegen;
-        DocPath filename = DocPaths.OVERVIEW_TREE;
-        try {
-            treegen = new TreeWriter(configuration, filename, classtree);
-            treegen.generateTreeFile();
-            treegen.close();
-        } catch (IOException exc) {
-            configuration.standardmessage.error(
-                        "doclet.exception_encountered",
-                        exc.toString(), filename);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    /**
-     * Generate the interface hierarchy and class hierarchy.
-     */
-    public void generateTreeFile() throws IOException {
-        HtmlTree body = getTreeHeader();
-        Content headContent = getResource("doclet.Hierarchy_For_All_Packages");
-        Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, false,
-                HtmlStyle.title, headContent);
-        Content div = HtmlTree.DIV(HtmlStyle.header, heading);
-        addPackageTreeLinks(div);
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN))
-                ? HtmlTree.MAIN()
-                : body;
-        htmlTree.addContent(div);
-        HtmlTree divTree = new HtmlTree(HtmlTag.DIV);
-        divTree.addStyle(HtmlStyle.contentContainer);
-        addTree(classtree.baseclasses(), "doclet.Class_Hierarchy", divTree);
-        addTree(classtree.baseinterfaces(), "doclet.Interface_Hierarchy", divTree);
-        addTree(classtree.baseAnnotationTypes(), "doclet.Annotation_Type_Hierarchy", divTree);
-        addTree(classtree.baseEnums(), "doclet.Enum_Hierarchy", divTree);
-        htmlTree.addContent(divTree);
-        if (configuration.allowTag(HtmlTag.MAIN)) {
-            body.addContent(htmlTree);
-        }
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            htmlTree = HtmlTree.FOOTER();
-        } else {
-            htmlTree = body;
-        }
-        addNavLinks(false, htmlTree);
-        addBottom(htmlTree);
-        if (configuration.allowTag(HtmlTag.FOOTER)) {
-            body.addContent(htmlTree);
-        }
-        printHtmlDocument(null, true, body);
-    }
-
-    /**
-     * Add the links to all the package tree files.
-     *
-     * @param contentTree the content tree to which the links will be added
-     */
-    protected void addPackageTreeLinks(Content contentTree) {
-        //Do nothing if only unnamed package is used
-        if (isUnnamedPackage()) {
-            return;
-        }
-        if (!classesonly) {
-            Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
-                    getResource("doclet.Package_Hierarchies"));
-            contentTree.addContent(span);
-            HtmlTree ul = new HtmlTree(HtmlTag.UL);
-            ul.addStyle(HtmlStyle.horizontal);
-            int i = 0;
-            for (PackageDoc pkg : packages) {
-                // If the package name length is 0 or if -nodeprecated option
-                // is set and the package is marked as deprecated, do not include
-                // the page in the list of package hierarchies.
-                if (pkg.name().isEmpty() ||
-                        (configuration.nodeprecated && utils.isDeprecated(pkg))) {
-                    i++;
-                    continue;
-                }
-                DocPath link = pathString(pkg, DocPaths.PACKAGE_TREE);
-                Content li = HtmlTree.LI(getHyperLink(
-                        link, new StringContent(pkg.name())));
-                if (i < packages.size() - 1) {
-                    li.addContent(", ");
-                }
-                ul.addContent(li);
-                i++;
-            }
-            contentTree.addContent(ul);
-        }
-    }
-
-    /**
-     * Get the tree header.
-     *
-     * @return a content tree for the tree header
-     */
-    protected HtmlTree getTreeHeader() {
-        String title = configuration.getText("doclet.Window_Class_Hierarchy");
-        HtmlTree bodyTree = getBody(true, getWindowTitle(title));
-        HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER))
-                ? HtmlTree.HEADER()
-                : bodyTree;
-        addTop(htmlTree);
-        addNavLinks(true, htmlTree);
-        if (configuration.allowTag(HtmlTag.HEADER)) {
-            bodyTree.addContent(htmlTree);
-        }
-        return bodyTree;
-    }
-
-    private boolean isUnnamedPackage() {
-        return packages.size() == 1 && packages.first().name().isEmpty();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
deleted file mode 100644
index d3ced42dd6e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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.doclets.formats.html;
-
-import java.io.IOException;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The factory that returns HTML writers.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class WriterFactoryImpl implements WriterFactory {
-
-    private final ConfigurationImpl configuration;
-
-    public WriterFactoryImpl(ConfigurationImpl configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ConstantsSummaryWriter getConstantsSummaryWriter() throws Exception {
-        return new ConstantsSummaryWriterImpl(configuration);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PackageSummaryWriter getPackageSummaryWriter(PackageDoc packageDoc,
-        PackageDoc prevPkg, PackageDoc nextPkg) throws Exception {
-        return new PackageWriterImpl(configuration, packageDoc,
-            prevPkg, nextPkg);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ClassWriter getClassWriter(ClassDoc classDoc, ClassDoc prevClass,
-            ClassDoc nextClass, ClassTree classTree) throws IOException {
-        return new ClassWriterImpl(configuration, classDoc,
-                prevClass, nextClass, classTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeWriter getAnnotationTypeWriter(
-        AnnotationTypeDoc annotationType, Type prevType, Type nextType)
-    throws Exception {
-        return new AnnotationTypeWriterImpl(configuration,
-                annotationType, prevType, nextType);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeFieldWriter
-            getAnnotationTypeFieldWriter(AnnotationTypeWriter annotationTypeWriter) throws Exception {
-        return new AnnotationTypeFieldWriterImpl(
-            (SubWriterHolderWriter) annotationTypeWriter,
-            annotationTypeWriter.getAnnotationTypeDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeOptionalMemberWriter
-            getAnnotationTypeOptionalMemberWriter(
-        AnnotationTypeWriter annotationTypeWriter) throws Exception {
-        return new AnnotationTypeOptionalMemberWriterImpl(
-            (SubWriterHolderWriter) annotationTypeWriter,
-            annotationTypeWriter.getAnnotationTypeDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnnotationTypeRequiredMemberWriter
-            getAnnotationTypeRequiredMemberWriter(AnnotationTypeWriter annotationTypeWriter) throws Exception {
-        return new AnnotationTypeRequiredMemberWriterImpl(
-            (SubWriterHolderWriter) annotationTypeWriter,
-            annotationTypeWriter.getAnnotationTypeDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public EnumConstantWriterImpl getEnumConstantWriter(ClassWriter classWriter)
-            throws Exception {
-        return new EnumConstantWriterImpl((SubWriterHolderWriter) classWriter,
-            classWriter.getClassDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public FieldWriterImpl getFieldWriter(ClassWriter classWriter)
-            throws Exception {
-        return new FieldWriterImpl((SubWriterHolderWriter) classWriter,
-            classWriter.getClassDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public PropertyWriterImpl getPropertyWriter(ClassWriter classWriter)
-            throws Exception {
-        return new PropertyWriterImpl((SubWriterHolderWriter) classWriter,
-            classWriter.getClassDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public MethodWriterImpl getMethodWriter(ClassWriter classWriter)
-            throws Exception {
-        return new MethodWriterImpl((SubWriterHolderWriter) classWriter,
-            classWriter.getClassDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ConstructorWriterImpl getConstructorWriter(ClassWriter classWriter)
-            throws Exception {
-        return new ConstructorWriterImpl((SubWriterHolderWriter) classWriter,
-            classWriter.getClassDoc());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public MemberSummaryWriter getMemberSummaryWriter(
-            ClassWriter classWriter, int memberType)
-            throws Exception {
-        switch (memberType) {
-            case VisibleMemberMap.CONSTRUCTORS:
-                return getConstructorWriter(classWriter);
-            case VisibleMemberMap.ENUM_CONSTANTS:
-                return getEnumConstantWriter(classWriter);
-            case VisibleMemberMap.FIELDS:
-                return getFieldWriter(classWriter);
-            case VisibleMemberMap.PROPERTIES:
-                return getPropertyWriter(classWriter);
-            case VisibleMemberMap.INNERCLASSES:
-                return new NestedClassWriterImpl((SubWriterHolderWriter)
-                    classWriter, classWriter.getClassDoc());
-            case VisibleMemberMap.METHODS:
-                return getMethodWriter(classWriter);
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public MemberSummaryWriter getMemberSummaryWriter(
-        AnnotationTypeWriter annotationTypeWriter, int memberType)
-    throws Exception {
-        switch (memberType) {
-            case VisibleMemberMap.ANNOTATION_TYPE_FIELDS:
-                return (AnnotationTypeFieldWriterImpl)
-                    getAnnotationTypeFieldWriter(annotationTypeWriter);
-            case VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL:
-                return (AnnotationTypeOptionalMemberWriterImpl)
-                    getAnnotationTypeOptionalMemberWriter(annotationTypeWriter);
-            case VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED:
-                return (AnnotationTypeRequiredMemberWriterImpl)
-                    getAnnotationTypeRequiredMemberWriter(annotationTypeWriter);
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public SerializedFormWriter getSerializedFormWriter() throws Exception {
-        return new SerializedFormWriterImpl(configuration);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
deleted file mode 100644
index 4d431c9cfbd..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for generating a comment for HTML pages of javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class Comment extends Content {
-
-    private String commentText;
-
-    /**
-     * Constructor to construct a Comment object.
-     *
-     * @param comment comment text for the comment
-     */
-    public Comment(String comment) {
-        commentText = nullCheck(comment);
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param content content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(Content content) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param stringContent string content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(String stringContent) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isEmpty() {
-        return commentText.isEmpty();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean write(Writer out, boolean atNewline) throws IOException {
-        if (!atNewline)
-            out.write(DocletConstants.NL);
-        out.write("<!-- ");
-        out.write(commentText);
-        out.write(" -->" + DocletConstants.NL);
-        return true;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
deleted file mode 100644
index 51dcae9bfa7..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * A sequence of Content nodes.
- */
-@Deprecated
-public class ContentBuilder extends Content {
-    protected List<Content> contents = Collections.emptyList();
-
-    @Override
-    public void addContent(Content content) {
-        nullCheck(content);
-        ensureMutableContents();
-        if (content instanceof ContentBuilder) {
-            contents.addAll(((ContentBuilder) content).contents);
-        } else
-            contents.add(content);
-    }
-
-    @Override
-    public void addContent(String text) {
-        if (text.isEmpty())
-            return;
-        ensureMutableContents();
-        Content c = contents.isEmpty() ? null : contents.get(contents.size() - 1);
-        StringContent sc;
-        if (c != null && c instanceof StringContent) {
-            sc = (StringContent) c;
-        } else {
-            contents.add(sc = new StringContent());
-        }
-        sc.addContent(text);
-    }
-
-    @Override
-    public boolean write(Writer writer, boolean atNewline) throws IOException {
-        for (Content content: contents) {
-            atNewline = content.write(writer, atNewline);
-        }
-        return atNewline;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        for (Content content: contents) {
-            if (!content.isEmpty())
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int charCount() {
-        int n = 0;
-        for (Content c : contents)
-            n += c.charCount();
-        return n;
-    }
-
-    private void ensureMutableContents() {
-        if (contents.isEmpty())
-            contents = new ArrayList<>();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
deleted file mode 100644
index e87d2776287..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for generating document type for HTML pages of javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class DocType extends Content {
-
-    private String docType;
-
-    public static final DocType TRANSITIONAL =
-            new DocType("Transitional", "http://www.w3.org/TR/html4/loose.dtd");
-
-    public static final DocType HTML5 = new DocType();
-
-    /**
-     * Constructor to construct a DocType object.
-     *
-     * @param type the doctype to be added
-     * @param dtd the dtd of the doctype
-     */
-    private DocType(String type, String dtd) {
-        docType = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 " + type +
-                "//EN\" \"" + dtd + "\">" + DocletConstants.NL;
-    }
-
-    /**
-     * Constructor to construct a DocType object.
-     */
-    private DocType() {
-        docType = "<!DOCTYPE HTML>" + DocletConstants.NL;
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param content content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(Content content) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param stringContent string content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(String stringContent) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isEmpty() {
-        return (docType.length() == 0);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean write(Writer out, boolean atNewline) throws IOException {
-        out.write(docType);
-        return true; // guaranteed by constructor
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
deleted file mode 100644
index 6c324eac7f2..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.doclets.formats.html.markup;
-
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Enum representing HTML tag attributes.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum HtmlAttr {
-    ALT,
-    CLASS,
-    CLEAR,
-    COLS,
-    CONTENT,
-    DISABLED,
-    HREF,
-    HTTP_EQUIV("http-equiv"),
-    ID,
-    LANG,
-    NAME,
-    ONLOAD,
-    REL,
-    ROLE,
-    ROWS,
-    SCOPE,
-    SCROLLING,
-    SRC,
-    SUMMARY,
-    TARGET,
-    TITLE,
-    TYPE,
-    VALUE,
-    WIDTH;
-
-    private final String value;
-
-    public enum Role {
-
-        BANNER,
-        CONTENTINFO,
-        MAIN,
-        NAVIGATION,
-        REGION;
-
-        private final String role;
-
-        Role() {
-            role = StringUtils.toLowerCase(name());
-        }
-
-        public String toString() {
-            return role;
-        }
-    }
-
-    HtmlAttr() {
-        this.value = StringUtils.toLowerCase(name());
-    }
-
-    HtmlAttr(String name) {
-        this.value = name;
-    }
-
-    public String toString() {
-        return value;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
deleted file mode 100644
index 54fedb0ef98..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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.doclets.formats.html.markup;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * Stores constants for Html Doclet.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class HtmlConstants {
-
-    /**
-     * Marker to identify start of top navigation bar.
-     */
-    public static final Content START_OF_TOP_NAVBAR =
-            new Comment("========= START OF TOP NAVBAR =======");
-
-    /**
-     * Marker to identify start of bottom navigation bar.
-     */
-    public static final Content START_OF_BOTTOM_NAVBAR =
-            new Comment("======= START OF BOTTOM NAVBAR ======");
-
-    /**
-     * Marker to identify end of top navigation bar.
-     */
-    public static final Content END_OF_TOP_NAVBAR =
-            new Comment("========= END OF TOP NAVBAR =========");
-
-    /**
-     * Marker to identify end of bottom navigation bar.
-     */
-    public static final Content END_OF_BOTTOM_NAVBAR =
-            new Comment("======== END OF BOTTOM NAVBAR =======");
-
-    /**
-     * Marker to identify start of class data.
-     */
-    public static final Content START_OF_CLASS_DATA =
-            new Comment("======== START OF CLASS DATA ========");
-
-    /**
-     * Marker to identify end of class data.
-     */
-    public static final Content END_OF_CLASS_DATA =
-            new Comment("========= END OF CLASS DATA =========");
-
-    /**
-     * Marker to identify start of nested class summary.
-     */
-    public static final Content START_OF_NESTED_CLASS_SUMMARY =
-            new Comment("======== NESTED CLASS SUMMARY ========");
-
-    /**
-     * Marker to identify start of annotation type optional member summary.
-     */
-    public static final Content START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY =
-            new Comment("=========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY ===========");
-
-    /**
-     * Marker to identify start of annotation type required member summary.
-     */
-    public static final Content START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY =
-            new Comment("=========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY ===========");
-
-    /**
-     * Marker to identify start of annotation type required member summary.
-     */
-    public static final Content START_OF_ANNOTATION_TYPE_FIELD_SUMMARY =
-            new Comment("=========== ANNOTATION TYPE FIELD SUMMARY ===========");
-
-    /**
-     * Marker to identify start of constructor summary.
-     */
-    public static final Content START_OF_CONSTRUCTOR_SUMMARY =
-            new Comment("======== CONSTRUCTOR SUMMARY ========");
-
-    /**
-     * Marker to identify start of enum constants summary.
-     */
-    public static final Content START_OF_ENUM_CONSTANT_SUMMARY =
-            new Comment("=========== ENUM CONSTANT SUMMARY ===========");
-
-    /**
-     * Marker to identify start of field summary.
-     */
-    public static final Content START_OF_FIELD_SUMMARY =
-            new Comment("=========== FIELD SUMMARY ===========");
-
-    /**
-     * Marker to identify start of properties summary.
-     */
-    public static final Content START_OF_PROPERTY_SUMMARY =
-            new Comment("=========== PROPERTY SUMMARY ===========");
-
-    /**
-     * Marker to identify start of method summary.
-     */
-    public static final Content START_OF_METHOD_SUMMARY =
-            new Comment("========== METHOD SUMMARY ===========");
-
-    /**
-     * Marker to identify start of annotation type details.
-     */
-    public static final Content START_OF_ANNOTATION_TYPE_DETAILS =
-            new Comment("============ ANNOTATION TYPE MEMBER DETAIL ===========");
-
-    /**
-     * Marker to identify start of annotation type field details.
-     */
-    public static final Content START_OF_ANNOTATION_TYPE_FIELD_DETAILS =
-            new Comment("============ ANNOTATION TYPE FIELD DETAIL ===========");
-
-    /**
-     * Marker to identify start of method details.
-     */
-    public static final Content START_OF_METHOD_DETAILS =
-            new Comment("============ METHOD DETAIL ==========");
-
-    /**
-     * Marker to identify start of field details.
-     */
-    public static final Content START_OF_FIELD_DETAILS =
-            new Comment("============ FIELD DETAIL ===========");
-
-    /**
-     * Marker to identify start of property details.
-     */
-    public static final Content START_OF_PROPERTY_DETAILS =
-            new Comment("============ PROPERTY DETAIL ===========");
-
-    /**
-     * Marker to identify start of constructor details.
-     */
-    public static final Content START_OF_CONSTRUCTOR_DETAILS =
-            new Comment("========= CONSTRUCTOR DETAIL ========");
-
-    /**
-     * Marker to identify start of enum constants details.
-     */
-    public static final Content START_OF_ENUM_CONSTANT_DETAILS =
-            new Comment("============ ENUM CONSTANT DETAIL ===========");
-
-    /**
-     * Html tag for the page title heading.
-     */
-    public static final HtmlTag TITLE_HEADING = HtmlTag.H1;
-
-    /**
-     * Html tag for the class page title heading.
-     */
-    public static final HtmlTag CLASS_PAGE_HEADING = HtmlTag.H2;
-
-    /**
-     * Html tag for the content heading.
-     */
-    public static final HtmlTag CONTENT_HEADING = HtmlTag.H2;
-
-    /**
-     * Html tag for the package name heading.
-     */
-    public static final HtmlTag PACKAGE_HEADING = HtmlTag.H2;
-
-    /**
-     * Html tag for the member summary heading.
-     */
-    public static final HtmlTag SUMMARY_HEADING = HtmlTag.H3;
-
-    /**
-     * Html tag for the inherited member summary heading.
-     */
-    public static final HtmlTag INHERITED_SUMMARY_HEADING = HtmlTag.H3;
-
-    /**
-     * Html tag for the member details heading.
-     */
-    public static final HtmlTag DETAILS_HEADING = HtmlTag.H3;
-
-    /**
-     * Html tag for the serialized member heading.
-     */
-    public static final HtmlTag SERIALIZED_MEMBER_HEADING = HtmlTag.H3;
-
-    /**
-     * Html tag for the member heading.
-     */
-    public static final HtmlTag MEMBER_HEADING = HtmlTag.H4;
-
-    /**
-     * Default charset for HTML.
-     */
-    public static final String HTML_DEFAULT_CHARSET = "utf-8";
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
deleted file mode 100644
index 7ea864f1394..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 1997, 2015, 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.doclets.formats.html.markup;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.ConfigurationImpl;
-import com.sun.tools.doclets.formats.html.SectionName;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.DocFile;
-import com.sun.tools.doclets.internal.toolkit.util.DocLink;
-import com.sun.tools.doclets.internal.toolkit.util.DocPath;
-import com.sun.tools.doclets.internal.toolkit.util.DocPaths;
-
-
-/**
- * Class for the Html Format Code Generation specific to JavaDoc.
- * This Class contains methods related to the Html Code Generation which
- * are used by the Sub-Classes in the package com.sun.tools.doclets.standard
- * and com.sun.tools.doclets.oneone.
- *
- *  <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>
- *
- * @since 1.2
- * @author Atul M Dambalkar
- * @author Robert Field
- */
-@Deprecated
-public abstract class HtmlDocWriter extends HtmlWriter {
-
-    public static final String CONTENT_TYPE = "text/html";
-
-    DocPath pathToRoot;
-
-    /**
-     * Constructor. Initializes the destination file name through the super
-     * class HtmlWriter.
-     *
-     * @param filename String file name.
-     */
-    public HtmlDocWriter(Configuration configuration, DocPath filename)
-            throws IOException {
-        super(configuration, filename);
-        this.pathToRoot = filename.parent().invert();
-        configuration.message.notice("doclet.Generating_0",
-            DocFile.createFileForOutput(configuration, filename).getPath());
-    }
-
-    /**
-     * Accessor for configuration.
-     */
-    public abstract Configuration configuration();
-
-    public Content getHyperLink(DocPath link, String label) {
-        return getHyperLink(link, new StringContent(label), false, "", "", "");
-    }
-
-    /**
-     * Get Html Hyper Link Content.
-     *
-     * @param where      Position of the link in the file. Character '#' is not
-     *                   needed.
-     * @param label      Tag for the link.
-     * @return a content tree for the hyper link
-     */
-    public Content getHyperLink(String where,
-                               Content label) {
-        return getHyperLink(getDocLink(where), label, "", "");
-    }
-
-    /**
-     * Get Html Hyper Link Content.
-     *
-     * @param sectionName      The section name to which the link will be created.
-     * @param label            Tag for the link.
-     * @return a content tree for the hyper link
-     */
-    public Content getHyperLink(SectionName sectionName,
-                               Content label) {
-        return getHyperLink(getDocLink(sectionName), label, "", "");
-    }
-
-    /**
-     * Get Html Hyper Link Content.
-     *
-     * @param sectionName      The section name combined with where to which the link
-     *                         will be created.
-     * @param where            The fragment combined with sectionName to which the link
-     *                         will be created.
-     * @param label            Tag for the link.
-     * @return a content tree for the hyper link
-     */
-    public Content getHyperLink(SectionName sectionName, String where,
-                               Content label) {
-        return getHyperLink(getDocLink(sectionName, where), label, "", "");
-    }
-
-    /**
-     * Get the link.
-     *
-     * @param where      Position of the link in the file.
-     * @return a DocLink object for the hyper link
-     */
-    public DocLink getDocLink(String where) {
-        return DocLink.fragment(getName(where));
-    }
-
-    /**
-     * Get the link.
-     *
-     * @param sectionName      The section name to which the link will be created.
-     * @return a DocLink object for the hyper link
-     */
-    public DocLink getDocLink(SectionName sectionName) {
-        return DocLink.fragment(sectionName.getName());
-    }
-
-    /**
-     * Get the link.
-     *
-     * @param sectionName      The section name combined with where to which the link
-     *                         will be created.
-     * @param where            The fragment combined with sectionName to which the link
-     *                         will be created.
-     * @return a DocLink object for the hyper link
-     */
-    public DocLink getDocLink(SectionName sectionName, String where) {
-        return DocLink.fragment(sectionName.getName() + getName(where));
-    }
-
-    /**
-     * Convert the name to a valid HTML name.
-     *
-     * @param name the name that needs to be converted to valid HTML name.
-     * @return a valid HTML name string.
-     */
-    public String getName(String name) {
-        StringBuilder sb = new StringBuilder();
-        char ch;
-        /* The HTML 4 spec at http://www.w3.org/TR/html4/types.html#h-6.2 mentions
-         * that the name/id should begin with a letter followed by other valid characters.
-         * The HTML 5 spec (draft) is more permissive on names/ids where the only restriction
-         * is that it should be at least one character long and should not contain spaces.
-         * The spec draft is @ http://www.w3.org/html/wg/drafts/html/master/dom.html#the-id-attribute.
-         *
-         * For HTML 4, we need to check for non-characters at the beginning of the name and
-         * substitute it accordingly, "_" and "$" can appear at the beginning of a member name.
-         * The method substitutes "$" with "Z:Z:D" and will prefix "_" with "Z:Z".
-         */
-        for (int i = 0; i < name.length(); i++) {
-            ch = name.charAt(i);
-            switch (ch) {
-                case '(':
-                case ')':
-                case '<':
-                case '>':
-                case ',':
-                    sb.append('-');
-                    break;
-                case ' ':
-                case '[':
-                    break;
-                case ']':
-                    sb.append(":A");
-                    break;
-                // Any appearance of $ needs to be substituted with ":D" and not with hyphen
-                // since a field name "P$$ and a method P(), both valid member names, can end
-                // up as "P--". A member name beginning with $ needs to be substituted with
-                // "Z:Z:D".
-                case '$':
-                    if (i == 0)
-                        sb.append("Z:Z");
-                    sb.append(":D");
-                    break;
-                // A member name beginning with _ needs to be prefixed with "Z:Z" since valid anchor
-                // names can only begin with a letter.
-                case '_':
-                    if (i == 0)
-                        sb.append("Z:Z");
-                    sb.append(ch);
-                    break;
-                default:
-                    sb.append(ch);
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Get Html hyperlink.
-     *
-     * @param link       path of the file.
-     * @param label      Tag for the link.
-     * @return a content tree for the hyper link
-     */
-    public Content getHyperLink(DocPath link, Content label) {
-        return getHyperLink(link, label, "", "");
-    }
-
-    public Content getHyperLink(DocLink link, Content label) {
-        return getHyperLink(link, label, "", "");
-    }
-
-    public Content getHyperLink(DocPath link,
-                               Content label, boolean strong,
-                               String stylename, String title, String target) {
-        return getHyperLink(new DocLink(link), label, strong,
-                stylename, title, target);
-    }
-
-    public Content getHyperLink(DocLink link,
-                               Content label, boolean strong,
-                               String stylename, String title, String target) {
-        Content body = label;
-        if (strong) {
-            body = HtmlTree.SPAN(HtmlStyle.typeNameLink, body);
-        }
-        if (stylename != null && stylename.length() != 0) {
-            HtmlTree t = new HtmlTree(HtmlTag.FONT, body);
-            t.addAttr(HtmlAttr.CLASS, stylename);
-            body = t;
-        }
-        HtmlTree l = HtmlTree.A(link.toString(), body);
-        if (title != null && title.length() != 0) {
-            l.addAttr(HtmlAttr.TITLE, title);
-        }
-        if (target != null && target.length() != 0) {
-            l.addAttr(HtmlAttr.TARGET, target);
-        }
-        return l;
-    }
-
-    /**
-     * Get Html Hyper Link.
-     *
-     * @param link       String name of the file.
-     * @param label      Tag for the link.
-     * @param title      String that describes the link's content for accessibility.
-     * @param target     Target frame.
-     * @return a content tree for the hyper link.
-     */
-    public Content getHyperLink(DocPath link,
-            Content label, String title, String target) {
-        return getHyperLink(new DocLink(link), label, title, target);
-    }
-
-    public Content getHyperLink(DocLink link,
-            Content label, String title, String target) {
-        HtmlTree anchor = HtmlTree.A(link.toString(), label);
-        if (title != null && title.length() != 0) {
-            anchor.addAttr(HtmlAttr.TITLE, title);
-        }
-        if (target != null && target.length() != 0) {
-            anchor.addAttr(HtmlAttr.TARGET, target);
-        }
-        return anchor;
-    }
-
-    /**
-     * Get the name of the package, this class is in.
-     *
-     * @param cd    ClassDoc.
-     */
-    public String getPkgName(ClassDoc cd) {
-        String pkgName = cd.containingPackage().name();
-        if (pkgName.length() > 0) {
-            pkgName += ".";
-            return pkgName;
-        }
-        return "";
-    }
-
-    public boolean getMemberDetailsListPrinted() {
-        return memberDetailsListPrinted;
-    }
-
-    /**
-     * Print the frames version of the Html file header.
-     * Called only when generating an HTML frames file.
-     *
-     * @param title Title of this HTML document
-     * @param configuration the configuration object
-     * @param body the body content tree to be added to the HTML document
-     */
-    public void printFramesDocument(String title, ConfigurationImpl configuration,
-            HtmlTree body) throws IOException {
-        Content htmlDocType = configuration.isOutputHtml5()
-                ? DocType.HTML5
-                : DocType.TRANSITIONAL;
-        Content htmlComment = new Comment(configuration.getText("doclet.New_Page"));
-        Content head = new HtmlTree(HtmlTag.HEAD);
-        head.addContent(getGeneratedBy(!configuration.notimestamp));
-        Content windowTitle = HtmlTree.TITLE(new StringContent(title));
-        head.addContent(windowTitle);
-        Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
-                (configuration.charset.length() > 0) ?
-                        configuration.charset : HtmlConstants.HTML_DEFAULT_CHARSET);
-        head.addContent(meta);
-        head.addContent(getStyleSheetProperties(configuration));
-        head.addContent(getFramesJavaScript());
-        Content htmlTree = HtmlTree.HTML(configuration.getLocale().getLanguage(),
-                head, body);
-        Content htmlDocument = new HtmlDocument(htmlDocType,
-                htmlComment, htmlTree);
-        write(htmlDocument);
-    }
-
-    /**
-     * Returns a link to the stylesheet file.
-     *
-     * @return an HtmlTree for the lINK tag which provides the stylesheet location
-     */
-    public HtmlTree getStyleSheetProperties(ConfigurationImpl configuration) {
-        String stylesheetfile = configuration.stylesheetfile;
-        DocPath stylesheet;
-        if (stylesheetfile.isEmpty()) {
-            stylesheet = DocPaths.STYLESHEET;
-        } else {
-            DocFile file = DocFile.createFileForInput(configuration, stylesheetfile);
-            stylesheet = DocPath.create(file.getName());
-        }
-        HtmlTree link = HtmlTree.LINK("stylesheet", "text/css",
-                pathToRoot.resolve(stylesheet).getPath(),
-                "Style");
-        return link;
-    }
-
-    protected Comment getGeneratedBy(boolean timestamp) {
-        String text = "Generated by javadoc"; // marker string, deliberately not localized
-        if (timestamp) {
-            Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
-            Date today = calendar.getTime();
-            text += " ("+ configuration.getDocletSpecificBuildDate() + ") on " + today;
-        }
-        return new Comment(text);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
deleted file mode 100644
index ab60fc73208..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for generating an HTML document for javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class HtmlDocument extends Content {
-
-    private List<Content> docContent = Collections.emptyList();
-
-    /**
-     * Constructor to construct an HTML document.
-     *
-     * @param docType document type for the HTML document
-     * @param docComment comment for the document
-     * @param htmlTree HTML tree of the document
-     */
-    public HtmlDocument(Content docType, Content docComment, Content htmlTree) {
-        docContent = new ArrayList<>();
-        addContent(nullCheck(docType));
-        addContent(nullCheck(docComment));
-        addContent(nullCheck(htmlTree));
-    }
-
-    /**
-     * Constructor to construct an HTML document.
-     *
-     * @param docType document type for the HTML document
-     * @param htmlTree HTML tree of the document
-     */
-    public HtmlDocument(Content docType, Content htmlTree) {
-        docContent = new ArrayList<>();
-        addContent(nullCheck(docType));
-        addContent(nullCheck(htmlTree));
-    }
-
-    /**
-     * Adds content for the HTML document.
-     *
-     * @param htmlContent html content to be added
-     */
-    public final void addContent(Content htmlContent) {
-        if (htmlContent.isValid())
-            docContent.add(htmlContent);
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param stringContent string content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(String stringContent) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isEmpty() {
-        return (docContent.isEmpty());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean write(Writer out,  boolean atNewline) throws IOException {
-        for (Content c : docContent)
-            atNewline = c.write(out, atNewline);
-        return atNewline;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
deleted file mode 100644
index 52a3b573f5f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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.doclets.formats.html.markup;
-
-/**
- * Enum representing HTML styles. The name map to values in the CSS file.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum HtmlStyle {
-    aboutLanguage,
-    activeTableTab,
-    altColor,
-    bar,
-    block,
-    blockList,
-    blockListLast,
-    bottomNav,
-    circle,
-    classUseContainer,
-    colFirst,
-    colLast,
-    colOne,
-    constantsSummary,
-    constantValuesContainer,
-    contentContainer,
-    deprecatedContent,
-    deprecatedLabel,
-    deprecatedSummary,
-    deprecationComment,
-    description,
-    descfrmTypeLabel,
-    details,
-    docSummary,
-    emphasizedPhrase,
-    fixedNav,
-    header,
-    horizontal,
-    footer,
-    indexContainer,
-    indexNav,
-    inheritance,
-    interfaceName,
-    leftContainer,
-    leftTop,
-    leftBottom,
-    legalCopy,
-    mainContainer,
-    memberNameLabel,
-    memberNameLink,
-    memberSummary,
-    nameValue,
-    navBarCell1Rev,
-    navList,
-    navListSearch,
-    navPadding,
-    overrideSpecifyLabel,
-    overviewSummary,
-    packageHierarchyLabel,
-    packageLabelInClass,
-    paramLabel,
-    returnLabel,
-    rightContainer,
-    rightIframe,
-    rowColor,
-    searchTagLink,
-    seeLabel,
-    serializedFormContainer,
-    simpleTagLabel,
-    skipNav,
-    sourceContainer,
-    sourceLineNo,
-    subNav,
-    subNavList,
-    subTitle,
-    summary,
-    tabEnd,
-    tableTab,
-    throwsLabel,
-    title,
-    topNav,
-    typeNameLabel,
-    typeNameLink,
-    typeSummary,
-    useSummary
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
deleted file mode 100644
index d8fad045a0c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.doclets.formats.html.markup;
-
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Enum representing HTML tags.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum HtmlTag {
-    A(BlockType.INLINE, EndTag.END),
-    BLOCKQUOTE,
-    BODY(BlockType.OTHER, EndTag.END),
-    BR(BlockType.INLINE, EndTag.NOEND),
-    CAPTION,
-    CENTER(HtmlVersion.HTML4),
-    CODE(BlockType.INLINE, EndTag.END),
-    DD,
-    DIR(HtmlVersion.HTML4),
-    DIV,
-    DL,
-    DT,
-    EM(BlockType.INLINE, EndTag.END),
-    FONT(HtmlVersion.HTML4, BlockType.INLINE, EndTag.END),
-    FOOTER(HtmlVersion.HTML5),
-    H1,
-    H2,
-    H3,
-    H4,
-    H5,
-    H6,
-    HEAD(BlockType.OTHER, EndTag.END),
-    HEADER(HtmlVersion.HTML5),
-    HR(BlockType.BLOCK, EndTag.NOEND),
-    HTML(BlockType.OTHER, EndTag.END),
-    I(BlockType.INLINE, EndTag.END),
-    IFRAME(BlockType.OTHER, EndTag.END),
-    IMG(BlockType.INLINE, EndTag.NOEND),
-    INPUT(BlockType.BLOCK, EndTag.NOEND),
-    LI,
-    LISTING,
-    LINK(BlockType.OTHER, EndTag.NOEND),
-    MAIN(HtmlVersion.HTML5),
-    MENU,
-    META(BlockType.OTHER, EndTag.NOEND),
-    NAV(HtmlVersion.HTML5),
-    NOSCRIPT(BlockType.OTHER, EndTag.END),
-    OL,
-    P,
-    PRE,
-    SCRIPT(BlockType.OTHER, EndTag.END),
-    SECTION(HtmlVersion.HTML5),
-    SMALL(BlockType.INLINE, EndTag.END),
-    SPAN(BlockType.INLINE, EndTag.END),
-    STRONG(BlockType.INLINE, EndTag.END),
-    SUB(BlockType.INLINE, EndTag.END),
-    TABLE,
-    TBODY,
-    TD,
-    TH,
-    TITLE(BlockType.OTHER, EndTag.END),
-    TR,
-    TT(HtmlVersion.HTML4, BlockType.INLINE, EndTag.END),
-    UL;
-
-    public final BlockType blockType;
-    public final EndTag endTag;
-    public final String value;
-    public final HtmlVersion htmlVersion;
-
-    /**
-     * Enum representing the type of HTML element.
-     */
-    public static enum BlockType {
-        BLOCK,
-        INLINE,
-        OTHER
-    }
-
-    /**
-     * Enum representing HTML end tag requirement.
-     */
-    public static enum EndTag {
-        END,
-        NOEND
-    }
-
-    HtmlTag() {
-        this(HtmlVersion.ALL, BlockType.BLOCK, EndTag.END);
-    }
-
-    HtmlTag(HtmlVersion htmlVersion) {
-        this(htmlVersion, BlockType.BLOCK, EndTag.END);
-    }
-
-    HtmlTag(BlockType blockType, EndTag endTag ) {
-        this(HtmlVersion.ALL, blockType, endTag);
-    }
-
-    HtmlTag(HtmlVersion htmlVersion, BlockType blockType, EndTag endTag ) {
-        this.htmlVersion = htmlVersion;
-        this.blockType = blockType;
-        this.endTag = endTag;
-        this.value = StringUtils.toLowerCase(name());
-    }
-
-    /**
-     * Returns true if the end tag is required. This is specific to the standard
-     * doclet and does not exactly resemble the W3C specifications.
-     *
-     * @return true if end tag needs to be displayed else return false
-     */
-    public boolean endTagRequired() {
-        return (endTag == EndTag.END);
-    }
-
-    /**
-     * Returns true if the tag is allowed in the output HTML version of this javadoc run.
-     *
-     * @param htmlVer the output HTML version for this javadoc run
-     * @return true if the tag is allowed
-     */
-    public boolean allowTag(HtmlVersion htmlVer) {
-        return (this.htmlVersion == HtmlVersion.ALL || this.htmlVersion == htmlVer);
-    }
-
-    public String toString() {
-        return value;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
deleted file mode 100644
index f2aa755337e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
+++ /dev/null
@@ -1,973 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
-import java.nio.charset.*;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.formats.html.markup.HtmlAttr.Role;
-
-/**
- * Class for generating HTML tree for javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class HtmlTree extends Content {
-
-    private HtmlTag htmlTag;
-    private Map<HtmlAttr,String> attrs = Collections.emptyMap();
-    private List<Content> content = Collections.emptyList();
-    public static final Content EMPTY = new StringContent("");
-
-    /**
-     * Constructor to construct HtmlTree object.
-     *
-     * @param tag HTML tag for the HtmlTree object
-     */
-    public HtmlTree(HtmlTag tag) {
-        htmlTag = nullCheck(tag);
-    }
-
-    /**
-     * Constructor to construct HtmlTree object.
-     *
-     * @param tag HTML tag for the HtmlTree object
-     * @param contents contents to be added to the tree
-     */
-    public HtmlTree(HtmlTag tag, Content... contents) {
-        this(tag);
-        for (Content content: contents)
-            addContent(content);
-    }
-
-    /**
-     * Adds an attribute for the HTML tag.
-     *
-     * @param attrName name of the attribute
-     * @param attrValue value of the attribute
-     */
-    public void addAttr(HtmlAttr attrName, String attrValue) {
-        if (attrs.isEmpty())
-            attrs = new LinkedHashMap<>(3);
-        attrs.put(nullCheck(attrName), escapeHtmlChars(attrValue));
-    }
-
-    public void setTitle(Content body) {
-        addAttr(HtmlAttr.TITLE, stripHtml(body));
-    }
-
-    public void setRole(Role role) {
-        addAttr(HtmlAttr.ROLE, role.toString());
-    }
-
-    /**
-     * Adds a style for the HTML tag.
-     *
-     * @param style style to be added
-     */
-    public void addStyle(HtmlStyle style) {
-        addAttr(HtmlAttr.CLASS, style.toString());
-    }
-
-    /**
-     * Adds content for the HTML tag.
-     *
-     * @param tagContent tag content to be added
-     */
-    public void addContent(Content tagContent) {
-        if (tagContent instanceof ContentBuilder) {
-            for (Content content: ((ContentBuilder)tagContent).contents) {
-                addContent(content);
-            }
-        }
-        else if (tagContent == HtmlTree.EMPTY || tagContent.isValid()) {
-            if (content.isEmpty())
-                content = new ArrayList<>();
-            content.add(tagContent);
-        }
-    }
-
-    /**
-     * This method adds a string content to the htmltree. If the last content member
-     * added is a StringContent, append the string to that StringContent or else
-     * create a new StringContent and add it to the html tree.
-     *
-     * @param stringContent string content that needs to be added
-     */
-    public void addContent(String stringContent) {
-        if (!content.isEmpty()) {
-            Content lastContent = content.get(content.size() - 1);
-            if (lastContent instanceof StringContent)
-                lastContent.addContent(stringContent);
-            else
-                addContent(new StringContent(stringContent));
-        }
-        else
-            addContent(new StringContent(stringContent));
-    }
-
-    public int charCount() {
-        int n = 0;
-        for (Content c : content)
-            n += c.charCount();
-        return n;
-    }
-
-    /**
-     * Given a string, escape all special html characters and
-     * return the result.
-     *
-     * @param s The string to check.
-     * @return the original string with all of the HTML characters escaped.
-     */
-    private static String escapeHtmlChars(String s) {
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-            switch (ch) {
-                // only start building a new string if we need to
-                case '<': case '>': case '&':
-                    StringBuilder sb = new StringBuilder(s.substring(0, i));
-                    for ( ; i < s.length(); i++) {
-                        ch = s.charAt(i);
-                        switch (ch) {
-                            case '<': sb.append("&lt;");  break;
-                            case '>': sb.append("&gt;");  break;
-                            case '&': sb.append("&amp;"); break;
-                            default:  sb.append(ch);      break;
-                        }
-                    }
-                    return sb.toString();
-            }
-        }
-        return s;
-    }
-
-    /**
-     * A set of ASCII URI characters to be left unencoded.
-     */
-    public static final BitSet NONENCODING_CHARS = new BitSet(256);
-
-    static {
-        // alphabetic characters
-        for (int i = 'a'; i <= 'z'; i++) {
-            NONENCODING_CHARS.set(i);
-        }
-        for (int i = 'A'; i <= 'Z'; i++) {
-            NONENCODING_CHARS.set(i);
-        }
-        // numeric characters
-        for (int i = '0'; i <= '9'; i++) {
-            NONENCODING_CHARS.set(i);
-        }
-        // Reserved characters as per RFC 3986. These are set of delimiting characters.
-        String noEnc = ":/?#[]@!$&'()*+,;=";
-        // Unreserved characters as per RFC 3986 which should not be percent encoded.
-        noEnc += "-._~";
-        for (int i = 0; i < noEnc.length(); i++) {
-            NONENCODING_CHARS.set(noEnc.charAt(i));
-        }
-    }
-
-    private static String encodeURL(String url) {
-        StringBuilder sb = new StringBuilder();
-        for (byte c : url.getBytes(Charset.forName("UTF-8"))) {
-            if (NONENCODING_CHARS.get(c & 0xFF)) {
-                sb.append((char) c);
-            } else {
-                sb.append(String.format("%%%02X", c & 0xFF));
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Generates an HTML anchor tag.
-     *
-     * @param ref reference url for the anchor tag
-     * @param body content for the anchor tag
-     * @return an HtmlTree object
-     */
-    public static HtmlTree A(String ref, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.A, nullCheck(body));
-        htmltree.addAttr(HtmlAttr.HREF, encodeURL(ref));
-        return htmltree;
-    }
-
-    /**
-     * Generates an HTML anchor tag with an id or a name attribute and content.
-     *
-     * @param htmlVersion the version of the generated HTML
-     * @param attr name or id attribute for the anchor tag
-     * @param body content for the anchor tag
-     * @return an HtmlTree object
-     */
-    public static HtmlTree A(HtmlVersion htmlVersion, String attr, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.A);
-        htmltree.addAttr((htmlVersion == HtmlVersion.HTML4)
-                ? HtmlAttr.NAME
-                : HtmlAttr.ID,
-                nullCheck(attr));
-        htmltree.addContent(nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates an HTML anchor tag with id attribute and a body.
-     *
-     * @param id id for the anchor tag
-     * @param body body for the anchor tag
-     * @return an HtmlTree object
-     */
-    public static HtmlTree A_ID(String id, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.A);
-        htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
-        htmltree.addContent(nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a CAPTION tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the CAPTION tag
-     */
-    public static HtmlTree CAPTION(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.CAPTION, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a CODE tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the CODE tag
-     */
-    public static HtmlTree CODE(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.CODE, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a DD tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the DD tag
-     */
-    public static HtmlTree DD(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.DD, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a DL tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the DL tag
-     */
-    public static HtmlTree DL(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.DL, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a DIV tag with the style class attributes. It also encloses
-     * a content.
-     *
-     * @param styleClass stylesheet class for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the DIV tag
-     */
-    public static HtmlTree DIV(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.DIV, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a DIV tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the DIV tag
-     */
-    public static HtmlTree DIV(Content body) {
-        return DIV(null, body);
-    }
-
-    /**
-     * Generates a DT tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the DT tag
-     */
-    public static HtmlTree DT(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.DT, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a FOOTER tag with role attribute.
-     *
-     * @return an HtmlTree object for the FOOTER tag
-     */
-    public static HtmlTree FOOTER() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.FOOTER);
-        htmltree.setRole(Role.CONTENTINFO);
-        return htmltree;
-    }
-
-    /**
-     * Generates a HEADER tag with role attribute.
-     *
-     * @return an HtmlTree object for the HEADER tag
-     */
-    public static HtmlTree HEADER() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.HEADER);
-        htmltree.setRole(Role.BANNER);
-        return htmltree;
-    }
-
-    /**
-     * Generates a heading tag (h1 to h6) with the title and style class attributes. It also encloses
-     * a content.
-     *
-     * @param headingTag the heading tag to be generated
-     * @param printTitle true if title for the tag needs to be printed else false
-     * @param styleClass stylesheet class for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the tag
-     */
-    public static HtmlTree HEADING(HtmlTag headingTag, boolean printTitle,
-            HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(headingTag, nullCheck(body));
-        if (printTitle)
-            htmltree.setTitle(body);
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a heading tag (h1 to h6) with style class attribute. It also encloses
-     * a content.
-     *
-     * @param headingTag the heading tag to be generated
-     * @param styleClass stylesheet class for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the tag
-     */
-    public static HtmlTree HEADING(HtmlTag headingTag, HtmlStyle styleClass, Content body) {
-        return HEADING(headingTag, false, styleClass, body);
-    }
-
-    /**
-     * Generates a heading tag (h1 to h6) with the title attribute. It also encloses
-     * a content.
-     *
-     * @param headingTag the heading tag to be generated
-     * @param printTitle true if the title for the tag needs to be printed else false
-     * @param body content for the tag
-     * @return an HtmlTree object for the tag
-     */
-    public static HtmlTree HEADING(HtmlTag headingTag, boolean printTitle, Content body) {
-        return HEADING(headingTag, printTitle, null, body);
-    }
-
-    /**
-     * Generates a heading tag (h1 to h6)  with some content.
-     *
-     * @param headingTag the heading tag to be generated
-     * @param body content for the tag
-     * @return an HtmlTree object for the tag
-     */
-    public static HtmlTree HEADING(HtmlTag headingTag, Content body) {
-        return HEADING(headingTag, false, null, body);
-    }
-
-    /**
-     * Generates an HTML tag with lang attribute. It also adds head and body
-     * content to the HTML tree.
-     *
-     * @param lang language for the HTML document
-     * @param head head for the HTML tag
-     * @param body body for the HTML tag
-     * @return an HtmlTree object for the HTML tag
-     */
-    public static HtmlTree HTML(String lang, Content head, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.HTML, nullCheck(head), nullCheck(body));
-        htmltree.addAttr(HtmlAttr.LANG, nullCheck(lang));
-        return htmltree;
-    }
-
-    /**
-     * Generates a IFRAME tag.
-     *
-     * @param src the url of the document to be shown in the frame
-     * @param name specifies the name of the frame
-     * @param title the title for the frame
-     * @return an HtmlTree object for the IFRAME tag
-     */
-    public static HtmlTree IFRAME(String src, String name, String title) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.IFRAME);
-        htmltree.addAttr(HtmlAttr.SRC, nullCheck(src));
-        htmltree.addAttr(HtmlAttr.NAME, nullCheck(name));
-        htmltree.addAttr(HtmlAttr.TITLE, nullCheck(title));
-        return htmltree;
-    }
-
-    /**
-     * Generates a INPUT tag with some id.
-     *
-     * @param type the type of input
-     * @param id id for the tag
-     * @return an HtmlTree object for the INPUT tag
-     */
-    public static HtmlTree INPUT(String type, String id) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.INPUT);
-        htmltree.addAttr(HtmlAttr.TYPE, nullCheck(type));
-        htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
-        htmltree.addAttr(HtmlAttr.VALUE, " ");
-        htmltree.addAttr(HtmlAttr.DISABLED, "disabled");
-        return htmltree;
-    }
-
-    /**
-     * Generates a LI tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the LI tag
-     */
-    public static HtmlTree LI(Content body) {
-        return LI(null, body);
-    }
-
-    /**
-     * Generates a LI tag with some content.
-     *
-     * @param styleClass style for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the LI tag
-     */
-    public static HtmlTree LI(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.LI, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a LINK tag with the rel, type, href and title attributes.
-     *
-     * @param rel relevance of the link
-     * @param type type of link
-     * @param href the path for the link
-     * @param title title for the link
-     * @return an HtmlTree object for the LINK tag
-     */
-    public static HtmlTree LINK(String rel, String type, String href, String title) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.LINK);
-        htmltree.addAttr(HtmlAttr.REL, nullCheck(rel));
-        htmltree.addAttr(HtmlAttr.TYPE, nullCheck(type));
-        htmltree.addAttr(HtmlAttr.HREF, nullCheck(href));
-        htmltree.addAttr(HtmlAttr.TITLE, nullCheck(title));
-        return htmltree;
-    }
-
-    /**
-     * Generates a MAIN tag with role attribute.
-     *
-     * @return an HtmlTree object for the MAIN tag
-     */
-    public static HtmlTree MAIN() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.MAIN);
-        htmltree.setRole(Role.MAIN);
-        return htmltree;
-    }
-
-    /**
-     * Generates a MAIN tag with role attribute and some content.
-     *
-     * @param body content of the MAIN tag
-     * @return an HtmlTree object for the MAIN tag
-     */
-    public static HtmlTree MAIN(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.MAIN, nullCheck(body));
-        htmltree.setRole(Role.MAIN);
-        return htmltree;
-    }
-
-    /**
-     * Generates a MAIN tag with role attribute, style attribute and some content.
-     *
-     * @param styleClass style of the MAIN tag
-     * @param body content of the MAIN tag
-     * @return an HtmlTree object for the MAIN tag
-     */
-    public static HtmlTree MAIN(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = HtmlTree.MAIN(body);
-        if (styleClass != null) {
-            htmltree.addStyle(styleClass);
-        }
-        return htmltree;
-    }
-
-    /**
-     * Generates a META tag with the http-equiv, content and charset attributes.
-     *
-     * @param httpEquiv http equiv attribute for the META tag
-     * @param content type of content
-     * @param charSet character set used
-     * @return an HtmlTree object for the META tag
-     */
-    public static HtmlTree META(String httpEquiv, String content, String charSet) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.META);
-        String contentCharset = content + "; charset=" + charSet;
-        htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
-        htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
-        return htmltree;
-    }
-
-    /**
-     * Generates a META tag with the name and content attributes.
-     *
-     * @param name name attribute
-     * @param content type of content
-     * @return an HtmlTree object for the META tag
-     */
-    public static HtmlTree META(String name, String content) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.META);
-        htmltree.addAttr(HtmlAttr.NAME, nullCheck(name));
-        htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
-        return htmltree;
-    }
-
-    /**
-     * Generates a NAV tag with the role attribute.
-     *
-     * @return an HtmlTree object for the NAV tag
-     */
-    public static HtmlTree NAV() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.NAV);
-        htmltree.setRole(Role.NAVIGATION);
-        return htmltree;
-    }
-
-    /**
-     * Generates a NOSCRIPT tag with some content.
-     *
-     * @param body content of the noscript tag
-     * @return an HtmlTree object for the NOSCRIPT tag
-     */
-    public static HtmlTree NOSCRIPT(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.NOSCRIPT, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a P tag with some content.
-     *
-     * @param body content of the Paragraph tag
-     * @return an HtmlTree object for the P tag
-     */
-    public static HtmlTree P(Content body) {
-        return P(null, body);
-    }
-
-    /**
-     * Generates a P tag with some content.
-     *
-     * @param styleClass style of the Paragraph tag
-     * @param body content of the Paragraph tag
-     * @return an HtmlTree object for the P tag
-     */
-    public static HtmlTree P(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.P, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a SCRIPT tag with the type and src attributes.
-     *
-     * @param type type of link
-     * @param src the path for the script
-     * @return an HtmlTree object for the SCRIPT tag
-     */
-    public static HtmlTree SCRIPT(String src) {
-        HtmlTree htmltree = HtmlTree.SCRIPT();
-        htmltree.addAttr(HtmlAttr.SRC, nullCheck(src));
-        return htmltree;
-    }
-
-    /**
-     * Generates a SCRIPT tag with the type attribute.
-     *
-     * @return an HtmlTree object for the SCRIPT tag
-     */
-    public static HtmlTree SCRIPT() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SCRIPT);
-        htmltree.addAttr(HtmlAttr.TYPE, "text/javascript");
-        return htmltree;
-    }
-
-    /**
-     * Generates a SECTION tag with role attribute.
-     *
-     * @return an HtmlTree object for the SECTION tag
-     */
-    public static HtmlTree SECTION() {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SECTION);
-        htmltree.setRole(Role.REGION);
-        return htmltree;
-    }
-
-    /**
-     * Generates a SECTION tag with role attribute and some content.
-     *
-     * @param body content of the section tag
-     * @return an HtmlTree object for the SECTION tag
-     */
-    public static HtmlTree SECTION(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SECTION, nullCheck(body));
-        htmltree.setRole(Role.REGION);
-        return htmltree;
-    }
-
-    /**
-     * Generates a SMALL tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the SMALL tag
-     */
-    public static HtmlTree SMALL(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SMALL, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a SPAN tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the SPAN tag
-     */
-    public static HtmlTree SPAN(Content body) {
-        return SPAN(null, body);
-    }
-
-    /**
-     * Generates a SPAN tag with style class attribute and some content.
-     *
-     * @param styleClass style class for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the SPAN tag
-     */
-    public static HtmlTree SPAN(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SPAN, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a SPAN tag with id and style class attributes. It also encloses
-     * a content.
-     *
-     * @param id the id for the tag
-     * @param styleClass stylesheet class for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the SPAN tag
-     */
-    public static HtmlTree SPAN(String id, HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.SPAN, nullCheck(body));
-        htmltree.addAttr(HtmlAttr.ID, nullCheck(id));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a Table tag with style class and summary attributes and some content.
-     *
-     * @param styleClass style of the table
-     * @param summary summary for the table
-     * @param body content for the table
-     * @return an HtmlTree object for the TABLE tag
-     */
-    public static HtmlTree TABLE(HtmlStyle styleClass, String summary, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TABLE, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        htmltree.addAttr(HtmlAttr.SUMMARY, nullCheck(summary));
-        return htmltree;
-    }
-
-    /**
-     * Generates a Table tag with style class attribute and some content.
-     *
-     * @param styleClass style of the table
-     * @param body content for the table
-     * @return an HtmlTree object for the TABLE tag
-     */
-    public static HtmlTree TABLE(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TABLE, nullCheck(body));
-        if (styleClass != null) {
-            htmltree.addStyle(styleClass);
-        }
-        return htmltree;
-    }
-
-    /**
-     * Generates a TD tag with style class attribute and some content.
-     *
-     * @param styleClass style for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the TD tag
-     */
-    public static HtmlTree TD(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TD, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        return htmltree;
-    }
-
-    /**
-     * Generates a TD tag for an HTML table with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the TD tag
-     */
-    public static HtmlTree TD(Content body) {
-        return TD(null, body);
-    }
-
-    /**
-     * Generates a TH tag with style class and scope attributes and some content.
-     *
-     * @param styleClass style for the tag
-     * @param scope scope of the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the TH tag
-     */
-    public static HtmlTree TH(HtmlStyle styleClass, String scope, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TH, nullCheck(body));
-        if (styleClass != null)
-            htmltree.addStyle(styleClass);
-        htmltree.addAttr(HtmlAttr.SCOPE, nullCheck(scope));
-        return htmltree;
-    }
-
-    /**
-     * Generates a TH tag with scope attribute and some content.
-     *
-     * @param scope scope of the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the TH tag
-     */
-    public static HtmlTree TH(String scope, Content body) {
-        return TH(null, scope, body);
-    }
-
-    /**
-     * Generates a TITLE tag with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the TITLE tag
-     */
-    public static HtmlTree TITLE(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TITLE, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a TR tag for an HTML table with some content.
-     *
-     * @param body content for the tag
-     * @return an HtmlTree object for the TR tag
-     */
-    public static HtmlTree TR(Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.TR, nullCheck(body));
-        return htmltree;
-    }
-
-    /**
-     * Generates a UL tag with the style class attribute and some content.
-     *
-     * @param styleClass style for the tag
-     * @param body content for the tag
-     * @return an HtmlTree object for the UL tag
-     */
-    public static HtmlTree UL(HtmlStyle styleClass, Content body) {
-        HtmlTree htmltree = new HtmlTree(HtmlTag.UL, nullCheck(body));
-        htmltree.addStyle(nullCheck(styleClass));
-        return htmltree;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isEmpty() {
-        return (!hasContent() && !hasAttrs());
-    }
-
-    /**
-     * Returns true if the HTML tree has content.
-     *
-     * @return true if the HTML tree has content else return false
-     */
-    public boolean hasContent() {
-        return (!content.isEmpty());
-    }
-
-    /**
-     * Returns true if the HTML tree has attributes.
-     *
-     * @return true if the HTML tree has attributes else return false
-     */
-    public boolean hasAttrs() {
-        return (!attrs.isEmpty());
-    }
-
-    /**
-     * Returns true if the HTML tree has a specific attribute.
-     *
-     * @param attrName name of the attribute to check within the HTML tree
-     * @return true if the HTML tree has the specified attribute else return false
-     */
-    public boolean hasAttr(HtmlAttr attrName) {
-        return (attrs.containsKey(attrName));
-    }
-
-    /**
-     * Returns true if the HTML tree is valid. This check is more specific to
-     * standard doclet and not exactly similar to W3C specifications. But it
-     * ensures HTML validation.
-     *
-     * @return true if the HTML tree is valid
-     */
-    public boolean isValid() {
-        switch (htmlTag) {
-            case A :
-                return (hasAttr(HtmlAttr.NAME) || hasAttr(HtmlAttr.ID) || (hasAttr(HtmlAttr.HREF) && hasContent()));
-            case BR :
-                return (!hasContent() && (!hasAttrs() || hasAttr(HtmlAttr.CLEAR)));
-            case IFRAME :
-                return (hasAttr(HtmlAttr.SRC) && !hasContent());
-            case HR :
-            case INPUT:
-                return (!hasContent());
-            case IMG :
-                return (hasAttr(HtmlAttr.SRC) && hasAttr(HtmlAttr.ALT) && !hasContent());
-            case LINK :
-                return (hasAttr(HtmlAttr.HREF) && !hasContent());
-            case META :
-                return (hasAttr(HtmlAttr.CONTENT) && !hasContent());
-            case SCRIPT :
-                return ((hasAttr(HtmlAttr.TYPE) && hasAttr(HtmlAttr.SRC) && !hasContent()) ||
-                        (hasAttr(HtmlAttr.TYPE) && hasContent()));
-            default :
-                return hasContent();
-        }
-    }
-
-    /**
-     * Returns true if the element is an inline element.
-     *
-     * @return true if the HTML tag is an inline element
-     */
-    public boolean isInline() {
-        return (htmlTag.blockType == HtmlTag.BlockType.INLINE);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean write(Writer out, boolean atNewline) throws IOException {
-        if (!isInline() && !atNewline)
-            out.write(DocletConstants.NL);
-        String tagString = htmlTag.toString();
-        out.write("<");
-        out.write(tagString);
-        Iterator<HtmlAttr> iterator = attrs.keySet().iterator();
-        HtmlAttr key;
-        String value;
-        while (iterator.hasNext()) {
-            key = iterator.next();
-            value = attrs.get(key);
-            out.write(" ");
-            out.write(key.toString());
-            if (!value.isEmpty()) {
-                out.write("=\"");
-                out.write(value);
-                out.write("\"");
-            }
-        }
-        out.write(">");
-        boolean nl = false;
-        for (Content c : content)
-            nl = c.write(out, nl);
-        if (htmlTag.endTagRequired()) {
-            out.write("</");
-            out.write(tagString);
-            out.write(">");
-        }
-        if (!isInline()) {
-            out.write(DocletConstants.NL);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Given a Content node, strips all html characters and
-     * return the result.
-     *
-     * @param body The content node to check.
-     * @return the plain text from the content node
-     *
-     */
-    private static String stripHtml(Content body) {
-        String rawString = body.toString();
-        // remove HTML tags
-        rawString = rawString.replaceAll("\\<.*?>", " ");
-        // consolidate multiple spaces between a word to a single space
-        rawString = rawString.replaceAll("\\b\\s{2,}\\b", " ");
-        // remove extra whitespaces
-        return rawString.trim();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java
deleted file mode 100644
index 76b1f4bc8f9..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlVersion.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2015, 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.doclets.formats.html.markup;
-
-/**
- * Enum representing the version of HTML generated by javadoc.
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum HtmlVersion {
-    HTML4,
-    HTML5,
-    ALL
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
deleted file mode 100644
index 06f93b7cf1d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, 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.doclets.formats.html.markup;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for the Html format code generation.
- * Initializes PrintWriter with FileWriter, to enable print
- * related methods to generate the code to the named File through FileWriter.
- *
- *  <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>
- *
- * @since 1.2
- * @author Atul M Dambalkar
- * @author Bhavesh Patel (Modified)
- */
-@Deprecated
-public class HtmlWriter {
-
-    /**
-     * The window title of this file
-     */
-    protected String winTitle;
-
-    /**
-     * The configuration
-     */
-    protected Configuration configuration;
-
-    /**
-     * The flag to indicate whether a member details list is printed or not.
-     */
-    protected boolean memberDetailsListPrinted;
-
-    /**
-     * Header for tables displaying packages and description..
-     */
-    protected final String[] packageTableHeader;
-
-    /**
-     * Summary for use tables displaying class and package use.
-     */
-    protected final String useTableSummary;
-
-    /**
-     * Column header for class docs displaying Modifier and Type header.
-     */
-    protected final String modifierTypeHeader;
-
-    public final Content overviewLabel;
-
-    public final Content defaultPackageLabel;
-
-    public final Content packageLabel;
-
-    public final Content useLabel;
-
-    public final Content prevLabel;
-
-    public final Content nextLabel;
-
-    public final Content prevclassLabel;
-
-    public final Content nextclassLabel;
-
-    public final Content summaryLabel;
-
-    public final Content detailLabel;
-
-    public final Content framesLabel;
-
-    public final Content noframesLabel;
-
-    public final Content treeLabel;
-
-    public final Content classLabel;
-
-    public final Content deprecatedLabel;
-
-    public final Content deprecatedPhrase;
-
-    public final Content allclassesLabel;
-
-    public final Content allpackagesLabel;
-
-    public final Content indexLabel;
-
-    public final Content helpLabel;
-
-    public final Content seeLabel;
-
-    public final Content descriptionLabel;
-
-    public final Content prevpackageLabel;
-
-    public final Content nextpackageLabel;
-
-    public final Content packagesLabel;
-
-    public final Content methodDetailsLabel;
-
-    public final Content annotationTypeDetailsLabel;
-
-    public final Content fieldDetailsLabel;
-
-    public final Content propertyDetailsLabel;
-
-    public final Content constructorDetailsLabel;
-
-    public final Content enumConstantsDetailsLabel;
-
-    public final Content specifiedByLabel;
-
-    public final Content overridesLabel;
-
-    public final Content descfrmClassLabel;
-
-    public final Content descfrmInterfaceLabel;
-
-    private final DocFile file;
-
-    private Writer writer;
-
-    protected Content script;
-
-    /**
-     * Constructor.
-     *
-     * @param path The directory path to be created for this file
-     *             or null if none to be created.
-     * @exception IOException Exception raised by the FileWriter is passed on
-     * to next level.
-     * @exception UnsupportedEncodingException Exception raised by the
-     * OutputStreamWriter is passed on to next level.
-     */
-    public HtmlWriter(Configuration configuration, DocPath path)
-            throws IOException, UnsupportedEncodingException {
-        file = DocFile.createFileForOutput(configuration, path);
-        this.configuration = configuration;
-        this.memberDetailsListPrinted = false;
-        packageTableHeader = new String[] {
-            configuration.getText("doclet.Package"),
-            configuration.getText("doclet.Description")
-        };
-        useTableSummary = configuration.getText("doclet.Use_Table_Summary",
-                configuration.getText("doclet.packages"));
-        modifierTypeHeader = configuration.getText("doclet.0_and_1",
-                configuration.getText("doclet.Modifier"),
-                configuration.getText("doclet.Type"));
-        overviewLabel = getResource("doclet.Overview");
-        defaultPackageLabel = new StringContent(DocletConstants.DEFAULT_PACKAGE_NAME);
-        packageLabel = getResource("doclet.Package");
-        useLabel = getResource("doclet.navClassUse");
-        prevLabel = getResource("doclet.Prev");
-        nextLabel = getResource("doclet.Next");
-        prevclassLabel = getNonBreakResource("doclet.Prev_Class");
-        nextclassLabel = getNonBreakResource("doclet.Next_Class");
-        summaryLabel = getResource("doclet.Summary");
-        detailLabel = getResource("doclet.Detail");
-        framesLabel = getResource("doclet.Frames");
-        noframesLabel = getNonBreakResource("doclet.No_Frames");
-        treeLabel = getResource("doclet.Tree");
-        classLabel = getResource("doclet.Class");
-        deprecatedLabel = getResource("doclet.navDeprecated");
-        deprecatedPhrase = getResource("doclet.Deprecated");
-        allclassesLabel = getNonBreakResource("doclet.All_Classes");
-        allpackagesLabel = getNonBreakResource("doclet.All_Packages");
-        indexLabel = getResource("doclet.Index");
-        helpLabel = getResource("doclet.Help");
-        seeLabel = getResource("doclet.See");
-        descriptionLabel = getResource("doclet.Description");
-        prevpackageLabel = getNonBreakResource("doclet.Prev_Package");
-        nextpackageLabel = getNonBreakResource("doclet.Next_Package");
-        packagesLabel = getResource("doclet.Packages");
-        methodDetailsLabel = getResource("doclet.Method_Detail");
-        annotationTypeDetailsLabel = getResource("doclet.Annotation_Type_Member_Detail");
-        fieldDetailsLabel = getResource("doclet.Field_Detail");
-        propertyDetailsLabel = getResource("doclet.Property_Detail");
-        constructorDetailsLabel = getResource("doclet.Constructor_Detail");
-        enumConstantsDetailsLabel = getResource("doclet.Enum_Constant_Detail");
-        specifiedByLabel = getResource("doclet.Specified_By");
-        overridesLabel = getResource("doclet.Overrides");
-        descfrmClassLabel = getResource("doclet.Description_From_Class");
-        descfrmInterfaceLabel = getResource("doclet.Description_From_Interface");
-    }
-
-    public void write(Content c) throws IOException {
-        writer = file.openWriter();
-        c.write(writer, true);
-    }
-
-    public void close() throws IOException {
-        writer.close();
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @return a content tree for the text
-     */
-    public Content getResource(String key) {
-        return configuration.getResource(key);
-    }
-
-    /**
-     * Get the configuration string as a content, replacing spaces
-     * with non-breaking spaces.
-     *
-     * @param key the key to look for in the configuration file
-     * @return a content tree for the text
-     */
-    public Content getNonBreakResource(String key) {
-        String text = configuration.getText(key);
-        Content c = configuration.newContent();
-        int start = 0;
-        int p;
-        while ((p = text.indexOf(" ", start)) != -1) {
-            c.addContent(text.substring(start, p));
-            c.addContent(RawHtml.nbsp);
-            start = p + 1;
-        }
-        c.addContent(text.substring(start));
-        return c;
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @param o   string or content argument added to configuration text
-     * @return a content tree for the text
-     */
-    public Content getResource(String key, Object o) {
-        return configuration.getResource(key, o);
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @param o1  string or content argument added to configuration text
-     * @param o2  string or content argument added to configuration text
-     * @return a content tree for the text
-     */
-    public Content getResource(String key, Object o0, Object o1) {
-        return configuration.getResource(key, o0, o1);
-    }
-
-    /**
-     * Returns an HtmlTree for the SCRIPT tag.
-     *
-     * @return an HtmlTree for the SCRIPT tag
-     */
-    protected HtmlTree getWinTitleScript(){
-        HtmlTree script = HtmlTree.SCRIPT();
-        if(winTitle != null && winTitle.length() > 0) {
-            String scriptCode = "<!--" + DocletConstants.NL +
-                    "    try {" + DocletConstants.NL +
-                    "        if (location.href.indexOf('is-external=true') == -1) {" + DocletConstants.NL +
-                    "            parent.document.title=\"" + escapeJavaScriptChars(winTitle) + "\";" + DocletConstants.NL +
-                    "        }" + DocletConstants.NL +
-                    "    }" + DocletConstants.NL +
-                    "    catch(err) {" + DocletConstants.NL +
-                    "    }" + DocletConstants.NL +
-                    "//-->" + DocletConstants.NL;
-            RawHtml scriptContent = new RawHtml(scriptCode);
-            script.addContent(scriptContent);
-        }
-        return script;
-    }
-
-    /**
-     * Returns a String with escaped special JavaScript characters.
-     *
-     * @param s String that needs to be escaped
-     * @return a valid escaped JavaScript string
-     */
-    private static String escapeJavaScriptChars(String s) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-            switch (ch) {
-                case '\b':
-                    sb.append("\\b");
-                    break;
-                case '\t':
-                    sb.append("\\t");
-                    break;
-                case '\n':
-                    sb.append("\\n");
-                    break;
-                case '\f':
-                    sb.append("\\f");
-                    break;
-                case '\r':
-                    sb.append("\\r");
-                    break;
-                case '"':
-                    sb.append("\\\"");
-                    break;
-                case '\'':
-                    sb.append("\\\'");
-                    break;
-                case '\\':
-                    sb.append("\\\\");
-                    break;
-                default:
-                    if (ch < 32 || ch >= 127) {
-                        sb.append(String.format("\\u%04X", (int)ch));
-                    } else {
-                        sb.append(ch);
-                    }
-                    break;
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Returns a content tree for the SCRIPT tag for the main page(index.html).
-     *
-     * @return a content for the SCRIPT tag
-     */
-    protected Content getFramesJavaScript() {
-        HtmlTree script = HtmlTree.SCRIPT();
-        String scriptCode = DocletConstants.NL +
-                "    tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
-                "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
-                "        tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
-                "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
-                "        tmpTargetPage = \"undefined\";" + DocletConstants.NL +
-                "    targetPage = tmpTargetPage;" + DocletConstants.NL +
-                "    function validURL(url) {" + DocletConstants.NL +
-                "        try {" + DocletConstants.NL +
-                "            url = decodeURIComponent(url);" + DocletConstants.NL +
-                "        }" + DocletConstants.NL +
-                "        catch (error) {" + DocletConstants.NL +
-                "            return false;" + DocletConstants.NL +
-                "        }" + DocletConstants.NL +
-                "        var pos = url.indexOf(\".html\");" + DocletConstants.NL +
-                "        if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
-                "            return false;" + DocletConstants.NL +
-                "        var allowNumber = false;" + DocletConstants.NL +
-                "        var allowSep = false;" + DocletConstants.NL +
-                "        var seenDot = false;" + DocletConstants.NL +
-                "        for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL +
-                "            var ch = url.charAt(i);" + DocletConstants.NL +
-                "            if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
-                "                    'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
-                "                    ch == '$' ||" + DocletConstants.NL +
-                "                    ch == '_' ||" + DocletConstants.NL +
-                "                    ch.charCodeAt(0) > 127) {" + DocletConstants.NL +
-                "                allowNumber = true;" + DocletConstants.NL +
-                "                allowSep = true;" + DocletConstants.NL +
-                "            } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
-                "                    || ch == '-') {" + DocletConstants.NL +
-                "                if (!allowNumber)" + DocletConstants.NL +
-                "                     return false;" + DocletConstants.NL +
-                "            } else if (ch == '/' || ch == '.') {" + DocletConstants.NL +
-                "                if (!allowSep)" + DocletConstants.NL +
-                "                    return false;" + DocletConstants.NL +
-                "                allowNumber = false;" + DocletConstants.NL +
-                "                allowSep = false;" + DocletConstants.NL +
-                "                if (ch == '.')" + DocletConstants.NL +
-                "                     seenDot = true;" + DocletConstants.NL +
-                "                if (ch == '/' && seenDot)" + DocletConstants.NL +
-                "                     return false;" + DocletConstants.NL +
-                "            } else {" + DocletConstants.NL +
-                "                return false;"+ DocletConstants.NL +
-                "            }" + DocletConstants.NL +
-                "        }" + DocletConstants.NL +
-                "        return true;" + DocletConstants.NL +
-                "    }" + DocletConstants.NL +
-                "    function loadFrames() {" + DocletConstants.NL +
-                "        if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
-                "             top.classFrame.location = top.targetPage;" + DocletConstants.NL +
-                "    }" + DocletConstants.NL;
-        RawHtml scriptContent = new RawHtml(scriptCode);
-        script.addContent(scriptContent);
-        return script;
-    }
-
-    /**
-     * Returns an HtmlTree for the BODY tag.
-     *
-     * @param includeScript  set true if printing windowtitle script
-     * @param title title for the window
-     * @return an HtmlTree for the BODY tag
-     */
-    public HtmlTree getBody(boolean includeScript, String title) {
-        HtmlTree body = new HtmlTree(HtmlTag.BODY);
-        // Set window title string which is later printed
-        this.winTitle = title;
-        // Don't print windowtitle script for overview-frame, allclasses-frame
-        // and package-frame
-        if (includeScript) {
-            this.script = getWinTitleScript();
-            body.addContent(script);
-            Content noScript = HtmlTree.NOSCRIPT(
-                    HtmlTree.DIV(getResource("doclet.No_Script_Message")));
-            body.addContent(noScript);
-        }
-        return body;
-    }
-
-    /**
-     * Generated javascript variables for the document.
-     *
-     * @param typeMap map comprising of method and type relationship
-     * @param methodTypes set comprising of all methods types for this class
-     */
-    public void generateMethodTypesScript(Map<String,Integer> typeMap,
-            Set<MethodTypes> methodTypes) {
-        String sep = "";
-        StringBuilder vars = new StringBuilder("var methods = {");
-        for (Map.Entry<String,Integer> entry : typeMap.entrySet()) {
-            vars.append(sep);
-            sep = ",";
-            vars.append("\"")
-                    .append(entry.getKey())
-                    .append("\":")
-                    .append(entry.getValue());
-        }
-        vars.append("};").append(DocletConstants.NL);
-        sep = "";
-        vars.append("var tabs = {");
-        for (MethodTypes entry : methodTypes) {
-            vars.append(sep);
-            sep = ",";
-            vars.append(entry.value())
-                    .append(":")
-                    .append("[")
-                    .append("\"")
-                    .append(entry.tabId())
-                    .append("\"")
-                    .append(sep)
-                    .append("\"")
-                    .append(configuration.getText(entry.resourceKey()))
-                    .append("\"]");
-        }
-        vars.append("};")
-                .append(DocletConstants.NL);
-        addStyles(HtmlStyle.altColor, vars);
-        addStyles(HtmlStyle.rowColor, vars);
-        addStyles(HtmlStyle.tableTab, vars);
-        addStyles(HtmlStyle.activeTableTab, vars);
-        script.addContent(new RawHtml(vars.toString()));
-    }
-
-    /**
-     * Adds javascript style variables to the document.
-     *
-     * @param style style to be added as a javascript variable
-     * @param vars variable string to which the style variable will be added
-     */
-    public void addStyles(HtmlStyle style, StringBuilder vars) {
-        vars.append("var ").append(style).append(" = \"").append(style)
-                .append("\";").append(DocletConstants.NL);
-    }
-
-    /**
-     * Returns an HtmlTree for the TITLE tag.
-     *
-     * @return an HtmlTree for the TITLE tag
-     */
-    public HtmlTree getTitle() {
-        HtmlTree title = HtmlTree.TITLE(new StringContent(winTitle));
-        return title;
-    }
-
-    public String codeText(String text) {
-        return "<code>" + text + "</code>";
-    }
-
-    /**
-     * Return "&#38;nbsp;", non-breaking space.
-     */
-    public Content getSpace() {
-        return RawHtml.nbsp;
-    }
-
-    /*
-     * Returns a header for Modifier and Type column of a table.
-     */
-    public String getModifierTypeHeader() {
-        return modifierTypeHeader;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
deleted file mode 100644
index 6949dd23e72..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for generating raw HTML content to be added to HTML pages of javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class RawHtml extends Content {
-
-    private String rawHtmlContent;
-
-    public static final Content nbsp = new RawHtml("&nbsp;");
-
-    /**
-     * Constructor to construct a RawHtml object.
-     *
-     * @param rawHtml raw HTML text to be added
-     */
-    public RawHtml(String rawHtml) {
-        rawHtmlContent = nullCheck(rawHtml);
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param content content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(Content content) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param stringContent string content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    public void addContent(String stringContent) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isEmpty() {
-        return rawHtmlContent.isEmpty();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return rawHtmlContent;
-    }
-
-    private enum State { TEXT, ENTITY, TAG, STRING }
-
-    @Override
-    public int charCount() {
-        return charCount(rawHtmlContent);
-    }
-
-    static int charCount(String htmlText) {
-        State state = State.TEXT;
-        int count = 0;
-        for (int i = 0; i < htmlText.length(); i++) {
-            char c = htmlText.charAt(i);
-            switch (state) {
-                case TEXT:
-                    switch (c) {
-                        case '<':
-                            state = State.TAG;
-                            break;
-                        case '&':
-                            state = State.ENTITY;
-                            count++;
-                            break;
-                        default:
-                            count++;
-                    }
-                    break;
-
-                case ENTITY:
-                    if (!Character.isLetterOrDigit(c))
-                        state = State.TEXT;
-                    break;
-
-                case TAG:
-                    switch (c) {
-                        case '"':
-                            state = State.STRING;
-                            break;
-                        case '>':
-                            state = State.TEXT;
-                            break;
-                    }
-                    break;
-
-                case STRING:
-                    switch (c) {
-                        case '"':
-                            state = State.TAG;
-                            break;
-                    }
-            }
-        }
-        return count;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean write(Writer out, boolean atNewline) throws IOException {
-        out.write(rawHtmlContent);
-        return rawHtmlContent.endsWith(DocletConstants.NL);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
deleted file mode 100644
index 43f9693e41d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.doclets.formats.html.markup;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Class for generating string content for HTML tags of javadoc output.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public class StringContent extends Content {
-
-    private StringBuilder stringContent;
-
-    /**
-     * Constructor to construct StringContent object.
-     */
-    public StringContent() {
-        stringContent = new StringBuilder();
-    }
-
-    /**
-     * Constructor to construct StringContent object with some initial content.
-     *
-     * @param initialContent initial content for the object
-     */
-    public StringContent(String initialContent) {
-        stringContent = new StringBuilder();
-        appendChars(initialContent);
-    }
-
-    /**
-     * This method is not supported by the class.
-     *
-     * @param content content that needs to be added
-     * @throws DocletAbortException this method will always throw a
-     *                              DocletAbortException because it
-     *                              is not supported.
-     */
-    @Override
-    public void addContent(Content content) {
-        throw new DocletAbortException("not supported");
-    }
-
-    /**
-     * Adds content for the StringContent object.  The method escapes
-     * HTML characters for the string content that is added.
-     *
-     * @param strContent string content to be added
-     */
-    @Override
-    public void addContent(String strContent) {
-        appendChars(strContent);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isEmpty() {
-        return (stringContent.length() == 0);
-    }
-
-    @Override
-    public int charCount() {
-        return RawHtml.charCount(stringContent.toString());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return stringContent.toString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean write(Writer out, boolean atNewline) throws IOException {
-        String s = stringContent.toString();
-        out.write(s);
-        return s.endsWith(DocletConstants.NL);
-    }
-
-    private void appendChars(String s) {
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-            switch (ch) {
-                case '<': stringContent.append("&lt;");  break;
-                case '>': stringContent.append("&gt;");  break;
-                case '&': stringContent.append("&amp;"); break;
-                default:  stringContent.append(ch);      break;
-            }
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
deleted file mode 100644
index a9eb28cbea5..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/markup/package-info.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
-    This package contains classes that write HTML markup tags.
-
-    <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>
- */
-
-package com.sun.tools.doclets.formats.html.markup;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java
deleted file mode 100644
index d2f2618e64d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/package-info.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
-    This produces Javadoc's HTML-formatted API output.  For more documentation
-    on this doclet, please refer to the link below.
-
-    @see <a href="http://www.java.sun.com/javadoc/standard-doclet.html">
-            http://www.java.sun.com/javadoc/standard-doclet.html </a>
-
-    <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>
-*/
-
-package com.sun.tools.doclets.formats.html;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
deleted file mode 100644
index b20f72255fa..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
+++ /dev/null
@@ -1,237 +0,0 @@
-doclet.build_version=Standard Doclet (Old) version {0}
-doclet.Contents=Contents
-doclet.Overview=Overview
-doclet.Window_Overview=Overview List
-doclet.Window_Overview_Summary=Overview
-doclet.Package=Package
-doclet.All_Packages=All Packages
-doclet.Tree=Tree
-doclet.Class_Hierarchy=Class Hierarchy
-doclet.Window_Class_Hierarchy=Class Hierarchy
-doclet.Interface_Hierarchy=Interface Hierarchy
-doclet.Enum_Hierarchy=Enum Hierarchy
-doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy
-doclet.Prev=Prev
-doclet.Next=Next
-doclet.Prev_Class=Prev Class
-doclet.Next_Class=Next Class
-doclet.Prev_Package=Prev Package
-doclet.Next_Package=Next Package
-doclet.Prev_Letter=Prev Letter
-doclet.Next_Letter=Next Letter
-doclet.Href_Class_Title=class in {0}
-doclet.Href_Interface_Title=interface in {0}
-doclet.Href_Annotation_Title=annotation in {0}
-doclet.Href_Enum_Title=enum in {0}
-doclet.Href_Type_Param_Title=type parameter in {0}
-doclet.Href_Class_Or_Interface_Title=class or interface in {0}
-doclet.Summary=Summary:
-doclet.Detail=Detail:
-doclet.navNested=Nested
-doclet.navAnnotationTypeOptionalMember=Optional
-doclet.navAnnotationTypeRequiredMember=Required
-doclet.navAnnotationTypeMember=Element
-doclet.navField=Field
-doclet.navProperty=Property
-doclet.navEnum=Enum Constants
-doclet.navConstructor=Constr
-doclet.navMethod=Method
-doclet.Index=Index
-doclet.Window_Single_Index=Index
-doclet.Window_Split_Index={0}-Index
-doclet.Help=Help
-doclet.Skip_navigation_links=Skip navigation links
-doclet.Navigation=Navigation
-doclet.New_Page=NewPage
-doclet.navDeprecated=Deprecated
-doclet.Window_Deprecated_List=Deprecated List
-doclet.Overrides=Overrides:
-doclet.in_class=in class
-doclet.Static_variable_in=Static variable in {0}
-doclet.Variable_in=Variable in {0}
-doclet.Constructor_for=Constructor for {0}
-doclet.Static_method_in=Static method in {0}
-doclet.Search_tag_in=Search tag in {0}
-doclet.Method_in=Method in {0}
-doclet.package=package
-doclet.MalformedURL=Malformed URL: {0}
-doclet.File_error=Error reading file: {0}
-doclet.URL_error=Error fetching URL: {0}
-doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1}
-doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1}
-doclet.Deprecated_API=Deprecated API
-doclet.Deprecated_Packages=Deprecated Packages
-doclet.Deprecated_Classes=Deprecated Classes
-doclet.Deprecated_Enums=Deprecated Enums
-doclet.Deprecated_Interfaces=Deprecated Interfaces
-doclet.Deprecated_Exceptions=Deprecated Exceptions
-doclet.Deprecated_Annotation_Types=Deprecated Annotation Types
-doclet.Deprecated_Errors=Deprecated Errors
-doclet.Deprecated_Fields=Deprecated Fields
-doclet.Deprecated_Constructors=Deprecated Constructors
-doclet.Deprecated_Methods=Deprecated Methods
-doclet.Deprecated_Enum_Constants=Deprecated Enum Constants
-doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements
-doclet.deprecated_packages=deprecated packages
-doclet.deprecated_classes=deprecated classes
-doclet.deprecated_enums=deprecated enums
-doclet.deprecated_interfaces=deprecated interfaces
-doclet.deprecated_exceptions=deprecated exceptions
-doclet.deprecated_annotation_types=deprecated annotation types
-doclet.deprecated_errors=deprecated errors
-doclet.deprecated_fields=deprecated fields
-doclet.deprecated_constructors=deprecated constructors
-doclet.deprecated_methods=deprecated methods
-doclet.deprecated_enum_constants=deprecated enum constants
-doclet.deprecated_annotation_type_members=deprecated annotation type elements
-doclet.Generated_Docs_Untitled=Generated Documentation (Untitled)
-doclet.Other_Packages=Other Packages
-doclet.Package_Description=Package {0} Description
-doclet.Description=Description
-doclet.Specified_By=Specified by:
-doclet.in_interface=in interface
-doclet.Subclasses=Direct Known Subclasses:
-doclet.Subinterfaces=All Known Subinterfaces:
-doclet.Implementing_Classes=All Known Implementing Classes:
-doclet.Functional_Interface=Functional Interface:
-doclet.Functional_Interface_Message=This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference.
-doclet.also=also
-doclet.Frames=Frames
-doclet.No_Frames=No Frames
-doclet.Package_Hierarchies=Package Hierarchies:
-doclet.Hierarchy_For_Package=Hierarchy For Package {0}
-doclet.Hierarchy_For_All_Packages=Hierarchy For All Packages
-doclet.No_Script_Message=JavaScript is disabled on your browser.
-doclet.Description_From_Interface=Description copied from interface:
-doclet.Description_From_Class=Description copied from class:
-doclet.No_Non_Deprecated_Classes_To_Document=No non-deprecated classes found to document.
-doclet.Interfaces_Italic=Interfaces (italic)
-doclet.Enclosing_Class=Enclosing class:
-doclet.Enclosing_Interface=Enclosing interface:
-doclet.Window_Source_title=Source code
-doclet.Window_Help_title=API Help
-doclet.Help_line_1=How This API Document Is Organized
-doclet.Help_line_2=This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.
-doclet.Help_line_3=The {0} page is the front page of this API document and provides a list of all packages with a summary for each.  This page can also contain an overall description of the set of packages.
-doclet.Help_line_4=Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
-doclet.Help_line_5=Class/Interface
-doclet.Help_line_6=Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-doclet.Help_line_7=Class inheritance diagram
-doclet.Help_line_8=Direct Subclasses
-doclet.Help_line_9=All Known Subinterfaces
-doclet.Help_line_10=All Known Implementing Classes
-doclet.Help_line_11=Class/interface declaration
-doclet.Help_line_12=Class/interface description
-doclet.Help_line_13=Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
-doclet.Help_line_14=Use
-doclet.Help_line_15=Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
-doclet.Help_line_16=Tree (Class Hierarchy)
-doclet.Help_line_17_with_tree_link=There is a {0} page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with {1}. The interfaces do not inherit from {1}.
-doclet.Help_line_18=When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
-doclet.Help_line_19=When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-doclet.Help_line_20_with_deprecated_api_link=The {0} page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-doclet.Help_line_21=Index
-doclet.Help_line_22=The {0} contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-doclet.Help_line_23=Prev/Next
-doclet.Help_line_24=These links take you to the next or previous class, interface, package, or related page.
-doclet.Help_line_25=Frames/No Frames
-doclet.Help_line_26=These links show and hide the HTML frames.  All pages are available with or without frames.
-doclet.Help_line_27=The {0} link shows all classes and interfaces except non-static nested types.
-doclet.Help_line_28=Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-doclet.Help_line_29=The {0} page lists the static final fields and their values.
-doclet.Help_line_30=This help file applies to API documentation generated using the standard doclet.
-doclet.Help_enum_line_1=Each enum has its own separate page with the following sections:
-doclet.Help_enum_line_2=Enum declaration
-doclet.Help_enum_line_3=Enum description
-doclet.Help_annotation_type_line_1=Each annotation type has its own separate page with the following sections:
-doclet.Help_annotation_type_line_2=Annotation Type declaration
-doclet.Help_annotation_type_line_3=Annotation Type description
-doclet.ClassUse_Packages.that.use.0=Packages that use {0}
-doclet.ClassUse_Uses.of.0.in.1=Uses of {0} in {1}
-doclet.ClassUse_Classes.in.0.used.by.1=Classes in {0} used by {1}
-doclet.ClassUse_PackageAnnotation=Packages with annotations of type {0}
-doclet.ClassUse_Annotation=Classes in {1} with annotations of type {0}
-doclet.ClassUse_TypeParameter=Classes in {1} with type parameters of type {0}
-doclet.ClassUse_MethodTypeParameter=Methods in {1} with type parameters of type {0}
-doclet.ClassUse_FieldTypeParameter=Fields in {1} with type parameters of type {0}
-doclet.ClassUse_FieldAnnotations=Fields in {1} with annotations of type {0}
-doclet.ClassUse_MethodAnnotations=Methods in {1} with annotations of type {0}
-doclet.ClassUse_MethodParameterAnnotations=Method parameters in {1} with annotations of type {0}
-doclet.ClassUse_MethodReturnTypeParameter=Methods in {1} that return types with arguments of type {0}
-doclet.ClassUse_Subclass=Subclasses of {0} in {1}
-doclet.ClassUse_Subinterface=Subinterfaces of {0} in {1}
-doclet.ClassUse_ImplementingClass=Classes in {1} that implement {0}
-doclet.ClassUse_Field=Fields in {1} declared as {0}
-doclet.ClassUse_MethodReturn=Methods in {1} that return {0}
-doclet.ClassUse_MethodArgs=Methods in {1} with parameters of type {0}
-doclet.ClassUse_MethodArgsTypeParameters=Method parameters in {1} with type arguments of type {0}
-doclet.ClassUse_MethodThrows=Methods in {1} that throw {0}
-doclet.ClassUse_ConstructorAnnotations=Constructors in {1} with annotations of type {0}
-doclet.ClassUse_ConstructorParameterAnnotations=Constructor parameters in {1} with annotations of type {0}
-doclet.ClassUse_ConstructorArgs=Constructors in {1} with parameters of type {0}
-doclet.ClassUse_ConstructorArgsTypeParameters=Constructor parameters in {1} with type arguments of type {0}
-doclet.ClassUse_ConstructorThrows=Constructors in {1} that throw {0}
-doclet.ClassUse_No.usage.of.0=No usage of {0}
-doclet.Window_ClassUse_Header=Uses of {0} {1}
-doclet.ClassUse_Title=Uses of {0}
-doclet.navClassUse=Use
-doclet.Error_in_packagelist=Error in using -group option: {0} {1}
-doclet.Groupname_already_used=In -group option, groupname already used: {0}
-doclet.Same_package_name_used=Package name format used twice: {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\
-\  -version                         Include @version paragraphs\n\
-\  -author                          Include @author paragraphs\n\
-\  -docfilessubdirs                 Recursively copy doc-file subdirectories\n\
-\  -splitindex                      Split index into one file per letter\n\
-\  -windowtitle <text>              Browser window title for the documentation\n\
-\  -doctitle <html-code>            Include title for the overview page\n\
-\  -header <html-code>              Include header text for each page\n\
-\  -html4                           Generate HTML 4.01 output\n\
-\  -html5                           Generate HTML 5 output\n\
-\  -footer <html-code>              Include footer text for each page\n\
-\  -top    <html-code>              Include top text for each page\n\
-\  -bottom <html-code>              Include bottom text for each page\n\
-\  -link <url>                      Create links to javadoc output at <url>\n\
-\  -linkoffline <url> <url2>        Link to docs at <url> using package list at <url2>\n\
-\  -excludedocfilessubdir <name1>:.. Exclude any doc-files subdirectories with given name.\n\
-\  -group <name> <p1>:<p2>..        Group specified packages together in overview page\n\
-\  -nocomment                       Suppress description and tags, generate only declarations.\n\
-\  -nodeprecated                    Do not include @deprecated information\n\
-\  -noqualifier <name1>:<name2>:... Exclude the list of qualifiers from the output.\n\
-\  -nosince                         Do not include @since information\n\
-\  -notimestamp                     Do not include hidden time stamp\n\
-\  -nodeprecatedlist                Do not generate deprecated list\n\
-\  -notree                          Do not generate class hierarchy\n\
-\  -noindex                         Do not generate index\n\
-\  -nohelp                          Do not generate help link\n\
-\  -nonavbar                        Do not generate navigation bar\n\
-\  -serialwarn                      Generate warning about @serial tag\n\
-\  -tag <name>:<locations>:<header> Specify single argument custom tags\n\
-\  -taglet                          The fully qualified name of Taglet to register\n\
-\  -tagletpath                      The path to Taglets\n\
-\  -charset <charset>               Charset for cross-platform viewing of generated documentation.\n\
-\  -helpfile <file>                 Include file that help link links to\n\
-\  -linksource                      Generate source in HTML\n\
-\  -sourcetab <tab length>          Specify the number of spaces each tab takes up in the source\n\
-\  -keywords                        Include HTML meta tags with package, class and member info\n\
-\  -stylesheetfile <path>           File to change style of the generated documentation\n\
-\  -docencoding <name>              Specify the character encoding for the output
-
-
-# L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.X.usage=Provided by standard doclet:\n\
-\  -Xdocrootparent <url>            Replaces all appearances of @docRoot followed\n\
-\                                   by /.. in doc comments with <url>\n\
-\  -Xdoclint                        Enable recommended checks for problems in javadoc comments\n\
-\  -Xdoclint:(all|none|[-]<group>) \n\
-\        Enable or disable specific checks for problems in javadoc comments,\n\
-\        where <group> is one of accessibility, html, missing, reference, or syntax.\n\
-\  -Xdoclint/package:([-]<packages>)\n\
-\        Enable or disable checks in specific packages. <packages> is a comma separated\n\
-\        list of package specifiers. Package specifier is either a qualified name of a package\n\
-\        or a package name prefix followed by .*, which expands to all sub-packages of\n\
-\        the given package. Prefix the package specifier with - to disable checks for\n\
-\        the specified packages.\n
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
deleted file mode 100644
index 6d690122fdf..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
+++ /dev/null
@@ -1,187 +0,0 @@
-doclet.build_version=\u6A19\u6E96Doclet (\u65E7)\u30D0\u30FC\u30B8\u30E7\u30F3{0}
-doclet.Contents=\u30B3\u30F3\u30C6\u30F3\u30C4
-doclet.Overview=\u6982\u8981
-doclet.Window_Overview=\u6982\u8981\u30EA\u30B9\u30C8
-doclet.Window_Overview_Summary=\u6982\u8981
-doclet.Package=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Tree=\u968E\u5C64\u30C4\u30EA\u30FC
-doclet.Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Window_Class_Hierarchy=\u30AF\u30E9\u30B9\u968E\u5C64
-doclet.Interface_Hierarchy=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u968E\u5C64
-doclet.Enum_Hierarchy=\u5217\u6319\u578B\u968E\u5C64
-doclet.Annotation_Type_Hierarchy=\u6CE8\u91C8\u578B\u968E\u5C64
-doclet.Prev=\u524D
-doclet.Next=\u6B21
-doclet.Prev_Class=\u524D\u306E\u30AF\u30E9\u30B9
-doclet.Next_Class=\u6B21\u306E\u30AF\u30E9\u30B9
-doclet.Prev_Package=\u524D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Next_Package=\u6B21\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Prev_Letter=\u524D\u306E\u6587\u5B57
-doclet.Next_Letter=\u6B21\u306E\u6587\u5B57
-doclet.Href_Class_Title={0}\u5185\u306E\u30AF\u30E9\u30B9
-doclet.Href_Interface_Title={0}\u5185\u306E\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Href_Annotation_Title={0}\u5185\u306E\u6CE8\u91C8
-doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
-doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Summary=\u6982\u8981:
-doclet.Detail=\u8A73\u7D30:
-doclet.navNested=\u30CD\u30B9\u30C8
-doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
-doclet.navAnnotationTypeRequiredMember=\u5FC5\u9808
-doclet.navAnnotationTypeMember=\u8981\u7D20
-doclet.navField=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.navProperty=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.navEnum=\u5217\u6319\u5B9A\u6570
-doclet.navConstructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.navMethod=\u30E1\u30BD\u30C3\u30C9
-doclet.Index=\u7D22\u5F15
-doclet.Window_Single_Index=\u7D22\u5F15
-doclet.Window_Split_Index={0}\u306E\u7D22\u5F15
-doclet.Help=\u30D8\u30EB\u30D7
-doclet.Skip_navigation_links=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30EA\u30F3\u30AF\u3092\u30B9\u30AD\u30C3\u30D7
-doclet.Navigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
-doclet.New_Page=NewPage
-doclet.navDeprecated=\u975E\u63A8\u5968
-doclet.Window_Deprecated_List=\u975E\u63A8\u5968API\u306E\u30EA\u30B9\u30C8
-doclet.Overrides=\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9:
-doclet.in_class=\u30AF\u30E9\u30B9\u5185
-doclet.Static_variable_in={0}\u306Estatic\u5909\u6570
-doclet.Variable_in={0}\u306E\u5909\u6570
-doclet.Constructor_for={0}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Static_method_in={0}\u306Estatic\u30E1\u30BD\u30C3\u30C9
-doclet.Search_tag_in={0}\u306E\u691C\u7D22\u30BF\u30B0
-doclet.Method_in={0}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.package=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.MalformedURL=\u4E0D\u6B63\u306AURL: {0}
-doclet.File_error=\u30D5\u30A1\u30A4\u30EB\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC: {0}
-doclet.URL_error=URL\u53D6\u51FA\u3057\u30A8\u30E9\u30FC: {0}
-doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1}
-doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1}
-doclet.Deprecated_API=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044API
-doclet.Deprecated_Packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Deprecated_Classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.Deprecated_Enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.Deprecated_Interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Deprecated_Exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.Deprecated_Annotation_Types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.Deprecated_Errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.Deprecated_Fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Deprecated_Constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.Deprecated_Enum_Constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
-doclet.Deprecated_Annotation_Type_Members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
-doclet.deprecated_packages=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.deprecated_classes=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30AF\u30E9\u30B9
-doclet.deprecated_enums=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B
-doclet.deprecated_interfaces=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.deprecated_exceptions=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u4F8B\u5916
-doclet.deprecated_annotation_types=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B
-doclet.deprecated_errors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30A8\u30E9\u30FC
-doclet.deprecated_fields=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.deprecated_constructors=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.deprecated_methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.deprecated_enum_constants=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u5217\u6319\u578B\u5B9A\u6570
-doclet.deprecated_annotation_type_members=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u6CE8\u91C8\u578B\u306E\u8981\u7D20
-doclet.Generated_Docs_Untitled=\u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8(\u30BF\u30A4\u30C8\u30EB\u306A\u3057)
-doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Package_Description=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u8AAC\u660E
-doclet.Description=\u8AAC\u660E
-doclet.Specified_By=\u5B9A\u7FA9:
-doclet.in_interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u5185
-doclet.Subclasses=\u76F4\u7CFB\u306E\u65E2\u77E5\u306E\u30B5\u30D6\u30AF\u30E9\u30B9:
-doclet.Subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8:
-doclet.Implementing_Classes=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8:
-doclet.Functional_Interface=\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 
-doclet.also=\u540C\u69D8\u306B
-doclet.Frames=\u30D5\u30EC\u30FC\u30E0
-doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057
-doclet.Package_Hierarchies=\u30D1\u30C3\u30B1\u30FC\u30B8\u968E\u5C64:
-doclet.Hierarchy_For_Package=\u30D1\u30C3\u30B1\u30FC\u30B8{0}\u306E\u968E\u5C64
-doclet.Hierarchy_For_All_Packages=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64
-doclet.No_Script_Message=\u30D6\u30E9\u30A6\u30B6\u306EJavaScript\u304C\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002
-doclet.Description_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
-doclet.Description_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u30B3\u30D4\u30FC\u3055\u308C\u305F\u8AAC\u660E:
-doclet.No_Non_Deprecated_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308B\u975E\u63A8\u5968\u4EE5\u5916\u306E\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-doclet.Interfaces_Italic=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u30A4\u30BF\u30EA\u30C3\u30AF)
-doclet.Enclosing_Class=\u542B\u307E\u308C\u3066\u3044\u308B\u30AF\u30E9\u30B9:
-doclet.Enclosing_Interface=\u542B\u307E\u308C\u3066\u3044\u308B\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
-doclet.Window_Help_title=API\u30D8\u30EB\u30D7
-doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
-doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
-doclet.Help_line_8=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
-doclet.Help_line_9=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
-doclet.Help_line_10=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
-doclet.Help_line_11=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
-doclet.Help_line_12=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.Help_line_13=\u5404\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_14=\u4F7F\u7528
-doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
-doclet.Help_line_17_with_tree_link=\u3059\u3079\u3066\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F{0}\u30DA\u30FC\u30B8\u304C\u3042\u308A\u3001\u3055\u3089\u306B\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u968E\u5C64\u30DA\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3092\u542B\u307F\u307E\u3059\u3002\u30AF\u30E9\u30B9\u306F{1}\u3092\u958B\u59CB\u70B9\u3068\u3059\u308B\u7D99\u627F\u69CB\u9020\u3067\u7DE8\u6210\u3055\u308C\u307E\u3059\u3002\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306F\u3001{1}\u304B\u3089\u306F\u7D99\u627F\u3057\u307E\u305B\u3093\u3002
-doclet.Help_line_18=\u6982\u8981\u30DA\u30FC\u30B8\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_19=\u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u8868\u793A\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u300C\u968E\u5C64\u30C4\u30EA\u30FC\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u3001\u8A72\u5F53\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u307F\u306E\u968E\u5C64\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_20_with_deprecated_api_link={0}\u30DA\u30FC\u30B8\u306F\u3001\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u3059\u3079\u3066\u306EAPI\u306E\u30EA\u30B9\u30C8\u3092\u8868\u793A\u3057\u307E\u3059\u3002\u975E\u63A8\u5968API\u3068\u306F\u3001\u6A5F\u80FD\u6539\u826F\u306A\u3069\u306E\u7406\u7531\u304B\u3089\u4F7F\u7528\u3092\u304A\u85A6\u3081\u3067\u304D\u306A\u304F\u306A\u3063\u305FAPI\u306E\u3053\u3068\u3067\u3001\u901A\u5E38\u306F\u305D\u308C\u306B\u4EE3\u308F\u308BAPI\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u975E\u63A8\u5968API\u306F\u4ECA\u5F8C\u306E\u5B9F\u88C5\u3067\u524A\u9664\u3055\u308C\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Help_line_21=\u7D22\u5F15
-doclet.Help_line_22={0}\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u3001\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306E\u30EA\u30B9\u30C8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.Help_line_23=\u524D/\u6B21
-doclet.Help_line_24=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306B\u3088\u308A\u3001\u524D\u307E\u305F\u306F\u6B21\u306E\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u307E\u305F\u306F\u95A2\u9023\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_25=\u30D5\u30EC\u30FC\u30E0/\u30D5\u30EC\u30FC\u30E0\u306A\u3057
-doclet.Help_line_26=\u3053\u308C\u3089\u306E\u30EA\u30F3\u30AF\u306FHTML\u30D5\u30EC\u30FC\u30E0\u306E\u8868\u793A\u3068\u975E\u8868\u793A\u3092\u5207\u308A\u66FF\u3048\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30DA\u30FC\u30B8\u306F\u30D5\u30EC\u30FC\u30E0\u3042\u308A\u3067\u3082\u3001\u30D5\u30EC\u30FC\u30E0\u306A\u3057\u3067\u3082\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_27={0}\u30EA\u30F3\u30AF\u306B\u306F\u3001\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_28=\u76F4\u5217\u5316\u53EF\u80FD\u307E\u305F\u306F\u5916\u90E8\u5316\u53EF\u80FD\u306A\u5404\u30AF\u30E9\u30B9\u306F\u3001\u76F4\u5217\u5316\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u30E1\u30BD\u30C3\u30C9\u306E\u8AAC\u660E\u3092\u542B\u307F\u307E\u3059\u3002\u3053\u306E\u60C5\u5831\u306F\u3001API\u3092\u4F7F\u7528\u3059\u308B\u958B\u767A\u8005\u3067\u306F\u306A\u304F\u3001\u518D\u5B9F\u88C5\u3092\u884C\u3046\u62C5\u5F53\u8005\u306B\u5F79\u7ACB\u3061\u307E\u3059\u3002\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u30EA\u30F3\u30AF\u304C\u306A\u3044\u5834\u5408\u3001\u76F4\u5217\u5316\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306B\u79FB\u52D5\u3057\u3066\u3001\u30AF\u30E9\u30B9\u8A18\u8FF0\u306E\u300C\u95A2\u9023\u9805\u76EE\u300D\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u3042\u308B\u300C\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F\u300D\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u3053\u306E\u60C5\u5831\u3092\u8868\u793A\u3067\u304D\u307E\u3059\u3002
-doclet.Help_line_29={0}\u30DA\u30FC\u30B8\u306B\u306F\u3001static final\u30D5\u30A3\u30FC\u30EB\u30C9\u3068\u305D\u306E\u5024\u306E\u30EA\u30B9\u30C8\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Help_line_30=\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u6A19\u6E96doclet\u3092\u4F7F\u7528\u3057\u3066\u751F\u6210\u3055\u308C\u305FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
-doclet.Help_enum_line_1=\u5404\u5217\u6319\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.Help_enum_line_2=\u5217\u6319\u578B\u306E\u5BA3\u8A00
-doclet.Help_enum_line_3=\u5217\u6319\u578B\u306E\u8AAC\u660E
-doclet.Help_annotation_type_line_1=\u5404\u6CE8\u91C8\u578B\u306B\u306F\u3001\u305D\u308C\u81EA\u8EAB\u306E\u500B\u5225\u306E\u30DA\u30FC\u30B8\u3068\u6B21\u306E\u30BB\u30AF\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-doclet.Help_annotation_type_line_2=\u6CE8\u91C8\u578B\u306E\u5BA3\u8A00
-doclet.Help_annotation_type_line_3=\u6CE8\u91C8\u578B\u306E\u8AAC\u660E
-doclet.ClassUse_Packages.that.use.0={0}\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.ClassUse_Uses.of.0.in.1={1}\u3067\u306E{0}\u306E\u4F7F\u7528
-doclet.ClassUse_Classes.in.0.used.by.1={1}\u306B\u3088\u308A\u4F7F\u7528\u3055\u308C\u308B{0}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_PackageAnnotation={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.ClassUse_Annotation={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_TypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_MethodTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_FieldTypeParameter={0}\u578B\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_FieldAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_MethodAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodParameterAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_MethodReturnTypeParameter={0}\u578B\u306E\u5F15\u6570\u3092\u6301\u3064\u578B\u3092\u8FD4\u3059{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_Subclass={1}\u3067\u306E{0}\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
-doclet.ClassUse_Subinterface={1}\u3067\u306E{0}\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.ClassUse_ImplementingClass={0}\u3092\u5B9F\u88C5\u3057\u3066\u3044\u308B{1}\u306E\u30AF\u30E9\u30B9
-doclet.ClassUse_Field={0}\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B{1}\u306E\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.ClassUse_MethodReturn={0}\u3092\u8FD4\u3059{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodArgs={0}\u578B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_MethodArgsTypeParameters={0}\u578B\u306E\u578B\u5F15\u6570\u3092\u6301\u3064{1}\u306E\u30E1\u30BD\u30C3\u30C9\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_MethodThrows={0}\u3092\u30B9\u30ED\u30FC\u3059\u308B{1}\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.ClassUse_ConstructorAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_ConstructorParameterAnnotations={0}\u578B\u306E\u6CE8\u91C8\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_ConstructorArgs={0}\u578B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_ConstructorArgsTypeParameters={0}\u578B\u306E\u578B\u5F15\u6570\u3092\u6301\u3064{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FB\u30D1\u30E9\u30E1\u30FC\u30BF
-doclet.ClassUse_ConstructorThrows={0}\u3092\u30B9\u30ED\u30FC\u3059\u308B{1}\u306E\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.ClassUse_No.usage.of.0={0}\u306F\u3069\u3053\u304B\u3089\u3082\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-doclet.Window_ClassUse_Header={0} {1}\u306E\u4F7F\u7528
-doclet.ClassUse_Title={0}\u306E\u4F7F\u7528
-doclet.navClassUse=\u4F7F\u7528
-doclet.Error_in_packagelist=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528\u65B9\u6CD5\u306E\u30A8\u30E9\u30FC: {0} {1}
-doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.Same_package_name_used=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u5F62\u5F0F\u304C2\u56DE\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.exception_encountered={1}\u306E\u51E6\u7406\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n{0}
-doclet.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n  -d <directory>                    \u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u306E\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\n  -use                              \u30AF\u30E9\u30B9\u3068\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4F7F\u7528\u30DA\u30FC\u30B8\u3092\u4F5C\u6210\u3059\u308B\n  -version                          @version\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n  -author                           @author\u30D1\u30E9\u30B0\u30E9\u30D5\u3092\u542B\u3081\u308B\n  -docfilessubdirs                  doc-file\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u518D\u5E30\u7684\u306B\u30B3\u30D4\u30FC\u3059\u308B\n  -splitindex                       1\u5B57\u3054\u3068\u306B1\u30D5\u30A1\u30A4\u30EB\u306B\u7D22\u5F15\u3092\u5206\u5272\u3059\u308B\n  -windowtitle <text>               \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u7528\u306E\u30D6\u30E9\u30A6\u30B6\u30FB\u30A6\u30A3\u30F3\u30C9\u30A6\u30FB\u30BF\u30A4\u30C8\u30EB\n  -doctitle <html-code>             \u6982\u8981\u30DA\u30FC\u30B8\u306B\u30BF\u30A4\u30C8\u30EB\u3092\u542B\u3081\u308B\n  -header <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D8\u30C3\u30C0\u30FC\u3092\u542B\u3081\u308B\n  -html4                           HTML 4.01\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n  -html5                           HTML 5\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n  -footer <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u30D5\u30C3\u30BF\u30FC\u3092\u542B\u3081\u308B\n  -top    <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0A\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n  -bottom <html-code>               \u5404\u30DA\u30FC\u30B8\u306B\u4E0B\u90E8\u30C6\u30AD\u30B9\u30C8\u3092\u542B\u3081\u308B\n  -link <url>                       <url>\u306Bjavadoc\u51FA\u529B\u3078\u306E\u30EA\u30F3\u30AF\u3092\u4F5C\u6210\u3059\u308B\n  -linkoffline <url> <url2>         <url2>\u306B\u3042\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u30FB\u30EA\u30B9\u30C8\u3092\u4F7F\u7528\u3057\u3066<url>\u306Edocs\u306B\u30EA\u30F3\u30AF\u3059\u308B\n  -excludedocfilessubdir <name1>:.. \u6307\u5B9A\u3055\u308C\u305F\u540D\u524D\u306Edoc-files\u30B5\u30D6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u3059\u3079\u3066\u9664\u5916\u3059\u308B\n  -group <name> <p1>:<p2>..         \u6307\u5B9A\u3059\u308B\u30D1\u30C3\u30B1\u30FC\u30B8\u3092\u6982\u8981\u30DA\u30FC\u30B8\u306B\u304A\u3044\u3066\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\n  -nocomment                        \u8A18\u8FF0\u304A\u3088\u3073\u30BF\u30B0\u3092\u6291\u5236\u3057\u3066\u5BA3\u8A00\u306E\u307F\u3092\u751F\u6210\u3059\u308B\n  -nodeprecated                     @deprecated\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n  -noqualifier <name1>:<name2>:...  \u51FA\u529B\u304B\u3089\u4FEE\u98FE\u5B50\u306E\u30EA\u30B9\u30C8\u3092\u9664\u5916\u3059\u308B\n  -nosince                          @since\u60C5\u5831\u3092\u9664\u5916\u3059\u308B\n  -notimestamp                      \u975E\u8868\u793A\u306E\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u3092\u9664\u5916\u3059\u308B\n  -nodeprecatedlist                 \u975E\u63A8\u5968\u306E\u30EA\u30B9\u30C8\u3092\u751F\u6210\u3057\u306A\u3044\n  -notree                           \u30AF\u30E9\u30B9\u968E\u5C64\u3092\u751F\u6210\u3057\u306A\u3044\n  -noindex                          \u7D22\u5F15\u3092\u751F\u6210\u3057\u306A\u3044\n  -nohelp                           \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u3092\u751F\u6210\u3057\u306A\u3044\n  -nonavbar                         \u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u3092\u751F\u6210\u3057\u306A\u3044\n  -serialwarn                       @serial\u30BF\u30B0\u306B\u95A2\u3059\u308B\u8B66\u544A\u3092\u751F\u6210\u3059\u308B\n  -tag <name>:<locations>:<header>  \u5358\u4E00\u306E\u5F15\u6570\u3092\u6301\u3064\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u3092\u6307\u5B9A\u3059\u308B\n  \
--taglet                           \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u5B8C\u5168\u4FEE\u98FE\u540D\u3092\u767B\u9332\u3059\u308B\n  -tagletpath                       \u30BF\u30B0\u30EC\u30C3\u30C8\u306E\u30D1\u30B9\n  -charset <charset>                \u751F\u6210\u3055\u308C\u308B\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30AF\u30ED\u30B9\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\n  -helpfile <file>                  \u30D8\u30EB\u30D7\u30FB\u30EA\u30F3\u30AF\u306E\u30EA\u30F3\u30AF\u5148\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B\n-  linksource                       HTML\u5F62\u5F0F\u3067\u30BD\u30FC\u30B9\u3092\u751F\u6210\u3059\u308B\n  -sourcetab <tab length>           \u30BD\u30FC\u30B9\u5185\u306E\u30BF\u30D6\u306E\u7A7A\u767D\u6587\u5B57\u306E\u6570\u3092\u6307\u5B9A\u3059\u308B\n  -keywords                         HTML\u306Emeta\u30BF\u30B0\u306B\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u60C5\u5831\u3092\u542B\u3081\u308B\n  -stylesheetfile <path>            \u751F\u6210\u3055\u308C\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30B9\u30BF\u30A4\u30EB\u5909\u66F4\u7528\u30D5\u30A1\u30A4\u30EB\n  -docencoding <name>               \u51FA\u529B\u306E\u6587\u5B57\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3059\u308B
-
-
-# L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.X.usage=\u6A19\u6E96\u306Edoclet\u306B\u3088\u308A\u63D0\u4F9B\u3055\u308C\u308B\u3082\u306E:\n  -Xdocrootparent <url>            doc\u30B3\u30E1\u30F3\u30C8\u5185\u306E/..\u304C\u5F8C\u306B\u7D9A\u304F@docRoot\u306E\u3059\u3079\u3066\u3092\n                                   <url>\u3067\u7F6E\u63DB\u3057\u307E\u3059\n  -Xdoclint                        javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u63A8\u5968\u3055\u308C\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3057\u307E\u3059\n  -Xdoclint:(all|none|[-]<group>) \n        javadoc\u30B3\u30E1\u30F3\u30C8\u5185\u306E\u554F\u984C\u306B\u5BFE\u3059\u308B\u7279\u5B9A\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\n        \u3053\u3053\u3067\u3001<group>\u306Faccessibility\u3001html\u3001missing\u3001reference\u307E\u305F\u306Fsyntax\u306E\u3044\u305A\u308C\u304B\u3067\u3059\u3002\n -Xdoclint/package:([-]<packages>)\n        \u7279\u5B9A\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002<packages>\u306F\n        \u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306F\u3001\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u3001\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\u306E\u63A5\u982D\u8F9E\u306E\u5F8C\u306B''.*''\u3092\u6307\u5B9A(\u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\n        \u3059\u3079\u3066\u306E\u30B5\u30D6\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u62E1\u5F35)\u3057\u305F\u3082\u306E\u3067\u3059\u3002\u30D1\u30C3\u30B1\u30FC\u30B8\u6307\u5B9A\u5B50\u306E\u524D\u306B'-'\u3092\u6307\u5B9A\u3059\u308B\u3068\u3001\n        \u6307\u5B9A\u3057\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u95A2\u3059\u308B\u30C1\u30A7\u30C3\u30AF\u3092\u7121\u52B9\u306B\u3067\u304D\u307E\u3059\u3002\n
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
deleted file mode 100644
index c7ff3f3a203..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
+++ /dev/null
@@ -1,186 +0,0 @@
-doclet.build_version=\u6807\u51C6 Doclet (\u65E7) \u7248\u672C {0}
-doclet.Contents=\u76EE\u5F55
-doclet.Overview=\u6982\u89C8
-doclet.Window_Overview=\u6982\u89C8\u5217\u8868
-doclet.Window_Overview_Summary=\u6982\u89C8
-doclet.Package=\u7A0B\u5E8F\u5305
-doclet.All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305
-doclet.Tree=\u6811
-doclet.Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Window_Class_Hierarchy=\u7C7B\u5206\u5C42\u7ED3\u6784
-doclet.Interface_Hierarchy=\u63A5\u53E3\u5206\u5C42\u7ED3\u6784
-doclet.Enum_Hierarchy=\u679A\u4E3E\u5206\u5C42\u7ED3\u6784
-doclet.Annotation_Type_Hierarchy=\u6CE8\u91CA\u7C7B\u578B\u5206\u5C42\u7ED3\u6784
-doclet.Prev=\u4E0A\u4E00\u4E2A
-doclet.Next=\u4E0B\u4E00\u4E2A
-doclet.Prev_Class=\u4E0A\u4E00\u4E2A\u7C7B
-doclet.Next_Class=\u4E0B\u4E00\u4E2A\u7C7B
-doclet.Prev_Package=\u4E0A\u4E00\u4E2A\u7A0B\u5E8F\u5305
-doclet.Next_Package=\u4E0B\u4E00\u4E2A\u7A0B\u5E8F\u5305
-doclet.Prev_Letter=\u4E0A\u4E00\u4E2A\u5B57\u6BCD
-doclet.Next_Letter=\u4E0B\u4E00\u4E2A\u5B57\u6BCD
-doclet.Href_Class_Title={0}\u4E2D\u7684\u7C7B
-doclet.Href_Interface_Title={0}\u4E2D\u7684\u63A5\u53E3
-doclet.Href_Annotation_Title={0}\u4E2D\u7684\u6CE8\u91CA
-doclet.Href_Enum_Title={0}\u4E2D\u7684\u679A\u4E3E
-doclet.Href_Type_Param_Title={0}\u4E2D\u7684\u7C7B\u578B\u53C2\u6570
-doclet.Href_Class_Or_Interface_Title={0}\u4E2D\u7684\u7C7B\u6216\u63A5\u53E3
-doclet.Summary=\u6982\u8981:
-doclet.Detail=\u8BE6\u7EC6\u8D44\u6599:
-doclet.navNested=\u5D4C\u5957
-doclet.navAnnotationTypeOptionalMember=\u53EF\u9009
-doclet.navAnnotationTypeRequiredMember=\u5FC5\u9700
-doclet.navAnnotationTypeMember=\u5143\u7D20
-doclet.navField=\u5B57\u6BB5
-doclet.navProperty=\u5C5E\u6027
-doclet.navEnum=\u679A\u4E3E\u5E38\u91CF
-doclet.navConstructor=\u6784\u9020\u5668
-doclet.navMethod=\u65B9\u6CD5
-doclet.Index=\u7D22\u5F15
-doclet.Window_Single_Index=\u7D22\u5F15
-doclet.Window_Split_Index={0} - \u7D22\u5F15
-doclet.Help=\u5E2E\u52A9
-doclet.Skip_navigation_links=\u8DF3\u8FC7\u5BFC\u822A\u94FE\u63A5
-doclet.Navigation=\u5BFC\u822A
-doclet.New_Page=NewPage
-doclet.navDeprecated=\u5DF2\u8FC7\u65F6
-doclet.Window_Deprecated_List=\u5DF2\u8FC7\u65F6\u7684\u5217\u8868
-doclet.Overrides=\u8986\u76D6:
-doclet.in_class=\u5728\u7C7B\u4E2D
-doclet.Static_variable_in={0}\u4E2D\u7684\u9759\u6001\u53D8\u91CF
-doclet.Variable_in={0}\u4E2D\u7684\u53D8\u91CF
-doclet.Constructor_for={0}\u7684\u6784\u9020\u5668
-doclet.Static_method_in={0}\u4E2D\u7684\u9759\u6001\u65B9\u6CD5
-doclet.Search_tag_in={0}\u4E2D\u7684\u641C\u7D22\u6807\u8BB0
-doclet.Method_in={0}\u4E2D\u7684\u65B9\u6CD5
-doclet.package=\u7A0B\u5E8F\u5305
-doclet.MalformedURL=\u683C\u5F0F\u9519\u8BEF\u7684 URL: {0}
-doclet.File_error=\u8BFB\u53D6\u6587\u4EF6\u65F6\u51FA\u9519: {0}
-doclet.URL_error=\u83B7\u53D6 URL \u65F6\u51FA\u9519: {0}
-doclet.see.class_or_package_not_found=\u6807\u8BB0{0}: \u627E\u4E0D\u5230\u5F15\u7528: {1}
-doclet.see.class_or_package_not_accessible=\u6807\u8BB0{0}: \u65E0\u6CD5\u8BBF\u95EE\u5F15\u7528: {1}
-doclet.Deprecated_API=\u5DF2\u8FC7\u65F6\u7684 API
-doclet.Deprecated_Packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305
-doclet.Deprecated_Classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B
-doclet.Deprecated_Enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E
-doclet.Deprecated_Interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3
-doclet.Deprecated_Exceptions=\u5DF2\u8FC7\u65F6\u7684\u5F02\u5E38\u9519\u8BEF
-doclet.Deprecated_Annotation_Types=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B
-doclet.Deprecated_Errors=\u5DF2\u8FC7\u65F6\u7684\u9519\u8BEF
-doclet.Deprecated_Fields=\u5DF2\u8FC7\u65F6\u7684\u5B57\u6BB5
-doclet.Deprecated_Constructors=\u5DF2\u8FC7\u65F6\u7684\u6784\u9020\u5668
-doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
-doclet.Deprecated_Enum_Constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF
-doclet.Deprecated_Annotation_Type_Members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.deprecated_packages=\u5DF2\u8FC7\u65F6\u7A0B\u5E8F\u5305
-doclet.deprecated_classes=\u5DF2\u8FC7\u65F6\u7684\u7C7B
-doclet.deprecated_enums=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E
-doclet.deprecated_interfaces=\u5DF2\u8FC7\u65F6\u7684\u63A5\u53E3
-doclet.deprecated_exceptions=\u5DF2\u8FC7\u65F6\u7684\u5F02\u5E38\u9519\u8BEF
-doclet.deprecated_annotation_types=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B
-doclet.deprecated_errors=\u5DF2\u8FC7\u65F6\u7684\u9519\u8BEF
-doclet.deprecated_fields=\u5DF2\u8FC7\u65F6\u7684\u5B57\u6BB5
-doclet.deprecated_constructors=\u5DF2\u8FC7\u65F6\u7684\u6784\u9020\u5668
-doclet.deprecated_methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
-doclet.deprecated_enum_constants=\u5DF2\u8FC7\u65F6\u7684\u679A\u4E3E\u5E38\u91CF
-doclet.deprecated_annotation_type_members=\u5DF2\u8FC7\u65F6\u7684\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.Generated_Docs_Untitled=\u751F\u6210\u7684\u6587\u6863 (\u65E0\u6807\u9898)
-doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
-doclet.Package_Description=\u7A0B\u5E8F\u5305{0}\u7684\u8BF4\u660E
-doclet.Description=\u8BF4\u660E
-doclet.Specified_By=\u6307\u5B9A\u8005:
-doclet.in_interface=\u5728\u63A5\u53E3\u4E2D
-doclet.Subclasses=\u76F4\u63A5\u5DF2\u77E5\u5B50\u7C7B:
-doclet.Subinterfaces=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3:
-doclet.Implementing_Classes=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B:
-doclet.Functional_Interface=\u51FD\u6570\u63A5\u53E3:
-doclet.Functional_Interface_Message=\u8FD9\u662F\u4E00\u4E2A\u51FD\u6570\u63A5\u53E3, \u56E0\u6B64\u53EF\u7528\u4F5C lambda \u8868\u8FBE\u5F0F\u6216\u65B9\u6CD5\u5F15\u7528\u7684\u8D4B\u503C\u76EE\u6807\u3002
-doclet.also=\u5E76
-doclet.Frames=\u6846\u67B6
-doclet.No_Frames=\u65E0\u6846\u67B6
-doclet.Package_Hierarchies=\u7A0B\u5E8F\u5305\u5206\u5C42\u7ED3\u6784:
-doclet.Hierarchy_For_Package=\u7A0B\u5E8F\u5305{0}\u7684\u5206\u5C42\u7ED3\u6784
-doclet.Hierarchy_For_All_Packages=\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784
-doclet.No_Script_Message=\u60A8\u7684\u6D4F\u89C8\u5668\u5DF2\u7981\u7528 JavaScript\u3002
-doclet.Description_From_Interface=\u4ECE\u63A5\u53E3\u590D\u5236\u7684\u8BF4\u660E:
-doclet.Description_From_Class=\u4ECE\u7C7B\u590D\u5236\u7684\u8BF4\u660E:
-doclet.No_Non_Deprecated_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u672A\u8FC7\u65F6\u7684\u7C7B\u3002
-doclet.Interfaces_Italic=\u63A5\u53E3 (\u659C\u4F53)
-doclet.Enclosing_Class=\u5C01\u95ED\u7C7B:
-doclet.Enclosing_Interface=\u5C01\u95ED\u63A5\u53E3:
-doclet.Window_Source_title=\u6E90\u4EE3\u7801
-doclet.Window_Help_title=API \u5E2E\u52A9
-doclet.Help_line_1=\u6B64 API \u6587\u6863\u7684\u7EC4\u7EC7\u65B9\u5F0F
-doclet.Help_line_2=\u6B64 API (\u5E94\u7528\u7A0B\u5E8F\u7F16\u7A0B\u63A5\u53E3) \u6587\u6863\u5305\u542B\u5BF9\u5E94\u4E8E\u5BFC\u822A\u680F\u4E2D\u7684\u9879\u76EE\u7684\u9875\u9762, \u5982\u4E0B\u6240\u8FF0\u3002
-doclet.Help_line_3={0} \u9875\u9762\u662F\u6B64 API \u6587\u6863\u7684\u9996\u9875, \u63D0\u4F9B\u4E86\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u4E5F\u53EF\u80FD\u5305\u542B\u8FD9\u4E9B\u7A0B\u5E8F\u5305\u7684\u603B\u4F53\u8BF4\u660E\u3002
-doclet.Help_line_4=\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u90FD\u6709\u4E00\u4E2A\u9875\u9762, \u5176\u4E2D\u5305\u542B\u5B83\u7684\u7C7B\u548C\u63A5\u53E3\u7684\u5217\u8868\u53CA\u5176\u6982\u8981\u3002\u6B64\u9875\u9762\u53EF\u4EE5\u5305\u542B\u516D\u4E2A\u7C7B\u522B:
-doclet.Help_line_5=\u7C7B/\u63A5\u53E3
-doclet.Help_line_6=\u6BCF\u4E2A\u7C7B, \u63A5\u53E3, \u5D4C\u5957\u7C7B\u548C\u5D4C\u5957\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762\u3002\u5176\u4E2D\u6BCF\u4E2A\u9875\u9762\u90FD\u7531\u4E09\u90E8\u5206 (\u7C7B/\u63A5\u53E3\u8BF4\u660E, \u6982\u8981\u8868, \u4EE5\u53CA\u8BE6\u7EC6\u7684\u6210\u5458\u8BF4\u660E) \u7EC4\u6210:
-doclet.Help_line_7=\u7C7B\u7EE7\u627F\u56FE
-doclet.Help_line_8=\u76F4\u63A5\u5B50\u7C7B
-doclet.Help_line_9=\u6240\u6709\u5DF2\u77E5\u5B50\u63A5\u53E3
-doclet.Help_line_10=\u6240\u6709\u5DF2\u77E5\u5B9E\u73B0\u7C7B
-doclet.Help_line_11=\u7C7B/\u63A5\u53E3\u58F0\u660E
-doclet.Help_line_12=\u7C7B/\u63A5\u53E3\u8BF4\u660E
-doclet.Help_line_13=\u6BCF\u4E2A\u6982\u8981\u6761\u76EE\u90FD\u5305\u542B\u8BE5\u9879\u76EE\u7684\u8BE6\u7EC6\u8BF4\u660E\u7684\u7B2C\u4E00\u53E5\u3002\u6982\u8981\u6761\u76EE\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217, \u800C\u8BE6\u7EC6\u8BF4\u660E\u5219\u6309\u5176\u5728\u6E90\u4EE3\u7801\u4E2D\u51FA\u73B0\u7684\u987A\u5E8F\u6392\u5217\u3002\u8FD9\u6837\u4FDD\u6301\u4E86\u7A0B\u5E8F\u5458\u6240\u5EFA\u7ACB\u7684\u903B\u8F91\u5206\u7EC4\u3002
-doclet.Help_line_14=\u4F7F\u7528
-doclet.Help_line_15=\u6BCF\u4E2A\u5DF2\u6587\u6863\u5316\u7684\u7A0B\u5E8F\u5305, \u7C7B\u548C\u63A5\u53E3\u90FD\u6709\u5404\u81EA\u7684\u201C\u4F7F\u7528\u201D\u9875\u9762\u3002\u6B64\u9875\u9762\u4ECB\u7ECD\u4E86\u4F7F\u7528\u7ED9\u5B9A\u7C7B\u6216\u7A0B\u5E8F\u5305\u7684\u4EFB\u4F55\u90E8\u5206\u7684\u7A0B\u5E8F\u5305, \u7C7B, \u65B9\u6CD5, \u6784\u9020\u5668\u548C\u5B57\u6BB5\u3002\u5BF9\u4E8E\u7ED9\u5B9A\u7684\u7C7B\u6216\u63A5\u53E3 A, \u5176\u201C\u4F7F\u7528\u201D\u9875\u9762\u5305\u542B A \u7684\u5B50\u7C7B, \u58F0\u660E\u4E3A A \u7684\u5B57\u6BB5, \u8FD4\u56DE A \u7684\u65B9\u6CD5, \u4EE5\u53CA\u5E26\u6709\u7C7B\u578B\u4E3A A \u7684\u53C2\u6570\u7684\u65B9\u6CD5\u548C\u6784\u9020\u5668\u3002\u8BBF\u95EE\u6B64\u9875\u9762\u7684\u65B9\u6CD5\u662F: \u9996\u5148\u8F6C\u81F3\u7A0B\u5E8F\u5305, \u7C7B\u6216\u63A5\u53E3, \u7136\u540E\u5355\u51FB\u5BFC\u822A\u680F\u4E2D\u7684 "\u4F7F\u7528" \u94FE\u63A5\u3002
-doclet.Help_line_16=\u6811 (\u7C7B\u5206\u5C42\u7ED3\u6784)
-doclet.Help_line_17_with_tree_link=\u5BF9\u4E8E\u6240\u6709\u7A0B\u5E8F\u5305, \u6709\u4E00\u4E2A{0}\u9875\u9762, \u4EE5\u53CA\u6BCF\u4E2A\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002\u6BCF\u4E2A\u5206\u5C42\u7ED3\u6784\u9875\u9762\u90FD\u5305\u542B\u7C7B\u7684\u5217\u8868\u548C\u63A5\u53E3\u7684\u5217\u8868\u3002\u4ECE{1}\u5F00\u59CB, \u6309\u7EE7\u627F\u7ED3\u6784\u5BF9\u7C7B\u8FDB\u884C\u6392\u5217\u3002\u63A5\u53E3\u4E0D\u4ECE{1}\u7EE7\u627F\u3002
-doclet.Help_line_18=\u67E5\u770B\u201C\u6982\u89C8\u201D\u9875\u9762\u65F6, \u5355\u51FB "\u6811" \u5C06\u663E\u793A\u6240\u6709\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
-doclet.Help_line_19=\u67E5\u770B\u7279\u5B9A\u7A0B\u5E8F\u5305, \u7C7B\u6216\u63A5\u53E3\u9875\u9762\u65F6, \u5355\u51FB "\u6811" \u5C06\u4EC5\u663E\u793A\u8BE5\u7A0B\u5E8F\u5305\u7684\u5206\u5C42\u7ED3\u6784\u3002
-doclet.Help_line_20_with_deprecated_api_link={0} \u9875\u9762\u5217\u51FA\u4E86\u6240\u6709\u5DF2\u8FC7\u65F6\u7684 API\u3002\u4E00\u822C\u7531\u4E8E\u8FDB\u884C\u4E86\u6539\u8FDB\u5E76\u4E14\u901A\u5E38\u63D0\u4F9B\u4E86\u66FF\u4EE3\u7684 API, \u6240\u4EE5\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u5DF2\u8FC7\u65F6\u7684 API\u3002\u5728\u5C06\u6765\u7684\u5B9E\u73B0\u8FC7\u7A0B\u4E2D, \u53EF\u80FD\u4F1A\u5220\u9664\u5DF2\u8FC7\u65F6\u7684 API\u3002
-doclet.Help_line_21=\u7D22\u5F15
-doclet.Help_line_22={0} \u5305\u542B\u6309\u5B57\u6BCD\u987A\u5E8F\u6392\u5217\u7684\u6240\u6709\u7C7B, \u63A5\u53E3, \u6784\u9020\u5668, \u65B9\u6CD5\u548C\u5B57\u6BB5\u7684\u5217\u8868\u3002
-doclet.Help_line_23=\u4E0A\u4E00\u4E2A/\u4E0B\u4E00\u4E2A
-doclet.Help_line_24=\u8FD9\u4E9B\u94FE\u63A5\u4F7F\u60A8\u53EF\u4EE5\u8F6C\u81F3\u4E0B\u4E00\u4E2A\u6216\u4E0A\u4E00\u4E2A\u7C7B, \u63A5\u53E3, \u7A0B\u5E8F\u5305\u6216\u76F8\u5173\u9875\u9762\u3002
-doclet.Help_line_25=\u6846\u67B6/\u65E0\u6846\u67B6
-doclet.Help_line_26=\u8FD9\u4E9B\u94FE\u63A5\u7528\u4E8E\u663E\u793A\u548C\u9690\u85CF HTML \u6846\u67B6\u3002\u6240\u6709\u9875\u9762\u5747\u5177\u6709\u6709\u6846\u67B6\u548C\u65E0\u6846\u67B6\u4E24\u79CD\u663E\u793A\u65B9\u5F0F\u3002
-doclet.Help_line_27={0}\u94FE\u63A5\u663E\u793A\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)\u3002
-doclet.Help_line_28=\u6BCF\u4E2A\u53EF\u5E8F\u5217\u5316\u6216\u53EF\u5916\u90E8\u5316\u7684\u7C7B\u90FD\u6709\u5176\u5E8F\u5217\u5316\u5B57\u6BB5\u548C\u65B9\u6CD5\u7684\u8BF4\u660E\u3002\u6B64\u4FE1\u606F\u5BF9\u91CD\u65B0\u5B9E\u73B0\u8005\u6709\u7528, \u800C\u5BF9\u4F7F\u7528 API \u7684\u5F00\u53D1\u8005\u5219\u6CA1\u6709\u4EC0\u4E48\u7528\u5904\u3002\u5C3D\u7BA1\u5BFC\u822A\u680F\u4E2D\u6CA1\u6709\u94FE\u63A5, \u4F46\u60A8\u53EF\u4EE5\u901A\u8FC7\u4E0B\u5217\u65B9\u5F0F\u83B7\u53D6\u6B64\u4FE1\u606F: \u8F6C\u81F3\u4EFB\u4F55\u5E8F\u5217\u5316\u7C7B, \u7136\u540E\u5355\u51FB\u7C7B\u8BF4\u660E\u7684 "\u53E6\u8BF7\u53C2\u9605" \u90E8\u5206\u4E2D\u7684 "\u5E8F\u5217\u5316\u8868\u683C"\u3002
-doclet.Help_line_29={0}\u9875\u9762\u5217\u51FA\u4E86\u9759\u6001\u6700\u7EC8\u5B57\u6BB5\u53CA\u5176\u503C\u3002
-doclet.Help_line_30=\u6B64\u5E2E\u52A9\u6587\u4EF6\u9002\u7528\u4E8E\u4F7F\u7528\u6807\u51C6 doclet \u751F\u6210\u7684 API \u6587\u6863\u3002
-doclet.Help_enum_line_1=\u6BCF\u4E2A\u679A\u4E3E\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.Help_enum_line_2=\u679A\u4E3E\u58F0\u660E
-doclet.Help_enum_line_3=\u679A\u4E3E\u8BF4\u660E
-doclet.Help_annotation_type_line_1=\u6BCF\u4E2A\u6CE8\u91CA\u7C7B\u578B\u90FD\u6709\u5404\u81EA\u7684\u9875\u9762, \u5176\u4E2D\u5305\u542B\u4EE5\u4E0B\u90E8\u5206:
-doclet.Help_annotation_type_line_2=\u6CE8\u91CA\u7C7B\u578B\u58F0\u660E
-doclet.Help_annotation_type_line_3=\u6CE8\u91CA\u7C7B\u578B\u8BF4\u660E
-doclet.ClassUse_Packages.that.use.0=\u4F7F\u7528{0}\u7684\u7A0B\u5E8F\u5305
-doclet.ClassUse_Uses.of.0.in.1={1}\u4E2D{0}\u7684\u4F7F\u7528
-doclet.ClassUse_Classes.in.0.used.by.1={1}\u4F7F\u7528\u7684{0}\u4E2D\u7684\u7C7B
-doclet.ClassUse_PackageAnnotation=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684\u7A0B\u5E8F\u5305
-doclet.ClassUse_Annotation=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_TypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_MethodTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_FieldTypeParameter=\u7C7B\u578B\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_FieldAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_MethodAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodParameterAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5\u53C2\u6570
-doclet.ClassUse_MethodReturnTypeParameter=\u8FD4\u56DE\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684\u7C7B\u578B\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_Subclass={1}\u4E2D{0}\u7684\u5B50\u7C7B
-doclet.ClassUse_Subinterface={1}\u4E2D{0}\u7684\u5B50\u63A5\u53E3
-doclet.ClassUse_ImplementingClass=\u5B9E\u73B0{0}\u7684{1}\u4E2D\u7684\u7C7B
-doclet.ClassUse_Field=\u58F0\u660E\u4E3A{0}\u7684{1}\u4E2D\u7684\u5B57\u6BB5
-doclet.ClassUse_MethodReturn=\u8FD4\u56DE{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodArgs=\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_MethodArgsTypeParameters=\u7C7B\u578B\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5\u53C2\u6570
-doclet.ClassUse_MethodThrows=\u629B\u51FA{0}\u7684{1}\u4E2D\u7684\u65B9\u6CD5
-doclet.ClassUse_ConstructorAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_ConstructorParameterAnnotations=\u6CE8\u91CA\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668\u53C2\u6570
-doclet.ClassUse_ConstructorArgs=\u53C2\u6570\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_ConstructorArgsTypeParameters=\u7C7B\u578B\u53D8\u91CF\u7C7B\u578B\u4E3A{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668\u53C2\u6570
-doclet.ClassUse_ConstructorThrows=\u629B\u51FA{0}\u7684{1}\u4E2D\u7684\u6784\u9020\u5668
-doclet.ClassUse_No.usage.of.0=\u6CA1\u6709{0}\u7684\u7528\u6CD5
-doclet.Window_ClassUse_Header={0} {1}\u7684\u4F7F\u7528
-doclet.ClassUse_Title={0}\u7684\u4F7F\u7528
-doclet.navClassUse=\u4F7F\u7528
-doclet.Error_in_packagelist=\u4F7F\u7528 -group \u9009\u9879\u65F6\u51FA\u9519: {0} {1}
-doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
-doclet.Same_package_name_used=\u7A0B\u5E8F\u5305\u540D\u79F0\u5F62\u5F0F\u4F7F\u7528\u4E86\u4E24\u6B21: {0}
-doclet.exception_encountered=\u5904\u7406{1}\u65F6\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\n{0}
-doclet.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n  -d <directory>                   \u8F93\u51FA\u6587\u4EF6\u7684\u76EE\u6807\u76EE\u5F55\n  -use                             \u521B\u5EFA\u7C7B\u548C\u7A0B\u5E8F\u5305\u7528\u6CD5\u9875\u9762\n  -version                         \u5305\u542B @version \u6BB5\n  -author                          \u5305\u542B @author \u6BB5\n  -docfilessubdirs                 \u9012\u5F52\u590D\u5236\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\n  -splitindex                      \u5C06\u7D22\u5F15\u5206\u4E3A\u6BCF\u4E2A\u5B57\u6BCD\u5BF9\u5E94\u4E00\u4E2A\u6587\u4EF6\n  -windowtitle <text>              \u6587\u6863\u7684\u6D4F\u89C8\u5668\u7A97\u53E3\u6807\u9898\n  -doctitle <html-code>            \u5305\u542B\u6982\u89C8\u9875\u9762\u7684\u6807\u9898\n  -header <html-code>              \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u7709\u6587\u672C\n  -html4                           \u751F\u6210 HTML 4.01 \u8F93\u51FA\n  -html5                           \u751F\u6210 HTML 5 \u8F93\u51FA\n  -footer <html-code>              \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9875\u811A\u6587\u672C\n  -top    <html-code>              \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u9876\u90E8\u6587\u672C\n  -bottom <html-code>              \u5305\u542B\u6BCF\u4E2A\u9875\u9762\u7684\u5E95\u90E8\u6587\u672C\n  -link <url>                      \u521B\u5EFA\u6307\u5411\u4F4D\u4E8E <url> \u7684 javadoc \u8F93\u51FA\u7684\u94FE\u63A5\n  -linkoffline <url> <url2>        \u5229\u7528\u4F4D\u4E8E <url2> \u7684\u7A0B\u5E8F\u5305\u5217\u8868\u94FE\u63A5\u81F3\u4F4D\u4E8E <url> \u7684\u6587\u6863\n  -excludedocfilessubdir <name1>:.. \u6392\u9664\u5177\u6709\u7ED9\u5B9A\u540D\u79F0\u7684\u6240\u6709\u6587\u6863\u6587\u4EF6\u5B50\u76EE\u5F55\u3002\n  -group <name> <p1>:<p2>..        \u5728\u6982\u89C8\u9875\u9762\u4E2D, \u5C06\u6307\u5B9A\u7684\u7A0B\u5E8F\u5305\u5206\u7EC4\n  -nocomment                       \u4E0D\u751F\u6210\u8BF4\u660E\u548C\u6807\u8BB0, \u53EA\u751F\u6210\u58F0\u660E\u3002\n  -nodeprecated                    \u4E0D\u5305\u542B @deprecated \u4FE1\u606F\n  -noqualifier <name1>:<name2>:... \u8F93\u51FA\u4E2D\u4E0D\u5305\u62EC\u6307\u5B9A\u9650\u5B9A\u7B26\u7684\u5217\u8868\u3002\n  -nosince                         \u4E0D\u5305\u542B @since \u4FE1\u606F\n  -notimestamp                     \u4E0D\u5305\u542B\u9690\u85CF\u65F6\u95F4\u6233\n  -nodeprecatedlist                \u4E0D\u751F\u6210\u5DF2\u8FC7\u65F6\u7684\u5217\u8868\n  -notree                          \u4E0D\u751F\u6210\u7C7B\u5206\u5C42\u7ED3\u6784\n  -noindex                         \u4E0D\u751F\u6210\u7D22\u5F15\n  -nohelp                          \u4E0D\u751F\u6210\u5E2E\u52A9\u94FE\u63A5\n  -nonavbar                        \u4E0D\u751F\u6210\u5BFC\u822A\u680F\n  -serialwarn                      \u751F\u6210\u6709\u5173 @serial \u6807\u8BB0\u7684\u8B66\u544A\n  -tag <name>:<locations>:<header> \u6307\u5B9A\u5355\u4E2A\u53C2\u6570\u5B9A\u5236\u6807\u8BB0\n  -taglet                          \u8981\u6CE8\u518C\u7684 Taglet \u7684\u5168\u9650\u5B9A\u540D\u79F0\n  -tagletpath                      Taglet \u7684\u8DEF\u5F84\n  -charset <charset>               \u7528\u4E8E\u8DE8\u5E73\u53F0\u67E5\u770B\u751F\u6210\u7684\u6587\u6863\u7684\u5B57\u7B26\u96C6\u3002\n  -helpfile <file>                 \u5305\u542B\u5E2E\u52A9\u94FE\u63A5\u6240\u94FE\u63A5\u5230\u7684\u6587\u4EF6\n  -linksource                      \u4EE5 HTML \u683C\u5F0F\u751F\u6210\u6E90\u6587\u4EF6\n  -sourcetab <tab length>          \u6307\u5B9A\u6E90\u4E2D\u6BCF\u4E2A\u5236\u8868\u7B26\u5360\u636E\u7684\u7A7A\u683C\u6570\n  -keywords                        \u4F7F\u7A0B\u5E8F\u5305, \u7C7B\u548C\u6210\u5458\u4FE1\u606F\u9644\u5E26 HTML \u5143\u6807\u8BB0\n  -stylesheetfile <path>           \u7528\u4E8E\u66F4\u6539\u751F\u6210\u6587\u6863\u7684\u6837\u5F0F\u7684\u6587\u4EF6\n  -docencoding <name>              \u6307\u5B9A\u8F93\u51FA\u7684\u5B57\u7B26\u7F16\u7801
-
-
-# L10N: do not localize these words: all none accessibility html missing reference syntax
-doclet.X.usage=\u901A\u8FC7\u6807\u51C6 doclet \u63D0\u4F9B:\n  -Xdocrootparent <url>            \u4F7F\u7528 <url> \u66FF\u6362\u6587\u6863\u6CE8\u91CA\u4E2D\u51FA\u73B0\u7684\n                                   \u6240\u6709\u5176\u540E\u8DDF\u968F /.. \u7684 @docRoot\n  -Xdoclint                        \u4E3A javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u5EFA\u8BAE\u7684\u68C0\u67E5\n  -Xdoclint:(all|none|[-]<group>) \n        \u5BF9 javadoc \u6CE8\u91CA\u4E2D\u7684\u95EE\u9898\u542F\u7528\u6216\u7981\u7528\u7279\u5B9A\u68C0\u67E5\u3002\n        \u5176\u4E2D <group> \u662F accessibility, html, missing, reference \u6216 syntax \u4E4B\u4E00\u3002\n  -Xdoclint/package:([-]<packages>)\n        \u5728\u7279\u5B9A\u7684\u7A0B\u5E8F\u5305\u4E2D\u542F\u7528\u6216\u7981\u7528\u68C0\u67E5\u3002<packages> \u662F\u9017\u53F7\u5206\u9694\u7684\n        \u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u5217\u8868\u3002\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u662F\u7A0B\u5E8F\u5305\u7684\u9650\u5B9A\u540D\u79F0\n        \u6216\u7A0B\u5E8F\u5305\u540D\u79F0\u524D\u7F00\u540E\u8DDF .*, \u5B83\u6269\u5C55\u5230\u7ED9\u5B9A\u7A0B\u5E8F\u5305\u7684\n        \u6240\u6709\u5B50\u7A0B\u5E8F\u5305\u3002\u5728\u7A0B\u5E8F\u5305\u8BF4\u660E\u7B26\u524D\u9762\u52A0\u4E0A - \u53EF\u4EE5\u4E3A\n        \u6307\u5B9A\u7A0B\u5E8F\u5305\u7981\u7528\u68C0\u67E5\u3002\n
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
deleted file mode 100644
index 1b357a5029f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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.doclets.internal.toolkit;
-
-import javax.tools.StandardLocation;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.builders.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * An abstract implementation of a Doclet.
- *
- *  <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>
- *
- * @author Jamie Ho
- */
-@Deprecated
-public abstract class AbstractDoclet {
-
-    /**
-     * The global configuration information for this run.
-     */
-    public Configuration configuration;
-    /*
-     *  a handle to our utility methods
-     */
-    protected Utils utils;
-
-    /**
-     * The only doclet that may use this toolkit is {@value}
-     */
-    private static final String TOOLKIT_DOCLET_NAME =
-        com.sun.tools.doclets.formats.html.HtmlDoclet.class.getName();
-
-    /**
-     * Verify that the only doclet that is using this toolkit is
-     * {@value #TOOLKIT_DOCLET_NAME}.
-     */
-    private boolean isValidDoclet() {
-        if (!getClass().getName().equals(TOOLKIT_DOCLET_NAME)) {
-            configuration.message.error("doclet.Toolkit_Usage_Violation",
-                TOOLKIT_DOCLET_NAME);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * The method that starts the execution of the doclet.
-     *
-     * @param root   the {@link RootDoc} that points to the source to document.
-     * @return true if the doclet executed without error.  False otherwise.
-     */
-    public boolean startDoclet(RootDoc root) {
-        configuration = configuration();
-        configuration.root = root;
-        utils = configuration.utils;
-        if (!isValidDoclet()) {
-            return false;
-        }
-        try {
-            startGeneration(root);
-        } catch (Configuration.Fault f) {
-            root.printError(f.getMessage());
-            return false;
-        } catch (FatalError fe) {
-            return false;
-        } catch (DocletAbortException e) {
-            e.printStackTrace();
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                if (cause.getLocalizedMessage() != null) {
-                    root.printError(cause.getLocalizedMessage());
-                } else {
-                    root.printError(cause.toString());
-                }
-            }
-            return false;
-        } catch (Exception exc) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Indicate that this doclet supports the 1.5 language features.
-     * @return JAVA_1_5, indicating that the new features are supported.
-     */
-    public static LanguageVersion languageVersion() {
-        return LanguageVersion.JAVA_1_5;
-    }
-
-
-    /**
-     * Create the configuration instance and returns it.
-     * @return the configuration of the doclet.
-     */
-    public abstract Configuration configuration();
-
-    /**
-     * Start the generation of files. Call generate methods in the individual
-     * writers, which will in turn generate the documentation files. Call the
-     * TreeWriter generation first to ensure the Class Hierarchy is built
-     * first and then can be used in the later generation.
-     *
-     * @see com.sun.javadoc.RootDoc
-     */
-    private void startGeneration(RootDoc root) throws Configuration.Fault, Exception {
-        if (root.classes().length == 0) {
-            configuration.message.
-                error("doclet.No_Public_Classes_To_Document");
-            return;
-        }
-        configuration.setOptions();
-        configuration.getDocletSpecificMsg().notice("doclet.build_version",
-            configuration.getDocletSpecificBuildDate());
-        ClassTree classtree = new ClassTree(configuration, configuration.nodeprecated);
-
-        generateClassFiles(root, classtree);
-        configuration.utils.copyDocFiles(configuration, StandardLocation.SOURCE_PATH, DocPaths.DOC_FILES);
-
-        PackageListWriter.generate(configuration);
-        generatePackageFiles(classtree);
-
-        generateOtherFiles(root, classtree);
-        configuration.tagletManager.printReport();
-    }
-
-    /**
-     * Generate additional documentation that is added to the API documentation.
-     *
-     * @param root      the RootDoc of source to document.
-     * @param classtree the data structure representing the class tree.
-     */
-    protected void generateOtherFiles(RootDoc root, ClassTree classtree) throws Exception {
-        BuilderFactory builderFactory = configuration.getBuilderFactory();
-        AbstractBuilder constantsSummaryBuilder = builderFactory.getConstantsSummaryBuider();
-        constantsSummaryBuilder.build();
-        AbstractBuilder serializedFormBuilder = builderFactory.getSerializedFormBuilder();
-        serializedFormBuilder.build();
-    }
-
-    /**
-     * Generate the package documentation.
-     *
-     * @param classtree the data structure representing the class tree.
-     */
-    protected abstract void generatePackageFiles(ClassTree classtree) throws Exception;
-
-    /**
-     * Generate the class documentation.
-     *
-     * @param classtree the data structure representing the class tree.
-     */
-    protected abstract void generateClassFiles(ClassDoc[] arr, ClassTree classtree);
-
-    /**
-     * Iterate through all classes and construct documentation for them.
-     *
-     * @param root      the RootDoc of source to document.
-     * @param classtree the data structure representing the class tree.
-     */
-    protected void generateClassFiles(RootDoc root, ClassTree classtree) {
-        generateClassFiles(classtree);
-        PackageDoc[] packages = root.specifiedPackages();
-        for (PackageDoc pkg : packages) {
-            generateClassFiles(pkg.allClasses(), classtree);
-        }
-    }
-
-    /**
-     * Generate the class files for single classes specified on the command line.
-     *
-     * @param classtree the data structure representing the class tree.
-     */
-    private void generateClassFiles(ClassTree classtree) {
-        String[] packageNames = configuration.classDocCatalog.packageNames();
-        for (String packageName : packageNames) {
-            generateClassFiles(configuration.classDocCatalog.allClasses(
-                    packageName), classtree);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
deleted file mode 100644
index b16f18303a8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2013, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing annotation type field output.
- *
- *  <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>
- *
- *
- * @author Bhavesh Patel
- * @since 1.8
- */
-
-@Deprecated
-public interface AnnotationTypeFieldWriter {
-
-    /**
-     * Add the annotation type member tree header.
-     *
-     * @return content tree for the member tree header
-     */
-    public Content getMemberTreeHeader();
-
-    /**
-     * Add the annotation type field details marker.
-     *
-     * @param memberDetails the content tree representing field details marker
-     */
-    public void addAnnotationFieldDetailsMarker(Content memberDetails);
-
-    /**
-     * Add the annotation type details tree header.
-     *
-     * @param classDoc the annotation type being documented
-     * @param memberDetailsTree the content tree representing member details
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the annotation type documentation tree header.
-     *
-     * @param member the annotation type being documented
-     * @param annotationDetailsTree the content tree representing annotation type details
-     * @return content tree for the annotation type documentation header
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree);
-
-    /**
-     * Get the annotation type details tree.
-     *
-     * @param annotationDetailsTree the content tree representing annotation type details
-     * @return content tree for the annotation type details
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree);
-
-    /**
-     * Get the annotation type documentation.
-     *
-     * @param annotationDocTree the content tree representing annotation type documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the annotation type documentation
-     */
-    public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
-
-    /**
-     * Get the signature for the given member.
-     *
-     * @param member the member being documented
-     * @return content tree for the annotation type signature
-     */
-    public Content getSignature(MemberDoc member);
-
-    /**
-     * Add the deprecated output for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Add the comments for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree the content tree to which the comments will be added
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Add the tags for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree the content tree to which the tags will be added
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
deleted file mode 100644
index c3ae75897c4..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing annotation type optional member output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface AnnotationTypeOptionalMemberWriter extends
-        AnnotationTypeRequiredMemberWriter {
-
-    /**
-     * Add the the default value documentation.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree content tree to which the default value will be added
-     */
-    public void addDefaultValueInfo(MemberDoc member, Content annotationDocTree);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
deleted file mode 100644
index c4b3e9e01c2..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing annotation type required member output.
- *
- *  <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>
- *
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface AnnotationTypeRequiredMemberWriter {
-
-    /**
-     * Add the annotation type member tree header.
-     *
-     * @return content tree for the member tree header
-     */
-    public Content getMemberTreeHeader();
-
-    /**
-     * Add the annotation type details marker.
-     *
-     * @param memberDetails the content tree representing details marker
-     */
-    public void addAnnotationDetailsMarker(Content memberDetails);
-
-    /**
-     * Add the annotation type details tree header.
-     *
-     * @param classDoc the annotation type being documented
-     * @param memberDetailsTree the content tree representing member details
-     */
-    public void addAnnotationDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the annotation type documentation tree header.
-     *
-     * @param member the annotation type being documented
-     * @param annotationDetailsTree the content tree representing annotation type details
-     * @return content tree for the annotation type documentation header
-     */
-    public Content getAnnotationDocTreeHeader(MemberDoc member,
-            Content annotationDetailsTree);
-
-    /**
-     * Get the annotation type details tree.
-     *
-     * @param annotationDetailsTree the content tree representing annotation type details
-     * @return content tree for the annotation type details
-     */
-    public Content getAnnotationDetails(Content annotationDetailsTree);
-
-    /**
-     * Get the annotation type documentation.
-     *
-     * @param annotationDocTree the content tree representing annotation type documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the annotation type documentation
-     */
-    public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
-
-    /**
-     * Get the signature for the given member.
-     *
-     * @param member the member being documented
-     * @return content tree for the annotation type signature
-     */
-    public Content getSignature(MemberDoc member);
-
-    /**
-     * Add the deprecated output for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Add the comments for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree the content tree to which the comments will be added
-     */
-    public void addComments(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Add the tags for the given member.
-     *
-     * @param member the member being documented
-     * @param annotationDocTree the content tree to which the tags will be added
-     */
-    public void addTags(MemberDoc member, Content annotationDocTree);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
deleted file mode 100644
index 63454a6fd05..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing annotation type output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface AnnotationTypeWriter {
-
-    /**
-     * Get the header of the page.
-     *
-     * @param header the header string to write
-     * @return a content tree for the header documentation
-     */
-    public Content getHeader(String header);
-
-    /**
-     * Get the annotation content header.
-     *
-     * @return annotation content header that needs to be added to the documentation
-     */
-    public Content getAnnotationContentHeader();
-
-    /**
-     * Get the annotation information tree header.
-     *
-     * @return annotation information tree header that needs to be added to the documentation
-     */
-    public Content getAnnotationInfoTreeHeader();
-
-    /**
-     * Get the annotation information.
-     *
-     * @param annotationInfoTree content tree containing the annotation information
-     * @return a content tree for the annotation
-     */
-    public Content getAnnotationInfo(Content annotationInfoTree);
-
-    /**
-     * Add the signature of the current annotation type.
-     *
-     * @param modifiers the modifiers for the signature
-     * @param annotationInfoTree the annotation content tree to which the signature will be added
-     */
-    public void addAnnotationTypeSignature(String modifiers, Content annotationInfoTree);
-
-    /**
-     * Build the annotation type description.
-     *
-     * @param annotationInfoTree content tree to which the description will be added
-     */
-    public void addAnnotationTypeDescription(Content annotationInfoTree);
-
-    /**
-     * Add the tag information for the current annotation type.
-     *
-     * @param annotationInfoTree content tree to which the tag information will be added
-     */
-    public void addAnnotationTypeTagInfo(Content annotationInfoTree);
-
-    /**
-     * If this annotation is deprecated, add the appropriate information.
-     *
-     * @param annotationInfoTree content tree to which the deprecated information will be added
-     */
-    public void addAnnotationTypeDeprecationInfo (Content annotationInfoTree);
-
-    /**
-     * Get the member tree header for the annotation type.
-     *
-     * @return a content tree for the member tree header
-     */
-    public Content getMemberTreeHeader();
-
-    /**
-     * Add the annotation content tree to the documentation content tree.
-     *
-     * @param contentTree content tree to which the annotation content will be added
-     * @param annotationContentTree annotation content tree which will be added to the content tree
-     */
-    public void addAnnotationContentTree(Content contentTree, Content annotationContentTree);
-
-    /**
-     * Get the member tree.
-     *
-     * @param memberTree the content tree that will be modified and returned
-     * @return a content tree for the member
-     */
-    public Content getMemberTree(Content memberTree);
-
-    /**
-     * Get the member summary tree.
-     *
-     * @param memberTree the content tree that will be used to build the summary tree
-     * @return a content tree for the member summary
-     */
-    public Content getMemberSummaryTree(Content memberTree);
-
-    /**
-     * Get the member details tree.
-     *
-     * @param memberTree the content tree that will be used to build the details tree
-     * @return a content tree for the member details
-     */
-    public Content getMemberDetailsTree(Content memberTree);
-
-    /**
-     * Add the footer of the page.
-     *
-     * @param contentTree content tree to which the footer will be added
-     */
-    public void addFooter(Content contentTree);
-
-    /**
-     * Print the document.
-     *
-     * @param contentTree content tree that will be printed as a document
-     */
-    public void printDocument(Content contentTree) throws IOException;
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-
-    /**
-     * Return the {@link AnnotationTypeDoc} being documented.
-     *
-     * @return the AnnotationTypeDoc being documented.
-     */
-    public AnnotationTypeDoc getAnnotationTypeDoc();
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
deleted file mode 100644
index 370ae3ddc57..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing class output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface ClassWriter {
-
-    /**
-     * Get the header of the page.
-     *
-     * @param header the header string to write
-     * @return header content that needs to be added to the documentation
-     */
-    public Content getHeader(String header);
-
-    /**
-     * Get the class content header.
-     *
-     * @return class content header that needs to be added to the documentation
-     */
-    public Content getClassContentHeader();
-
-    /**
-     * Add the class tree documentation.
-     *
-     * @param classContentTree class content tree to which the documentation will be added
-     */
-    public void addClassTree(Content classContentTree);
-
-    /**
-     * Get the class information tree header.
-     *
-     * @return class informaion tree header that needs to be added to the documentation
-     */
-    public Content getClassInfoTreeHeader();
-
-    /**
-     * Add the type parameter information.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addTypeParamInfo(Content classInfoTree);
-
-    /**
-     * Add all super interfaces if this is an interface.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addSuperInterfacesInfo(Content classInfoTree);
-
-    /**
-     * Add all implemented interfaces if this is a class.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addImplementedInterfacesInfo(Content classInfoTree);
-
-    /**
-     * Add all the classes that extend this one.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addSubClassInfo(Content classInfoTree);
-
-    /**
-     * Add all the interfaces that extend this one.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addSubInterfacesInfo(Content classInfoTree);
-
-    /**
-     * If this is an interface, add all classes that implement this
-     * interface.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addInterfaceUsageInfo(Content classInfoTree);
-
-    /**
-     * If this is an functional interface, display appropriate message.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addFunctionalInterfaceInfo(Content classInfoTree);
-
-    /**
-     * If this is an inner class or interface, add the enclosing class or
-     * interface.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addNestedClassInfo (Content classInfoTree);
-
-    /**
-     * Get the class information.
-     *
-     * @param classInfoTree content tree conatining the class information
-     * @return a content tree for the class
-     */
-    public Content getClassInfo(Content classInfoTree);
-
-    /**
-     * If this class is deprecated, add the appropriate information.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addClassDeprecationInfo (Content classInfoTree);
-
-    /**
-     * Add the signature of the current class content tree.
-     *
-     * @param modifiers the modifiers for the signature
-     * @param classInfoTree the class content tree to which the signature will be added
-     */
-    public void addClassSignature(String modifiers, Content classInfoTree);
-
-    /**
-     * Build the class description.
-     *
-     * @param classInfoTree content tree to which the documentation will be added
-     */
-    public void addClassDescription(Content classInfoTree);
-
-    /**
-     * Add the tag information for the current class.
-     *
-     * @param classInfoTree content tree to which the tag information will be added
-     */
-    public void addClassTagInfo(Content classInfoTree);
-
-    /**
-     * Get the member tree header for the class.
-     *
-     * @return a content tree for the member tree header
-     */
-    public Content getMemberTreeHeader();
-
-    /**
-     * Add the class content tree.
-     *
-     * @param contentTree content tree to which the class content will be added
-     * @param classContentTree class content tree which will be added to the content tree
-     */
-    public void addClassContentTree(Content contentTree, Content classContentTree);
-
-    /**
-     * Add the footer of the page.
-     *
-     * @param contentTree content tree to which the footer will be added
-     */
-    public void addFooter(Content contentTree);
-
-    /**
-     * Print the document.
-     *
-     * @param contentTree content tree that will be printed as a document
-     */
-    public void printDocument(Content contentTree) throws IOException;
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-
-    /**
-     * Return the classDoc being documented.
-     *
-     * @return the classDoc being documented.
-     */
-    public ClassDoc getClassDoc();
-
-    /**
-     * Get the member summary tree.
-     *
-     * @param memberTree the content tree used to build the summary tree
-     * @return a content tree for the member summary
-     */
-    public Content getMemberSummaryTree(Content memberTree);
-
-    /**
-     * Get the member details tree.
-     *
-     * @param memberTree the content tree used to build the details tree
-     * @return a content tree for the member details
-     */
-    public Content getMemberDetailsTree(Content memberTree);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
deleted file mode 100644
index 268a66211de..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
+++ /dev/null
@@ -1,892 +0,0 @@
-/*
- * Copyright (c) 1997, 2016, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileManager.Location;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Configure the output based on the options. Doclets should sub-class
- * Configuration, to configure and add their own options. This class contains
- * all user options which are supported by the 1.1 doclet and the standard
- * doclet.
- *
- *  <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>
- *
- * @author Robert Field.
- * @author Atul Dambalkar.
- * @author Jamie Ho
- */
-@Deprecated
-public abstract class Configuration {
-
-    /**
-     * Exception used to report a problem during setOptions.
-     */
-    public static class Fault extends Exception {
-        private static final long serialVersionUID = 0;
-
-        Fault(String msg) {
-            super(msg);
-        }
-
-        Fault(String msg, Exception cause) {
-            super(msg, cause);
-        }
-    }
-
-    /**
-     * The factory for builders.
-     */
-    protected BuilderFactory builderFactory;
-
-    /**
-     * The taglet manager.
-     */
-    public TagletManager tagletManager;
-
-    /**
-     * The path to the builder XML input file.
-     */
-    public String builderXMLPath;
-
-    /**
-     * The default path to the builder XML.
-     */
-    private static final String DEFAULT_BUILDER_XML = "resources/doclet.xml";
-
-    /**
-     * The path to Taglets
-     */
-    public String tagletpath = "";
-
-    /**
-     * This is true if option "-serialwarn" is used. Defualt value is false to
-     * suppress excessive warnings about serial tag.
-     */
-    public boolean serialwarn = false;
-
-    /**
-     * The specified amount of space between tab stops.
-     */
-    public int sourcetab;
-
-    public String tabSpaces;
-
-    /**
-     * True if we should generate browsable sources.
-     */
-    public boolean linksource = false;
-
-    /**
-     * True if command line option "-nosince" is used. Default value is
-     * false.
-     */
-    public boolean nosince = false;
-
-    /**
-     * True if we should recursively copy the doc-file subdirectories
-     */
-    public boolean copydocfilesubdirs = false;
-
-    /**
-     * The META charset tag used for cross-platform viewing.
-     */
-    public String charset = "";
-
-    /**
-     * True if user wants to add member names as meta keywords.
-     * Set to false because meta keywords are ignored in general
-     * by most Internet search engines.
-     */
-    public boolean keywords = false;
-
-    /**
-     * The meta tag keywords instance.
-     */
-    public final MetaKeywords metakeywords;
-
-    /**
-     * The list of doc-file subdirectories to exclude
-     */
-    protected Set<String> excludedDocFileDirs;
-
-    /**
-     * The list of qualifiers to exclude
-     */
-    protected Set<String> excludedQualifiers;
-
-    /**
-     * The Root of the generated Program Structure from the Doclet API.
-     */
-    public RootDoc root;
-
-    /**
-     * An utility class for commonly used helpers
-     */
-    public Utils utils;
-    /**
-     * Destination directory name, in which doclet will generate the entire
-     * documentation. Default is current directory.
-     */
-    public String destDirName = "";
-
-    /**
-     * Destination directory name, in which doclet will copy the doc-files to.
-     */
-    public String docFileDestDirName = "";
-
-    /**
-     * Encoding for this document. Default is default encoding for this
-     * platform.
-     */
-    public String docencoding = null;
-
-    /**
-     * True if user wants to suppress descriptions and tags.
-     */
-    public boolean nocomment = false;
-
-    /**
-     * Encoding for this document. Default is default encoding for this
-     * platform.
-     */
-    public String encoding = null;
-
-    /**
-     * Generate author specific information for all the classes if @author
-     * tag is used in the doc comment and if -author option is used.
-     * <code>showauthor</code> is set to true if -author option is used.
-     * Default is don't show author information.
-     */
-    public boolean showauthor = false;
-
-    /**
-     * Generate documentation for JavaFX getters and setters automatically
-     * by copying it from the appropriate property definition.
-     */
-    public boolean javafx = false;
-
-    /**
-     * Generate version specific information for the all the classes
-     * if @version tag is used in the doc comment and if -version option is
-     * used. <code>showversion</code> is set to true if -version option is
-     * used.Default is don't show version information.
-     */
-    public boolean showversion = false;
-
-    /**
-     * Don't generate deprecated API information at all, if -nodeprecated
-     * option is used. <code>nodepracted</code> is set to true if
-     * -nodeprecated option is used. Default is generate deprected API
-     * information.
-     */
-    public boolean nodeprecated = false;
-
-    /**
-     * The catalog of classes specified on the command-line
-     */
-    public ClassDocCatalog classDocCatalog;
-
-    /**
-     * Message Retriever for the doclet, to retrieve message from the resource
-     * file for this Configuration, which is common for 1.1 and standard
-     * doclets.
-     *
-     * TODO:  Make this private!!!
-     */
-    public MessageRetriever message = null;
-
-    /**
-     * True if user wants to suppress time stamp in output.
-     * Default is false.
-     */
-    public boolean notimestamp= false;
-
-    /**
-     * The package grouping instance.
-     */
-    public final Group group = new Group(this);
-
-    /**
-     * The tracker of external package links.
-     */
-    public final Extern extern = new Extern(this);
-
-    /**
-     * Return the build date for the doclet.
-     */
-    public abstract String getDocletSpecificBuildDate();
-
-    /**
-     * This method should be defined in all those doclets(configurations),
-     * which want to derive themselves from this Configuration. This method
-     * can be used to set its own command line options.
-     *
-     * @param options The array of option names and values.
-     * @throws DocletAbortException
-     */
-    public abstract void setSpecificDocletOptions(String[][] options) throws Fault;
-
-    /**
-     * Return the doclet specific {@link MessageRetriever}
-     * @return the doclet specific MessageRetriever.
-     */
-    public abstract MessageRetriever getDocletSpecificMsg();
-
-    /**
-     * A sorted set of packages specified on the command-line merged with a
-     * collection of packages that contain the classes specified on the
-     * command-line.
-     */
-    public SortedSet<PackageDoc> packages;
-
-    public boolean exportInternalAPI;
-
-    /**
-     * Constructor. Constructs the message retriever with resource file.
-     */
-    public Configuration() {
-        message =
-            new MessageRetriever(this,
-            "com.sun.tools.doclets.internal.toolkit.resources.doclets");
-        excludedDocFileDirs = new HashSet<>();
-        excludedQualifiers = new HashSet<>();
-        setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH);
-        utils = new Utils();
-        metakeywords = new MetaKeywords(this);
-    }
-
-    /**
-     * Return the builder factory for this doclet.
-     *
-     * @return the builder factory for this doclet.
-     */
-    public BuilderFactory getBuilderFactory() {
-        if (builderFactory == null) {
-            builderFactory = new BuilderFactory(this);
-        }
-        return builderFactory;
-    }
-
-    /**
-     * This method should be defined in all those doclets
-     * which want to inherit from this Configuration. This method
-     * should return the number of arguments to the command line
-     * option (including the option name).  For example,
-     * -notimestamp is a single-argument option, so this method would
-     * return 1.
-     *
-     * @param option Command line option under consideration.
-     * @return number of arguments to option (including the
-     * option name). Zero return means option not known.
-     * Negative value means error occurred.
-     */
-    public int optionLength(String option) {
-        option = StringUtils.toLowerCase(option);
-        switch (option) {
-            case "-author":
-            case "-docfilessubdirs":
-            case "-javafx":
-            case "-keywords":
-            case "-linksource":
-            case "-nocomment":
-            case "-nodeprecated":
-            case "-nosince":
-            case "-notimestamp":
-            case "-quiet":
-            case "-xnodate":
-            case "-version":
-            case "-xdaccessinternalapi":
-                return 1;
-            case "-d":
-            case "-docencoding":
-            case "-encoding":
-            case "-excludedocfilessubdir":
-            case "-link":
-            case "-sourcetab":
-            case "-noqualifier":
-            case "-output":
-            case "-sourcepath":
-            case "-tag":
-            case "-taglet":
-            case "-tagletpath":
-                return 2;
-            case "-group":
-            case "-linkoffline":
-                return 3;
-            default:
-                return -1;  // indicate we don't know about it
-        }
-    }
-
-    /**
-     * Perform error checking on the given options.
-     *
-     * @param options  the given options to check.
-     * @param reporter the reporter used to report errors.
-     */
-    public abstract boolean validOptions(String options[][],
-        DocErrorReporter reporter);
-
-    private void initPackages() {
-        packages = new TreeSet<>(Arrays.asList(root.specifiedPackages()));
-        for (ClassDoc aClass : root.specifiedClasses()) {
-            packages.add(aClass.containingPackage());
-        }
-    }
-
-    /**
-     * Set the command line options supported by this configuration.
-     *
-     * @param options the two dimensional array of options.
-     */
-    public void setOptions(String[][] options) throws Fault {
-        LinkedHashSet<String[]> customTagStrs = new LinkedHashSet<>();
-
-        // Some options, specifically -link and -linkoffline, require that
-        // the output directory has already been created: so do that first.
-        for (String[] os : options) {
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-d")) {
-                destDirName = addTrailingFileSep(os[1]);
-                docFileDestDirName = destDirName;
-                ensureOutputDirExists();
-                break;
-            }
-        }
-
-        for (String[] os : options) {
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-docfilessubdirs")) {
-                copydocfilesubdirs = true;
-            } else if (opt.equals("-docencoding")) {
-                docencoding = os[1];
-            } else if (opt.equals("-encoding")) {
-                encoding = os[1];
-            } else if (opt.equals("-author")) {
-                showauthor = true;
-            } else  if (opt.equals("-javafx")) {
-                javafx = true;
-            } else if (opt.equals("-nosince")) {
-                nosince = true;
-            } else if (opt.equals("-version")) {
-                showversion = true;
-            } else if (opt.equals("-nodeprecated")) {
-                nodeprecated = true;
-            } else if (opt.equals("-excludedocfilessubdir")) {
-                addToSet(excludedDocFileDirs, os[1]);
-            } else if (opt.equals("-noqualifier")) {
-                addToSet(excludedQualifiers, os[1]);
-            } else if (opt.equals("-linksource")) {
-                linksource = true;
-            } else if (opt.equals("-sourcetab")) {
-                linksource = true;
-                try {
-                    setTabWidth(Integer.parseInt(os[1]));
-                } catch (NumberFormatException e) {
-                    //Set to -1 so that warning will be printed
-                    //to indicate what is valid argument.
-                    sourcetab = -1;
-                }
-                if (sourcetab <= 0) {
-                    message.warning("doclet.sourcetab_warning");
-                    setTabWidth(DocletConstants.DEFAULT_TAB_STOP_LENGTH);
-                }
-            } else if (opt.equals("-notimestamp")) {
-                notimestamp = true;
-            } else if (opt.equals("-nocomment")) {
-                nocomment = true;
-            } else if (opt.equals("-tag") || opt.equals("-taglet")) {
-                customTagStrs.add(os);
-            } else if (opt.equals("-tagletpath")) {
-                tagletpath = os[1];
-            } else if (opt.equals("-keywords")) {
-                keywords = true;
-            } else if (opt.equals("-serialwarn")) {
-                serialwarn = true;
-            } else if (opt.equals("-group")) {
-                group.checkPackageGroups(os[1], os[2]);
-            } else if (opt.equals("-link")) {
-                String url = os[1];
-                extern.link(url, url, root, false);
-            } else if (opt.equals("-linkoffline")) {
-                String url = os[1];
-                String pkglisturl = os[2];
-                extern.link(url, pkglisturl, root, true);
-            } else if (opt.equals("-xdaccessinternalapi")) {
-                exportInternalAPI = true;
-            }
-        }
-        if (docencoding == null) {
-            docencoding = encoding;
-        }
-
-        classDocCatalog = new ClassDocCatalog(root.specifiedClasses(), this);
-        initTagletManager(customTagStrs);
-    }
-
-    /**
-     * Set the command line options supported by this configuration.
-     *
-     * @throws DocletAbortException
-     */
-    public void setOptions() throws Fault {
-        initPackages();
-        setOptions(root.options());
-        setSpecificDocletOptions(root.options());
-    }
-
-    private void ensureOutputDirExists() throws Fault {
-        DocFile destDir = DocFile.createFileForDirectory(this, destDirName);
-        if (!destDir.exists()) {
-            //Create the output directory (in case it doesn't exist yet)
-            root.printNotice(getText("doclet.dest_dir_create", destDirName));
-            destDir.mkdirs();
-        } else if (!destDir.isDirectory()) {
-            throw new Fault(getText(
-                "doclet.destination_directory_not_directory_0",
-                destDir.getPath()));
-        } else if (!destDir.canWrite()) {
-            throw new Fault(getText(
-                "doclet.destination_directory_not_writable_0",
-                destDir.getPath()));
-        }
-    }
-
-
-    /**
-     * Initialize the taglet manager.  The strings to initialize the simple custom tags should
-     * be in the following format:  "[tag name]:[location str]:[heading]".
-     * @param customTagStrs the set two dimensional arrays of strings.  These arrays contain
-     * either -tag or -taglet arguments.
-     */
-    private void initTagletManager(Set<String[]> customTagStrs) {
-        tagletManager = (tagletManager == null)
-                ? new TagletManager(nosince, showversion, showauthor, javafx, exportInternalAPI, message)
-                : tagletManager;
-        for (String[] args : customTagStrs) {
-            if (args[0].equals("-taglet")) {
-                tagletManager.addCustomTag(args[1], getFileManager(), tagletpath);
-                continue;
-            }
-            String[] tokens = tokenize(args[1],
-                                       TagletManager.SIMPLE_TAGLET_OPT_SEPARATOR, 3);
-            if (tokens.length == 1) {
-                String tagName = args[1];
-                if (tagletManager.isKnownCustomTag(tagName)) {
-                    //reorder a standard tag
-                    tagletManager.addNewSimpleCustomTag(tagName, null, "");
-                } else {
-                    //Create a simple tag with the heading that has the same name as the tag.
-                    StringBuilder heading = new StringBuilder(tagName + ":");
-                    heading.setCharAt(0, Character.toUpperCase(tagName.charAt(0)));
-                    tagletManager.addNewSimpleCustomTag(tagName, heading.toString(), "a");
-                }
-            } else if (tokens.length == 2) {
-                //Add simple taglet without heading, probably to excluding it in the output.
-                tagletManager.addNewSimpleCustomTag(tokens[0], tokens[1], "");
-            } else if (tokens.length >= 3) {
-                tagletManager.addNewSimpleCustomTag(tokens[0], tokens[2], tokens[1]);
-            } else {
-                message.error("doclet.Error_invalid_custom_tag_argument", args[1]);
-            }
-        }
-    }
-
-    /**
-     * Given a string, return an array of tokens.  The separator can be escaped
-     * with the '\' character.  The '\' character may also be escaped by the
-     * '\' character.
-     *
-     * @param s         the string to tokenize.
-     * @param separator the separator char.
-     * @param maxTokens the maximum number of tokens returned.  If the
-     *                  max is reached, the remaining part of s is appended
-     *                  to the end of the last token.
-     *
-     * @return an array of tokens.
-     */
-    private String[] tokenize(String s, char separator, int maxTokens) {
-        List<String> tokens = new ArrayList<>();
-        StringBuilder  token = new StringBuilder ();
-        boolean prevIsEscapeChar = false;
-        for (int i = 0; i < s.length(); i += Character.charCount(i)) {
-            int currentChar = s.codePointAt(i);
-            if (prevIsEscapeChar) {
-                // Case 1:  escaped character
-                token.appendCodePoint(currentChar);
-                prevIsEscapeChar = false;
-            } else if (currentChar == separator && tokens.size() < maxTokens-1) {
-                // Case 2:  separator
-                tokens.add(token.toString());
-                token = new StringBuilder();
-            } else if (currentChar == '\\') {
-                // Case 3:  escape character
-                prevIsEscapeChar = true;
-            } else {
-                // Case 4:  regular character
-                token.appendCodePoint(currentChar);
-            }
-        }
-        if (token.length() > 0) {
-            tokens.add(token.toString());
-        }
-        return tokens.toArray(new String[] {});
-    }
-
-    private void addToSet(Set<String> s, String str){
-        StringTokenizer st = new StringTokenizer(str, ":");
-        String current;
-        while(st.hasMoreTokens()){
-            current = st.nextToken();
-            s.add(current);
-        }
-    }
-
-    /**
-     * Add a trailing file separator, if not found. Remove superfluous
-     * file separators if any. Preserve the front double file separator for
-     * UNC paths.
-     *
-     * @param path Path under consideration.
-     * @return String Properly constructed path string.
-     */
-    public static String addTrailingFileSep(String path) {
-        String fs = System.getProperty("file.separator");
-        String dblfs = fs + fs;
-        int indexDblfs;
-        while ((indexDblfs = path.indexOf(dblfs, 1)) >= 0) {
-            path = path.substring(0, indexDblfs) +
-                path.substring(indexDblfs + fs.length());
-        }
-        if (!path.endsWith(fs))
-            path += fs;
-        return path;
-    }
-
-    /**
-     * This checks for the validity of the options used by the user.
-     * This works exactly like
-     * {@link com.sun.javadoc.Doclet#validOptions(String[][],
-     * DocErrorReporter)}. This will validate the options which are shared
-     * by our doclets. For example, this method will flag an error using
-     * the DocErrorReporter if user has used "-nohelp" and "-helpfile" option
-     * together.
-     *
-     * @param options  options used on the command line.
-     * @param reporter used to report errors.
-     * @return true if all the options are valid.
-     */
-    public boolean generalValidOptions(String options[][],
-            DocErrorReporter reporter) {
-        boolean docencodingfound = false;
-        String encoding = "";
-        for (int oi = 0; oi < options.length; oi++) {
-            String[] os = options[oi];
-            String opt = StringUtils.toLowerCase(os[0]);
-            if (opt.equals("-docencoding")) {
-                docencodingfound = true;
-                if (!checkOutputFileEncoding(os[1], reporter)) {
-                    return false;
-                }
-            } else if (opt.equals("-encoding")) {
-                encoding = os[1];
-            }
-        }
-        if (!docencodingfound && encoding.length() > 0) {
-            if (!checkOutputFileEncoding(encoding, reporter)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Check the validity of the given Source or Output File encoding on this
-     * platform.
-     *
-     * @param docencoding output file encoding.
-     * @param reporter    used to report errors.
-     */
-    private boolean checkOutputFileEncoding(String docencoding,
-            DocErrorReporter reporter) {
-        OutputStream ost= new ByteArrayOutputStream();
-        OutputStreamWriter osw = null;
-        try {
-            osw = new OutputStreamWriter(ost, docencoding);
-        } catch (UnsupportedEncodingException exc) {
-            reporter.printError(getText("doclet.Encoding_not_supported",
-                docencoding));
-            return false;
-        } finally {
-            try {
-                if (osw != null) {
-                    osw.close();
-                }
-            } catch (IOException exc) {
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return true if the given doc-file subdirectory should be excluded and
-     * false otherwise.
-     * @param docfilesubdir the doc-files subdirectory to check.
-     */
-    public boolean shouldExcludeDocFileDir(String docfilesubdir){
-        if (excludedDocFileDirs.contains(docfilesubdir)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Return true if the given qualifier should be excluded and false otherwise.
-     * @param qualifier the qualifier to check.
-     */
-    public boolean shouldExcludeQualifier(String qualifier){
-        if (excludedQualifiers.contains("all") ||
-            excludedQualifiers.contains(qualifier) ||
-            excludedQualifiers.contains(qualifier + ".*")) {
-            return true;
-        } else {
-            int index = -1;
-            while ((index = qualifier.indexOf(".", index + 1)) != -1) {
-                if (excludedQualifiers.contains(qualifier.substring(0, index + 1) + "*")) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Return the qualified name of the <code>ClassDoc</code> if it's qualifier is not excluded.  Otherwise,
-     * return the unqualified <code>ClassDoc</code> name.
-     * @param cd the <code>ClassDoc</code> to check.
-     */
-    public String getClassName(ClassDoc cd) {
-        PackageDoc pd = cd.containingPackage();
-        if (pd != null && shouldExcludeQualifier(cd.containingPackage().name())) {
-            return cd.name();
-        } else {
-            return cd.qualifiedName();
-        }
-    }
-
-    public String getText(String key) {
-        // Check the doclet specific properties file.
-        MessageRetriever docletMessage = getDocletSpecificMsg();
-        if (docletMessage.containsKey(key)) {
-            return docletMessage.getText(key);
-        }
-        // Check the shared properties file.
-        return message.getText(key);
-    }
-
-    public String getText(String key, String a1) {
-        // Check the doclet specific properties file.
-        MessageRetriever docletMessage = getDocletSpecificMsg();
-        if (docletMessage.containsKey(key)) {
-            return docletMessage.getText(key, a1);
-        }
-        // Check the shared properties file.
-        return message.getText(key, a1);
-    }
-
-    public String getText(String key, String a1, String a2) {
-        // Check the doclet specific properties file.
-        MessageRetriever docletMessage = getDocletSpecificMsg();
-        if (docletMessage.containsKey(key)) {
-            return docletMessage.getText(key, a1, a2);
-        }
-        // Check the shared properties file.
-        return message.getText(key, a1, a2);
-    }
-
-    public String getText(String key, String a1, String a2, String a3) {
-        // Check the doclet specific properties file.
-        MessageRetriever docletMessage = getDocletSpecificMsg();
-        if (docletMessage.containsKey(key)) {
-            return docletMessage.getText(key, a1, a2, a3);
-        }
-        // Check the shared properties file.
-        return message.getText(key, a1, a2, a3);
-    }
-
-    public abstract Content newContent();
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @return a content tree for the text
-     */
-    public Content getResource(String key) {
-        Content c = newContent();
-        c.addContent(getText(key));
-        return c;
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @param o   string or content argument added to configuration text
-     * @return a content tree for the text
-     */
-    public Content getResource(String key, Object o) {
-        return getResource(key, o, null, null);
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @param o   string or content argument added to configuration text
-     * @return a content tree for the text
-     */
-    public Content getResource(String key, Object o1, Object o2) {
-        return getResource(key, o1, o2, null);
-    }
-
-    /**
-     * Get the configuration string as a content.
-     *
-     * @param key the key to look for in the configuration file
-     * @param o1  string or content argument added to configuration text
-     * @param o2  string or content argument added to configuration text
-     * @return a content tree for the text
-     */
-    public Content getResource(String key, Object o0, Object o1, Object o2) {
-        Content c = newContent();
-        Pattern p = Pattern.compile("\\{([012])\\}");
-        String text = getText(key);
-        Matcher m = p.matcher(text);
-        int start = 0;
-        while (m.find(start)) {
-            c.addContent(text.substring(start, m.start()));
-
-            Object o = null;
-            switch (m.group(1).charAt(0)) {
-                case '0': o = o0; break;
-                case '1': o = o1; break;
-                case '2': o = o2; break;
-            }
-
-            if (o == null) {
-                c.addContent("{" + m.group(1) + "}");
-            } else if (o instanceof String) {
-                c.addContent((String) o);
-            } else if (o instanceof Content) {
-                c.addContent((Content) o);
-            }
-
-            start = m.end();
-        }
-
-        c.addContent(text.substring(start));
-        return c;
-    }
-
-
-    /**
-     * Return true if the ClassDoc element is getting documented, depending upon
-     * -nodeprecated option and the deprecation information. Return true if
-     * -nodeprecated is not used. Return false if -nodeprecated is used and if
-     * either ClassDoc element is deprecated or the containing package is deprecated.
-     *
-     * @param cd the ClassDoc for which the page generation is checked
-     */
-    public boolean isGeneratedDoc(ClassDoc cd) {
-        if (!nodeprecated) {
-            return true;
-        }
-        return !(utils.isDeprecated(cd) || utils.isDeprecated(cd.containingPackage()));
-    }
-
-    /**
-     * Return the doclet specific instance of a writer factory.
-     * @return the {@link WriterFactory} for the doclet.
-     */
-    public abstract WriterFactory getWriterFactory();
-
-    /**
-     * Return the input stream to the builder XML.
-     *
-     * @return the input steam to the builder XML.
-     * @throws FileNotFoundException when the given XML file cannot be found.
-     */
-    public InputStream getBuilderXML() throws IOException {
-        return builderXMLPath == null ?
-            Configuration.class.getResourceAsStream(DEFAULT_BUILDER_XML) :
-            DocFile.createFileForInput(this, builderXMLPath).openInputStream();
-    }
-
-    /**
-     * Return the Locale for this document.
-     */
-    public abstract Locale getLocale();
-
-    /**
-     * Return the current file manager.
-     */
-    public abstract JavaFileManager getFileManager();
-
-    /**
-     * Return the comparator that will be used to sort member documentation.
-     * To no do any sorting, return null.
-     *
-     * @return the {@link java.util.Comparator} used to sort members.
-     */
-    public abstract Comparator<ProgramElementDoc> getMemberComparator();
-
-    private void setTabWidth(int n) {
-        sourcetab = n;
-        tabSpaces = String.format("%" + n + "s", "");
-    }
-
-    public abstract boolean showMessage(SourcePosition pos, String key);
-
-    public abstract Location getLocationForPackage(PackageDoc pd);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
deleted file mode 100644
index f5e19d175b2..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing constants summary output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface ConstantsSummaryWriter {
-
-    /**
-     * Close the writer.
-     */
-    public abstract void close() throws IOException;
-
-    /**
-     * Get the header for the constant summary documentation.
-     *
-     * @return header that needs to be added to the documentation
-     */
-    public abstract Content getHeader();
-
-    /**
-     * Get the header for the constant content list.
-     *
-     * @return content header that needs to be added to the documentation
-     */
-    public abstract Content getContentsHeader();
-
-    /**
-     * Adds the given package name link to the constant content list tree.
-     *
-     * @param pkg                    the {@link PackageDoc} to index.
-     * @param parsedPackageName      the parsed package name.  We only Write the
-     *                               first 2 directory levels of the package
-     *                               name. For example, java.lang.ref would be
-     *                               indexed as java.lang.*.
-     * @param WriteedPackageHeaders the set of package headers that have already
-     *                              been indexed.  We don't want to index
-     *                              something more than once.
-     * @param contentListTree the content tree to which the link will be added
-     */
-    public abstract void addLinkToPackageContent(PackageDoc pkg, String parsedPackageName,
-        Set<String> WriteedPackageHeaders, Content contentListTree);
-
-    /**
-     * Add the content list to the documentation tree.
-     *
-     * @param contentTree the tree to which the contents list will be added
-     * @param contentListTree the content that will be added to the list
-     */
-    public abstract void addContentsList(Content contentTree, Content contentListTree);
-
-    /**
-     * Get the constant summaries for the document.
-     *
-     * @return constant summaries header to be added to the documentation tree
-     */
-    public abstract Content getConstantSummaries();
-
-    /**
-     * Adds the given package name.
-     *
-     * @param parsedPackageName the parsed package name.  We only Write the
-     *                          first 2 directory levels of the package
-     *                          name. For example, java.lang.ref would be
-     *                          indexed as java.lang.*.
-     * @param summariesTree the summaries documentation tree
-     * @param first true if the first package is listed
-     *                    be written
-     */
-    public abstract void addPackageName(String parsedPackageName, Content summariesTree, boolean first);
-
-    /**
-     * Get the class summary header for the constants summary.
-     *
-     * @return the header content for the class constants summary
-     */
-    public abstract Content getClassConstantHeader();
-
-    /**
-     * Add the content list to the documentation summaries tree.
-     *
-     * @param summariesTree the tree to which the class constants list will be added
-     * @param classConstantTree the class constant tree that will be added to the list
-     */
-    public abstract void addClassConstant(Content summariesTree, Content classConstantTree);
-
-    /**
-     * Adds the constant member table to the documentation tree.
-     *
-     * @param cd the class whose constants are being documented.
-     * @param fields the constants being documented.
-     * @param classConstantTree the documentation tree to which theconstant member
-     *                    table content will be added
-     */
-    public abstract void addConstantMembers(ClassDoc cd, List<FieldDoc> fields,
-            Content classConstantTree);
-
-    /**
-     * Add the summaries list to the content tree.
-     *
-     * @param contentTree the tree to which the summaries list will be added
-     * @param summariesTree the summaries content tree that will be added to the list
-     */
-    public abstract void addConstantSummaries(Content contentTree, Content summariesTree);
-
-    /**
-     * Adds the footer for the summary documentation.
-     *
-     * @param contentTree content tree to which the footer will be added
-     */
-    public abstract void addFooter(Content contentTree);
-
-    /**
-     * Print the constants summary document.
-     *
-     * @param contentTree content tree which should be printed
-     */
-    public abstract void printDocument(Content contentTree) throws IOException;
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
deleted file mode 100644
index 648168a30fd..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing constructor output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface ConstructorWriter {
-
-    /**
-     * Get the constructor details tree header.
-     *
-     * @param classDoc the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the constructor details header
-     */
-    public Content getConstructorDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the constructor documentation tree header.
-     *
-     * @param constructor the constructor being documented
-     * @param constructorDetailsTree the content tree representing constructor details
-     * @return content tree for the constructor documentation header
-     */
-    public Content getConstructorDocTreeHeader(ConstructorDoc constructor,
-            Content constructorDetailsTree);
-
-    /**
-     * Get the signature for the given constructor.
-     *
-     * @param constructor the constructor being documented
-     * @return content tree for the constructor signature
-     */
-    public Content getSignature(ConstructorDoc constructor);
-
-    /**
-     * Add the deprecated output for the given constructor.
-     *
-     * @param constructor the constructor being documented
-     * @param constructorDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(ConstructorDoc constructor, Content constructorDocTree);
-
-    /**
-     * Add the comments for the given constructor.
-     *
-     * @param constructor the constructor being documented
-     * @param constructorDocTree the content tree to which the comments will be added
-     */
-    public void addComments(ConstructorDoc constructor, Content constructorDocTree);
-
-    /**
-     * Add the tags for the given constructor.
-     *
-     * @param constructor the constructor being documented
-     * @param constructorDocTree the content tree to which the tags will be added
-     */
-    public void addTags(ConstructorDoc constructor, Content constructorDocTree);
-
-    /**
-     * Get the constructor details tree.
-     *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the constructor details
-     */
-    public Content getConstructorDetails(Content memberDetailsTree);
-
-    /**
-     * Get the constructor documentation.
-     *
-     * @param constructorDocTree the content tree representing constructor documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the constructor documentation
-     */
-    public Content getConstructorDoc(Content constructorDocTree, boolean isLastContent);
-
-    /**
-     * Let the writer know whether a non public constructor was found.
-     *
-     * @param foundNonPubConstructor true if we found a non public constructor.
-     */
-    public void setFoundNonPubConstructor(boolean foundNonPubConstructor);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
deleted file mode 100644
index 5a44a9a4c07..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.doclets.internal.toolkit;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Objects;
-
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * A class to create content for javadoc output pages.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public abstract class Content {
-
-    /**
-     * Returns a string representation of the content.
-     *
-     * @return string representation of the content
-     */
-    @Override
-    public String toString() {
-        StringWriter out = new StringWriter();
-        try {
-            write(out, true);
-        } catch (IOException e) {
-            // cannot happen from StringWriter
-            throw new DocletAbortException(e);
-        }
-        return out.toString();
-    }
-
-    /**
-     * Adds content to the existing content.
-     *
-     * @param content content that needs to be added
-     */
-    public abstract void addContent(Content content);
-
-    /**
-     * Adds a string content to the existing content.
-     *
-     * @param stringContent the string content to be added
-     */
-    public abstract void addContent(String stringContent);
-
-    /**
-     * Writes content to a writer.
-     *
-     */
-    public abstract boolean write(Writer writer, boolean atNewline) throws IOException ;
-
-    /**
-     * Returns true if the content is empty.
-     *
-     * @return true if no content to be displayed else return false
-     */
-    public abstract boolean isEmpty();
-
-    /**
-     * Returns true if the content is valid.
-     *
-     * @return true if the content is valid else return false
-     */
-    public boolean isValid() {
-        return !isEmpty();
-    }
-
-    /**
-     * Return the number of characters of plain text content in this object
-     * (optional operation.)
-     * @return the number of characters of plain text content in this
-     */
-    public int charCount() {
-        return 0;
-    }
-
-    /**
-     * Checks for null values.
-     *
-     * @param t reference type to check for null values
-     * @return the reference type if not null or else throws a null pointer exception
-     */
-    protected static <T> T nullCheck(T t) {
-        return Objects.requireNonNull(t);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
deleted file mode 100644
index 76aa4f31a95..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing enum constant output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface EnumConstantWriter {
-
-    /**
-     * Get the enum constants details tree header.
-     *
-     * @param classDoc the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the enum constants details header
-     */
-    public Content getEnumConstantsDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the enum constants documentation tree header.
-     *
-     * @param enumConstant the enum constant being documented
-     * @param enumConstantsDetailsTree the content tree representing enum constant details
-     * @return content tree for the enum constant documentation header
-     */
-    public Content getEnumConstantsTreeHeader(FieldDoc enumConstant,
-            Content enumConstantsDetailsTree);
-
-    /**
-     * Get the signature for the given enum constant.
-     *
-     * @param enumConstant the enum constant being documented
-     * @return content tree for the enum constant signature
-     */
-    public Content getSignature(FieldDoc enumConstant);
-
-    /**
-     * Add the deprecated output for the given enum constant.
-     *
-     * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(FieldDoc enumConstant, Content enumConstantsTree);
-
-    /**
-     * Add the comments for the given enum constant.
-     *
-     * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree the content tree to which the comments will be added
-     */
-    public void addComments(FieldDoc enumConstant, Content enumConstantsTree);
-
-    /**
-     * Add the tags for the given enum constant.
-     *
-     * @param enumConstant the enum constant being documented
-     * @param enumConstantsTree the content tree to which the tags will be added
-     */
-    public void addTags(FieldDoc enumConstant, Content enumConstantsTree);
-
-    /**
-     * Get the enum constants details tree.
-     *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the enum constant details
-     */
-    public Content getEnumConstantsDetails(Content memberDetailsTree);
-
-    /**
-     * Get the enum constants documentation.
-     *
-     * @param enumConstantsTree the content tree representing enum constants documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the enum constants documentation
-     */
-    public Content getEnumConstants(Content enumConstantsTree, boolean isLastContent);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
deleted file mode 100644
index 406d097003b..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing field output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface FieldWriter {
-
-    /**
-     * Get the field details tree header.
-     *
-     * @param classDoc the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the field details header
-     */
-    public Content getFieldDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the field documentation tree header.
-     *
-     * @param field the constructor being documented
-     * @param fieldDetailsTree the content tree representing field details
-     * @return content tree for the field documentation header
-     */
-    public Content getFieldDocTreeHeader(FieldDoc field,
-            Content fieldDetailsTree);
-
-    /**
-     * Get the signature for the given field.
-     *
-     * @param field the field being documented
-     * @return content tree for the field signature
-     */
-    public Content getSignature(FieldDoc field);
-
-    /**
-     * Add the deprecated output for the given field.
-     *
-     * @param field the field being documented
-     * @param fieldDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(FieldDoc field, Content fieldDocTree);
-
-    /**
-     * Add the comments for the given field.
-     *
-     * @param field the field being documented
-     * @param fieldDocTree the content tree to which the comments will be added
-     */
-    public void addComments(FieldDoc field, Content fieldDocTree);
-
-    /**
-     * Add the tags for the given field.
-     *
-     * @param field the field being documented
-     * @param fieldDocTree the content tree to which the tags will be added
-     */
-    public void addTags(FieldDoc field, Content fieldDocTree);
-
-    /**
-     * Get the field details tree.
-     *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the field details
-     */
-    public Content getFieldDetails(Content memberDetailsTree);
-
-    /**
-     * Get the field documentation.
-     *
-     * @param fieldDocTree the content tree representing field documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the field documentation
-     */
-    public Content getFieldDoc(Content fieldDocTree, boolean isLastContent);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
deleted file mode 100644
index f18d1106e99..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import java.util.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing member summary output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface MemberSummaryWriter {
-
-    /**
-     * Get the member summary header for the given class.
-     *
-     * @param classDoc the class the summary belongs to
-     * @param memberSummaryTree the content tree to which the member summary will be added
-     * @return a content tree for the member summary header
-     */
-    public Content getMemberSummaryHeader(ClassDoc classDoc,
-            Content memberSummaryTree);
-
-    /**
-     * Get the summary table for the given class.
-     *
-     * @param classDoc the class the summary table belongs to
-     * @param tableContents list of contents that will be added to the summary table
-     * @return a content tree for the member summary table
-     */
-    public Content getSummaryTableTree(ClassDoc classDoc,
-            List<Content> tableContents);
-
-    /**
-     * Add the member summary for the given class and member.
-     *
-     * @param classDoc the class the summary belongs to
-     * @param member the member that is documented
-     * @param firstSentenceTags the tags for the sentence being documented
-     * @param tableContents list of contents to which the summary will be added
-     * @param counter the counter for determining id and style for the table row
-     */
-    public void addMemberSummary(ClassDoc classDoc, ProgramElementDoc member,
-            Tag[] firstSentenceTags, List<Content> tableContents, int counter);
-
-    /**
-     * Get the inherited member summary header for the given class.
-     *
-     * @param classDoc the class the summary belongs to
-     * @return a content tree containing the inherited summary header
-     */
-    public Content getInheritedSummaryHeader(ClassDoc classDoc);
-
-    /**
-     * Add the inherited member summary for the given class and member.
-     *
-     * @param classDoc the class the inherited member belongs to
-     * @param member the inherited member that is being documented
-     * @param isFirst true if this is the first member in the list
-     * @param isLast true if this is the last member in the list
-     * @param linksTree the content tree to which the links will be added
-     */
-    public void addInheritedMemberSummary(ClassDoc classDoc,
-        ProgramElementDoc member, boolean isFirst, boolean isLast,
-        Content linksTree);
-
-    /**
-     * Get inherited summary links.
-     *
-     * @return a content tree containing the inherited summary links
-     */
-    public Content getInheritedSummaryLinksTree();
-
-    /**
-     * Add the member tree to the member summary tree.
-     *
-     * @param memberSummaryTree the content tree representing the member summary
-     * @param memberTree the content tree representing the member
-     */
-    public void addMemberTree(Content memberSummaryTree, Content memberTree);
-
-    /**
-     * Get the member tree.
-     *
-     * @param memberTree the content tree representing the member
-     * @return a content tree for the member
-     */
-    public Content getMemberTree(Content memberTree);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
deleted file mode 100644
index b57a791c016..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing method output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface MethodWriter {
-
-    /**
-     * Get the method details tree header.
-     *
-     * @param classDoc the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the method details header
-     */
-    public Content getMethodDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the method documentation tree header.
-     *
-     * @param method the method being documented
-     * @param methodDetailsTree the content tree representing method details
-     * @return content tree for the method documentation header
-     */
-    public Content getMethodDocTreeHeader(MethodDoc method,
-            Content methodDetailsTree);
-
-    /**
-     * Get the signature for the given method.
-     *
-     * @param method the method being documented
-     * @return content tree for the method signature
-     */
-    public Content getSignature(MethodDoc method);
-
-    /**
-     * Add the deprecated output for the given method.
-     *
-     * @param method the method being documented
-     * @param methodDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(MethodDoc method, Content methodDocTree);
-
-    /**
-     * Add the comments for the given method.
-     *
-     * @param holder the holder type (not erasure) of the method
-     * @param method the method being documented
-     * @param methodDocTree the content tree to which the comments will be added
-     */
-    public void addComments(Type holder, MethodDoc method, Content methodDocTree);
-
-    /**
-     * Add the tags for the given method.
-     *
-     * @param method the method being documented
-     * @param methodDocTree the content tree to which the tags will be added
-     */
-    public void addTags(MethodDoc method, Content methodDocTree);
-
-    /**
-     * Get the method details tree.
-     *
-     * @param methodDetailsTree the content tree representing method details
-     * @return content tree for the method details
-     */
-    public Content getMethodDetails(Content methodDetailsTree);
-
-    /**
-     * Get the method documentation.
-     *
-     * @param methodDocTree the content tree representing method documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the method documentation
-     */
-    public Content getMethodDoc(Content methodDocTree, boolean isLastContent);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
deleted file mode 100644
index ca9fa5c1b3f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit;
-
-import java.io.*;
-
-/**
- * The interface for writing class output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface NestedClassWriter {
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
deleted file mode 100644
index 050e4b65770..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing package summary output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-
-@Deprecated
-public interface PackageSummaryWriter {
-
-    /**
-     * Get the header for the summary.
-     *
-     * @param heading Package name.
-     * @return the header to be added to the content tree
-     */
-    public abstract Content getPackageHeader(String heading);
-
-    /**
-     * Get the header for the package content.
-     *
-     * @return a content tree for the package content header
-     */
-    public abstract Content getContentHeader();
-
-    /**
-     * Get the header for the package summary.
-     *
-     * @return a content tree with the package summary header
-     */
-    public abstract Content getSummaryHeader();
-
-    /**
-     * Adds the table of classes to the documentation tree.
-     *
-     * @param classes the array of classes to document.
-     * @param label the label for this table.
-     * @param tableSummary the summary string for the table
-     * @param tableHeader array of table headers
-     * @param summaryContentTree the content tree to which the summaries will be added
-     */
-    public abstract void addClassesSummary(ClassDoc[] classes, String label,
-            String tableSummary, String[] tableHeader, Content summaryContentTree);
-
-    /**
-     * Adds the package description from the "packages.html" file to the documentation
-     * tree.
-     *
-     * @param packageContentTree the content tree to which the package description
-     *                           will be added
-     */
-    public abstract void addPackageDescription(Content packageContentTree);
-
-    /**
-     * Adds the tag information from the "packages.html" file to the documentation
-     * tree.
-     *
-     * @param packageContentTree the content tree to which the package tags will
-     *                           be added
-     */
-    public abstract void addPackageTags(Content packageContentTree);
-
-    /**
-     * Adds the tag information from the "packages.html" or "package-info.java" file to the
-     * documentation tree.
-     *
-     * @param contentTree the content tree to which the package content tree will be added
-     * @param packageContentTree the package content tree to be added
-     */
-    public abstract void addPackageContent(Content contentTree, Content packageContentTree);
-
-    /**
-     * Adds the footer to the documentation tree.
-     *
-     * @param contentTree the tree to which the footer will be added
-     */
-    public abstract void addPackageFooter(Content contentTree);
-
-    /**
-     * Print the package summary document.
-     *
-     * @param contentTree the content tree that will be printed
-     */
-    public abstract void printDocument(Content contentTree) throws IOException;
-
-    /**
-     * Close the writer.
-     */
-    public abstract void close() throws IOException;
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
deleted file mode 100644
index 40d7085f825..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit;
-
-import java.io.*;
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing property output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.7
- */
-
-@Deprecated
-public interface PropertyWriter {
-
-    /**
-     * Get the property details tree header.
-     *
-     * @param classDoc the class being documented
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the property details header
-     */
-    public Content getPropertyDetailsTreeHeader(ClassDoc classDoc,
-            Content memberDetailsTree);
-
-    /**
-     * Get the property documentation tree header.
-     *
-     * @param property the property being documented
-     * @param propertyDetailsTree the content tree representing property details
-     * @return content tree for the property documentation header
-     */
-    public Content getPropertyDocTreeHeader(MethodDoc property,
-            Content propertyDetailsTree);
-
-    /**
-     * Get the signature for the given property.
-     *
-     * @param property the property being documented
-     * @return content tree for the property signature
-     */
-    public Content getSignature(MethodDoc property);
-
-    /**
-     * Add the deprecated output for the given property.
-     *
-     * @param property the property being documented
-     * @param propertyDocTree content tree to which the deprecated information will be added
-     */
-    public void addDeprecated(MethodDoc property, Content propertyDocTree);
-
-    /**
-     * Add the comments for the given property.
-     *
-     * @param property the property being documented
-     * @param propertyDocTree the content tree to which the comments will be added
-     */
-    public void addComments(MethodDoc property, Content propertyDocTree);
-
-    /**
-     * Add the tags for the given property.
-     *
-     * @param property the property being documented
-     * @param propertyDocTree the content tree to which the tags will be added
-     */
-    public void addTags(MethodDoc property, Content propertyDocTree);
-
-    /**
-     * Get the property details tree.
-     *
-     * @param memberDetailsTree the content tree representing member details
-     * @return content tree for the property details
-     */
-    public Content getPropertyDetails(Content memberDetailsTree);
-
-    /**
-     * Get the property documentation.
-     *
-     * @param propertyDocTree the content tree representing property documentation
-     * @param isLastContent true if the content to be added is the last content
-     * @return content tree for the property documentation
-     */
-    public Content getPropertyDoc(Content propertyDocTree, boolean isLastContent);
-
-    /**
-     * Close the writer.
-     */
-    public void close() throws IOException;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
deleted file mode 100644
index a652c99ebb3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-
-/**
- * The interface for writing serialized form output.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-
-@Deprecated
-public interface SerializedFormWriter {
-
-    /**
-     * Get the header.
-     *
-     * @param header the header to write.
-     * @return the header content tree
-     */
-    public Content getHeader(String header);
-
-    /**
-     * Get the serialized form summaries header.
-     *
-     * @return the serialized form summary header tree
-     */
-    public Content getSerializedSummariesHeader();
-
-    /**
-     * Get the package serialized form header.
-     *
-     * @return the package serialized form header tree
-     */
-    public Content getPackageSerializedHeader();
-
-    /**
-     * Add the serialized tree per package to the serialized summaries tree.
-     *
-     * @param serializedSummariesTree the serialized tree to which the package serialized tree will be added
-     * @param packageSerializedTree the serialized tree per package that needs to be added
-     */
-    public void addPackageSerializedTree(Content serializedSummariesTree, Content packageSerializedTree);
-
-    /**
-     * Get the given package header.
-     *
-     * @param packageName the package header to write
-     * @return a content tree for the package header
-     */
-    public Content getPackageHeader(String packageName);
-
-    /**
-     * Get the serialized class header.
-     *
-     * @return a content tree for the serialized class header
-     */
-    public Content getClassSerializedHeader();
-
-    /**
-     * Get the heading for the serializable class.
-     *
-     * @param classDoc the class being processed
-     * @return a content tree for the class heading
-     */
-    public Content getClassHeader(ClassDoc classDoc);
-
-    /**
-     * Get the serial UID info header.
-     *
-     * @return a content tree for the serial uid info header
-     */
-    public Content getSerialUIDInfoHeader();
-
-    /**
-     * Adds the serial UID info.
-     *
-     * @param header the header that will show up before the UID.
-     * @param serialUID the serial UID to print.
-     * @param serialUidTree the serial UID tree to which the content will be added.
-     */
-    public void addSerialUIDInfo(String header, String serialUID,
-            Content serialUidTree);
-
-    /**
-     * Get the class serialize content header.
-     *
-     * @return a content tree for the class serialize content header
-     */
-    public Content getClassContentHeader();
-
-    /**
-     * Return an instance of a SerialFieldWriter.
-     *
-     * @return an instance of a SerialFieldWriter.
-     */
-    public SerialFieldWriter getSerialFieldWriter(ClassDoc classDoc);
-
-    /**
-     * Return an instance of a SerialMethodWriter.
-     *
-     * @return an instance of a SerialMethodWriter.
-     */
-    public SerialMethodWriter getSerialMethodWriter(ClassDoc classDoc);
-
-    /**
-     * Close the writer.
-     */
-    public abstract void close() throws IOException;
-
-    /**
-     * Get the serialized content.
-     *
-     * @param serializedTreeContent content for serialized data
-     * @return a content tree for serialized information
-     */
-    public Content getSerializedContent(Content serializedTreeContent);
-
-    /**
-     * Add the footer.
-     *
-     * @param serializedTree the serialized tree to be added
-     */
-    public void addFooter(Content serializedTree);
-
-    /**
-     * Print the serialized form document.
-     *
-     * @param serializedTree the content tree that will be printed
-     */
-    public abstract void printDocument(Content serializedTree) throws IOException;
-
-    /**
-     * Write the serialized form for a given field.
-     */
-    public interface SerialFieldWriter {
-
-        /**
-         * Get the serializable field header.
-         *
-         * @return serialized fields header content tree
-         */
-        public Content getSerializableFieldsHeader();
-
-        /**
-         * Get the field content header.
-         *
-         * @param isLastContent true if this is the last content to be documented
-         * @return fields header content tree
-         */
-        public Content getFieldsContentHeader(boolean isLastContent);
-
-        /**
-         * Get the fields content.
-         *
-         * @param heading the heading to write.
-         * @param contentTree content tree to which the heading will be added
-         * @return serializable fields content tree
-         */
-        public Content getSerializableFields(String heading, Content contentTree);
-
-        /**
-         * Adds the deprecated information for this member.
-         *
-         * @param field the field to document.
-         * @param contentTree content tree to which the deprecated information will be added
-         */
-        public void addMemberDeprecatedInfo(FieldDoc field, Content contentTree);
-
-        /**
-         * Adds the description text for this member.
-         *
-         * @param field the field to document.
-         * @param contentTree content tree to which the member description will be added
-         */
-        public void addMemberDescription(FieldDoc field, Content contentTree);
-
-        /**
-         * Adds the description text for this member represented by the tag.
-         *
-         * @param serialFieldTag the field to document (represented by tag).
-         * @param contentTree content tree to which the member description will be added
-         */
-        public void addMemberDescription(SerialFieldTag serialFieldTag, Content contentTree);
-
-        /**
-         * Adds the tag information for this member.
-         *
-         * @param field the field to document.
-         * @param contentTree content tree to which the member tags will be added
-         */
-        public void addMemberTags(FieldDoc field, Content contentTree);
-
-        /**
-         * Adds the member header.
-         *
-         * @param fieldType the type of the field.
-         * @param fieldTypeStr the type of the field in string format.  We will
-         * print this out if we can't link to the type.
-         * @param fieldDimensions the dimensions of the field.
-         * @param fieldName the name of the field.
-         * @param contentTree content tree to which the member header will be added
-         */
-        public void addMemberHeader(ClassDoc fieldType, String fieldTypeStr,
-            String fieldDimensions, String fieldName, Content contentTree);
-
-        /**
-         * Check to see if overview details should be printed. If
-         * nocomment option set or if there is no text to be printed
-         * for deprecation info, inline comment or tags,
-         * do not print overview details.
-         *
-         * @param field the field to check overview details for.
-         * @return true if overview details need to be printed
-         */
-        public boolean shouldPrintOverview(FieldDoc field);
-    }
-
-    /**
-     * Write the serialized form for a given field.
-     */
-    public interface SerialMethodWriter {
-
-        /**
-         * Get the serializable method header.
-         *
-         * @return serializable methods content tree
-         */
-        public Content getSerializableMethodsHeader();
-
-        /**
-         * Get the method content header.
-         *
-         * @param isLastContent true if this is the last content to be documented
-         * @return methods content tree
-         */
-        public Content getMethodsContentHeader(boolean isLastContent);
-
-        /**
-         * Write the given heading.
-         *
-         * @param heading the heading to write
-         * @param serializableMethodTree content tree which will be added
-         * @return serializable methods content tree
-         */
-        public Content getSerializableMethods(String heading, Content serializableMethodTree);
-
-        /**
-         * Write a warning that no serializable methods exist.
-         *
-         * @param msg the warning to print
-         * @return no customization message tree
-         */
-        public Content getNoCustomizationMsg(String msg);
-
-        /**
-         * Adds the header.
-         *
-         * @param member the member to write the header for
-         * @param methodsContentTree content tree to which the header will be added
-         */
-        public void addMemberHeader(MethodDoc member, Content methodsContentTree);
-
-        /**
-         * Adds the deprecated information for this member.
-         *
-         * @param member the member to write the deprecated information for
-         * @param methodsContentTree content tree to which the deprecated
-         * information will be added
-         */
-        public void addDeprecatedMemberInfo(MethodDoc member, Content methodsContentTree);
-
-        /**
-         * Adds the description for this member.
-         *
-         * @param member the member to write the information for
-         * @param methodsContentTree content tree to which the member
-         * information will be added
-         */
-        public void addMemberDescription(MethodDoc member, Content methodsContentTree);
-
-        /**
-         * Adds the tag information for this member.
-         *
-         * @param member the member to write the tags information for
-         * @param methodsContentTree content tree to which the tags
-         * information will be added
-         */
-        public void addMemberTags(MethodDoc member, Content methodsContentTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
deleted file mode 100644
index c24b8bf2238..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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.doclets.internal.toolkit;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The interface for a factory creates writers.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public interface WriterFactory {
-
-    /**
-     * Return the writer for the constant summary.
-     *
-     * @return the writer for the constant summary.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract ConstantsSummaryWriter getConstantsSummaryWriter()
-        throws Exception;
-
-    /**
-     * Return the writer for the package summary.
-     *
-     * @param packageDoc the package being documented.
-     * @param prevPkg the previous package that was documented.
-     * @param nextPkg the next package being documented.
-     * @return the writer for the package summary.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract PackageSummaryWriter getPackageSummaryWriter(PackageDoc
-        packageDoc, PackageDoc prevPkg, PackageDoc nextPkg)
-    throws Exception;
-
-    /**
-     * Return the writer for a class.
-     *
-     * @param classDoc the class being documented.
-     * @param prevClass the previous class that was documented.
-     * @param nextClass the next class being documented.
-     * @param classTree the class tree.
-     * @return the writer for the class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract ClassWriter getClassWriter(ClassDoc classDoc,
-        ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree)
-            throws Exception;
-
-    /**
-     * Return the writer for an annotation type.
-     *
-     * @param annotationType the type being documented.
-     * @param prevType the previous type that was documented.
-     * @param nextType the next type being documented.
-     * @return the writer for the annotation type.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract AnnotationTypeWriter getAnnotationTypeWriter(
-        AnnotationTypeDoc annotationType, Type prevType, Type nextType)
-            throws Exception;
-
-    /**
-     * Return the method writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @return the method writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract MethodWriter getMethodWriter(ClassWriter classWriter)
-            throws Exception;
-
-    /**
-     * Return the annotation type field writer for a given annotation type.
-     *
-     * @param annotationTypeWriter the writer for the annotation type
-     *        being documented.
-     * @return the member writer for the given annotation type.  Return null if
-     *         this writer is not supported by the doclet.
-     */
-    public abstract AnnotationTypeFieldWriter
-            getAnnotationTypeFieldWriter(
-        AnnotationTypeWriter annotationTypeWriter) throws Exception;
-
-    /**
-     * Return the annotation type optional member writer for a given annotation
-     * type.
-     *
-     * @param annotationTypeWriter the writer for the annotation type
-     *        being documented.
-     * @return the member writer for the given annotation type.  Return null if
-     *         this writer is not supported by the doclet.
-     */
-    public abstract AnnotationTypeOptionalMemberWriter
-            getAnnotationTypeOptionalMemberWriter(
-        AnnotationTypeWriter annotationTypeWriter) throws Exception;
-
-    /**
-     * Return the annotation type required member writer for a given annotation type.
-     *
-     * @param annotationTypeWriter the writer for the annotation type
-     *        being documented.
-     * @return the member writer for the given annotation type.  Return null if
-     *         this writer is not supported by the doclet.
-     */
-    public abstract AnnotationTypeRequiredMemberWriter
-            getAnnotationTypeRequiredMemberWriter(
-        AnnotationTypeWriter annotationTypeWriter) throws Exception;
-
-    /**
-     * Return the enum constant writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @return the enum constant writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract EnumConstantWriter getEnumConstantWriter(
-        ClassWriter classWriter) throws Exception;
-
-    /**
-     * Return the field writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @return the field writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract FieldWriter getFieldWriter(ClassWriter classWriter)
-            throws Exception;
-
-    /**
-     * Return the property writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @return the property writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract PropertyWriter getPropertyWriter(ClassWriter classWriter)
-            throws Exception;
-
-    /**
-     * Return the constructor writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @return the method writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public abstract ConstructorWriter getConstructorWriter(
-        ClassWriter classWriter)
-    throws Exception;
-
-    /**
-     * Return the specified member summary writer for a given class.
-     *
-     * @param classWriter the writer for the class being documented.
-     * @param memberType  the {@link VisibleMemberMap} member type indicating
-     *                    the type of member summary that should be returned.
-     * @return the summary writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     *
-     * @see VisibleMemberMap
-     * @throws IllegalArgumentException if memberType is unknown.
-     */
-    public abstract MemberSummaryWriter getMemberSummaryWriter(
-        ClassWriter classWriter, int memberType)
-    throws Exception;
-
-    /**
-     * Return the specified member summary writer for a given annotation type.
-     *
-     * @param annotationTypeWriter the writer for the annotation type being
-     *                             documented.
-     * @param memberType  the {@link VisibleMemberMap} member type indicating
-     *                    the type of member summary that should be returned.
-     * @return the summary writer for the give class.  Return null if this
-     * writer is not supported by the doclet.
-     *
-     * @see VisibleMemberMap
-     * @throws IllegalArgumentException if memberType is unknown.
-     */
-    public abstract MemberSummaryWriter getMemberSummaryWriter(
-        AnnotationTypeWriter annotationTypeWriter, int memberType)
-    throws Exception;
-
-    /**
-     * Return the writer for the serialized form.
-     *
-     * @return the writer for the serialized form.
-     */
-    public SerializedFormWriter getSerializedFormWriter() throws Exception;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
deleted file mode 100644
index 3e8e4cbf8f5..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import com.sun.javadoc.PackageDoc;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The superclass for all builders.  A builder is a class that provides
- * the structure and content of API documentation.  A builder is completely
- * doclet independent which means that any doclet can use builders to
- * construct documentation, as long as it impelements the appropriate
- * writer interfaces.  For example, if a doclet wanted to use
- * {@link ConstantsSummaryBuilder} to build a constant summary, all it has to
- * do is implement the ConstantsSummaryWriter interface and pass it to the
- * builder using a WriterFactory.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-
-@Deprecated
-public abstract class AbstractBuilder {
-    public static class Context {
-        /**
-         * The configuration used in this run of the doclet.
-         */
-        final Configuration configuration;
-
-        /**
-         * Keep track of which packages we have seen for
-         * efficiency purposes.  We don't want to copy the
-         * doc files multiple times for a single package.
-         */
-        final Set<PackageDoc> containingPackagesSeen;
-
-        /**
-         * Shared parser for the builder XML file
-         */
-        final LayoutParser layoutParser;
-
-        Context(Configuration configuration,
-                Set<PackageDoc> containingPackagesSeen,
-                LayoutParser layoutParser) {
-            this.configuration = configuration;
-            this.containingPackagesSeen = containingPackagesSeen;
-            this.layoutParser = layoutParser;
-        }
-    }
-
-    /**
-     * The configuration used in this run of the doclet.
-     */
-    protected final Configuration configuration;
-
-    protected final Utils utils;
-
-    /**
-     * Keep track of which packages we have seen for
-     * efficiency purposes.  We don't want to copy the
-     * doc files multiple times for a single package.
-     */
-    protected final Set<PackageDoc> containingPackagesSeen;
-
-    protected final LayoutParser layoutParser;
-
-    /**
-     * True if we want to print debug output.
-     */
-    protected static final boolean DEBUG = false;
-
-    /**
-     * Construct a Builder.
-     * @param configuration the configuration used in this run
-     *        of the doclet.
-     */
-    public AbstractBuilder(Context c) {
-        this.configuration = c.configuration;
-        this.utils = configuration.utils;
-        this.containingPackagesSeen = c.containingPackagesSeen;
-        this.layoutParser = c.layoutParser;
-    }
-
-    /**
-     * Return the name of this builder.
-     *
-     * @return the name of the builder.
-     */
-    public abstract String getName();
-
-    /**
-     * Build the documentation.
-     *
-     * @throws IOException if there is a problem writing the output
-     */
-    public abstract void build() throws IOException;
-
-    /**
-     * Build the documentation, as specified by the given XML element.
-     *
-     * @param node the XML element that specifies which component to document.
-     * @param contentTree content tree to which the documentation will be added
-     */
-    protected void build(XMLNode node, Content contentTree) {
-        String component = node.name;
-        try {
-            invokeMethod("build" + component,
-                    new Class<?>[]{XMLNode.class, Content.class},
-                    new Object[]{node, contentTree});
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-            configuration.root.printError("Unknown element: " + component);
-            throw new DocletAbortException(e);
-        } catch (InvocationTargetException e) {
-            Throwable cause = e.getCause();
-            if (cause instanceof FatalError) {
-                throw (FatalError) cause;
-            } else if (cause instanceof DocletAbortException) {
-                throw (DocletAbortException) cause;
-            } else {
-                throw new DocletAbortException(cause);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            configuration.root.printError("Exception " +
-                    e.getClass().getName() +
-                    " thrown while processing element: " + component);
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /**
-     * Build the documentation, as specified by the children of the given XML element.
-     *
-     * @param node the XML element that specifies which components to document.
-     * @param contentTree content tree to which the documentation will be added
-     */
-    protected void buildChildren(XMLNode node, Content contentTree) {
-        for (XMLNode child : node.children)
-            build(child, contentTree);
-    }
-
-    /**
-     * Given the name and parameters, invoke the method in the builder.  This
-     * method is required to invoke the appropriate build method as instructed
-     * by the builder XML file.
-     *
-     * @param methodName   the name of the method that we would like to invoke.
-     * @param paramClasses the types for each parameter.
-     * @param params       the parameters of the method.
-     */
-    protected void invokeMethod(String methodName, Class<?>[] paramClasses,
-            Object[] params)
-    throws Exception {
-        if (DEBUG) {
-            configuration.root.printError("DEBUG: " + this.getClass().getName() + "." + methodName);
-        }
-        Method method = this.getClass().getMethod(methodName, paramClasses);
-        method.invoke(this, params);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
deleted file mode 100644
index 4acea626fe4..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.Set;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The superclass for all member builders.  Member builders are only executed
- * within Class Builders.  They essentially build sub-components.  For example,
- * method documentation is a sub-component of class documentation.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public abstract class AbstractMemberBuilder extends AbstractBuilder {
-
-    /**
-     * Construct a SubBuilder.
-     * @param configuration the configuration used in this run
-     *        of the doclet.
-     */
-    public AbstractMemberBuilder(Context context) {
-        super(context);
-    }
-
-    /**
-     * This method is not supported by sub-builders.
-     *
-     * @throws DocletAbortException this method will always throw a
-     * DocletAbortException because it is not supported.
-     */
-    public void build() throws DocletAbortException {
-        //You may not call the build method in a subbuilder.
-        throw new DocletAbortException("not supported");
-    }
-
-
-    /**
-     * Build the sub component if there is anything to document.
-     *
-     * @param node the XML element that specifies which components to document.
-     * @param contentTree content tree to which the documentation will be added
-     */
-    @Override
-    public void build(XMLNode node, Content contentTree) {
-        if (hasMembersToDocument()) {
-            super.build(node, contentTree);
-        }
-    }
-
-    /**
-     * Return true if this subbuilder has anything to document.
-     *
-     * @return true if this subbuilder has anything to document.
-     */
-    public abstract boolean hasMembersToDocument();
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
deleted file mode 100644
index 5d9a4df74d3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Builds the summary for a given annotation type.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class AnnotationTypeBuilder extends AbstractBuilder {
-
-    /**
-     * The root element of the annotation type XML is {@value}.
-     */
-    public static final String ROOT = "AnnotationTypeDoc";
-
-    /**
-     * The annotation type being documented.
-     */
-    private final AnnotationTypeDoc annotationTypeDoc;
-
-    /**
-     * The doclet specific writer.
-     */
-    private final AnnotationTypeWriter writer;
-
-    /**
-     * The content tree for the annotation documentation.
-     */
-    private Content contentTree;
-
-    /**
-     * Construct a new ClassBuilder.
-     *
-     * @param context           the build context.
-     * @param annotationTypeDoc the class being documented.
-     * @param writer            the doclet specific writer.
-     */
-    private AnnotationTypeBuilder(Context context,
-            AnnotationTypeDoc annotationTypeDoc,
-            AnnotationTypeWriter writer) {
-        super(context);
-        this.annotationTypeDoc = annotationTypeDoc;
-        this.writer = writer;
-    }
-
-    /**
-     * Construct a new ClassBuilder.
-     *
-     * @param context           the build context.
-     * @param annotationTypeDoc the class being documented.
-     * @param writer            the doclet specific writer.
-     */
-    public static AnnotationTypeBuilder getInstance(Context context,
-            AnnotationTypeDoc annotationTypeDoc,
-            AnnotationTypeWriter writer)
-            throws Exception {
-        return new AnnotationTypeBuilder(context, annotationTypeDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void build() throws IOException {
-        build(layoutParser.parseXML(ROOT), contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return ROOT;
-    }
-
-    /**
-      * Build the annotation type documentation.
-      *
-      * @param node the XML element that specifies which components to document
-      * @param contentTree the content tree to which the documentation will be added
-      */
-     public void buildAnnotationTypeDoc(XMLNode node, Content contentTree) throws Exception {
-         contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") +
-                " " + annotationTypeDoc.name());
-         Content annotationContentTree = writer.getAnnotationContentHeader();
-         buildChildren(node, annotationContentTree);
-         writer.addAnnotationContentTree(contentTree, annotationContentTree);
-         writer.addFooter(contentTree);
-         writer.printDocument(contentTree);
-         writer.close();
-         copyDocFiles();
-     }
-
-     /**
-      * Copy the doc files for the current ClassDoc if necessary.
-      */
-     private void copyDocFiles() {
-        PackageDoc containingPackage = annotationTypeDoc.containingPackage();
-        if((configuration.packages == null ||
-            !configuration.packages.contains(containingPackage) &&
-            !containingPackagesSeen.contains(containingPackage))){
-            //Only copy doc files dir if the containing package is not
-            //documented AND if we have not documented a class from the same
-            //package already. Otherwise, we are making duplicate copies.
-            utils.copyDocFiles(configuration, containingPackage);
-            containingPackagesSeen.add(containingPackage);
-        }
-     }
-
-    /**
-     * Build the annotation information tree documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationContentTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeInfo(XMLNode node, Content annotationContentTree) {
-        Content annotationInfoTree = writer.getAnnotationInfoTreeHeader();
-        buildChildren(node, annotationInfoTree);
-        annotationContentTree.addContent(writer.getAnnotationInfo(annotationInfoTree));
-    }
-
-    /**
-     * If this annotation is deprecated, build the appropriate information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationInfoTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo (XMLNode node, Content annotationInfoTree) {
-        writer.addAnnotationTypeDeprecationInfo(annotationInfoTree);
-    }
-
-    /**
-     * Build the signature of the current annotation type.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationInfoTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeSignature(XMLNode node, Content annotationInfoTree) {
-        StringBuilder modifiers = new StringBuilder(
-                annotationTypeDoc.modifiers() + " ");
-        writer.addAnnotationTypeSignature(utils.replaceText(
-                modifiers.toString(), "interface", "@interface"), annotationInfoTree);
-    }
-
-    /**
-     * Build the annotation type description.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationInfoTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeDescription(XMLNode node, Content annotationInfoTree) {
-        writer.addAnnotationTypeDescription(annotationInfoTree);
-    }
-
-    /**
-     * Build the tag information for the current annotation type.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationInfoTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeTagInfo(XMLNode node, Content annotationInfoTree) {
-        writer.addAnnotationTypeTagInfo(annotationInfoTree);
-    }
-
-    /**
-     * Build the member summary contents of the page.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationContentTree the content tree to which the documentation will be added
-     */
-    public void buildMemberSummary(XMLNode node, Content annotationContentTree)
-            throws Exception {
-        Content memberSummaryTree = writer.getMemberTreeHeader();
-        configuration.getBuilderFactory().
-                getMemberSummaryBuilder(writer).buildChildren(node, memberSummaryTree);
-        annotationContentTree.addContent(writer.getMemberSummaryTree(memberSummaryTree));
-    }
-
-    /**
-     * Build the member details contents of the page.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationContentTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeMemberDetails(XMLNode node, Content annotationContentTree) {
-        Content memberDetailsTree = writer.getMemberTreeHeader();
-        buildChildren(node, memberDetailsTree);
-        if (memberDetailsTree.isValid()) {
-            annotationContentTree.addContent(writer.getMemberDetailsTree(memberDetailsTree));
-        }
-    }
-
-    /**
-     * Build the annotation type field documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeFieldDetails(XMLNode node, Content memberDetailsTree)
-            throws Exception {
-        configuration.getBuilderFactory().
-                getAnnotationTypeFieldsBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the annotation type optional member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeOptionalMemberDetails(XMLNode node, Content memberDetailsTree)
-            throws Exception {
-        configuration.getBuilderFactory().
-                getAnnotationTypeOptionalMemberBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the annotation type required member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeRequiredMemberDetails(XMLNode node, Content memberDetailsTree)
-            throws Exception {
-        configuration.getBuilderFactory().
-                getAnnotationTypeRequiredMemberBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
deleted file mode 100644
index 0e52d101611..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for annotation type fields.
- *
- *  <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>
- *
- * @author Bhavesh Patel
- * @since 1.8
- */
-@Deprecated
-public class AnnotationTypeFieldBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The annotation type whose members are being documented.
-     */
-    protected ClassDoc classDoc;
-
-    /**
-     * The visible members for the given class.
-     */
-    protected VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the member documentation.
-     */
-    protected AnnotationTypeFieldWriter writer;
-
-    /**
-     * The list of members being documented.
-     */
-    protected List<ProgramElementDoc> members;
-
-    /**
-     * The index of the current member that is being documented at this point
-     * in time.
-     */
-    protected int currentMemberIndex;
-
-    /**
-     * Construct a new AnnotationTypeFieldsBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     * @param memberType the type of member that is being documented.
-     */
-    protected AnnotationTypeFieldBuilder(Context context,
-            ClassDoc classDoc,
-            AnnotationTypeFieldWriter writer,
-            int memberType) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType,
-            configuration);
-        this.members = new ArrayList<>(this.visibleMemberMap.getMembersFor(classDoc));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(this.members, configuration.getMemberComparator());
-        }
-    }
-
-
-    /**
-     * Construct a new AnnotationTypeFieldBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static AnnotationTypeFieldBuilder getInstance(
-            Context context, ClassDoc classDoc,
-            AnnotationTypeFieldWriter writer) {
-        return new AnnotationTypeFieldBuilder(context, classDoc,
-                    writer, VisibleMemberMap.ANNOTATION_TYPE_FIELDS);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "AnnotationTypeFieldDetails";
-    }
-
-    /**
-     * Returns a list of members that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of members that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the members of this class.
-     *
-     * @return the visible member map for the members of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * summaryOrder.size()
-     */
-    public boolean hasMembersToDocument() {
-        return members.size() > 0;
-    }
-
-    /**
-     * Build the annotation type field documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeField(XMLNode node, Content memberDetailsTree) {
-        buildAnnotationTypeMember(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeMember(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = members.size();
-        if (size > 0) {
-            writer.addAnnotationFieldDetailsMarker(memberDetailsTree);
-            for (currentMemberIndex = 0; currentMemberIndex < size;
-                    currentMemberIndex++) {
-                Content detailsTree = writer.getMemberTreeHeader();
-                writer.addAnnotationDetailsTreeHeader(classDoc, detailsTree);
-                Content annotationDocTree = writer.getAnnotationDocTreeHeader(
-                        (MemberDoc) members.get(currentMemberIndex),
-                        detailsTree);
-                buildChildren(node, annotationDocTree);
-                detailsTree.addContent(writer.getAnnotationDoc(
-                        annotationDocTree, (currentMemberIndex == size - 1)));
-                memberDetailsTree.addContent(writer.getAnnotationDetails(detailsTree));
-            }
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content annotationDocTree) {
-        annotationDocTree.addContent(
-                writer.getSignature((MemberDoc) members.get(currentMemberIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content annotationDocTree) {
-        writer.addDeprecated((MemberDoc) members.get(currentMemberIndex),
-                annotationDocTree);
-    }
-
-    /**
-     * Build the comments for the member.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildMemberComments(XMLNode node, Content annotationDocTree) {
-        if(! configuration.nocomment){
-            writer.addComments((MemberDoc) members.get(currentMemberIndex),
-                    annotationDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content annotationDocTree) {
-        writer.addTags((MemberDoc) members.get(currentMemberIndex),
-                annotationDocTree);
-    }
-
-    /**
-     * Return the annotation type field writer for this builder.
-     *
-     * @return the annotation type field writer for this builder.
-     */
-    public AnnotationTypeFieldWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
deleted file mode 100644
index c35d51f2b6d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit.builders;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for optional annotation type members.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class AnnotationTypeOptionalMemberBuilder extends
-        AnnotationTypeRequiredMemberBuilder {
-
-
-    /**
-     * Construct a new AnnotationTypeMemberBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private AnnotationTypeOptionalMemberBuilder(Context context,
-            ClassDoc classDoc,
-            AnnotationTypeOptionalMemberWriter writer) {
-        super(context, classDoc, writer,
-                VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL);
-    }
-
-
-    /**
-     * Construct a new AnnotationTypeMemberBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static AnnotationTypeOptionalMemberBuilder getInstance(
-            Context context, ClassDoc classDoc,
-            AnnotationTypeOptionalMemberWriter writer) {
-        return new AnnotationTypeOptionalMemberBuilder(context,
-                classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return "AnnotationTypeOptionalMemberDetails";
-    }
-
-    /**
-     * Build the annotation type optional member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeOptionalMember(XMLNode node, Content memberDetailsTree) {
-        buildAnnotationTypeMember(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the default value for this optional member.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildDefaultValueInfo(XMLNode node, Content annotationDocTree) {
-        ((AnnotationTypeOptionalMemberWriter) writer).addDefaultValueInfo(
-                (MemberDoc) members.get(currentMemberIndex),
-                annotationDocTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public AnnotationTypeRequiredMemberWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
deleted file mode 100644
index f1708495e1e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for required annotation type members.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class AnnotationTypeRequiredMemberBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The annotation type whose members are being documented.
-     */
-    protected ClassDoc classDoc;
-
-    /**
-     * The visible members for the given class.
-     */
-    protected VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the member documentation.
-     */
-    protected AnnotationTypeRequiredMemberWriter writer;
-
-    /**
-     * The list of members being documented.
-     */
-    protected List<ProgramElementDoc> members;
-
-    /**
-     * The index of the current member that is being documented at this point
-     * in time.
-     */
-    protected int currentMemberIndex;
-
-    /**
-     * Construct a new AnnotationTypeRequiredMemberBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    protected AnnotationTypeRequiredMemberBuilder(Context context,
-            ClassDoc classDoc,
-            AnnotationTypeRequiredMemberWriter writer,
-            int memberType) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        this.visibleMemberMap = new VisibleMemberMap(classDoc, memberType,
-            configuration);
-        this.members = new ArrayList<>(this.visibleMemberMap.getMembersFor(classDoc));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(this.members, configuration.getMemberComparator());
-        }
-    }
-
-
-    /**
-     * Construct a new AnnotationTypeMemberBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whose members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static AnnotationTypeRequiredMemberBuilder getInstance(
-            Context context, ClassDoc classDoc,
-            AnnotationTypeRequiredMemberWriter writer) {
-        return new AnnotationTypeRequiredMemberBuilder(context, classDoc,
-                    writer,
-                    VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "AnnotationTypeRequiredMemberDetails";
-    }
-
-    /**
-     * Returns a list of members that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of members that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the members of this class.
-     *
-     * @return the visible member map for the members of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * summaryOrder.size()
-     */
-    public boolean hasMembersToDocument() {
-        return members.size() > 0;
-    }
-
-    /**
-     * Build the annotation type required member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeRequiredMember(XMLNode node, Content memberDetailsTree) {
-        buildAnnotationTypeMember(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the member documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeMember(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = members.size();
-        if (size > 0) {
-            writer.addAnnotationDetailsMarker(memberDetailsTree);
-            for (currentMemberIndex = 0; currentMemberIndex < size;
-                    currentMemberIndex++) {
-                Content detailsTree = writer.getMemberTreeHeader();
-                writer.addAnnotationDetailsTreeHeader(classDoc, detailsTree);
-                Content annotationDocTree = writer.getAnnotationDocTreeHeader(
-                        (MemberDoc) members.get(currentMemberIndex), detailsTree);
-                buildChildren(node, annotationDocTree);
-                detailsTree.addContent(writer.getAnnotationDoc(
-                        annotationDocTree, (currentMemberIndex == size - 1)));
-                memberDetailsTree.addContent(writer.getAnnotationDetails(detailsTree));
-            }
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content annotationDocTree) {
-        annotationDocTree.addContent(
-                writer.getSignature((MemberDoc) members.get(currentMemberIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content annotationDocTree) {
-        writer.addDeprecated((MemberDoc) members.get(currentMemberIndex),
-                annotationDocTree);
-    }
-
-    /**
-     * Build the comments for the member.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildMemberComments(XMLNode node, Content annotationDocTree) {
-        if(! configuration.nocomment){
-            writer.addComments((MemberDoc) members.get(currentMemberIndex),
-                    annotationDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param annotationDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content annotationDocTree) {
-        writer.addTags((MemberDoc) members.get(currentMemberIndex),
-                annotationDocTree);
-    }
-
-    /**
-     * Return the annotation type required member writer for this builder.
-     *
-     * @return the annotation type required member constant writer for this
-     * builder.
-     */
-    public AnnotationTypeRequiredMemberWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
deleted file mode 100644
index 3e4f4e4fa79..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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.doclets.internal.toolkit.builders;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The factory for constructing builders.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public class BuilderFactory {
-
-    /**
-     * The current configuration of the doclet.
-     */
-    private final Configuration configuration;
-
-    /**
-     * The factory to retrieve the required writers from.
-     */
-    private final WriterFactory writerFactory;
-
-    private final AbstractBuilder.Context context;
-
-    /**
-     * Construct a builder factory using the given configuration.
-     * @param configuration the configuration for the current doclet
-     * being executed.
-     */
-    public BuilderFactory (Configuration configuration) {
-        this.configuration = configuration;
-        this.writerFactory = configuration.getWriterFactory();
-
-        Set<PackageDoc> containingPackagesSeen = new HashSet<>();
-        context = new AbstractBuilder.Context(configuration, containingPackagesSeen,
-                LayoutParser.getInstance(configuration));
-    }
-
-    /**
-     * Return the builder that builds the constant summary.
-     * @return the builder that builds the constant summary.
-     */
-    public AbstractBuilder getConstantsSummaryBuider() throws Exception {
-        return ConstantsSummaryBuilder.getInstance(context,
-            writerFactory.getConstantsSummaryWriter());
-    }
-
-    /**
-     * Return the builder that builds the package summary.
-     *
-     * @param pkg the package being documented.
-     * @param prevPkg the previous package being documented.
-     * @param nextPkg the next package being documented.
-     * @return the builder that builds the constant summary.
-     */
-    public AbstractBuilder getPackageSummaryBuilder(PackageDoc pkg, PackageDoc prevPkg,
-            PackageDoc nextPkg) throws Exception {
-        return PackageSummaryBuilder.getInstance(context, pkg,
-            writerFactory.getPackageSummaryWriter(pkg, prevPkg, nextPkg));
-    }
-
-    /**
-     * Return the builder for the class.
-     *
-     * @param classDoc the class being documented.
-     * @param prevClass the previous class that was documented.
-     * @param nextClass the next class being documented.
-     * @param classTree the class tree.
-     * @return the writer for the class.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public AbstractBuilder getClassBuilder(ClassDoc classDoc,
-            ClassDoc prevClass, ClassDoc nextClass, ClassTree classTree)
-            throws Exception {
-        return ClassBuilder.getInstance(context, classDoc,
-            writerFactory.getClassWriter(classDoc, prevClass, nextClass,
-                classTree));
-    }
-
-    /**
-     * Return the builder for the annotation type.
-     *
-     * @param annotationType the annotation type being documented.
-     * @param prevType the previous type that was documented.
-     * @param nextType the next type being documented.
-     * @return the writer for the annotation type.  Return null if this
-     * writer is not supported by the doclet.
-     */
-    public AbstractBuilder getAnnotationTypeBuilder(
-        AnnotationTypeDoc annotationType,
-        Type prevType, Type nextType)
-            throws Exception {
-        return AnnotationTypeBuilder.getInstance(context, annotationType,
-            writerFactory.getAnnotationTypeWriter(annotationType, prevType, nextType));
-    }
-
-    /**
-     * Return an instance of the method builder for the given class.
-     *
-     * @return an instance of the method builder for the given class.
-     */
-    public AbstractBuilder getMethodBuilder(ClassWriter classWriter)
-           throws Exception {
-        return MethodBuilder.getInstance(context,
-            classWriter.getClassDoc(),
-            writerFactory.getMethodWriter(classWriter));
-    }
-
-    /**
-     * Return an instance of the annotation type fields builder for the given
-     * class.
-     *
-     * @return an instance of the annotation type field builder for the given
-     *         annotation type.
-     */
-    public AbstractBuilder getAnnotationTypeFieldsBuilder(
-            AnnotationTypeWriter annotationTypeWriter)
-    throws Exception {
-        return AnnotationTypeFieldBuilder.getInstance(context,
-            annotationTypeWriter.getAnnotationTypeDoc(),
-            writerFactory.getAnnotationTypeFieldWriter(
-                annotationTypeWriter));
-    }
-
-    /**
-     * Return an instance of the annotation type member builder for the given
-     * class.
-     *
-     * @return an instance of the annotation type member builder for the given
-     *         annotation type.
-     */
-    public AbstractBuilder getAnnotationTypeOptionalMemberBuilder(
-            AnnotationTypeWriter annotationTypeWriter)
-    throws Exception {
-        return AnnotationTypeOptionalMemberBuilder.getInstance(context,
-            annotationTypeWriter.getAnnotationTypeDoc(),
-            writerFactory.getAnnotationTypeOptionalMemberWriter(
-                annotationTypeWriter));
-    }
-
-    /**
-     * Return an instance of the annotation type member builder for the given
-     * class.
-     *
-     * @return an instance of the annotation type member builder for the given
-     *         annotation type.
-     */
-    public AbstractBuilder getAnnotationTypeRequiredMemberBuilder(
-            AnnotationTypeWriter annotationTypeWriter)
-    throws Exception {
-        return AnnotationTypeRequiredMemberBuilder.getInstance(context,
-            annotationTypeWriter.getAnnotationTypeDoc(),
-            writerFactory.getAnnotationTypeRequiredMemberWriter(
-                annotationTypeWriter));
-    }
-
-    /**
-     * Return an instance of the enum constants builder for the given class.
-     *
-     * @return an instance of the enum constants builder for the given class.
-     */
-    public AbstractBuilder getEnumConstantsBuilder(ClassWriter classWriter)
-            throws Exception {
-        return EnumConstantBuilder.getInstance(context, classWriter.getClassDoc(),
-            writerFactory.getEnumConstantWriter(classWriter));
-    }
-
-    /**
-     * Return an instance of the field builder for the given class.
-     *
-     * @return an instance of the field builder for the given class.
-     */
-    public AbstractBuilder getFieldBuilder(ClassWriter classWriter)
-            throws Exception {
-        return FieldBuilder.getInstance(context, classWriter.getClassDoc(),
-            writerFactory.getFieldWriter(classWriter));
-    }
-
-    /**
-     * Return an instance of the property builder for the given class.
-     *
-     * @return an instance of the field builder for the given class.
-     */
-    public AbstractBuilder getPropertyBuilder(ClassWriter classWriter) throws Exception {
-        final PropertyWriter propertyWriter =
-                writerFactory.getPropertyWriter(classWriter);
-        return PropertyBuilder.getInstance(context,
-                                           classWriter.getClassDoc(),
-                                           propertyWriter);
-    }
-
-    /**
-     * Return an instance of the constructor builder for the given class.
-     *
-     * @return an instance of the constructor builder for the given class.
-     */
-    public AbstractBuilder getConstructorBuilder(ClassWriter classWriter)
-            throws Exception {
-        return ConstructorBuilder.getInstance(context,
-            classWriter.getClassDoc(),
-            writerFactory.getConstructorWriter(classWriter));
-    }
-
-    /**
-     * Return an instance of the member summary builder for the given class.
-     *
-     * @return an instance of the member summary builder for the given class.
-     */
-    public AbstractBuilder getMemberSummaryBuilder(ClassWriter classWriter)
-            throws Exception {
-        return MemberSummaryBuilder.getInstance(classWriter, context);
-    }
-
-    /**
-     * Return an instance of the member summary builder for the given annotation
-     * type.
-     *
-     * @return an instance of the member summary builder for the given
-     *         annotation type.
-     */
-    public AbstractBuilder getMemberSummaryBuilder(
-            AnnotationTypeWriter annotationTypeWriter)
-    throws Exception {
-        return MemberSummaryBuilder.getInstance(annotationTypeWriter, context);
-    }
-
-    /**
-     * Return the builder that builds the serialized form.
-     *
-     * @return the builder that builds the serialized form.
-     */
-    public AbstractBuilder getSerializedFormBuilder()
-            throws Exception {
-        return SerializedFormBuilder.getInstance(context);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
deleted file mode 100644
index 994e0e8831e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Builds the summary for a given class.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class ClassBuilder extends AbstractBuilder {
-
-    /**
-     * The root element of the class XML is {@value}.
-     */
-    public static final String ROOT = "ClassDoc";
-
-    /**
-     * The class being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The doclet specific writer.
-     */
-    private final ClassWriter writer;
-
-    /**
-     * Keep track of whether or not this classdoc is an interface.
-     */
-    private final boolean isInterface;
-
-    /**
-     * Keep track of whether or not this classdoc is an enum.
-     */
-    private final boolean isEnum;
-
-    /**
-     * The content tree for the class documentation.
-     */
-    private Content contentTree;
-
-    /**
-     * Construct a new ClassBuilder.
-     *
-     * @param context  the build context
-     * @param classDoc the class being documented.
-     * @param writer the doclet specific writer.
-     */
-    private ClassBuilder(Context context,
-            ClassDoc classDoc, ClassWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        if (classDoc.isInterface()) {
-            isInterface = true;
-            isEnum = false;
-        } else if (classDoc.isEnum()) {
-            isInterface = false;
-            isEnum = true;
-            utils.setEnumDocumentation(configuration, classDoc);
-        } else {
-            isInterface = false;
-            isEnum = false;
-        }
-    }
-
-    /**
-     * Construct a new ClassBuilder.
-     *
-     * @param context  the build context
-     * @param classDoc the class being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static ClassBuilder getInstance(Context context,
-            ClassDoc classDoc, ClassWriter writer) {
-        return new ClassBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void build() throws IOException {
-        build(layoutParser.parseXML(ROOT), contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return ROOT;
-    }
-
-     /**
-      * Handles the {@literal <ClassDoc>} tag.
-      *
-      * @param node the XML element that specifies which components to document
-      * @param contentTree the content tree to which the documentation will be added
-      */
-     public void buildClassDoc(XMLNode node, Content contentTree) throws Exception {
-         String key;
-         if (isInterface) {
-             key =  "doclet.Interface";
-         } else if (isEnum) {
-             key = "doclet.Enum";
-         } else {
-             key =  "doclet.Class";
-         }
-         contentTree = writer.getHeader(configuration.getText(key) + " " +
-                 classDoc.name());
-         Content classContentTree = writer.getClassContentHeader();
-         buildChildren(node, classContentTree);
-         writer.addClassContentTree(contentTree, classContentTree);
-         writer.addFooter(contentTree);
-         writer.printDocument(contentTree);
-         writer.close();
-         copyDocFiles();
-     }
-
-     /**
-      * Build the class tree documentation.
-      *
-      * @param node the XML element that specifies which components to document
-      * @param classContentTree the content tree to which the documentation will be added
-      */
-    public void buildClassTree(XMLNode node, Content classContentTree) {
-        writer.addClassTree(classContentTree);
-    }
-
-    /**
-     * Build the class information tree documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree the content tree to which the documentation will be added
-     */
-    public void buildClassInfo(XMLNode node, Content classContentTree) {
-        Content classInfoTree = writer.getClassInfoTreeHeader();
-        buildChildren(node, classInfoTree);
-        classContentTree.addContent(writer.getClassInfo(classInfoTree));
-    }
-
-    /**
-     * Build the typeparameters of this class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildTypeParamInfo(XMLNode node, Content classInfoTree) {
-        writer.addTypeParamInfo(classInfoTree);
-    }
-
-    /**
-     * If this is an interface, list all super interfaces.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildSuperInterfacesInfo(XMLNode node, Content classInfoTree) {
-        writer.addSuperInterfacesInfo(classInfoTree);
-    }
-
-    /**
-     * If this is a class, list all interfaces implemented by this class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildImplementedInterfacesInfo(XMLNode node, Content classInfoTree) {
-        writer.addImplementedInterfacesInfo(classInfoTree);
-    }
-
-    /**
-     * List all the classes extend this one.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildSubClassInfo(XMLNode node, Content classInfoTree) {
-        writer.addSubClassInfo(classInfoTree);
-    }
-
-    /**
-     * List all the interfaces that extend this one.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildSubInterfacesInfo(XMLNode node, Content classInfoTree) {
-        writer.addSubInterfacesInfo(classInfoTree);
-    }
-
-    /**
-     * If this is an interface, list all classes that implement this interface.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildInterfaceUsageInfo(XMLNode node, Content classInfoTree) {
-        writer.addInterfaceUsageInfo(classInfoTree);
-    }
-
-    /**
-     * If this is an functional interface, display appropriate message.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildFunctionalInterfaceInfo(XMLNode node, Content classInfoTree) {
-        writer.addFunctionalInterfaceInfo(classInfoTree);
-    }
-
-    /**
-     * If this class is deprecated, build the appropriate information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo (XMLNode node, Content classInfoTree) {
-        writer.addClassDeprecationInfo(classInfoTree);
-    }
-
-    /**
-     * If this is an inner class or interface, list the enclosing class or interface.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildNestedClassInfo (XMLNode node, Content classInfoTree) {
-        writer.addNestedClassInfo(classInfoTree);
-    }
-
-    /**
-     * Copy the doc files for the current ClassDoc if necessary.
-     */
-     private void copyDocFiles() {
-        PackageDoc containingPackage = classDoc.containingPackage();
-        if((configuration.packages == null ||
-            !configuration.packages.contains(containingPackage)) &&
-            ! containingPackagesSeen.contains(containingPackage)){
-            //Only copy doc files dir if the containing package is not
-            //documented AND if we have not documented a class from the same
-            //package already. Otherwise, we are making duplicate copies.
-            utils.copyDocFiles(configuration, containingPackage);
-            containingPackagesSeen.add(containingPackage);
-        }
-     }
-
-    /**
-     * Build the signature of the current class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildClassSignature(XMLNode node, Content classInfoTree) {
-        StringBuilder modifiers = new StringBuilder(classDoc.modifiers());
-        modifiers.append(modifiers.length() == 0 ? "" : " ");
-        if (isEnum) {
-            modifiers.append("enum ");
-            int index;
-            if ((index = modifiers.indexOf("abstract")) >= 0) {
-                modifiers.delete(index, index + "abstract".length());
-                modifiers = new StringBuilder(
-                        utils.replaceText(modifiers.toString(), "  ", " "));
-            }
-            if ((index = modifiers.indexOf("final")) >= 0) {
-                modifiers.delete(index, index + "final".length());
-                modifiers = new StringBuilder(
-                        utils.replaceText(modifiers.toString(), "  ", " "));
-            }
-        //} else if (classDoc.isAnnotationType()) {
-            //modifiers.append("@interface ");
-        } else if (! isInterface) {
-            modifiers.append("class ");
-        }
-        writer.addClassSignature(modifiers.toString(), classInfoTree);
-    }
-
-    /**
-     * Build the class description.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildClassDescription(XMLNode node, Content classInfoTree) {
-       writer.addClassDescription(classInfoTree);
-    }
-
-    /**
-     * Build the tag information for the current class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classInfoTree the content tree to which the documentation will be added
-     */
-    public void buildClassTagInfo(XMLNode node, Content classInfoTree) {
-       writer.addClassTagInfo(classInfoTree);
-    }
-
-    /**
-     * Build the member summary contents of the page.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree the content tree to which the documentation will be added
-     */
-    public void buildMemberSummary(XMLNode node, Content classContentTree) throws Exception {
-        Content memberSummaryTree = writer.getMemberTreeHeader();
-        configuration.getBuilderFactory().
-                getMemberSummaryBuilder(writer).buildChildren(node, memberSummaryTree);
-        classContentTree.addContent(writer.getMemberSummaryTree(memberSummaryTree));
-    }
-
-    /**
-     * Build the member details contents of the page.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree the content tree to which the documentation will be added
-     */
-    public void buildMemberDetails(XMLNode node, Content classContentTree) {
-        Content memberDetailsTree = writer.getMemberTreeHeader();
-        buildChildren(node, memberDetailsTree);
-        classContentTree.addContent(writer.getMemberDetailsTree(memberDetailsTree));
-    }
-
-    /**
-     * Build the enum constants documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildEnumConstantsDetails(XMLNode node,
-            Content memberDetailsTree) throws Exception {
-        configuration.getBuilderFactory().
-                getEnumConstantsBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the field documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildFieldDetails(XMLNode node,
-            Content memberDetailsTree) throws Exception {
-        configuration.getBuilderFactory().
-                getFieldBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the property documentation.
-     *
-     * @param elements the XML elements that specify how a field is documented.
-     */
-    public void buildPropertyDetails(XMLNode node,
-            Content memberDetailsTree) throws Exception {
-        configuration.getBuilderFactory().
-                getPropertyBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the constructor documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildConstructorDetails(XMLNode node,
-            Content memberDetailsTree) throws Exception {
-        configuration.getBuilderFactory().
-                getConstructorBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-
-    /**
-     * Build the method documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildMethodDetails(XMLNode node,
-            Content memberDetailsTree) throws Exception {
-        configuration.getBuilderFactory().
-                getMethodBuilder(writer).buildChildren(node, memberDetailsTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
deleted file mode 100644
index 89ff56e93b0..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds the Constants Summary Page.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class ConstantsSummaryBuilder extends AbstractBuilder {
-
-    /**
-     * The root element of the constant summary XML is {@value}.
-     */
-    public static final String ROOT = "ConstantSummary";
-
-    /**
-     * The maximum number of package directories shown in the constant
-     * value index.
-     */
-    public static final int MAX_CONSTANT_VALUE_INDEX_LENGTH = 2;
-
-    /**
-     * The writer used to write the results.
-     */
-    protected final ConstantsSummaryWriter writer;
-
-    /**
-     * The set of ClassDocs that have constant fields.
-     */
-    protected final Set<ClassDoc> classDocsWithConstFields;
-
-    /**
-     * The set of printed package headers.
-     */
-    protected Set<String> printedPackageHeaders;
-
-    /**
-     * The current package being documented.
-     */
-    private PackageDoc currentPackage;
-
-    /**
-     * The current class being documented.
-     */
-    private ClassDoc currentClass;
-
-    /**
-     * The content tree for the constant summary documentation.
-     */
-    private Content contentTree;
-
-    /**
-     * True if first package is listed.
-     */
-    private boolean first = true;
-
-    /**
-     * Construct a new ConstantsSummaryBuilder.
-     *
-     * @param context       the build context.
-     * @param writer        the writer for the summary.
-     */
-    private ConstantsSummaryBuilder(Context context,
-            ConstantsSummaryWriter writer) {
-        super(context);
-        this.writer = writer;
-        this.classDocsWithConstFields = new HashSet<>();
-    }
-
-    /**
-     * Construct a ConstantsSummaryBuilder.
-     *
-     * @param context       the build context.
-     * @param writer        the writer for the summary.
-     */
-    public static ConstantsSummaryBuilder getInstance(Context context,
-            ConstantsSummaryWriter writer) {
-        return new ConstantsSummaryBuilder(context, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void build() throws IOException {
-        if (writer == null) {
-            //Doclet does not support this output.
-            return;
-        }
-        build(layoutParser.parseXML(ROOT), contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return ROOT;
-    }
-
-    /**
-     * Build the constant summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param contentTree the content tree to which the documentation will be added
-     */
-    public void buildConstantSummary(XMLNode node, Content contentTree) throws Exception {
-        contentTree = writer.getHeader();
-        buildChildren(node, contentTree);
-        writer.addFooter(contentTree);
-        writer.printDocument(contentTree);
-        writer.close();
-    }
-
-    /**
-     * Build the list of packages.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param contentTree the content tree to which the content list will be added
-     */
-    public void buildContents(XMLNode node, Content contentTree) {
-        Content contentListTree = writer.getContentsHeader();
-        printedPackageHeaders = new HashSet<>();
-        for (PackageDoc pkg : configuration.packages) {
-            if (hasConstantField(pkg) && !hasPrintedPackageIndex(pkg.name())) {
-                writer.addLinkToPackageContent(pkg,
-                                               parsePackageName(pkg.name()),
-                                               printedPackageHeaders, contentListTree);
-            }
-        }
-        writer.addContentsList(contentTree, contentListTree);
-    }
-
-    /**
-     * Build the summary for each documented package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param contentTree the tree to which the summaries will be added
-     */
-    public void buildConstantSummaries(XMLNode node, Content contentTree) {
-        printedPackageHeaders = new HashSet<>();
-        Content summariesTree = writer.getConstantSummaries();
-        for (PackageDoc aPackage : configuration.packages) {
-            if (hasConstantField(aPackage)) {
-                currentPackage = aPackage;
-                //Build the documentation for the current package.
-                buildChildren(node, summariesTree);
-                first = false;
-            }
-        }
-        writer.addConstantSummaries(contentTree, summariesTree);
-    }
-
-    /**
-     * Build the header for the given package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summariesTree the tree to which the package header will be added
-     */
-    public void buildPackageHeader(XMLNode node, Content summariesTree) {
-        String parsedPackageName = parsePackageName(currentPackage.name());
-        if (! printedPackageHeaders.contains(parsedPackageName)) {
-            writer.addPackageName(parsePackageName(currentPackage.name()), summariesTree, first);
-            printedPackageHeaders.add(parsedPackageName);
-        }
-    }
-
-    /**
-     * Build the summary for the current class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summariesTree the tree to which the class constant summary will be added
-     */
-    public void buildClassConstantSummary(XMLNode node, Content summariesTree) {
-        ClassDoc[] classes = currentPackage.name().length() > 0 ?
-            currentPackage.allClasses() :
-            configuration.classDocCatalog.allClasses(
-                DocletConstants.DEFAULT_PACKAGE_NAME);
-        Arrays.sort(classes);
-        Content classConstantTree = writer.getClassConstantHeader();
-        for (ClassDoc doc : classes) {
-            if (!classDocsWithConstFields.contains(doc) ||
-                !doc.isIncluded()) {
-                continue;
-            }
-            currentClass = doc;
-            //Build the documentation for the current class.
-            buildChildren(node, classConstantTree);
-        }
-        writer.addClassConstant(summariesTree, classConstantTree);
-    }
-
-    /**
-     * Build the summary of constant members in the class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classConstantTree the tree to which the constant members table
-     *                          will be added
-     */
-    public void buildConstantMembers(XMLNode node, Content classConstantTree) {
-        new ConstantFieldBuilder(currentClass).buildMembersSummary(node, classConstantTree);
-    }
-
-    /**
-     * Return true if the given package has constant fields to document.
-     *
-     * @param pkg   the package being checked.
-     * @return true if the given package has constant fields to document.
-     */
-    private boolean hasConstantField(PackageDoc pkg) {
-        ClassDoc[] classes
-                = (pkg.name().length() > 0)
-                  ? pkg.allClasses()
-                  : configuration.classDocCatalog.allClasses(DocletConstants.DEFAULT_PACKAGE_NAME);
-        boolean found = false;
-        for (ClassDoc doc : classes) {
-            if (doc.isIncluded() && hasConstantField(doc)) {
-                found = true;
-            }
-        }
-        return found;
-    }
-
-    /**
-     * Return true if the given class has constant fields to document.
-     *
-     * @param classDoc the class being checked.
-     * @return true if the given package has constant fields to document.
-     */
-    private boolean hasConstantField (ClassDoc classDoc) {
-        VisibleMemberMap visibleMemberMapFields = new VisibleMemberMap(classDoc,
-            VisibleMemberMap.FIELDS, configuration);
-        List<?> fields = visibleMemberMapFields.getLeafClassMembers(configuration);
-        for (Object f : fields) {
-            FieldDoc field = (FieldDoc) f;
-            if (field.constantValueExpression() != null) {
-                classDocsWithConstFields.add(classDoc);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return true if the given package name has been printed.  Also
-     * return true if the root of this package has been printed.
-     *
-     * @param pkgname the name of the package to check.
-     */
-    private boolean hasPrintedPackageIndex(String pkgname) {
-        String[] list = printedPackageHeaders.toArray(new String[] {});
-        for (String packageHeader : list) {
-            if (pkgname.startsWith(packageHeader)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Print the table of constants.
-     *
-     * @author Jamie Ho
-     * @since 1.4
-     */
-    private class ConstantFieldBuilder {
-
-        /**
-         * The map used to get the visible variables.
-         */
-        protected VisibleMemberMap visibleMemberMapFields = null;
-
-        /**
-         * The map used to get the visible variables.
-         */
-        protected VisibleMemberMap visibleMemberMapEnumConst = null;
-
-        /**
-         * The classdoc that we are examining constants for.
-         */
-        protected ClassDoc classdoc;
-
-        /**
-         * Construct a ConstantFieldSubWriter.
-         * @param classdoc the classdoc that we are examining constants for.
-         */
-        public ConstantFieldBuilder(ClassDoc classdoc) {
-            this.classdoc = classdoc;
-            visibleMemberMapFields = new VisibleMemberMap(classdoc,
-                VisibleMemberMap.FIELDS, configuration);
-            visibleMemberMapEnumConst = new VisibleMemberMap(classdoc,
-                VisibleMemberMap.ENUM_CONSTANTS, configuration);
-        }
-
-        /**
-         * Builds the table of constants for a given class.
-         *
-         * @param node the XML element that specifies which components to document
-         * @param classConstantTree the tree to which the class constants table
-         *                          will be added
-         */
-        protected void buildMembersSummary(XMLNode node, Content classConstantTree) {
-            List<FieldDoc> members = new ArrayList<>(members());
-            if (members.size() > 0) {
-                Collections.sort(members);
-                writer.addConstantMembers(classdoc, members, classConstantTree);
-            }
-        }
-
-        /**
-         * Return the list of visible constant fields for the given classdoc.
-         * @return the list of visible constant fields for the given classdoc.
-         */
-        protected List<FieldDoc> members() {
-            List<ProgramElementDoc> l = visibleMemberMapFields.getLeafClassMembers(configuration);
-            l.addAll(visibleMemberMapEnumConst.getLeafClassMembers(configuration));
-            Iterator<ProgramElementDoc> iter;
-
-            if(l != null){
-                iter = l.iterator();
-            } else {
-                return null;
-            }
-            List<FieldDoc> inclList = new LinkedList<>();
-            FieldDoc member;
-            while(iter.hasNext()){
-                member = (FieldDoc)iter.next();
-                if(member.constantValue() != null){
-                    inclList.add(member);
-                }
-            }
-            return inclList;
-        }
-    }
-
-    /**
-     * Parse the package name.  We only want to display package name up to
-     * 2 levels.
-     */
-    private String parsePackageName(String pkgname) {
-        int index = -1;
-        for (int j = 0; j < MAX_CONSTANT_VALUE_INDEX_LENGTH; j++) {
-            index = pkgname.indexOf(".", index + 1);
-        }
-        if (index != -1) {
-            pkgname = pkgname.substring(0, index);
-        }
-        return pkgname;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
deleted file mode 100644
index 594909fd124..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for a constructor.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class ConstructorBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The name of this builder.
-     */
-    public static final String NAME = "ConstructorDetails";
-
-    /**
-     * The index of the current field that is being documented at this point
-     * in time.
-     */
-    private int currentConstructorIndex;
-
-    /**
-     * The class whose constructors are being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The visible constructors for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the constructor documentation.
-     */
-    private final ConstructorWriter writer;
-
-    /**
-     * The constructors being documented.
-     */
-    private final List<ProgramElementDoc> constructors;
-
-    /**
-     * Construct a new ConstructorBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private ConstructorBuilder(Context context,
-            ClassDoc classDoc,
-            ConstructorWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        visibleMemberMap =
-                new VisibleMemberMap(
-                classDoc,
-                VisibleMemberMap.CONSTRUCTORS,
-                configuration);
-        constructors = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc));
-        for (ProgramElementDoc constructor : constructors) {
-            if (constructor.isProtected() || constructor.isPrivate()) {
-                writer.setFoundNonPubConstructor(true);
-            }
-        }
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(constructors,configuration.getMemberComparator());
-        }
-    }
-
-    /**
-     * Construct a new ConstructorBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static ConstructorBuilder getInstance(Context context,
-            ClassDoc classDoc, ConstructorWriter writer) {
-        return new ConstructorBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasMembersToDocument() {
-        return constructors.size() > 0;
-    }
-
-    /**
-     * Returns a list of constructors that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @return a list of constructors that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Return the constructor writer for this builder.
-     *
-     * @return the constructor writer for this builder.
-     */
-    public ConstructorWriter getWriter() {
-        return writer;
-    }
-
-    /**
-     * Build the constructor documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildConstructorDoc(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = constructors.size();
-        if (size > 0) {
-            Content constructorDetailsTree = writer.getConstructorDetailsTreeHeader(
-                    classDoc, memberDetailsTree);
-            for (currentConstructorIndex = 0; currentConstructorIndex < size;
-                    currentConstructorIndex++) {
-                Content constructorDocTree = writer.getConstructorDocTreeHeader(
-                        (ConstructorDoc) constructors.get(currentConstructorIndex),
-                        constructorDetailsTree);
-                buildChildren(node, constructorDocTree);
-                constructorDetailsTree.addContent(writer.getConstructorDoc(
-                        constructorDocTree, (currentConstructorIndex == size - 1)));
-            }
-            memberDetailsTree.addContent(
-                    writer.getConstructorDetails(constructorDetailsTree));
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param constructorDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content constructorDocTree) {
-        constructorDocTree.addContent(
-                writer.getSignature(
-                (ConstructorDoc) constructors.get(currentConstructorIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param constructorDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content constructorDocTree) {
-        writer.addDeprecated(
-                (ConstructorDoc) constructors.get(currentConstructorIndex), constructorDocTree);
-    }
-
-    /**
-     * Build the comments for the constructor.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param constructorDocTree the content tree to which the documentation will be added
-     */
-    public void buildConstructorComments(XMLNode node, Content constructorDocTree) {
-        if (!configuration.nocomment) {
-            writer.addComments(
-                    (ConstructorDoc) constructors.get(currentConstructorIndex),
-                    constructorDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param constructorDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content constructorDocTree) {
-        writer.addTags((ConstructorDoc) constructors.get(currentConstructorIndex),
-                constructorDocTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
deleted file mode 100644
index 2f759cb8862..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for a enum constants.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class EnumConstantBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The class whose enum constants are being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The visible enum constantss for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the enum constants documentation.
-     */
-    private final EnumConstantWriter writer;
-
-    /**
-     * The list of enum constants being documented.
-     */
-    private final List<ProgramElementDoc> enumConstants;
-
-    /**
-     * The index of the current enum constant that is being documented at this point
-     * in time.
-     */
-    private int currentEnumConstantsIndex;
-
-    /**
-     * Construct a new EnumConstantsBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private EnumConstantBuilder(Context context,
-            ClassDoc classDoc, EnumConstantWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        visibleMemberMap =
-                new VisibleMemberMap(
-                classDoc,
-                VisibleMemberMap.ENUM_CONSTANTS,
-                configuration);
-        enumConstants = new ArrayList<>(visibleMemberMap.getMembersFor(classDoc));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(enumConstants, configuration.getMemberComparator());
-        }
-    }
-
-    /**
-     * Construct a new EnumConstantsBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static EnumConstantBuilder getInstance(Context context,
-            ClassDoc classDoc, EnumConstantWriter writer) {
-        return new EnumConstantBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "EnumConstantDetails";
-    }
-
-    /**
-     * Returns a list of enum constants that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of enum constants that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the enum constants of this class.
-     *
-     * @return the visible member map for the enum constants of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * summaryOrder.size()
-     */
-    public boolean hasMembersToDocument() {
-        return enumConstants.size() > 0;
-    }
-
-    /**
-     * Build the enum constant documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildEnumConstant(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = enumConstants.size();
-        if (size > 0) {
-            Content enumConstantsDetailsTree = writer.getEnumConstantsDetailsTreeHeader(
-                    classDoc, memberDetailsTree);
-            for (currentEnumConstantsIndex = 0; currentEnumConstantsIndex < size;
-                    currentEnumConstantsIndex++) {
-                Content enumConstantsTree = writer.getEnumConstantsTreeHeader(
-                        (FieldDoc) enumConstants.get(currentEnumConstantsIndex),
-                        enumConstantsDetailsTree);
-                buildChildren(node, enumConstantsTree);
-                enumConstantsDetailsTree.addContent(writer.getEnumConstants(
-                        enumConstantsTree, (currentEnumConstantsIndex == size - 1)));
-            }
-            memberDetailsTree.addContent(
-                    writer.getEnumConstantsDetails(enumConstantsDetailsTree));
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param enumConstantsTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content enumConstantsTree) {
-        enumConstantsTree.addContent(writer.getSignature(
-                (FieldDoc) enumConstants.get(currentEnumConstantsIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param enumConstantsTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content enumConstantsTree) {
-        writer.addDeprecated(
-                (FieldDoc) enumConstants.get(currentEnumConstantsIndex),
-                enumConstantsTree);
-    }
-
-    /**
-     * Build the comments for the enum constant.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param enumConstantsTree the content tree to which the documentation will be added
-     */
-    public void buildEnumConstantComments(XMLNode node, Content enumConstantsTree) {
-        if (!configuration.nocomment) {
-            writer.addComments(
-                    (FieldDoc) enumConstants.get(currentEnumConstantsIndex),
-                    enumConstantsTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param enumConstantsTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content enumConstantsTree) {
-        writer.addTags(
-                (FieldDoc) enumConstants.get(currentEnumConstantsIndex),
-                enumConstantsTree);
-    }
-
-    /**
-     * Return the enum constant writer for this builder.
-     *
-     * @return the enum constant writer for this builder.
-     */
-    public EnumConstantWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
deleted file mode 100644
index 675ae28376f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for a field.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class FieldBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The class whose fields are being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The visible fields for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the field documentation.
-     */
-    private final FieldWriter writer;
-
-    /**
-     * The list of fields being documented.
-     */
-    private final List<ProgramElementDoc> fields;
-
-    /**
-     * The index of the current field that is being documented at this point
-     * in time.
-     */
-    private int currentFieldIndex;
-
-    /**
-     * Construct a new FieldBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private FieldBuilder(Context context,
-            ClassDoc classDoc,
-            FieldWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        visibleMemberMap =
-                new VisibleMemberMap(
-                classDoc,
-                VisibleMemberMap.FIELDS,
-                configuration);
-        fields = new ArrayList<>(visibleMemberMap.getLeafClassMembers(configuration));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(fields, configuration.getMemberComparator());
-        }
-    }
-
-    /**
-     * Construct a new FieldBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static FieldBuilder getInstance(Context context,
-            ClassDoc classDoc,
-            FieldWriter writer) {
-        return new FieldBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "FieldDetails";
-    }
-
-    /**
-     * Returns a list of fields that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of fields that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the fields of this class.
-     *
-     * @return the visible member map for the fields of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * summaryOrder.size()
-     */
-    public boolean hasMembersToDocument() {
-        return fields.size() > 0;
-    }
-
-    /**
-     * Build the field documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildFieldDoc(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = fields.size();
-        if (size > 0) {
-            Content fieldDetailsTree = writer.getFieldDetailsTreeHeader(
-                    classDoc, memberDetailsTree);
-            for (currentFieldIndex = 0; currentFieldIndex < size;
-                    currentFieldIndex++) {
-                Content fieldDocTree = writer.getFieldDocTreeHeader(
-                        (FieldDoc) fields.get(currentFieldIndex),
-                        fieldDetailsTree);
-                buildChildren(node, fieldDocTree);
-                fieldDetailsTree.addContent(writer.getFieldDoc(
-                        fieldDocTree, (currentFieldIndex == size - 1)));
-            }
-            memberDetailsTree.addContent(
-                    writer.getFieldDetails(fieldDetailsTree));
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content fieldDocTree) {
-        fieldDocTree.addContent(
-                writer.getSignature((FieldDoc) fields.get(currentFieldIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content fieldDocTree) {
-        writer.addDeprecated(
-                (FieldDoc) fields.get(currentFieldIndex), fieldDocTree);
-    }
-
-    /**
-     * Build the comments for the field.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldDocTree the content tree to which the documentation will be added
-     */
-    public void buildFieldComments(XMLNode node, Content fieldDocTree) {
-        if (!configuration.nocomment) {
-            writer.addComments((FieldDoc) fields.get(currentFieldIndex), fieldDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content fieldDocTree) {
-        writer.addTags((FieldDoc) fields.get(currentFieldIndex), fieldDocTree);
-    }
-
-    /**
-     * Return the field writer for this builder.
-     *
-     * @return the field writer for this builder.
-     */
-    public FieldWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
deleted file mode 100644
index 2e0783c455c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Parse the XML that specified the order of operation for the builders.  This
- * Parser uses SAX parsing.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- * @see SAXParser
- */
-@Deprecated
-public class LayoutParser extends DefaultHandler {
-
-    /**
-     * The map of XML elements that have been parsed.
-     */
-    private Map<String,XMLNode> xmlElementsMap;
-    private XMLNode currentNode;
-    private final Configuration configuration;
-    private String currentRoot;
-    private boolean isParsing;
-
-    private LayoutParser(Configuration configuration) {
-        xmlElementsMap = new HashMap<>();
-        this.configuration = configuration;
-    }
-
-    /**
-     * Return an instance of the BuilderXML.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @return an instance of the BuilderXML.
-     */
-    public static LayoutParser getInstance(Configuration configuration) {
-        return new LayoutParser(configuration);
-    }
-
-    /**
-     * Parse the XML specifying the layout of the documentation.
-     *
-     * @return the list of XML elements parsed.
-     */
-    public XMLNode parseXML(String root) {
-        if (xmlElementsMap.containsKey(root)) {
-            return xmlElementsMap.get(root);
-        }
-        try {
-            currentRoot = root;
-            isParsing = false;
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
-            InputStream in = configuration.getBuilderXML();
-            saxParser.parse(in, this);
-            return xmlElementsMap.get(root);
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new DocletAbortException(t);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void startElement(String namespaceURI, String sName, String qName,
-        Attributes attrs)
-    throws SAXException {
-        if (isParsing || qName.equals(currentRoot)) {
-            isParsing = true;
-            currentNode = new XMLNode(currentNode, qName);
-            for (int i = 0; i < attrs.getLength(); i++)
-                currentNode.attrs.put(attrs.getLocalName(i), attrs.getValue(i));
-            if (qName.equals(currentRoot))
-                xmlElementsMap.put(qName, currentNode);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void endElement(String namespaceURI, String sName, String qName)
-    throws SAXException {
-        if (! isParsing) {
-            return;
-        }
-        currentNode = currentNode.parent;
-        isParsing = ! qName.equals(currentRoot);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
deleted file mode 100644
index bab5f9f08c6..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-import java.text.MessageFormat;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds the member summary.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class MemberSummaryBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The XML root for this builder.
-     */
-    public static final String NAME = "MemberSummary";
-
-    /**
-     * The visible members for the given class.
-     */
-    private final VisibleMemberMap[] visibleMemberMaps;
-
-    /**
-     * The member summary writers for the given class.
-     */
-    private MemberSummaryWriter[] memberSummaryWriters;
-
-    /**
-     * The type being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * Construct a new MemberSummaryBuilder.
-     *
-     * @param classWriter   the writer for the class whose members are being
-     *                      summarized.
-     * @param context       the build context.
-     */
-    private MemberSummaryBuilder(Context context, ClassDoc classDoc) {
-        super(context);
-        this.classDoc = classDoc;
-        visibleMemberMaps =
-                new VisibleMemberMap[VisibleMemberMap.NUM_MEMBER_TYPES];
-        for (int i = 0; i < VisibleMemberMap.NUM_MEMBER_TYPES; i++) {
-            visibleMemberMaps[i] =
-                    new VisibleMemberMap(
-                    classDoc,
-                    i,
-                    configuration);
-        }
-    }
-
-    /**
-     * Construct a new MemberSummaryBuilder.
-     *
-     * @param classWriter   the writer for the class whose members are being
-     *                      summarized.
-     * @param context       the build context.
-     */
-    public static MemberSummaryBuilder getInstance(
-            ClassWriter classWriter, Context context)
-            throws Exception {
-        MemberSummaryBuilder builder = new MemberSummaryBuilder(context,
-                classWriter.getClassDoc());
-        builder.memberSummaryWriters =
-                new MemberSummaryWriter[VisibleMemberMap.NUM_MEMBER_TYPES];
-        WriterFactory wf = context.configuration.getWriterFactory();
-        for (int i = 0; i < VisibleMemberMap.NUM_MEMBER_TYPES; i++) {
-                builder.memberSummaryWriters[i] =
-                    builder.visibleMemberMaps[i].noVisibleMembers() ?
-                        null :
-                        wf.getMemberSummaryWriter(classWriter, i);
-        }
-        return builder;
-    }
-
-    /**
-     * Construct a new MemberSummaryBuilder.
-     *
-     * @param annotationTypeWriter the writer for the class whose members are
-     *                             being summarized.
-     * @param configuration the current configuration of the doclet.
-     */
-    public static MemberSummaryBuilder getInstance(
-            AnnotationTypeWriter annotationTypeWriter, Context context)
-            throws Exception {
-        MemberSummaryBuilder builder = new MemberSummaryBuilder(context,
-                annotationTypeWriter.getAnnotationTypeDoc());
-        builder.memberSummaryWriters =
-                new MemberSummaryWriter[VisibleMemberMap.NUM_MEMBER_TYPES];
-        WriterFactory wf = context.configuration.getWriterFactory();
-        for (int i = 0; i < VisibleMemberMap.NUM_MEMBER_TYPES; i++) {
-                builder.memberSummaryWriters[i] =
-                    builder.visibleMemberMaps[i].noVisibleMembers()?
-                        null :
-                        wf.getMemberSummaryWriter(
-                        annotationTypeWriter, i);
-        }
-        return builder;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * Return the specified visible member map.
-     *
-     * @param type the type of visible member map to return.
-     * @return the specified visible member map.
-     * @throws ArrayIndexOutOfBoundsException when the type is invalid.
-     * @see VisibleMemberMap
-     */
-    public VisibleMemberMap getVisibleMemberMap(int type) {
-        return visibleMemberMaps[type];
-    }
-
-    /**
-     * Return the specified member summary writer.
-     *
-     * @param type the type of member summary writer to return.
-     * @return the specified member summary writer.
-     * @throws ArrayIndexOutOfBoundsException when the type is invalid.
-     * @see VisibleMemberMap
-     */
-    public MemberSummaryWriter getMemberSummaryWriter(int type) {
-        return memberSummaryWriters[type];
-    }
-
-    /**
-     * Returns a list of methods that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param type the type of members to return.
-     * @return a list of methods that will be documented.
-     * @see VisibleMemberMap
-     */
-    public List<ProgramElementDoc> members(int type) {
-        return visibleMemberMaps[type].getLeafClassMembers(configuration);
-    }
-
-    /**
-     * Return true it there are any members to summarize.
-     *
-     * @return true if there are any members to summarize.
-     */
-    public boolean hasMembersToDocument() {
-        if (classDoc instanceof AnnotationTypeDoc) {
-            return ((AnnotationTypeDoc) classDoc).elements().length > 0;
-        }
-        for (int i = 0; i < VisibleMemberMap.NUM_MEMBER_TYPES; i++) {
-            VisibleMemberMap members = visibleMemberMaps[i];
-            if (!members.noVisibleMembers()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Build the summary for the enum constants.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildEnumConstantsSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.ENUM_CONSTANTS];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.ENUM_CONSTANTS];
-        addSummary(writer, visibleMemberMap, false, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for fields.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeFieldsSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.ANNOTATION_TYPE_FIELDS];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.ANNOTATION_TYPE_FIELDS];
-        addSummary(writer, visibleMemberMap, false, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for the optional members.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeOptionalMemberSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL];
-        addSummary(writer, visibleMemberMap, false, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for the optional members.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildAnnotationTypeRequiredMemberSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED];
-        addSummary(writer, visibleMemberMap, false, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for the fields.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildFieldsSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.FIELDS];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.FIELDS];
-        addSummary(writer, visibleMemberMap, true, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for the fields.
-     */
-    public void buildPropertiesSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.PROPERTIES];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.PROPERTIES];
-        addSummary(writer, visibleMemberMap, true, memberSummaryTree);
-    }
-
-    /**
-     * Build the summary for the nested classes.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildNestedClassesSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.INNERCLASSES];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.INNERCLASSES];
-        addSummary(writer, visibleMemberMap, true, memberSummaryTree);
-    }
-
-    /**
-     * Build the method summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildMethodsSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.METHODS];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.METHODS];
-        addSummary(writer, visibleMemberMap, true, memberSummaryTree);
-    }
-
-    /**
-     * Build the constructor summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    public void buildConstructorsSummary(XMLNode node, Content memberSummaryTree) {
-        MemberSummaryWriter writer =
-                memberSummaryWriters[VisibleMemberMap.CONSTRUCTORS];
-        VisibleMemberMap visibleMemberMap =
-                visibleMemberMaps[VisibleMemberMap.CONSTRUCTORS];
-        addSummary(writer, visibleMemberMap, false, memberSummaryTree);
-    }
-
-    /**
-     * Build the member summary for the given members.
-     *
-     * @param writer the summary writer to write the output.
-     * @param visibleMemberMap the given members to summarize.
-     * @param summaryTreeList list of content trees to which the documentation will be added
-     */
-    private void buildSummary(MemberSummaryWriter writer,
-            VisibleMemberMap visibleMemberMap, LinkedList<Content> summaryTreeList) {
-        List<ProgramElementDoc> members = new ArrayList<>(visibleMemberMap.getLeafClassMembers(
-                configuration));
-        if (members.size() > 0) {
-            Collections.sort(members);
-            List<Content> tableContents = new LinkedList<>();
-            for (int i = 0; i < members.size(); i++) {
-                ProgramElementDoc member = members.get(i);
-                final ProgramElementDoc propertyDoc =
-                            visibleMemberMap.getPropertyMemberDoc(member);
-                if (propertyDoc != null) {
-                    processProperty(visibleMemberMap, member, propertyDoc);
-                }
-                Tag[] firstSentenceTags = member.firstSentenceTags();
-                if (member instanceof MethodDoc && firstSentenceTags.length == 0) {
-                    //Inherit comments from overriden or implemented method if
-                    //necessary.
-                    DocFinder.Output inheritedDoc =
-                            DocFinder.search(configuration, new DocFinder.Input((MethodDoc) member));
-                    if (inheritedDoc.holder != null
-                            && inheritedDoc.holder.firstSentenceTags().length > 0) {
-                        firstSentenceTags = inheritedDoc.holder.firstSentenceTags();
-                    }
-                }
-                writer.addMemberSummary(classDoc, member, firstSentenceTags,
-                        tableContents, i);
-            }
-            summaryTreeList.add(writer.getSummaryTableTree(classDoc, tableContents));
-        }
-    }
-
-    /**
-     * Process the property method, property setter and/or property getter
-     * comment text so that it contains the documentation from
-     * the property field. The method adds the leading sentence,
-     * copied documentation including the defaultValue tag and
-     * the see tags if the appropriate property getter and setter are
-     * available.
-     *
-     * @param visibleMemberMap the members information.
-     * @param member the member which is to be augmented.
-     * @param propertyDoc the original property documentation.
-     */
-    private void processProperty(VisibleMemberMap visibleMemberMap,
-                                 ProgramElementDoc member,
-                                 ProgramElementDoc propertyDoc) {
-        StringBuilder commentTextBuilder = new StringBuilder();
-        final boolean isSetter = isSetter(member);
-        final boolean isGetter = isGetter(member);
-        if (isGetter || isSetter) {
-            //add "[GS]ets the value of the property PROPERTY_NAME."
-            if (isSetter) {
-                commentTextBuilder.append(
-                        MessageFormat.format(
-                                configuration.getText("doclet.PropertySetterWithName"),
-                                utils.propertyNameFromMethodName(configuration, member.name())));
-            }
-            if (isGetter) {
-                commentTextBuilder.append(
-                        MessageFormat.format(
-                                configuration.getText("doclet.PropertyGetterWithName"),
-                                utils.propertyNameFromMethodName(configuration, member.name())));
-            }
-            if (propertyDoc.commentText() != null
-                        && !propertyDoc.commentText().isEmpty()) {
-                commentTextBuilder.append(" \n @propertyDescription ");
-            }
-        }
-        commentTextBuilder.append(propertyDoc.commentText());
-
-        // copy certain tags
-        List<Tag> allTags = new LinkedList<>();
-        String[] tagNames = {"@defaultValue", "@since"};
-        for (String tagName: tagNames) {
-            Tag[] tags = propertyDoc.tags(tagName);
-            if (tags != null) {
-                allTags.addAll(Arrays.asList(tags));
-            }
-        }
-        for (Tag tag: allTags) {
-            commentTextBuilder.append("\n")
-                                .append(tag.name())
-                                .append(" ")
-                                .append(tag.text());
-        }
-
-        //add @see tags
-        if (!isGetter && !isSetter) {
-            MethodDoc getter = (MethodDoc) visibleMemberMap.getGetterForProperty(member);
-            MethodDoc setter = (MethodDoc) visibleMemberMap.getSetterForProperty(member);
-
-            if ((null != getter)
-                    && (commentTextBuilder.indexOf("@see #" + getter.name()) == -1)) {
-                commentTextBuilder.append("\n @see #")
-                                  .append(getter.name())
-                                  .append("() ");
-            }
-
-            if ((null != setter)
-                    && (commentTextBuilder.indexOf("@see #" + setter.name()) == -1)) {
-                String typeName = setter.parameters()[0].typeName();
-                // Removal of type parameters and package information.
-                typeName = typeName.split("<")[0];
-                if (typeName.contains(".")) {
-                    typeName = typeName.substring(typeName.lastIndexOf(".") + 1);
-                }
-                commentTextBuilder.append("\n @see #").append(setter.name());
-
-                if (setter.parameters()[0].type().asTypeVariable() == null) {
-                    commentTextBuilder.append("(").append(typeName).append(")");
-                }
-                commentTextBuilder.append(" \n");
-            }
-        }
-        member.setRawCommentText(commentTextBuilder.toString());
-    }
-    /**
-     * Test whether the method is a getter.
-     * @param ped property method documentation. Needs to be either property
-     * method, property getter, or property setter.
-     * @return true if the given documentation belongs to a getter.
-     */
-    private boolean isGetter(ProgramElementDoc ped) {
-        final String pedName = ped.name();
-        return pedName.startsWith("get") || pedName.startsWith("is");
-    }
-
-    /**
-     * Test whether the method is a setter.
-     * @param ped property method documentation. Needs to be either property
-     * method, property getter, or property setter.
-     * @return true if the given documentation belongs to a setter.
-     */
-    private boolean isSetter(ProgramElementDoc ped) {
-        return ped.name().startsWith("set");
-    }
-
-    /**
-     * Build the inherited member summary for the given methods.
-     *
-     * @param writer the writer for this member summary.
-     * @param visibleMemberMap the map for the members to document.
-     * @param summaryTreeList list of content trees to which the documentation will be added
-     */
-    private void buildInheritedSummary(MemberSummaryWriter writer,
-            VisibleMemberMap visibleMemberMap, LinkedList<Content> summaryTreeList) {
-        for (ClassDoc inhclass : visibleMemberMap.getVisibleClassesList()) {
-            if (!(inhclass.isPublic() ||
-                  utils.isLinkable(inhclass, configuration))) {
-                continue;
-            }
-            if (inhclass == classDoc) {
-                continue;
-            }
-            List<ProgramElementDoc> inhmembers = visibleMemberMap.getMembersFor(inhclass);
-            if (inhmembers.size() > 0) {
-                Collections.sort(inhmembers);
-                Content inheritedTree = writer.getInheritedSummaryHeader(inhclass);
-                Content linksTree = writer.getInheritedSummaryLinksTree();
-                for (int j = 0; j < inhmembers.size(); ++j) {
-                    writer.addInheritedMemberSummary(
-                            inhclass.isPackagePrivate() &&
-                            !utils.isLinkable(inhclass, configuration) ?
-                            classDoc : inhclass,
-                            inhmembers.get(j),
-                            j == 0,
-                            j == inhmembers.size() - 1, linksTree);
-                }
-                inheritedTree.addContent(linksTree);
-                summaryTreeList.add(writer.getMemberTree(inheritedTree));
-            }
-        }
-    }
-
-    /**
-     * Add the summary for the documentation.
-     *
-     * @param writer the writer for this member summary.
-     * @param visibleMemberMap the map for the members to document.
-     * @param showInheritedSummary true if inherited summary should be documented
-     * @param memberSummaryTree the content tree to which the documentation will be added
-     */
-    private void addSummary(MemberSummaryWriter writer,
-            VisibleMemberMap visibleMemberMap, boolean showInheritedSummary,
-            Content memberSummaryTree) {
-        LinkedList<Content> summaryTreeList = new LinkedList<>();
-        buildSummary(writer, visibleMemberMap, summaryTreeList);
-        if (showInheritedSummary)
-            buildInheritedSummary(writer, visibleMemberMap, summaryTreeList);
-        if (!summaryTreeList.isEmpty()) {
-            Content memberTree = writer.getMemberSummaryHeader(
-                    classDoc, memberSummaryTree);
-            for (Content aSummaryTreeList : summaryTreeList) {
-                memberTree.addContent(aSummaryTreeList);
-            }
-            writer.addMemberTree(memberSummaryTree, memberTree);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
deleted file mode 100644
index abd7a757704..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * Builds documentation for a method.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class MethodBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The index of the current field that is being documented at this point
-     * in time.
-     */
-    private int currentMethodIndex;
-
-    /**
-     * The class whose methods are being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The visible methods for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the method documentation.
-     */
-    private final MethodWriter writer;
-
-    /**
-     * The methods being documented.
-     */
-    private List<ProgramElementDoc> methods;
-
-
-    /**
-     * Construct a new MethodBuilder.
-     *
-     * @param context       the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private MethodBuilder(Context context,
-            ClassDoc classDoc,
-            MethodWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        visibleMemberMap = new VisibleMemberMap(
-                classDoc,
-                VisibleMemberMap.METHODS,
-                configuration);
-        methods =
-                new ArrayList<>(visibleMemberMap.getLeafClassMembers(configuration));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(methods, configuration.getMemberComparator());
-        }
-    }
-
-    /**
-     * Construct a new MethodBuilder.
-     *
-     * @param context       the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     *
-     * @return an instance of a MethodBuilder.
-     */
-    public static MethodBuilder getInstance(Context context,
-            ClassDoc classDoc, MethodWriter writer) {
-        return new MethodBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "MethodDetails";
-    }
-
-    /**
-     * Returns a list of methods that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of methods that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the methods of this class.
-     *
-     * @return the visible member map for the methods of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean hasMembersToDocument() {
-        return methods.size() > 0;
-    }
-
-    /**
-     * Build the method documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildMethodDoc(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = methods.size();
-        if (size > 0) {
-            Content methodDetailsTree = writer.getMethodDetailsTreeHeader(
-                    classDoc, memberDetailsTree);
-            for (currentMethodIndex = 0; currentMethodIndex < size;
-                    currentMethodIndex++) {
-                Content methodDocTree = writer.getMethodDocTreeHeader(
-                        (MethodDoc) methods.get(currentMethodIndex),
-                        methodDetailsTree);
-                buildChildren(node, methodDocTree);
-                methodDetailsTree.addContent(writer.getMethodDoc(
-                        methodDocTree, (currentMethodIndex == size - 1)));
-            }
-            memberDetailsTree.addContent(
-                    writer.getMethodDetails(methodDetailsTree));
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content methodDocTree) {
-        methodDocTree.addContent(
-                writer.getSignature((MethodDoc) methods.get(currentMethodIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content methodDocTree) {
-        writer.addDeprecated(
-                (MethodDoc) methods.get(currentMethodIndex), methodDocTree);
-    }
-
-    /**
-     * Build the comments for the method.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodDocTree the content tree to which the documentation will be added
-     */
-    public void buildMethodComments(XMLNode node, Content methodDocTree) {
-        if (!configuration.nocomment) {
-            MethodDoc method = (MethodDoc) methods.get(currentMethodIndex);
-
-            if (method.inlineTags().length == 0) {
-                DocFinder.Output docs = DocFinder.search(configuration,
-                        new DocFinder.Input(method));
-                method = docs.inlineTags != null && docs.inlineTags.length > 0 ?
-                    (MethodDoc) docs.holder : method;
-            }
-            //NOTE:  When we fix the bug where ClassDoc.interfaceTypes() does
-            //       not pass all implemented interfaces, holder will be the
-            //       interface type.  For now, it is really the erasure.
-            writer.addComments(method.containingClass(), method, methodDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content methodDocTree) {
-        writer.addTags((MethodDoc) methods.get(currentMethodIndex),
-                methodDocTree);
-    }
-
-    /**
-     * Return the method writer for this builder.
-     *
-     * @return the method writer for this builder.
-     */
-    public MethodWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
deleted file mode 100644
index fad38eec48e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Builds the summary for a given package.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class PackageSummaryBuilder extends AbstractBuilder {
-    /**
-     * The root element of the package summary XML is {@value}.
-     */
-    public static final String ROOT = "PackageDoc";
-
-    /**
-     * The package being documented.
-     */
-    private final PackageDoc packageDoc;
-
-    /**
-     * The doclet specific writer that will output the result.
-     */
-    private final PackageSummaryWriter packageWriter;
-
-    /**
-     * The content that will be added to the package summary documentation tree.
-     */
-    private Content contentTree;
-
-    /**
-     * Construct a new PackageSummaryBuilder.
-     *
-     * @param context  the build context.
-     * @param pkg the package being documented.
-     * @param packageWriter the doclet specific writer that will output the
-     *        result.
-     */
-    private PackageSummaryBuilder(Context context,
-            PackageDoc pkg,
-            PackageSummaryWriter packageWriter) {
-        super(context);
-        this.packageDoc = pkg;
-        this.packageWriter = packageWriter;
-    }
-
-    /**
-     * Construct a new PackageSummaryBuilder.
-     *
-     * @param context  the build context.
-     * @param pkg the package being documented.
-     * @param packageWriter the doclet specific writer that will output the
-     *        result.
-     *
-     * @return an instance of a PackageSummaryBuilder.
-     */
-    public static PackageSummaryBuilder getInstance(Context context,
-            PackageDoc pkg, PackageSummaryWriter packageWriter) {
-        return new PackageSummaryBuilder(context, pkg, packageWriter);
-    }
-
-    /**
-     * Build the package summary.
-     */
-    public void build() throws IOException {
-        if (packageWriter == null) {
-            //Doclet does not support this output.
-            return;
-        }
-        build(layoutParser.parseXML(ROOT), contentTree);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return ROOT;
-    }
-
-    /**
-     * Build the package documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param contentTree the content tree to which the documentation will be added
-     */
-    public void buildPackageDoc(XMLNode node, Content contentTree) throws Exception {
-        contentTree = packageWriter.getPackageHeader(utils.getPackageName(packageDoc));
-        buildChildren(node, contentTree);
-        packageWriter.addPackageFooter(contentTree);
-        packageWriter.printDocument(contentTree);
-        packageWriter.close();
-        utils.copyDocFiles(configuration, packageDoc);
-    }
-
-    /**
-     * Build the content for the package doc.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param contentTree the content tree to which the package contents
-     *                    will be added
-     */
-    public void buildContent(XMLNode node, Content contentTree) {
-        Content packageContentTree = packageWriter.getContentHeader();
-        buildChildren(node, packageContentTree);
-        packageWriter.addPackageContent(contentTree, packageContentTree);
-    }
-
-    /**
-     * Build the package summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param packageContentTree the package content tree to which the summaries will
-     *                           be added
-     */
-    public void buildSummary(XMLNode node, Content packageContentTree) {
-        Content summaryContentTree = packageWriter.getSummaryHeader();
-        buildChildren(node, summaryContentTree);
-        packageContentTree.addContent(summaryContentTree);
-    }
-
-    /**
-     * Build the summary for the interfaces in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the interface summary
-     *                           will be added
-     */
-    public void buildInterfaceSummary(XMLNode node, Content summaryContentTree) {
-        String interfaceTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Interface_Summary"),
-                configuration.getText("doclet.interfaces"));
-        String[] interfaceTableHeader = new String[] {
-            configuration.getText("doclet.Interface"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] interfaces =
-                packageDoc.isIncluded()
-                        ? packageDoc.interfaces()
-                        : configuration.classDocCatalog.interfaces(
-                                utils.getPackageName(packageDoc));
-        interfaces = utils.filterOutPrivateClasses(interfaces, configuration.javafx);
-        if (interfaces.length > 0) {
-            packageWriter.addClassesSummary(
-                    interfaces,
-                    configuration.getText("doclet.Interface_Summary"),
-                    interfaceTableSummary, interfaceTableHeader, summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the summary for the classes in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the class summary will
-     *                           be added
-     */
-    public void buildClassSummary(XMLNode node, Content summaryContentTree) {
-        String classTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Class_Summary"),
-                configuration.getText("doclet.classes"));
-        String[] classTableHeader = new String[] {
-            configuration.getText("doclet.Class"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] classes =
-                packageDoc.isIncluded()
-                        ? packageDoc.ordinaryClasses()
-                        : configuration.classDocCatalog.ordinaryClasses(
-                                utils.getPackageName(packageDoc));
-        classes = utils.filterOutPrivateClasses(classes, configuration.javafx);
-        if (classes.length > 0) {
-            packageWriter.addClassesSummary(
-                    classes,
-                    configuration.getText("doclet.Class_Summary"),
-                    classTableSummary, classTableHeader, summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the summary for the enums in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the enum summary will
-     *                           be added
-     */
-    public void buildEnumSummary(XMLNode node, Content summaryContentTree) {
-        String enumTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Enum_Summary"),
-                configuration.getText("doclet.enums"));
-        String[] enumTableHeader = new String[] {
-            configuration.getText("doclet.Enum"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] enums =
-                packageDoc.isIncluded()
-                        ? packageDoc.enums()
-                        : configuration.classDocCatalog.enums(
-                                utils.getPackageName(packageDoc));
-        enums = utils.filterOutPrivateClasses(enums, configuration.javafx);
-        if (enums.length > 0) {
-            packageWriter.addClassesSummary(
-                    enums,
-                    configuration.getText("doclet.Enum_Summary"),
-                    enumTableSummary, enumTableHeader, summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the summary for the exceptions in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the exception summary will
-     *                           be added
-     */
-    public void buildExceptionSummary(XMLNode node, Content summaryContentTree) {
-        String exceptionTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Exception_Summary"),
-                configuration.getText("doclet.exceptions"));
-        String[] exceptionTableHeader = new String[] {
-            configuration.getText("doclet.Exception"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] exceptions =
-                packageDoc.isIncluded()
-                        ? packageDoc.exceptions()
-                        : configuration.classDocCatalog.exceptions(
-                                utils.getPackageName(packageDoc));
-        exceptions = utils.filterOutPrivateClasses(exceptions, configuration.javafx);
-        if (exceptions.length > 0) {
-            packageWriter.addClassesSummary(
-                    exceptions,
-                    configuration.getText("doclet.Exception_Summary"),
-                    exceptionTableSummary, exceptionTableHeader, summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the summary for the errors in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the error summary will
-     *                           be added
-     */
-    public void buildErrorSummary(XMLNode node, Content summaryContentTree) {
-        String errorTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Error_Summary"),
-                configuration.getText("doclet.errors"));
-        String[] errorTableHeader = new String[] {
-            configuration.getText("doclet.Error"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] errors =
-                packageDoc.isIncluded()
-                        ? packageDoc.errors()
-                        : configuration.classDocCatalog.errors(
-                                utils.getPackageName(packageDoc));
-        errors = utils.filterOutPrivateClasses(errors, configuration.javafx);
-        if (errors.length > 0) {
-            packageWriter.addClassesSummary(
-                    errors,
-                    configuration.getText("doclet.Error_Summary"),
-                    errorTableSummary, errorTableHeader, summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the summary for the annotation type in this package.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param summaryContentTree the summary tree to which the annotation type
-     *                           summary will be added
-     */
-    public void buildAnnotationTypeSummary(XMLNode node, Content summaryContentTree) {
-        String annotationtypeTableSummary =
-                configuration.getText("doclet.Member_Table_Summary",
-                configuration.getText("doclet.Annotation_Types_Summary"),
-                configuration.getText("doclet.annotationtypes"));
-        String[] annotationtypeTableHeader = new String[] {
-            configuration.getText("doclet.AnnotationType"),
-            configuration.getText("doclet.Description")
-        };
-        ClassDoc[] annotationTypes =
-                packageDoc.isIncluded()
-                        ? packageDoc.annotationTypes()
-                        : configuration.classDocCatalog.annotationTypes(
-                                utils.getPackageName(packageDoc));
-        annotationTypes = utils.filterOutPrivateClasses(annotationTypes, configuration.javafx);
-        if (annotationTypes.length > 0) {
-            packageWriter.addClassesSummary(
-                    annotationTypes,
-                    configuration.getText("doclet.Annotation_Types_Summary"),
-                    annotationtypeTableSummary, annotationtypeTableHeader,
-                    summaryContentTree);
-        }
-    }
-
-    /**
-     * Build the description of the summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param packageContentTree the tree to which the package description will
-     *                           be added
-     */
-    public void buildPackageDescription(XMLNode node, Content packageContentTree) {
-        if (configuration.nocomment) {
-            return;
-        }
-        packageWriter.addPackageDescription(packageContentTree);
-    }
-
-    /**
-     * Build the tags of the summary.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param packageContentTree the tree to which the package tags will be added
-     */
-    public void buildPackageTags(XMLNode node, Content packageContentTree) {
-        if (configuration.nocomment) {
-            return;
-        }
-        packageWriter.addPackageTags(packageContentTree);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
deleted file mode 100644
index ba04ab2bd33..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.builders;
-
-import java.util.*;
-
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
-
-/**
- * Builds documentation for a property.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.7
- */
-@Deprecated
-public class PropertyBuilder extends AbstractMemberBuilder {
-
-    /**
-     * The class whose properties are being documented.
-     */
-    private final ClassDoc classDoc;
-
-    /**
-     * The visible properties for the given class.
-     */
-    private final VisibleMemberMap visibleMemberMap;
-
-    /**
-     * The writer to output the property documentation.
-     */
-    private final PropertyWriter writer;
-
-    /**
-     * The list of properties being documented.
-     */
-    private final List<ProgramElementDoc> properties;
-
-    /**
-     * The index of the current property that is being documented at this point
-     * in time.
-     */
-    private int currentPropertyIndex;
-
-    /**
-     * Construct a new PropertyBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    private PropertyBuilder(Context context,
-            ClassDoc classDoc,
-            PropertyWriter writer) {
-        super(context);
-        this.classDoc = classDoc;
-        this.writer = writer;
-        visibleMemberMap =
-                new VisibleMemberMap(
-                classDoc,
-                VisibleMemberMap.PROPERTIES,
-                configuration);
-        properties =
-                new ArrayList<>(visibleMemberMap.getMembersFor(classDoc));
-        if (configuration.getMemberComparator() != null) {
-            Collections.sort(properties, configuration.getMemberComparator());
-        }
-    }
-
-    /**
-     * Construct a new PropertyBuilder.
-     *
-     * @param context  the build context.
-     * @param classDoc the class whoses members are being documented.
-     * @param writer the doclet specific writer.
-     */
-    public static PropertyBuilder getInstance(Context context,
-            ClassDoc classDoc,
-            PropertyWriter writer) {
-        return new PropertyBuilder(context, classDoc, writer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return "PropertyDetails";
-    }
-
-    /**
-     * Returns a list of properties that will be documented for the given class.
-     * This information can be used for doclet specific documentation
-     * generation.
-     *
-     * @param classDoc the {@link ClassDoc} we want to check.
-     * @return a list of properties that will be documented.
-     */
-    public List<ProgramElementDoc> members(ClassDoc classDoc) {
-        return visibleMemberMap.getMembersFor(classDoc);
-    }
-
-    /**
-     * Returns the visible member map for the properties of this class.
-     *
-     * @return the visible member map for the properties of this class.
-     */
-    public VisibleMemberMap getVisibleMemberMap() {
-        return visibleMemberMap;
-    }
-
-    /**
-     * summaryOrder.size()
-     */
-    public boolean hasMembersToDocument() {
-        return properties.size() > 0;
-    }
-
-    /**
-     * Build the property documentation.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param memberDetailsTree the content tree to which the documentation will be added
-     */
-    public void buildPropertyDoc(XMLNode node, Content memberDetailsTree) {
-        if (writer == null) {
-            return;
-        }
-        int size = properties.size();
-        if (size > 0) {
-            Content propertyDetailsTree = writer.getPropertyDetailsTreeHeader(
-                    classDoc, memberDetailsTree);
-            for (currentPropertyIndex = 0; currentPropertyIndex < size;
-                    currentPropertyIndex++) {
-                Content propertyDocTree = writer.getPropertyDocTreeHeader(
-                        (MethodDoc) properties.get(currentPropertyIndex),
-                        propertyDetailsTree);
-                buildChildren(node, propertyDocTree);
-                propertyDetailsTree.addContent(writer.getPropertyDoc(
-                        propertyDocTree, (currentPropertyIndex == size - 1)));
-            }
-            memberDetailsTree.addContent(
-                    writer.getPropertyDetails(propertyDetailsTree));
-        }
-    }
-
-    /**
-     * Build the signature.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param propertyDocTree the content tree to which the documentation will be added
-     */
-    public void buildSignature(XMLNode node, Content propertyDocTree) {
-        propertyDocTree.addContent(
-                writer.getSignature((MethodDoc) properties.get(currentPropertyIndex)));
-    }
-
-    /**
-     * Build the deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param propertyDocTree the content tree to which the documentation will be added
-     */
-    public void buildDeprecationInfo(XMLNode node, Content propertyDocTree) {
-        writer.addDeprecated(
-                (MethodDoc) properties.get(currentPropertyIndex), propertyDocTree);
-    }
-
-    /**
-     * Build the comments for the property.  Do nothing if
-     * {@link Configuration#nocomment} is set to true.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param propertyDocTree the content tree to which the documentation will be added
-     */
-    public void buildPropertyComments(XMLNode node, Content propertyDocTree) {
-        if (!configuration.nocomment) {
-            writer.addComments((MethodDoc) properties.get(currentPropertyIndex), propertyDocTree);
-        }
-    }
-
-    /**
-     * Build the tag information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param propertyDocTree the content tree to which the documentation will be added
-     */
-    public void buildTagInfo(XMLNode node, Content propertyDocTree) {
-        writer.addTags((MethodDoc) properties.get(currentPropertyIndex), propertyDocTree);
-    }
-
-    /**
-     * Return the property writer for this builder.
-     *
-     * @return the property writer for this builder.
-     */
-    public PropertyWriter getWriter() {
-        return writer;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
deleted file mode 100644
index 983d3faf2ef..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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.doclets.internal.toolkit.builders;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Builds the serialized 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>
- *
- * @author Jamie Ho
- * @author Bhavesh Patel (Modified)
- * @since 1.5
- */
-@Deprecated
-public class SerializedFormBuilder extends AbstractBuilder {
-
-    /**
-     * The root element of the serialized form XML is {@value}.
-     */
-    public static final String NAME = "SerializedForm";
-
-    /**
-     * The writer for this builder.
-     */
-    private SerializedFormWriter writer;
-
-    /**
-     * The writer for serializable fields.
-     */
-    private SerializedFormWriter.SerialFieldWriter fieldWriter;
-
-    /**
-     * The writer for serializable method documentation.
-     */
-    private SerializedFormWriter.SerialMethodWriter methodWriter;
-
-    /**
-     * The header for the serial version UID.  Save the string
-     * here instead of the properties file because we do not want
-     * this string to be localized.
-     */
-    private static final String SERIAL_VERSION_UID_HEADER = "serialVersionUID:";
-
-    /**
-     * The current package being documented.
-     */
-    private PackageDoc currentPackage;
-
-    /**
-     * The current class being documented.
-     */
-    private ClassDoc currentClass;
-
-    /**
-     * The current member being documented.
-     */
-    protected MemberDoc currentMember;
-
-    /**
-     * The content that will be added to the serialized form documentation tree.
-     */
-    private Content contentTree;
-
-
-    /**
-     * Construct a new SerializedFormBuilder.
-     * @param context  the build context.
-     */
-    private SerializedFormBuilder(Context context) {
-        super(context);
-    }
-
-    /**
-     * Construct a new SerializedFormBuilder.
-     * @param context  the build context.
-     */
-    public static SerializedFormBuilder getInstance(Context context) {
-        return new SerializedFormBuilder(context);
-    }
-
-    /**
-     * Build the serialized form.
-     */
-    public void build() throws IOException {
-        if (! serialClassFoundToDocument(configuration.root.classes())) {
-            //Nothing to document.
-            return;
-        }
-        try {
-            writer = configuration.getWriterFactory().getSerializedFormWriter();
-            if (writer == null) {
-                //Doclet does not support this output.
-                return;
-            }
-        } catch (Exception e) {
-            throw new DocletAbortException(e);
-        }
-        build(layoutParser.parseXML(NAME), contentTree);
-        writer.close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * Build the serialized form.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param serializedTree content tree to which the documentation will be added
-     */
-    public void buildSerializedForm(XMLNode node, Content serializedTree) throws Exception {
-        serializedTree = writer.getHeader(configuration.getText(
-                "doclet.Serialized_Form"));
-        buildChildren(node, serializedTree);
-        writer.addFooter(serializedTree);
-        writer.printDocument(serializedTree);
-        writer.close();
-    }
-
-    /**
-     * Build the serialized form summaries.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param serializedTree content tree to which the documentation will be added
-     */
-    public void buildSerializedFormSummaries(XMLNode node, Content serializedTree) {
-        Content serializedSummariesTree = writer.getSerializedSummariesHeader();
-        for (PackageDoc pkg : configuration.packages) {
-            currentPackage = pkg;
-            buildChildren(node, serializedSummariesTree);
-        }
-        serializedTree.addContent(writer.getSerializedContent(
-                serializedSummariesTree));
-    }
-
-    /**
-     * Build the package serialized form for the current package being processed.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param serializedSummariesTree content tree to which the documentation will be added
-     */
-    public void buildPackageSerializedForm(XMLNode node, Content serializedSummariesTree) {
-        Content packageSerializedTree = writer.getPackageSerializedHeader();
-        String foo = currentPackage.name();
-        ClassDoc[] classes = currentPackage.allClasses(false);
-        if (classes == null || classes.length == 0) {
-            return;
-        }
-        if (!serialInclude(currentPackage)) {
-            return;
-        }
-        if (!serialClassFoundToDocument(classes)) {
-            return;
-        }
-        buildChildren(node, packageSerializedTree);
-        writer.addPackageSerializedTree(serializedSummariesTree, packageSerializedTree);
-    }
-
-    /**
-     * Build the package header.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param packageSerializedTree content tree to which the documentation will be added
-     */
-    public void buildPackageHeader(XMLNode node, Content packageSerializedTree) {
-        packageSerializedTree.addContent(writer.getPackageHeader(
-                utils.getPackageName(currentPackage)));
-    }
-
-    /**
-     * Build the class serialized form.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param packageSerializedTree content tree to which the documentation will be added
-     */
-    public void buildClassSerializedForm(XMLNode node, Content packageSerializedTree) {
-        Content classSerializedTree = writer.getClassSerializedHeader();
-        ClassDoc[] classes = currentPackage.allClasses(false);
-        Arrays.sort(classes);
-        for (ClassDoc classDoc : classes) {
-            currentClass = classDoc;
-            fieldWriter = writer.getSerialFieldWriter(currentClass);
-            methodWriter = writer.getSerialMethodWriter(currentClass);
-            if (currentClass.isClass() && currentClass.isSerializable()) {
-                if (!serialClassInclude(currentClass)) {
-                    continue;
-                }
-                Content classTree = writer.getClassHeader(currentClass);
-                buildChildren(node, classTree);
-                classSerializedTree.addContent(classTree);
-            }
-        }
-        packageSerializedTree.addContent(classSerializedTree);
-    }
-
-    /**
-     * Build the serial UID information for the given class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classTree content tree to which the serial UID information will be added
-     */
-    public void buildSerialUIDInfo(XMLNode node, Content classTree) {
-        Content serialUidTree = writer.getSerialUIDInfoHeader();
-        for (FieldDoc field : currentClass.fields(false)) {
-            if (field.name().equals("serialVersionUID") &&
-                field.constantValueExpression() != null) {
-                writer.addSerialUIDInfo(SERIAL_VERSION_UID_HEADER,
-                                        field.constantValueExpression(), serialUidTree);
-                break;
-            }
-        }
-        classTree.addContent(serialUidTree);
-    }
-
-    /**
-     * Build the summaries for the methods and fields.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classTree content tree to which the documentation will be added
-     */
-    public void buildClassContent(XMLNode node, Content classTree) {
-        Content classContentTree = writer.getClassContentHeader();
-        buildChildren(node, classContentTree);
-        classTree.addContent(classContentTree);
-    }
-
-    /**
-     * Build the summaries for the methods that belong to the given
-     * class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree content tree to which the documentation will be added
-     */
-    public void buildSerializableMethods(XMLNode node, Content classContentTree) {
-        Content serializableMethodTree = methodWriter.getSerializableMethodsHeader();
-        MemberDoc[] members = currentClass.serializationMethods();
-        int membersLength = members.length;
-        if (membersLength > 0) {
-            for (int i = 0; i < membersLength; i++) {
-                currentMember = members[i];
-                Content methodsContentTree = methodWriter.getMethodsContentHeader(
-                        (i == membersLength - 1));
-                buildChildren(node, methodsContentTree);
-                serializableMethodTree.addContent(methodsContentTree);
-            }
-        }
-        if (currentClass.serializationMethods().length > 0) {
-            classContentTree.addContent(methodWriter.getSerializableMethods(
-                    configuration.getText("doclet.Serialized_Form_methods"),
-                    serializableMethodTree));
-            if (currentClass.isSerializable() && !currentClass.isExternalizable()) {
-                if (currentClass.serializationMethods().length == 0) {
-                    Content noCustomizationMsg = methodWriter.getNoCustomizationMsg(
-                            configuration.getText(
-                            "doclet.Serializable_no_customization"));
-                    classContentTree.addContent(methodWriter.getSerializableMethods(
-                    configuration.getText("doclet.Serialized_Form_methods"),
-                    noCustomizationMsg));
-                }
-            }
-        }
-    }
-
-    /**
-     * Build the method sub header.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodsContentTree content tree to which the documentation will be added
-     */
-    public void buildMethodSubHeader(XMLNode node, Content methodsContentTree)  {
-        methodWriter.addMemberHeader((MethodDoc)currentMember, methodsContentTree);
-    }
-
-    /**
-     * Build the deprecated method description.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodsContentTree content tree to which the documentation will be added
-     */
-    public void buildDeprecatedMethodInfo(XMLNode node, Content methodsContentTree) {
-        methodWriter.addDeprecatedMemberInfo((MethodDoc) currentMember, methodsContentTree);
-    }
-
-    /**
-     * Build the information for the method.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodsContentTree content tree to which the documentation will be added
-     */
-    public void buildMethodInfo(XMLNode node, Content methodsContentTree)  {
-        if(configuration.nocomment){
-            return;
-        }
-        buildChildren(node, methodsContentTree);
-    }
-
-    /**
-     * Build method description.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodsContentTree content tree to which the documentation will be added
-     */
-    public void buildMethodDescription(XMLNode node, Content methodsContentTree) {
-        methodWriter.addMemberDescription((MethodDoc) currentMember, methodsContentTree);
-    }
-
-    /**
-     * Build the method tags.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param methodsContentTree content tree to which the documentation will be added
-     */
-    public void buildMethodTags(XMLNode node, Content methodsContentTree) {
-        methodWriter.addMemberTags((MethodDoc) currentMember, methodsContentTree);
-        MethodDoc method = (MethodDoc)currentMember;
-        if (method.name().compareTo("writeExternal") == 0
-                && method.tags("serialData").length == 0) {
-            if (configuration.serialwarn) {
-                configuration.getDocletSpecificMsg().warning(
-                        currentMember.position(), "doclet.MissingSerialDataTag",
-                        method.containingClass().qualifiedName(), method.name());
-            }
-        }
-    }
-
-    /**
-     * Build the field header.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree content tree to which the documentation will be added
-     */
-    public void buildFieldHeader(XMLNode node, Content classContentTree) {
-        if (currentClass.serializableFields().length > 0) {
-            buildFieldSerializationOverview(currentClass, classContentTree);
-        }
-    }
-
-    /**
-     * Build the serialization overview for the given class.
-     *
-     * @param classDoc the class to print the overview for.
-     * @param classContentTree content tree to which the documentation will be added
-     */
-    public void buildFieldSerializationOverview(ClassDoc classDoc, Content classContentTree) {
-        if (classDoc.definesSerializableFields()) {
-            FieldDoc serialPersistentField = classDoc.serializableFields()[0];
-            // Check to see if there are inline comments, tags or deprecation
-            // information to be printed.
-            if (fieldWriter.shouldPrintOverview(serialPersistentField)) {
-                Content serializableFieldsTree = fieldWriter.getSerializableFieldsHeader();
-                Content fieldsOverviewContentTree = fieldWriter.getFieldsContentHeader(true);
-                fieldWriter.addMemberDeprecatedInfo(serialPersistentField,
-                        fieldsOverviewContentTree);
-                if (!configuration.nocomment) {
-                    fieldWriter.addMemberDescription(serialPersistentField,
-                            fieldsOverviewContentTree);
-                    fieldWriter.addMemberTags(serialPersistentField,
-                            fieldsOverviewContentTree);
-                }
-                serializableFieldsTree.addContent(fieldsOverviewContentTree);
-                classContentTree.addContent(fieldWriter.getSerializableFields(
-                        configuration.getText("doclet.Serialized_Form_class"),
-                        serializableFieldsTree));
-            }
-        }
-    }
-
-    /**
-     * Build the summaries for the fields that belong to the given class.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param classContentTree content tree to which the documentation will be added
-     */
-    public void buildSerializableFields(XMLNode node, Content classContentTree) {
-        MemberDoc[] members = currentClass.serializableFields();
-        int membersLength = members.length;
-        if (membersLength > 0) {
-            Content serializableFieldsTree = fieldWriter.getSerializableFieldsHeader();
-            for (int i = 0; i < membersLength; i++) {
-                currentMember = members[i];
-                if (!currentClass.definesSerializableFields()) {
-                    Content fieldsContentTree = fieldWriter.getFieldsContentHeader(
-                            (i == membersLength - 1));
-                    buildChildren(node, fieldsContentTree);
-                    serializableFieldsTree.addContent(fieldsContentTree);
-                }
-                else {
-                    buildSerialFieldTagsInfo(serializableFieldsTree);
-                }
-            }
-            classContentTree.addContent(fieldWriter.getSerializableFields(
-                    configuration.getText("doclet.Serialized_Form_fields"),
-                    serializableFieldsTree));
-        }
-    }
-
-    /**
-     * Build the field sub header.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldsContentTree content tree to which the documentation will be added
-     */
-    public void buildFieldSubHeader(XMLNode node, Content fieldsContentTree) {
-        if (!currentClass.definesSerializableFields()) {
-            FieldDoc field = (FieldDoc) currentMember;
-            fieldWriter.addMemberHeader(field.type().asClassDoc(),
-                    field.type().typeName(), field.type().dimension(), field.name(),
-                    fieldsContentTree);
-        }
-    }
-
-    /**
-     * Build the field deprecation information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldsContentTree content tree to which the documentation will be added
-     */
-    public void buildFieldDeprecationInfo(XMLNode node, Content fieldsContentTree) {
-        if (!currentClass.definesSerializableFields()) {
-            FieldDoc field = (FieldDoc)currentMember;
-            fieldWriter.addMemberDeprecatedInfo(field, fieldsContentTree);
-        }
-    }
-
-    /**
-     * Build the serial field tags information.
-     *
-     * @param serializableFieldsTree content tree to which the documentation will be added
-     */
-    public void buildSerialFieldTagsInfo(Content serializableFieldsTree) {
-        if(configuration.nocomment){
-            return;
-        }
-        FieldDoc field = (FieldDoc)currentMember;
-        // Process Serializable Fields specified as array of
-        // ObjectStreamFields. Print a member for each serialField tag.
-        // (There should be one serialField tag per ObjectStreamField
-        // element.)
-        SerialFieldTag[] tags = field.serialFieldTags();
-        Arrays.sort(tags);
-        int tagsLength = tags.length;
-        for (int i = 0; i < tagsLength; i++) {
-            if (tags[i].fieldName() == null || tags[i].fieldType() == null) // ignore malformed @serialField tags
-                continue;
-            Content fieldsContentTree = fieldWriter.getFieldsContentHeader(
-                    (i == tagsLength - 1));
-            fieldWriter.addMemberHeader(tags[i].fieldTypeDoc(),
-                    tags[i].fieldType(), "", tags[i].fieldName(), fieldsContentTree);
-            fieldWriter.addMemberDescription(tags[i], fieldsContentTree);
-            serializableFieldsTree.addContent(fieldsContentTree);
-        }
-    }
-
-    /**
-     * Build the field information.
-     *
-     * @param node the XML element that specifies which components to document
-     * @param fieldsContentTree content tree to which the documentation will be added
-     */
-    public void buildFieldInfo(XMLNode node, Content fieldsContentTree) {
-        if(configuration.nocomment){
-            return;
-        }
-        FieldDoc field = (FieldDoc)currentMember;
-        ClassDoc cd = field.containingClass();
-        // Process default Serializable field.
-        if ((field.tags("serial").length == 0) && ! field.isSynthetic()
-                && configuration.serialwarn) {
-            configuration.message.warning(field.position(),
-                    "doclet.MissingSerialTag", cd.qualifiedName(),
-                    field.name());
-        }
-        fieldWriter.addMemberDescription(field, fieldsContentTree);
-        fieldWriter.addMemberTags(field, fieldsContentTree);
-    }
-
-    /**
-     * Return true if the given Doc should be included
-     * in the serialized form.
-     *
-     * @param doc the Doc object to check for serializability.
-     */
-    public static boolean serialInclude(Doc doc) {
-        if (doc == null) {
-            return false;
-        }
-        return doc.isClass() ?
-            serialClassInclude((ClassDoc)doc) :
-            serialDocInclude(doc);
-    }
-
-    /**
-     * Return true if the given ClassDoc should be included
-     * in the serialized form.
-     *
-     * @param cd the ClassDoc object to check for serializability.
-     */
-    private static boolean serialClassInclude(ClassDoc cd) {
-        if (cd.isEnum()) {
-            return false;
-        }
-        try {
-            cd.superclassType();
-        } catch (NullPointerException e) {
-            //Workaround for null pointer bug in ClassDoc.superclassType().
-            return false;
-        }
-        if (cd.isSerializable()) {
-            if (cd.tags("serial").length > 0) {
-                return serialDocInclude(cd);
-            } else if (cd.isPublic() || cd.isProtected()) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return true if the given Doc should be included
-     * in the serialized form.
-     *
-     * @param doc the Doc object to check for serializability.
-     */
-    private static boolean serialDocInclude(Doc doc) {
-        if (doc.isEnum()) {
-            return false;
-        }
-        Tag[] serial = doc.tags("serial");
-        if (serial.length > 0) {
-            String serialtext = StringUtils.toLowerCase(serial[0].text());
-            if (serialtext.contains("exclude")) {
-                return false;
-            } else if (serialtext.contains("include")) {
-                return true;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return true if any of the given classes have a @serialinclude tag.
-     *
-     * @param classes the classes to check.
-     * @return true if any of the given classes have a @serialinclude tag.
-     */
-    private boolean serialClassFoundToDocument(ClassDoc[] classes) {
-        for (ClassDoc aClass : classes) {
-            if (serialClassInclude(aClass)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
deleted file mode 100644
index f32bd6681fa..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2010, 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
- * 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.doclets.internal.toolkit.builders;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Simple class to represent the attribute and elements of an XML node.
- *
- *  <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>
- */
-@Deprecated
-public class XMLNode {
-    XMLNode(XMLNode parent, String qname) {
-        this.parent = parent;
-        name = qname;
-        attrs = new HashMap<>();
-        children = new ArrayList<>();
-
-        if (parent != null)
-            parent.children.add(this);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("<");
-        sb.append(name);
-        for (Map.Entry<String,String> e: attrs.entrySet())
-            sb.append(" " + e.getKey() + "=\"" + e.getValue() + "\"");
-        if (children.size() == 0)
-            sb.append("/>");
-        else {
-            sb.append(">");
-            for (XMLNode c: children)
-                sb.append(c.toString());
-            sb.append("</" + name + ">");
-        }
-        return sb.toString();
-    }
-
-    final XMLNode parent;
-    final String name;
-    final Map<String,String> attrs;
-    final List<XMLNode> children;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
deleted file mode 100644
index c11193fc36a..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package-info.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
-    This doclet-independent package has a set of classes and
-    interfaces that are the building blocks for doclets. They
-    define the basic structure of doclets and make doclet
-    writing much easier because they provide the content generation
-    code to be shared among different doclets. Builders only provide
-    the structure and content of API documentation.
-    They will not provide any style markup.
-
-    <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>
-*/
-
-package com.sun.tools.doclets.internal.toolkit.builders;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
deleted file mode 100644
index 30bc952e01b..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/package-info.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-/**
-    Contains the base classes that make up a doclet.  Doclets that reuse
-    the functionality provided by the toolkit should have the following
-    characteristics:
-    <ul>
-        <li>
-            The main driver class should extend
-            {@link com.sun.tools.doclets.internal.toolkit.AbstractDoclet}.
-        </li>
-        <li>
-            The doclet configuration class should extend
-            {@link com.sun.tools.doclets.internal.toolkit.Configuration}.
-        </li>
-        <li>
-            The doclet should have a writer factory that implements
-            {@link com.sun.tools.doclets.internal.toolkit.WriterFactory}.
-            This class constructs writers that write doclet specific output.
-        </li>
-        <li>
-            The doclet should have a taglet writer that extends
-            {@link com.sun.tools.doclets.internal.toolkit.taglets.TagletWriter}.
-             This writer determines how to output each given tag.
-        </li>
-    </ul>
-
-    <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>
-*/
-
-package com.sun.tools.doclets.internal.toolkit;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
deleted file mode 100644
index 3cbe58297e5..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!--
- Copyright (c) 2003, 2016, 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.
--->
-
-
-<Doclet>
-
-    <PackageDoc>
-        <Content>
-            <Summary>
-                <InterfaceSummary/>
-                <ClassSummary/>
-                <EnumSummary/>
-                <ExceptionSummary/>
-                <ErrorSummary/>
-                <AnnotationTypeSummary/>
-            </Summary>
-            <PackageDescription/>
-            <PackageTags/>
-        </Content>
-    </PackageDoc>
-
-    <AnnotationTypeDoc>
-        <AnnotationTypeInfo>
-            <DeprecationInfo/>
-            <AnnotationTypeSignature/>
-            <AnnotationTypeDescription/>
-            <AnnotationTypeTagInfo/>
-        </AnnotationTypeInfo>
-        <MemberSummary>
-            <AnnotationTypeFieldsSummary/>
-            <AnnotationTypeRequiredMemberSummary/>
-            <AnnotationTypeOptionalMemberSummary/>
-        </MemberSummary>
-        <AnnotationTypeMemberDetails>
-            <AnnotationTypeFieldDetails>
-                <AnnotationTypeField>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                </AnnotationTypeField>
-            </AnnotationTypeFieldDetails>
-            <AnnotationTypeRequiredMemberDetails>
-                <AnnotationTypeRequiredMember>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                </AnnotationTypeRequiredMember>
-            </AnnotationTypeRequiredMemberDetails>
-            <AnnotationTypeOptionalMemberDetails>
-                <AnnotationTypeOptionalMember>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MemberComments/>
-                    <TagInfo/>
-                    <DefaultValueInfo/>
-                </AnnotationTypeOptionalMember>
-            </AnnotationTypeOptionalMemberDetails>
-        </AnnotationTypeMemberDetails>
-    </AnnotationTypeDoc>
-
-    <ClassDoc>
-        <ClassTree/>
-        <ClassInfo>
-            <TypeParamInfo/>
-            <SuperInterfacesInfo/>
-            <ImplementedInterfacesInfo/>
-            <SubClassInfo/>
-            <SubInterfacesInfo/>
-            <InterfaceUsageInfo/>
-            <NestedClassInfo/>
-            <FunctionalInterfaceInfo/>
-            <DeprecationInfo/>
-            <ClassSignature/>
-            <ClassDescription/>
-            <ClassTagInfo/>
-        </ClassInfo>
-        <MemberSummary>
-            <PropertiesSummary/>
-            <NestedClassesSummary/>
-            <EnumConstantsSummary/>
-            <FieldsSummary/>
-            <ConstructorsSummary/>
-            <MethodsSummary/>
-        </MemberSummary>
-        <MemberDetails>
-            <EnumConstantsDetails>
-                <EnumConstant>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <EnumConstantComments/>
-                    <TagInfo/>
-                </EnumConstant>
-            </EnumConstantsDetails>
-            <PropertyDetails>
-                <PropertyDoc>
-                    <Signature/>
-                    <PropertyComments/>
-                    <TagInfo/>
-                </PropertyDoc>
-            </PropertyDetails>
-            <FieldDetails>
-                <FieldDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <FieldComments/>
-                    <TagInfo/>
-                </FieldDoc>
-            </FieldDetails>
-            <ConstructorDetails>
-                <ConstructorDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <ConstructorComments/>
-                    <TagInfo/>
-                </ConstructorDoc>
-            </ConstructorDetails>
-            <MethodDetails>
-                <MethodDoc>
-                    <Signature/>
-                    <DeprecationInfo/>
-                    <MethodComments/>
-                    <TagInfo/>
-                </MethodDoc>
-            </MethodDetails>
-        </MemberDetails>
-    </ClassDoc>
-
-    <ConstantSummary>
-        <Contents/>
-        <ConstantSummaries>
-            <PackageHeader/>
-            <ClassConstantSummary>
-                <ConstantMembers/>
-            </ClassConstantSummary>
-        </ConstantSummaries>
-    </ConstantSummary>
-
-    <SerializedForm>
-        <SerializedFormSummaries>
-            <PackageSerializedForm>
-                <PackageHeader/>
-                <ClassSerializedForm>
-                    <SerialUIDInfo/>
-                    <ClassContent>
-                        <SerializableMethods>
-                            <MethodSubHeader/>
-                            <DeprecatedMethodInfo/>
-                            <MethodInfo>
-                                <MethodDescription/>
-                                <MethodTags/>
-                            </MethodInfo>
-                        </SerializableMethods>
-                        <FieldHeader/>
-                        <SerializableFields>
-                            <FieldSubHeader/>
-                            <FieldDeprecationInfo/>
-                            <FieldInfo/>
-                        </SerializableFields>
-                    </ClassContent>
-                </ClassSerializedForm>
-            </PackageSerializedForm>
-        </SerializedFormSummaries>
-    </SerializedForm>
-</Doclet>
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
deleted file mode 100644
index dd6bfc038de..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties
+++ /dev/null
@@ -1,219 +0,0 @@
-doclet.Generating_0=Generating {0}...
-doclet.Toolkit_Usage_Violation=The Doclet Toolkit can only be used by {0}
-doclet.MissingSerialTag=in class {0}, missing @serial tag for default serializable field: {1}.
-doclet.MissingSerialDataTag=in class {0}, missing @serialData tag in method {1}.
-doclet.Serializable_no_customization=No readObject or writeObject method declared.
-doclet.Serialized_Form=Serialized Form
-doclet.Serialized_Form_methods=Serialization Methods
-doclet.Serialized_Form_fields=Serialized Fields
-doclet.Serialized_Form_class=Serialization Overview
-doclet.Class_0_implements_serializable=Class {0} implements Serializable
-doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
-doclet.Option_conflict=Option {0} conflicts with {1}
-doclet.Option_reuse=Option reused: {0}
-doclet.Option_doclint_no_qualifiers=Access qualifiers not permitted for -Xdoclint arguments
-doclet.Option_doclint_invalid_arg=Invalid argument for -Xdoclint option
-doclet.Option_doclint_package_invalid_arg=Invalid argument for -Xdoclint/package option
-doclet.exception_encountered= {0} encountered \n\
-\twhile attempting to create file: {1}
-doclet.perform_copy_exception_encountered= {0} encountered while \n\
-performing copy.
-doclet.File_not_found=File not found: {0}
-doclet.Copy_Overwrite_warning=File {0} not copied to {1} due to existing file with same name...
-doclet.Copying_File_0_To_Dir_1=Copying file {0} to directory {1}...
-doclet.Copying_File_0_To_File_1=Copying file {0} to file {1}...
-doclet.No_Public_Classes_To_Document=No public or protected classes found to document.
-doclet.destination_directory_not_directory_0=Destination directory is not a directory {0}
-doclet.destination_directory_not_writable_0=Destination directory not writable {0}
-doclet.Encoding_not_supported=Encoding not supported: {0}
-doclet.Building_Tree=Building tree for all the packages and classes...
-doclet.Building_Index=Building index for all the packages and classes...
-doclet.Building_Index_For_All_Classes=Building index for all classes...
-doclet.JavaScript_in_option=Argument for {0} contains JavaScript.\n\
-Use --allow-script-in-comments to allow use of JavaScript.
-doclet.sourcetab_warning=The argument for -sourcetab must be an integer greater than 0.
-doclet.Packages=Packages
-doclet.Other_Packages=Other Packages
-doclet.Notice_taglet_registered=Registered Taglet {0} ...
-doclet.Notice_taglet_unseen=Note: Custom tags that were not seen: {0}
-doclet.Notice_taglet_overriden=Note: Custom tags that override standard tags: {0}
-doclet.Notice_taglet_conflict_warn=Note: Custom tags that could override future standard tags: {0}. To avoid potential overrides, use at least one period character (.) in custom tag names.
-doclet.Error_taglet_not_registered=Error - Exception {0} thrown while trying to register Taglet {1}...
-doclet.Error_invalid_custom_tag_argument=Error - {0} is an invalid argument to the -tag option...
-doclet.Author=Author:
-doclet.DefaultValue=Default value:
-doclet.PropertyDescription=Property description:
-doclet.PropertyGetter=Gets the value of the property
-doclet.PropertySetter=Sets the value of the property
-doclet.PropertyGetterWithName=Gets the value of the property {0}.
-doclet.PropertySetterWithName=Sets the value of the property {0}.
-doclet.Default=Default:
-doclet.Parameters=Parameters:
-doclet.TypeParameters=Type Parameters:
-doclet.Parameters_warn=@param argument "{0}" is not a parameter name.
-doclet.Parameters_dup_warn=Parameter "{0}" is documented more than once.
-doclet.Type_Parameters_warn=@param argument "{0}" is not a type parameter name.
-doclet.Type_Parameters_dup_warn=Type parameter "{0}" is documented more than once.
-doclet.Returns=Returns:
-doclet.Return_tag_on_void_method=@return tag cannot be used in method with void return type.
-doclet.See_Also=See Also:
-doclet.See=See:
-doclet.SerialData=Serial Data:
-doclet.Since=Since:
-doclet.Throws=Throws:
-doclet.Version=Version:
-doclet.Factory=Factory:
-doclet.UnknownTag={0} is an unknown tag.
-doclet.UnknownTagLowercase={0} is an unknown tag -- same as a known tag except for case.
-doclet.noInheritedDoc=@inheritDoc used but {0} does not override or implement any method.
-doclet.malformed_html_link_tag=<a> tag is malformed:\n"{0}"
-doclet.tag_misuse=Tag {0} cannot be used in {1} documentation.  It can only be used in the following types of documentation: {2}.
-doclet.javafx_tag_misuse=Tags @propertyGetter, @propertySetter and @propertyDescription can only be used in JavaFX properties getters and setters.
-doclet.Package_Summary=Package Summary
-doclet.Interface_Summary=Interface Summary
-doclet.Annotation_Types_Summary=Annotation Types Summary
-doclet.Enum_Summary=Enum Summary
-doclet.Exception_Summary=Exception Summary
-doclet.Error_Summary=Error Summary
-doclet.Class_Summary=Class Summary
-doclet.Nested_Class_Summary=Nested Class Summary
-doclet.Annotation_Type_Optional_Member_Summary=Optional Element Summary
-doclet.Annotation_Type_Required_Member_Summary=Required Element Summary
-doclet.Field_Summary=Field Summary
-doclet.Property_Summary=Property Summary
-doclet.Enum_Constant_Summary=Enum Constant Summary
-doclet.Constructor_Summary=Constructor Summary
-doclet.Method_Summary=Method Summary
-doclet.Interfaces=Interfaces
-doclet.Enums=Enums
-doclet.AnnotationTypes=Annotation Types
-doclet.Exceptions=Exceptions
-doclet.Errors=Errors
-doclet.Classes=Classes
-doclet.Packages=Packages
-doclet.packages=packages
-doclet.All_Classes=All Classes
-doclet.All_Superinterfaces=All Superinterfaces:
-doclet.All_Implemented_Interfaces=All Implemented Interfaces:
-doclet.All_classes_and_interfaces=All classes and interfaces (except non-static nested types)
-doclet.Package_class_and_interface_descriptions=Package, class and interface descriptions
-doclet.Interface=Interface
-doclet.Class=Class
-doclet.AnnotationType=Annotation Type
-doclet.annotationtype=annotation type
-doclet.annotationtypes=annotation types
-doclet.Enum=Enum
-doclet.enum=enum
-doclet.enums=enums
-doclet.interface=interface
-doclet.interfaces=interfaces
-doclet.class=class
-doclet.classes=classes
-doclet.Error=Error
-doclet.error=error
-doclet.errors=errors
-doclet.Exception=Exception
-doclet.exception=exception
-doclet.exceptions=exceptions
-doclet.Package_private=(package private)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=Nested classes/interfaces inherited from class
-doclet.Nested_Classes_Interface_Inherited_From_Interface=Nested classes/interfaces inherited from interface
-doclet.Methods_Inherited_From_Class=Methods inherited from class
-doclet.Methods_Inherited_From_Interface=Methods inherited from interface
-doclet.Fields_Inherited_From_Class=Fields inherited from class
-doclet.Fields_Inherited_From_Interface=Fields inherited from interface
-doclet.Properties_Inherited_From_Class=Properties inherited from class
-doclet.Properties_Inherited_From_Interface=Properties inherited from interface
-doclet.Annotation_Type_Member_Detail=Element Detail
-doclet.Enum_Constant_Detail=Enum Constant Detail
-doclet.Constants_Summary=Constant Field Values
-doclet.Field_Detail=Field Detail
-doclet.Property_Detail=Property Detail
-doclet.Method_Detail=Method Detail
-doclet.Constructor_Detail=Constructor Detail
-doclet.Deprecated=Deprecated.
-doclet.Groupname_already_used=In -group option, groupname already used: {0}
-doclet.value_tag_invalid_reference={0} (referenced by @value tag) is an unknown reference.
-doclet.value_tag_invalid_constant=@value tag (which references {0}) can only be used in constants.
-doclet.value_tag_invalid_use=@value tag cannot be used here.
-doclet.dest_dir_create=Creating destination directory: "{0}"
-doclet.in={0} in {1}
-doclet.Use_Table_Summary=Use table, listing {0}, and an explanation
-doclet.Constants_Table_Summary={0} table, listing constant fields, and values
-doclet.Member_Table_Summary={0} table, listing {1}, and an explanation
-doclet.fields=fields
-doclet.Fields=Fields
-doclet.properties=properties
-doclet.Properties=Properties
-doclet.constructors=constructors
-doclet.Constructors=Constructors
-doclet.methods=methods
-doclet.Methods=Methods
-doclet.All_Methods=All Methods
-doclet.Static_Methods=Static Methods
-doclet.Instance_Methods=Instance Methods
-doclet.Abstract_Methods=Abstract Methods
-doclet.Concrete_Methods=Concrete Methods
-doclet.Default_Methods=Default Methods
-doclet.Deprecated_Methods=Deprecated Methods
-doclet.annotation_type_optional_members=optional elements
-doclet.Annotation_Type_Optional_Members=Optional Elements
-doclet.annotation_type_required_members=required elements
-doclet.Annotation_Type_Required_Members=Required Elements
-doclet.enum_constants=enum constants
-doclet.Enum_Constants=Enum Constants
-doclet.nested_classes=nested classes
-doclet.Nested_Classes=Nested Classes
-doclet.subclasses=subclasses
-doclet.subinterfaces=subinterfaces
-doclet.Modifier=Modifier
-doclet.Type=Type
-doclet.Types=Types
-doclet.Members=Members
-doclet.SearchTags=SearchTags
-doclet.search=SEARCH:
-doclet.invalid_usage_of_tag=invalid usage of {0} tag.
-doclet.Field=Field
-doclet.Property=Property
-doclet.Constructor=Constructor
-doclet.Method=Method
-doclet.Annotation_Type_Optional_Member=Optional Element
-doclet.Annotation_Type_Required_Member=Required Element
-doclet.Annotation_Type_Member=Annotation Type Element
-doclet.Enum_Constant=Enum Constant
-doclet.Class=Class
-doclet.Description=Description
-doclet.ConstantField=Constant Field
-doclet.Value=Value
-doclet.0_and_1={0} and {1}
-
-#Documentation for Enums
-doclet.enum_values_doc.main=\n\
- Returns an array containing the constants of this enum type, in\n\
- the order they are declared.  This method may be used to iterate\n\
- over the constants as follows:\n\
- <pre>\n\
- for ({0} c : {0}.values())\n\
- &nbsp;   System.out.println(c);\n\
- </pre>
-
-doclet.enum_values_doc.return=\n\
- an array containing the constants of this enum type, in the order they are declared
-
-doclet.enum_valueof_doc.main=\n\
- Returns the enum constant of this type with the specified name.\n\
- The string must match <i>exactly</i> an identifier used to declare an\n\
- enum constant in this type.  (Extraneous whitespace characters are \n\
- not permitted.)
-
-doclet.enum_valueof_doc.param_name=\
- the name of the enum constant to be returned.
-
-doclet.enum_valueof_doc.return=\
- the enum constant with the specified name
-
-doclet.enum_valueof_doc.throws_ila=\
- if this enum type has no constant with the specified name
-
-doclet.enum_valueof_doc.throws_npe=\
- if the argument is null
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
deleted file mode 100644
index 03f488a3293..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
+++ /dev/null
@@ -1,200 +0,0 @@
-doclet.Generating_0={0}\u306E\u751F\u6210\u4E2D...
-doclet.Toolkit_Usage_Violation=\u30C9\u30C3\u30AF\u30EC\u30C3\u30C8\u30FB\u30C4\u30FC\u30EB\u30FB\u30AD\u30C3\u30C8\u306F{0}\u306B\u3088\u3063\u3066\u306E\u307F\u4F7F\u7528\u3055\u308C\u307E\u3059
-doclet.MissingSerialTag=\u30AF\u30E9\u30B9{0}\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u76F4\u5217\u5316\u53EF\u80FD\u30D5\u30A3\u30FC\u30EB\u30C9{1}\u306E\u305F\u3081\u306E@serial\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.MissingSerialDataTag=\u30AF\u30E9\u30B9{0}\u306E\u30E1\u30BD\u30C3\u30C9{1}\u306B@serialData\u30BF\u30B0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.Serializable_no_customization=readObject\u307E\u305F\u306FwriteObject\u30E1\u30BD\u30C3\u30C9\u304C\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.Serialized_Form=\u76F4\u5217\u5316\u3055\u308C\u305F\u5F62\u5F0F
-doclet.Serialized_Form_methods=\u76F4\u5217\u5316\u30E1\u30BD\u30C3\u30C9
-doclet.Serialized_Form_fields=\u76F4\u5217\u5316\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Serialized_Form_class=\u76F4\u5217\u5316\u306E\u6982\u8981
-doclet.Class_0_implements_serializable=Class {0} implements Serializable
-doclet.Class_0_extends_implements_serializable=Class {0} extends {1} implements Serializable
-doclet.Option_conflict=\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u304C{1}\u3068\u77DB\u76FE\u3057\u307E\u3059
-doclet.Option_reuse=\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u518D\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.Option_doclint_no_qualifiers=\u30A2\u30AF\u30BB\u30B9\u4FEE\u98FE\u5B50\u306F-Xdoclint\u306E\u5F15\u6570\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-doclet.Option_doclint_invalid_arg=-Xdoclint\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059
-doclet.Option_doclint_package_invalid_arg=-Xdoclint/package\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u7121\u52B9\u3067\u3059
-doclet.exception_encountered= {0}\u3092\u691C\u51FA\n\t\u30D5\u30A1\u30A4\u30EB\u306E\u4F5C\u6210\u4E2D: {1}
-doclet.perform_copy_exception_encountered= \u30B3\u30D4\u30FC\u5B9F\u884C\u4E2D\u306B{0}\u3092\n\u691C\u51FA\u3057\u307E\u3057\u305F\u3002
-doclet.File_not_found=\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}
-doclet.Copy_Overwrite_warning=\u30D5\u30A1\u30A4\u30EB{0}\u306F\u540C\u3058\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u306E\u3067{1}\u306B\u30B3\u30D4\u30FC\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F...
-doclet.Copying_File_0_To_Dir_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
-doclet.Copying_File_0_To_File_1=\u30D5\u30A1\u30A4\u30EB{0}\u3092\u30D5\u30A1\u30A4\u30EB{1}\u306B\u30B3\u30D4\u30FC\u4E2D...
-doclet.No_Public_Classes_To_Document=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3059\u308Bpublic\u307E\u305F\u306Fprotected\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
-doclet.destination_directory_not_directory_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-doclet.destination_directory_not_writable_0=\u8EE2\u9001\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA{0}\u306F\u66F8\u8FBC\u307F\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093
-doclet.Encoding_not_supported=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-doclet.Building_Tree=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u968E\u5C64\u30C4\u30EA\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.Building_Index=\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u3068\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.Building_Index_For_All_Classes=\u5168\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059...
-doclet.JavaScript_in_option={0}\u306E\u5F15\u6570\u306BJavaScript\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\n--allow-script-in-comments\u3092\u4F7F\u7528\u3057\u3066\u3001JavaScript\u306E\u4F7F\u7528\u3092\u8A31\u53EF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.sourcetab_warning=-sourcetab\u306E\u5F15\u6570\u306F0\u3088\u308A\u5927\u304D\u3044\u6574\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-doclet.Packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Other_Packages=\u305D\u306E\u4ED6\u306E\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.Notice_taglet_registered=\u767B\u9332\u3055\u308C\u305F\u30BF\u30B0\u30EC\u30C3\u30C8{0} ...
-doclet.Notice_taglet_unseen=\u6CE8\u610F: \u975E\u8868\u793A\u306E\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
-doclet.Notice_taglet_overriden=\u6CE8\u610F: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}
-doclet.Notice_taglet_conflict_warn=\u6CE8\u610F: \u6A19\u6E96\u30BF\u30B0\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u53EF\u80FD\u6027\u306E\u3042\u308B\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0: {0}\u3002\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3092\u907F\u3051\u308B\u305F\u3081\u306B\u3001\u30AB\u30B9\u30BF\u30E0\u30FB\u30BF\u30B0\u540D\u306E\u4E2D\u306B\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30D4\u30EA\u30AA\u30C9(.)\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-doclet.Error_taglet_not_registered=\u30A8\u30E9\u30FC - \u30BF\u30B0\u30EC\u30C3\u30C8{1}\u3092\u767B\u9332\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4F8B\u5916{0}\u304C\u30B9\u30ED\u30FC\u3055\u308C\u307E\u3057\u305F...
-doclet.Error_invalid_custom_tag_argument=\u30A8\u30E9\u30FC - {0}\u306F-tag\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5BFE\u3057\u3066\u7121\u52B9\u306A\u5F15\u6570\u3067\u3059...
-doclet.Author=\u4F5C\u6210\u8005:
-doclet.DefaultValue=\u30C7\u30D5\u30A9\u30EB\u30C8\u5024:
-doclet.PropertyDescription=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8AAC\u660E:
-doclet.PropertyGetter=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059
-doclet.PropertySetter=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059
-doclet.PropertyGetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u53D6\u5F97\u3057\u307E\u3059\u3002
-doclet.PropertySetterWithName=\u30D7\u30ED\u30D1\u30C6\u30A3{0}\u306E\u5024\u3092\u8A2D\u5B9A\u3057\u307E\u3059\u3002
-doclet.Default=\u30C7\u30D5\u30A9\u30EB\u30C8:
-doclet.Parameters=\u30D1\u30E9\u30E1\u30FC\u30BF:
-doclet.TypeParameters=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF:
-doclet.Parameters_warn=@param argument "{0}"\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.Parameters_dup_warn=\u30D1\u30E9\u30E1\u30FC\u30BF"{0}"\u304C2\u56DE\u4EE5\u4E0A\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-doclet.Type_Parameters_warn=@param argument "{0}"\u306F\u578B\u30D1\u30E9\u30E1\u30FC\u30BF\u540D\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-doclet.Type_Parameters_dup_warn=\u578B\u30D1\u30E9\u30E1\u30FC\u30BF"{0}"\u304C2\u56DE\u4EE5\u4E0A\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-doclet.Returns=\u623B\u308A\u5024:
-doclet.Return_tag_on_void_method=\u623B\u308A\u5024\u306E\u578B\u304Cvoid\u306E\u30E1\u30BD\u30C3\u30C9\u3067\u306F@return\u30BF\u30B0\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-doclet.See_Also=\u95A2\u9023\u9805\u76EE:
-doclet.See=\u53C2\u7167\u5148:
-doclet.SerialData=\u30B7\u30EA\u30A2\u30EB\u30FB\u30C7\u30FC\u30BF:
-doclet.Since=\u5C0E\u5165\u3055\u308C\u305F\u30D0\u30FC\u30B8\u30E7\u30F3:
-doclet.Throws=\u4F8B\u5916:
-doclet.Version=\u30D0\u30FC\u30B8\u30E7\u30F3:
-doclet.Factory=\u30D5\u30A1\u30AF\u30C8\u30EA:
-doclet.UnknownTag={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002
-doclet.UnknownTagLowercase={0}\u306F\u4E0D\u660E\u306A\u30BF\u30B0\u3067\u3059\u3002\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u306E\u533A\u5225\u3092\u9664\u3044\u3066\u306F\u65E2\u77E5\u306E\u30BF\u30B0\u3068\u540C\u3058\u3067\u3059\u3002
-doclet.noInheritedDoc=@inheritDoc\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001{0}\u306F\u3069\u306E\u30E1\u30BD\u30C3\u30C9\u3082\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u307E\u305F\u306F\u5B9F\u88C5\u3057\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.malformed_html_link_tag=<a> \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}"
-doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002
-doclet.javafx_tag_misuse=\u30BF\u30B0@propertyGetter\u3001@propertySetter\u304A\u3088\u3073@propertyDescription\u306F\u3001JavaFX\u306E\u30D7\u30ED\u30D1\u30C6\u30A3getter\u3068setter\u306E\u307F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981
-doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981
-doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981
-doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981
-doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981
-doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981
-doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981
-doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981
-doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981
-doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981
-doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981
-doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981
-doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981
-doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981
-doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enums=\u5217\u6319\u578B
-doclet.AnnotationTypes=\u6CE8\u91C8\u578B
-doclet.Exceptions=\u4F8B\u5916
-doclet.Errors=\u30A8\u30E9\u30FC
-doclet.Classes=\u30AF\u30E9\u30B9
-doclet.Packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.packages=\u30D1\u30C3\u30B1\u30FC\u30B8
-doclet.All_Classes=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9
-doclet.All_Superinterfaces=\u3059\u3079\u3066\u306E\u30B9\u30FC\u30D1\u30FC\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.All_Implemented_Interfaces=\u3059\u3079\u3066\u306E\u5B9F\u88C5\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9:
-doclet.All_classes_and_interfaces=\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9(\u975Estatic\u306E\u30CD\u30B9\u30C8\u3055\u308C\u305F\u578B\u3092\u9664\u304F)
-doclet.Package_class_and_interface_descriptions=\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Class=\u30AF\u30E9\u30B9
-doclet.AnnotationType=\u6CE8\u91C8\u578B
-doclet.annotationtype=\u6CE8\u91C8\u578B
-doclet.annotationtypes=\u6CE8\u91C8\u578B
-doclet.Enum=\u5217\u6319\u578B
-doclet.enum=\u5217\u6319
-doclet.enums=\u5217\u6319
-doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.class=\u30AF\u30E9\u30B9
-doclet.classes=\u30AF\u30E9\u30B9
-doclet.Error=\u30A8\u30E9\u30FC
-doclet.error=\u30A8\u30E9\u30FC
-doclet.errors=\u30A8\u30E9\u30FC
-doclet.Exception=\u4F8B\u5916
-doclet.exception=\u4F8B\u5916
-doclet.exceptions=\u4F8B\u5916
-doclet.Package_private=(package private)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Nested_Classes_Interface_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9/\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Methods_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Methods_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9
-doclet.Fields_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Fields_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Properties_Inherited_From_Class=\u30AF\u30E9\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Properties_Inherited_From_Interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u304B\u3089\u7D99\u627F\u3055\u308C\u305F\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Annotation_Type_Member_Detail=\u8981\u7D20\u306E\u8A73\u7D30
-doclet.Enum_Constant_Detail=\u5217\u6319\u578B\u5B9A\u6570\u306E\u8A73\u7D30
-doclet.Constants_Summary=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u5024
-doclet.Field_Detail=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u8A73\u7D30
-doclet.Property_Detail=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u8A73\u7D30
-doclet.Method_Detail=\u30E1\u30BD\u30C3\u30C9\u306E\u8A73\u7D30
-doclet.Constructor_Detail=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u8A73\u7D30
-doclet.Deprecated=\u63A8\u5968\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-doclet.Groupname_already_used=-group\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u304A\u3044\u3066\u3001\u3059\u3067\u306B\u30B0\u30EB\u30FC\u30D7\u540D\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059: {0}
-doclet.value_tag_invalid_reference={0}(@value\u30BF\u30B0\u306B\u3088\u308A\u53C2\u7167\u3055\u308C\u3066\u3044\u308B)\u306F\u4E0D\u660E\u306A\u53C2\u7167\u3067\u3059\u3002
-doclet.value_tag_invalid_constant=@value\u30BF\u30B0({0}\u3092\u53C2\u7167\u3057\u3066\u3044\u308B)\u306F\u5B9A\u6570\u5185\u3067\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
-doclet.value_tag_invalid_use=@value\u30BF\u30B0\u306F\u3053\u3053\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-doclet.dest_dir_create=\u5B9B\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u4E2D: "{0}"
-doclet.in={1}\u306E{0}
-doclet.Use_Table_Summary=\u8868\u3001{0}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E\u306E\u4F7F\u7528
-doclet.Constants_Table_Summary={0}\u8868\u3001\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u5024
-doclet.Member_Table_Summary={0}\u8868\u3001{1}\u306E\u30EA\u30B9\u30C8\u304A\u3088\u3073\u8AAC\u660E
-doclet.fields=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Constructors=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.methods=\u30E1\u30BD\u30C3\u30C9
-doclet.Methods=\u30E1\u30BD\u30C3\u30C9
-doclet.All_Methods=\u3059\u3079\u3066\u306E\u30E1\u30BD\u30C3\u30C9
-doclet.Static_Methods=static\u30E1\u30BD\u30C3\u30C9
-doclet.Instance_Methods=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u30FB\u30E1\u30BD\u30C3\u30C9
-doclet.Abstract_Methods=abstract\u30E1\u30BD\u30C3\u30C9
-doclet.Concrete_Methods=concrete\u30E1\u30BD\u30C3\u30C9
-doclet.Default_Methods=\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30E1\u30BD\u30C3\u30C9
-doclet.Deprecated_Methods=\u63A8\u5968\u3055\u308C\u3066\u3044\u306A\u3044\u30E1\u30BD\u30C3\u30C9
-doclet.annotation_type_optional_members=\u4EFB\u610F\u8981\u7D20
-doclet.Annotation_Type_Optional_Members=\u4EFB\u610F\u8981\u7D20
-doclet.annotation_type_required_members=\u5FC5\u9808\u8981\u7D20
-doclet.Annotation_Type_Required_Members=\u5FC5\u9808\u8981\u7D20
-doclet.enum_constants=\u5217\u6319\u578B\u5B9A\u6570
-doclet.Enum_Constants=\u5217\u6319\u5B9A\u6570
-doclet.nested_classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
-doclet.Nested_Classes=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9
-doclet.subclasses=\u30B5\u30D6\u30AF\u30E9\u30B9
-doclet.subinterfaces=\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Modifier=\u4FEE\u98FE\u5B50
-doclet.Type=\u30BF\u30A4\u30D7
-doclet.Types=\u30BF\u30A4\u30D7
-doclet.Members=\u30E1\u30F3\u30D0\u30FC
-doclet.SearchTags=SearchTags
-doclet.search=SEARCH:
-doclet.invalid_usage_of_tag={0}\u30BF\u30B0\u306E\u4F7F\u7528\u65B9\u6CD5\u304C\u7121\u52B9\u3067\u3059\u3002
-doclet.Field=\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Property=\u30D7\u30ED\u30D1\u30C6\u30A3
-doclet.Constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
-doclet.Method=\u30E1\u30BD\u30C3\u30C9
-doclet.Annotation_Type_Optional_Member=\u4EFB\u610F\u8981\u7D20
-doclet.Annotation_Type_Required_Member=\u5FC5\u9808\u8981\u7D20
-doclet.Annotation_Type_Member=\u6CE8\u91C8\u578B\u8981\u7D20
-doclet.Enum_Constant=\u5217\u6319\u578B\u5B9A\u6570
-doclet.Class=\u30AF\u30E9\u30B9
-doclet.Description=\u8AAC\u660E
-doclet.ConstantField=\u5B9A\u6570\u30D5\u30A3\u30FC\u30EB\u30C9
-doclet.Value=\u5024
-doclet.0_and_1={0}\u3068{1}
-
-#Documentation for Enums
-doclet.enum_values_doc.main=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n<pre>\nfor({0} c: {0}.values())\n&nbsp; System.out.println(c);\n</pre>\n
-
-doclet.enum_values_doc.return=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u3001\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u306E\u914D\u5217
-
-doclet.enum_valueof_doc.main=\n\u6307\u5B9A\u3057\u305F\u540D\u524D\u3092\u6301\u3064\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u8FD4\u3057\u307E\u3059\u3002\n\u6587\u5B57\u5217\u306F\u3001\u3053\u306E\u578B\u306E\u5217\u6319\u578B\u5B9A\u6570\u3092\u5BA3\u8A00\u3059\u308B\u306E\u306B\u4F7F\u7528\u3057\u305F\u8B58\u5225\u5B50\u3068<i>\u6B63\u78BA\u306B</i>\n\u4E00\u81F4\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n(\u4F59\u5206\u306A\u7A7A\u767D\u6587\u5B57\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002)\n
-
-doclet.enum_valueof_doc.param_name=\u8FD4\u3055\u308C\u308B\u5217\u6319\u578B\u5B9A\u6570\u306E\u540D\u524D\u3002
-
-doclet.enum_valueof_doc.return=\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5217\u6319\u578B\u5B9A\u6570
-
-doclet.enum_valueof_doc.throws_ila=\u3053\u306E\u5217\u6319\u578B\u306B\u3001\u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u5B9A\u6570\u304C\u306A\u3044\u5834\u5408
-
-doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
deleted file mode 100644
index 177d3da36f8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
+++ /dev/null
@@ -1,200 +0,0 @@
-doclet.Generating_0=\u6B63\u5728\u751F\u6210{0}...
-doclet.Toolkit_Usage_Violation=\u53EA\u6709{0}\u53EF\u4EE5\u4F7F\u7528 Doclet \u5DE5\u5177\u7BB1
-doclet.MissingSerialTag=\u5728\u7C7B{0}\u4E2D, \u9ED8\u8BA4\u7684\u53EF\u5E8F\u5217\u5316\u5B57\u6BB5{1}\u7F3A\u5C11 @serial \u6807\u8BB0\u3002
-doclet.MissingSerialDataTag=\u5728\u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u4E2D\u7F3A\u5C11 @serialData \u6807\u8BB0\u3002
-doclet.Serializable_no_customization=\u672A\u58F0\u660E readObject \u6216 writeObject \u65B9\u6CD5\u3002
-doclet.Serialized_Form=\u5E8F\u5217\u5316\u8868\u683C
-doclet.Serialized_Form_methods=\u5E8F\u5217\u5316\u65B9\u6CD5
-doclet.Serialized_Form_fields=\u5E8F\u5217\u5316\u5B57\u6BB5
-doclet.Serialized_Form_class=\u5E8F\u5217\u5316\u6982\u89C8
-doclet.Class_0_implements_serializable=\u7C7B{0}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
-doclet.Class_0_extends_implements_serializable=\u7C7B{0}\u6269\u5C55{1}\u5B9E\u73B0\u53EF\u5E8F\u5217\u5316
-doclet.Option_conflict=\u9009\u9879{0}\u4E0E{1}\u51B2\u7A81
-doclet.Option_reuse=\u91CD\u590D\u4F7F\u7528\u7684\u9009\u9879: {0}
-doclet.Option_doclint_no_qualifiers=-Xdoclint \u53C2\u6570\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BBF\u95EE\u9650\u5B9A\u7B26
-doclet.Option_doclint_invalid_arg=-Xdoclint \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548
-doclet.Option_doclint_package_invalid_arg=-Xdoclint/package \u9009\u9879\u7684\u53C2\u6570\u65E0\u6548
-doclet.exception_encountered= \u5C1D\u8BD5\u521B\u5EFA\u6587\u4EF6{1}\u65F6 \n\t\u9047\u5230{0}
-doclet.perform_copy_exception_encountered= \u6267\u884C\u590D\u5236\u65F6 \n\u9047\u5230{0}\u3002
-doclet.File_not_found=\u627E\u4E0D\u5230\u6587\u4EF6: {0}
-doclet.Copy_Overwrite_warning=\u672A\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230 {1}, \u56E0\u4E3A\u73B0\u6709\u6587\u4EF6\u5177\u6709\u76F8\u540C\u540D\u79F0...
-doclet.Copying_File_0_To_Dir_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u76EE\u5F55 {1}...
-doclet.Copying_File_0_To_File_1=\u6B63\u5728\u5C06\u6587\u4EF6{0}\u590D\u5236\u5230\u6587\u4EF6{1}...
-doclet.No_Public_Classes_To_Document=\u627E\u4E0D\u5230\u53EF\u4EE5\u6587\u6863\u5316\u7684\u516C\u5171\u6216\u53D7\u4FDD\u62A4\u7684\u7C7B\u3002
-doclet.destination_directory_not_directory_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u662F\u76EE\u5F55 {0}
-doclet.destination_directory_not_writable_0=\u76EE\u6807\u76EE\u5F55\u4E0D\u53EF\u5199\u5165 {0}
-doclet.Encoding_not_supported=\u4E0D\u652F\u6301\u7F16\u7801: {0}
-doclet.Building_Tree=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u6811...
-doclet.Building_Index=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7A0B\u5E8F\u5305\u548C\u7C7B\u7684\u7D22\u5F15...
-doclet.Building_Index_For_All_Classes=\u6B63\u5728\u6784\u5EFA\u6240\u6709\u7C7B\u7684\u7D22\u5F15...
-doclet.JavaScript_in_option={0} \u7684\u53C2\u6570\u5305\u542B JavaScript\u3002\n\u4F7F\u7528 --allow-script-in-comments \u53EF\u5141\u8BB8\u4F7F\u7528 JavaScript\u3002
-doclet.sourcetab_warning=-sourcetab \u7684\u53C2\u6570\u5FC5\u987B\u662F\u5927\u4E8E 0 \u7684\u6574\u6570\u3002
-doclet.Packages=\u7A0B\u5E8F\u5305
-doclet.Other_Packages=\u5176\u4ED6\u7A0B\u5E8F\u5305
-doclet.Notice_taglet_registered=\u6CE8\u518C\u7684 Taglet {0}...
-doclet.Notice_taglet_unseen=\u6CE8: \u627E\u4E0D\u5230\u7684\u5B9A\u5236\u6807\u8BB0: {0}
-doclet.Notice_taglet_overriden=\u6CE8: \u8986\u76D6\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}
-doclet.Notice_taglet_conflict_warn=\u6CE8: \u53EF\u80FD\u8986\u76D6\u5C06\u6765\u7684\u6807\u51C6\u6807\u8BB0\u7684\u5B9A\u5236\u6807\u8BB0: {0}\u3002\u4E3A\u4E86\u907F\u514D\u51FA\u73B0\u53EF\u80FD\u7684\u8986\u76D6, \u8BF7\u5728\u5B9A\u5236\u6807\u8BB0\u540D\u79F0\u4E2D\u81F3\u5C11\u4F7F\u7528\u4E00\u4E2A\u53E5\u70B9\u5B57\u7B26 (.)\u3002
-doclet.Error_taglet_not_registered=\u9519\u8BEF - \u5C1D\u8BD5\u6CE8\u518C Taglet {1}\u65F6\u629B\u51FA\u5F02\u5E38\u9519\u8BEF{0}...
-doclet.Error_invalid_custom_tag_argument=\u9519\u8BEF - \u5BF9\u4E8E -tag \u9009\u9879, {0}\u662F\u65E0\u6548\u53C2\u6570...
-doclet.Author=\u4F5C\u8005:
-doclet.DefaultValue=\u9ED8\u8BA4\u503C:
-doclet.PropertyDescription=\u5C5E\u6027\u8BF4\u660E:
-doclet.PropertyGetter=\u83B7\u53D6\u5C5E\u6027\u7684\u503C
-doclet.PropertySetter=\u8BBE\u7F6E\u5C5E\u6027\u7684\u503C
-doclet.PropertyGetterWithName=\u83B7\u53D6\u5C5E\u6027{0}\u7684\u503C\u3002
-doclet.PropertySetterWithName=\u8BBE\u7F6E\u5C5E\u6027{0}\u7684\u503C\u3002
-doclet.Default=\u9ED8\u8BA4\u503C:
-doclet.Parameters=\u53C2\u6570:
-doclet.TypeParameters=\u7C7B\u578B\u53C2\u6570:
-doclet.Parameters_warn=@param argument "{0}" \u4E0D\u662F\u53C2\u6570\u540D\u79F0\u3002
-doclet.Parameters_dup_warn=\u591A\u6B21\u5BF9\u53C2\u6570 "{0}" \u8FDB\u884C\u6587\u6863\u5316\u3002
-doclet.Type_Parameters_warn=@param argument "{0}" \u4E0D\u662F\u7C7B\u578B\u53C2\u6570\u540D\u79F0\u3002
-doclet.Type_Parameters_dup_warn=\u591A\u6B21\u5BF9\u7C7B\u578B\u53C2\u6570 "{0}" \u8FDB\u884C\u6587\u6863\u5316\u3002
-doclet.Returns=\u8FD4\u56DE:
-doclet.Return_tag_on_void_method=\u4E0D\u80FD\u5728\u8FD4\u56DE\u7C7B\u578B\u4E3A\u7A7A\u7684\u65B9\u6CD5\u4E2D\u4F7F\u7528 @return \u6807\u8BB0\u3002
-doclet.See_Also=\u53E6\u8BF7\u53C2\u9605:
-doclet.See=\u8BF7\u53C2\u9605:
-doclet.SerialData=\u5E8F\u5217\u6570\u636E:
-doclet.Since=\u4ECE\u4EE5\u4E0B\u7248\u672C\u5F00\u59CB:
-doclet.Throws=\u629B\u51FA:
-doclet.Version=\u7248\u672C:
-doclet.Factory=\u5DE5\u5382:
-doclet.UnknownTag={0}\u662F\u672A\u77E5\u6807\u8BB0\u3002
-doclet.UnknownTagLowercase={0}\u662F\u672A\u77E5\u6807\u8BB0 - \u9664\u4E86\u5927\u5C0F\u5199\u4E4B\u5916\u5176\u4ED6\u65B9\u9762\u4E0E\u5DF2\u77E5\u6807\u8BB0\u76F8\u540C\u3002
-doclet.noInheritedDoc=\u4F7F\u7528\u4E86 @inheritDoc, \u4F46{0}\u672A\u8986\u76D6\u6216\u5B9E\u73B0\u4EFB\u4F55\u65B9\u6CD5\u3002
-doclet.malformed_html_link_tag=<a> \u6807\u8BB0\u683C\u5F0F\u9519\u8BEF: \n"{0}"
-doclet.tag_misuse=\u4E0D\u80FD\u5728{1}\u6587\u6863\u4E2D\u4F7F\u7528\u6807\u8BB0{0}\u3002\u53EA\u80FD\u5728\u4EE5\u4E0B\u7C7B\u578B\u7684\u6587\u6863\u4E2D\u4F7F\u7528\u8BE5\u6807\u8BB0: {2}\u3002
-doclet.javafx_tag_misuse=\u6807\u8BB0 @propertyGetter, @propertySetter \u548C @propertyDescription \u53EA\u80FD\u5728 JavaFX \u5C5E\u6027 getter \u548C setter \u4E2D\u4F7F\u7528\u3002
-doclet.Package_Summary=\u7A0B\u5E8F\u5305\u6982\u8981
-doclet.Interface_Summary=\u63A5\u53E3\u6982\u8981
-doclet.Annotation_Types_Summary=\u6CE8\u91CA\u7C7B\u578B\u6982\u8981
-doclet.Enum_Summary=\u679A\u4E3E\u6982\u8981
-doclet.Exception_Summary=\u5F02\u5E38\u9519\u8BEF\u6982\u8981
-doclet.Error_Summary=\u9519\u8BEF\u6982\u8981
-doclet.Class_Summary=\u7C7B\u6982\u8981
-doclet.Nested_Class_Summary=\u5D4C\u5957\u7C7B\u6982\u8981
-doclet.Annotation_Type_Optional_Member_Summary=\u53EF\u9009\u5143\u7D20\u6982\u8981
-doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9700\u5143\u7D20\u6982\u8981
-doclet.Field_Summary=\u5B57\u6BB5\u6982\u8981
-doclet.Property_Summary=\u5C5E\u6027\u6982\u8981
-doclet.Enum_Constant_Summary=\u679A\u4E3E\u5E38\u91CF\u6982\u8981
-doclet.Constructor_Summary=\u6784\u9020\u5668\u6982\u8981
-doclet.Method_Summary=\u65B9\u6CD5\u6982\u8981
-doclet.Interfaces=\u63A5\u53E3
-doclet.Enums=\u679A\u4E3E
-doclet.AnnotationTypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.Exceptions=\u5F02\u5E38\u9519\u8BEF
-doclet.Errors=\u9519\u8BEF
-doclet.Classes=\u7C7B
-doclet.Packages=\u7A0B\u5E8F\u5305
-doclet.packages=\u7A0B\u5E8F\u5305
-doclet.All_Classes=\u6240\u6709\u7C7B
-doclet.All_Superinterfaces=\u6240\u6709\u8D85\u7EA7\u63A5\u53E3:
-doclet.All_Implemented_Interfaces=\u6240\u6709\u5DF2\u5B9E\u73B0\u7684\u63A5\u53E3:
-doclet.All_classes_and_interfaces=\u6240\u6709\u7C7B\u548C\u63A5\u53E3 (\u9664\u4E86\u975E\u9759\u6001\u5D4C\u5957\u7C7B\u578B)
-doclet.Package_class_and_interface_descriptions=\u7A0B\u5E8F\u5305, \u7C7B\u548C\u63A5\u53E3\u8BF4\u660E
-doclet.Interface=\u63A5\u53E3
-doclet.Class=\u7C7B
-doclet.AnnotationType=\u6CE8\u91CA\u7C7B\u578B
-doclet.annotationtype=\u6CE8\u91CA\u7C7B\u578B
-doclet.annotationtypes=\u6CE8\u91CA\u7C7B\u578B
-doclet.Enum=\u679A\u4E3E
-doclet.enum=\u679A\u4E3E
-doclet.enums=\u679A\u4E3E
-doclet.interface=\u63A5\u53E3
-doclet.interfaces=\u63A5\u53E3
-doclet.class=\u7C7B
-doclet.classes=\u7C7B
-doclet.Error=\u9519\u8BEF
-doclet.error=\u9519\u8BEF
-doclet.errors=\u9519\u8BEF
-doclet.Exception=\u5F02\u5E38\u9519\u8BEF
-doclet.exception=\u5F02\u5E38\u9519\u8BEF
-doclet.exceptions=\u5F02\u5E38\u9519\u8BEF
-doclet.Package_private=(\u4E13\u7528\u7A0B\u5E8F\u5305)
-doclet.Nested_Classes_Interfaces_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Nested_Classes_Interface_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5D4C\u5957\u7C7B/\u63A5\u53E3
-doclet.Methods_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u65B9\u6CD5
-doclet.Methods_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u65B9\u6CD5
-doclet.Fields_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5B57\u6BB5
-doclet.Fields_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5B57\u6BB5
-doclet.Properties_Inherited_From_Class=\u4ECE\u7C7B\u7EE7\u627F\u7684\u5C5E\u6027
-doclet.Properties_Inherited_From_Interface=\u4ECE\u63A5\u53E3\u7EE7\u627F\u7684\u5C5E\u6027
-doclet.Annotation_Type_Member_Detail=\u5143\u7D20\u8BE6\u7EC6\u8D44\u6599
-doclet.Enum_Constant_Detail=\u679A\u4E3E\u5E38\u91CF\u8BE6\u7EC6\u8D44\u6599
-doclet.Constants_Summary=\u5E38\u91CF\u5B57\u6BB5\u503C
-doclet.Field_Detail=\u5B57\u6BB5\u8BE6\u7EC6\u8D44\u6599
-doclet.Property_Detail=\u5C5E\u6027\u8BE6\u7EC6\u4FE1\u606F
-doclet.Method_Detail=\u65B9\u6CD5\u8BE6\u7EC6\u8D44\u6599
-doclet.Constructor_Detail=\u6784\u9020\u5668\u8BE6\u7EC6\u8D44\u6599
-doclet.Deprecated=\u5DF2\u8FC7\u65F6\u3002
-doclet.Groupname_already_used=\u5728 -group \u9009\u9879\u4E2D, groupname \u5DF2\u4F7F\u7528: {0}
-doclet.value_tag_invalid_reference={0} (\u7531 @value \u6807\u8BB0\u5F15\u7528) \u4E3A\u672A\u77E5\u5F15\u7528\u3002
-doclet.value_tag_invalid_constant=@value \u6807\u8BB0 (\u5F15\u7528{0}) \u53EA\u80FD\u5728\u5E38\u91CF\u4E2D\u4F7F\u7528\u3002
-doclet.value_tag_invalid_use=\u6B64\u5904\u4E0D\u80FD\u4F7F\u7528 @value \u6807\u8BB0\u3002
-doclet.dest_dir_create=\u6B63\u5728\u521B\u5EFA\u76EE\u6807\u76EE\u5F55: "{0}"
-doclet.in={1}\u4E2D\u7684{0}
-doclet.Use_Table_Summary=\u4F7F\u7528\u8868, \u5217\u8868{0}\u548C\u89E3\u91CA
-doclet.Constants_Table_Summary={0}\u8868, \u5217\u8868\u5E38\u91CF\u5B57\u6BB5\u548C\u503C
-doclet.Member_Table_Summary={0}\u8868, \u5217\u8868{1}\u548C\u89E3\u91CA
-doclet.fields=\u5B57\u6BB5
-doclet.Fields=\u5B57\u6BB5
-doclet.properties=\u5C5E\u6027
-doclet.Properties=\u5C5E\u6027
-doclet.constructors=\u6784\u9020\u5668
-doclet.Constructors=\u6784\u9020\u5668
-doclet.methods=\u65B9\u6CD5
-doclet.Methods=\u65B9\u6CD5
-doclet.All_Methods=\u6240\u6709\u65B9\u6CD5
-doclet.Static_Methods=\u9759\u6001\u65B9\u6CD5
-doclet.Instance_Methods=\u5B9E\u4F8B\u65B9\u6CD5
-doclet.Abstract_Methods=\u62BD\u8C61\u65B9\u6CD5
-doclet.Concrete_Methods=\u5177\u4F53\u65B9\u6CD5
-doclet.Default_Methods=\u9ED8\u8BA4\u65B9\u6CD5
-doclet.Deprecated_Methods=\u5DF2\u8FC7\u65F6\u7684\u65B9\u6CD5
-doclet.annotation_type_optional_members=\u53EF\u9009\u5143\u7D20
-doclet.Annotation_Type_Optional_Members=\u53EF\u9009\u5143\u7D20
-doclet.annotation_type_required_members=\u5FC5\u9700\u7684\u5143\u7D20
-doclet.Annotation_Type_Required_Members=\u6240\u9700\u5143\u7D20
-doclet.enum_constants=\u679A\u4E3E\u5E38\u91CF
-doclet.Enum_Constants=\u679A\u4E3E\u5E38\u91CF
-doclet.nested_classes=\u5D4C\u5957\u7C7B
-doclet.Nested_Classes=\u5D4C\u5957\u7C7B
-doclet.subclasses=\u5B50\u7C7B
-doclet.subinterfaces=\u5B50\u63A5\u53E3
-doclet.Modifier=\u9650\u5B9A\u7B26
-doclet.Type=\u7C7B\u578B
-doclet.Types=\u7C7B\u578B
-doclet.Members=\u6210\u5458
-doclet.SearchTags=\u641C\u7D22\u6807\u8BB0
-doclet.search=SEARCH:
-doclet.invalid_usage_of_tag={0} \u6807\u8BB0\u7684\u7528\u6CD5\u65E0\u6548\u3002
-doclet.Field=\u5B57\u6BB5
-doclet.Property=\u5C5E\u6027
-doclet.Constructor=\u6784\u9020\u5668
-doclet.Method=\u65B9\u6CD5
-doclet.Annotation_Type_Optional_Member=\u53EF\u9009\u5143\u7D20
-doclet.Annotation_Type_Required_Member=\u5FC5\u9700\u7684\u5143\u7D20
-doclet.Annotation_Type_Member=\u6CE8\u91CA\u7C7B\u578B\u5143\u7D20
-doclet.Enum_Constant=\u679A\u4E3E\u5E38\u91CF
-doclet.Class=\u7C7B
-doclet.Description=\u8BF4\u660E
-doclet.ConstantField=\u5E38\u91CF\u5B57\u6BB5
-doclet.Value=\u503C
-doclet.0_and_1={0}\u548C{1}
-
-#Documentation for Enums
-doclet.enum_values_doc.main=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n<pre>\nfor ({0} c : {0}.values())\n&nbsp;   System.out.println(c);\n</pre>
-
-doclet.enum_values_doc.return=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F\u8FD4\u56DE\u7684\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4
-
-doclet.enum_valueof_doc.main=\n\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u3002\n\u5B57\u7B26\u4E32\u5FC5\u987B\u4E0E\u7528\u4E8E\u58F0\u660E\u8BE5\u7C7B\u578B\u7684\u679A\u4E3E\u5E38\u91CF\u7684\n\u6807\u8BC6\u7B26<i>\u5B8C\u5168</i>\u5339\u914D\u3002(\u4E0D\u5141\u8BB8\u6709\u591A\u4F59\n\u7684\u7A7A\u683C\u5B57\u7B26\u3002)
-
-doclet.enum_valueof_doc.param_name=\u8981\u8FD4\u56DE\u7684\u679A\u4E3E\u5E38\u91CF\u7684\u540D\u79F0\u3002
-
-doclet.enum_valueof_doc.return=\u8FD4\u56DE\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u679A\u4E3E\u5E38\u91CF
-
-doclet.enum_valueof_doc.throws_ila=\u5982\u679C\u8BE5\u679A\u4E3E\u7C7B\u578B\u6CA1\u6709\u5E26\u6709\u6307\u5B9A\u540D\u79F0\u7684\u5E38\u91CF
-
-doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/glass.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/glass.png
deleted file mode 100644
index a7f591f467a1c0c949bbc510156a0c1afb860a6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl}SWFRCwBA{Qv(y0|-RU-){({%7EAb
zhy{T7ArP+x;@;(nj_(+707j4jK+Q=&_Dmpt1jH+W_!SWAfXoHr*Ffw7G~^Ce10v?_
zGXv7cfOshorvVlIgh>JoRsvExf%rEN>jUL}qZ_~k#FbE+Q;{`;0FZwVNX2n-^JoI;
zP;4#$8DIy*Yk-P>VN(DUKmPse7mx+ExD4O|;?E5D0Z5($mjO3`*anwQU^s{ZDK#Lz
zj>~{qyaIx5K!t%=G&2IJNzg!ChRpyLkO7}Ry!QaotAHAMpbB3AF(}|_f!G-oI|uK6
z`id_dumai5K%C3Y$;tKS_iqMPHg<*|-@e`liWLAggVM!zAP#@l;=c>S03;{#04Z~5
zN_+ss=Yg6*hTr59mzMwZ@+l~q!+?ft!fF66AXT#wWavHt30bZWFCK%!BNk}LN?0Hg
z1VF_nfs`Lm^DjYZ1(1uD0u4<h+6721i2zbdgk+VN-#xwu(wIh)0Z>CSIr)XAaq<Z=
pynB52BgqCp4Jm;}@p6Cw0|4^LpB(^sAf*5R002ovPDHLkV1hXO#b5vc

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/external/jquery/jquery.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/external/jquery/jquery.js
deleted file mode 100644
index c5c648255c1..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/external/jquery/jquery.js
+++ /dev/null
@@ -1,9789 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.10.2
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-07-03T13:48Z
- */
-(function( window, undefined ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//"use strict";
-var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<10
-	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	location = window.location,
-	document = window.document,
-	docElem = document.documentElement,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-/*!
- * Sizzle CSS Selector Engine v1.10.2
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-07-03
- */
-(function( window, undefined ) {
-
-var i,
-	support,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	outermostContext,
-	sortInput,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	hasDuplicate = false,
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
-			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
-
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
-		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
-
-			return compare & 4 ? -1 : 1;
-		}
-
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val === undefined ?
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null :
-		val;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
-		}
-	});
-}
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function( support ) {
-
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
-			}
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})({});
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
-
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
-					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
-
-						name.toLowerCase() :
-						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
-
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
-
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
-				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback, allowIntersection ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	},
-
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
-					}
-				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
-
-	ajax_rquery = /\?/,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	};
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
-jQuery.offset = {
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || docElem;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-// })();
-if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-	// Expose jQuery as module.exports in loaders that implement the Node
-	// module pattern (including browserify). Do not create the global, since
-	// the user will be storing it themselves locally, and globals are frowned
-	// upon in the Node module world.
-	module.exports = jQuery;
-} else {
-	// Otherwise expose jQuery to the global object as usual
-	window.jQuery = window.$ = jQuery;
-
-	// Register as a named AMD module, since jQuery can be concatenated with other
-	// files that may use define, but not via a proper concatenation script that
-	// understands anonymous AMD modules. A named AMD is safest and most robust
-	// way to register. Lowercase jquery is used because AMD module names are
-	// derived from file names, and jQuery is normally delivered in a lowercase
-	// file name. Do this after creating the global so that if an AMD module wants
-	// to call noConflict to hide this version of jQuery, it will work.
-	if ( typeof define === "function" && define.amd ) {
-		define( "jquery", [], function () { return jQuery; } );
-	}
-}
-
-})( window );
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index ca17cb753b0a2ddbaacc849d284e0bf7af05428c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F1SA+{?>A)!QcOwS?k)_>#w|r1Kptm-M`SUO
z_5fqIli7AahM1>|V~EA+<Oo)Fp2cSZpJ^0N@zfJ$;PRZI9~D01F;InSiEBhjN@7W>
zRdP`(kYX@0Ff`RQFx53Q4>2&eGB&j`FxECOure@kD_zcvq9HdwB{QuOw+3?!`Tal*
N44$rjF6*2UngCl5GAIB5

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index e6a4176cf0b34674a44540e9ec03e5387ba31308..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F2qYNp$opRhQcOwS?k)_Bce{j_0C}7R9+AaB
z+5?Q;PG;Ky8A6^ejv*T7lYj6t@hpC#;TbB#aBAWwna#KLs)4eqC9V-ADTyViR>?)F
zK#IZ0z|d6Jz*N`JJjB4<%GlJ(z*yVBz{<eDt#mmviiX_$l+3hB+#1X^<o5$LFnGH9
KxvX<aXaWGO%QFlB

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index 0a084fd9377e687b7935fafa677439fc550120ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fC<Rju*&f~kYY>nc6a#?2AmP!?*K(O3p^r=
zfwTu0yPeFo12TF&T^vI^j=w#x$i?I+((tf;UXnmgbH|3oY>pC!)f}(GR!16S-u+#{
ze6YEqRkW=8vGl=5qArKM<9}TC-}iEvB{zdaTcX5$wyRTK&AL<j?Oogl7O%t;J!=h;
z-jz8yK2Z_Txf?iR!y=`46O)gZPw?Ar2`)?)dsFGUcbn%2mT)d+n{3Ay7yfr=9yaKa
z|HNjKs1n@qrcw{+Fx3**h?11Vl2ohYqEsNoU}Ruus%v1XYiJ%~U~Xk>YGq)oZD3$!
kVBl7|oEb$!ZhlH;S|x4`<{I+*ff^V*UHx3vIVCg!01$+91poj5

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 5b4820997690be6470e5c64b8cbd793431dd4ad3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^j6gI2NH8$CE1Q=ADW)WEcNYf6yIsOdfIQ9ukH}&m
z?E%JaC$sH<3_(v9#}JM4$r%X}t&0mp9yKsb%{ak$*<@oTP*SzTHKHUXu_V<hxhNG#
zF&G&bn(7*u>KdAd7?@ibn_3wdYa19?85p>gE@wv3kei>9nO2EggSm$MexL>hPgg&e
IbxsLQ0Lv~h$N&HU

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index 820ef7b466d5bff53a862ba6d7de69f5972dbad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&0LWmFTHNUZq?nSt-Ch3w7g=q17Rci)@Q5r1
z(jH*!b~4)z#PD=+46!(!T=8puqDZgOs>RXUCGx5b?-VBQkUm|IuXOmYJrBRJgj{Vx
zMbNnqUkncy+qa2-mWYc>swkcIuvGK#>(0d)B7)5f`@$Ei28nH~0h*~=;u=wsl30>z
zm0Xkxq!^403{7<nOmz*-Lk!HVj7_Z!jI|96tPBj?N|!UEXvob^$xN%nt-)MFem_tH
NgQu&X%Q~loCIBP9O%DJ7

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 26770496a2d27e0b8f5d4d4a067f8f3ff20dfc55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&0LWmFTHNUZq?nSt-Ch3w7g=q17Rci)@Q5r1
z(jH*!b~4)z#PD=+46!(!TrvH)L6@80)r*_cdCvDr%)6ghVL16=s@mbz7H!uRdGeDa
z?kzLg)16i!f8fKx84s0>4<FykGyjQ%on+slKo=e+hF*tnDhzt2`9L#OOI#yLQW8s2
zt&)pUffR$0fuX6cfvK*cd5D3zm9eRnfw8uMft7)QTj_FU6b-rgDVb@NxHXt-$nOVg
OVDNPHb6Mw<&;$T)4ow{Z

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index 671bc6bf9b27f6c645ba8103d0b5b441eb9233c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fC<Rju*&f~kYY>nc6a#?2AmP!?*K(O3p^r=
zfwTu0yPeFo12VciT^vI^j=w#>k(V)1qW$CZ|6)SVV-&*#dav<$DMuV&n0Dbpw@a<C
zL<6s0+7G*vvYqejST{BX?76zWVpaQ=iZkzonHi23$~?b)VOyyz)5%$db0%#{6W6}<
z!ED#MUb*PGy)jD<wKpxEbn*J^@Wmk}MQ?XX%rvu-j19ArkbS1Zt0D2{=$6M8=lCm`
z+;uflX3ggWIZw63HKHUXu_V<hxhNG#F&G&bn(7*u>KdAd7?@ibn_3wdYa19?85p>g
gE@wv3kei>9nO2EggSm$MexL>hPgg&ebxsLQ0D!7;1ONa4

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index 368044d43243216e33bf55bcf195fe271e57a7ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^j6j?s03;ZUuHXC*q?nSt-Ch3w7g=q17Rci)@Q5r1
z(jH*!b~4)z$cXZEaSV~ToLo`U+vu0Ue0cG9p8hWqa?gxxGLm=1A1u)Cewe3oSeCaf
zI$k30UHXoTXA5lSJe(zTc<N)G>E%W-S*bfB&J`pw9sa4-R?IGW?p~6`>jMSP&M+u3
zY@9al)zrvpHlQu4C9V-ADTyViR>?)FK#IZ0z|d6Jz*N`JJjB4<%GlJ(z*yVBz{<eD
it#mmviiX_$l+3hB+#1X^<o5$LFnGH9xvX<aXaWHFZdmpJ

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_222222_256x240.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_222222_256x240.png
deleted file mode 100644
index e9c8e16ac5e7f61c843fbac290ce30c5de7e40b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6922
zcmZ`;WmH_vmTkHN1c$~6PLSY|#sb0J-5r7l4-l+z2m}f4?tFL%PU9Z51HqaEx5g#t
z@MPA!_h#lt-E(W*b5`Bjwd&M9yQ0-q<!~@5FaZDnj)J_jCIEo)^a?nB{_N=~lj|=2
zWPp}Ra?$|$phL?aPdyA*c>|9pEC2T<JL32j0H9!2ke1N)Sv<_~v$Gir7!tGXd{Nuc
z?3dES1AeuNUU8d$V4}q2=60g9^x6^K(q1W3lSRHckwWsYU!6sv=Y!&oS^dhh*%}4i
zC2`<;$zq6ogDTCJdV4~-QwO(wCY(SC293<iN+gZDK66=6_WZceneg^<m0t-TLdNe%
zwA**mC6LcHu=|gSD`h;>IxHV+jYr=H%}!7RG)%@|?KBm>pyGpu&ojtW_wyym4g`c9
zco$2c8`p{vTVxgda<gZ?J~DwE#t!H^&%<awDT=2VY>l_?TR2q}t~bOfL?S*Jz>-hj
zej%U-ol64Z=H=<4vts*B%Lz$=z-A~15GXb3wI}HLd?o-|{AomRiY`p@EGlXSgLObn
zHiI+BXw_n(p}o|pYMok=31u8OMO?~bm-n`CS;fRowPbbSwTgu0=*7l(0v$^yp&hkM
zDNj1Y0bXyV)+53{VIwdGW4Fo5{;9<>33wL<a>?Z3XX8uv#Z=U!_NVfTGUbDr4v}Tu
zR`?wX3hn^0$(t{SX1-GeGS~e&#-4Kh2MVt#b5SU8CjmH-w$O;aCD6t?ZrfdZEbk@Y
zJqZfG&3O7WH7q-{({FD9v;hC5@$-r}DY+5dbrzbDrH+tT&pfKJUur|7-n>I<<=u4E
zqp>W4q^FJ|m<yC|_(fMpmIkO{+QJ^l%j<VxZi^$^T~H^y{2NZIF$K)>zJ;N(7*VMG
zU2BTU<l6%HV!pDfA5f<$m??a}ZV8m0KE@RECDYHV4kgqjyX_JX%K6Co^oOr00~yNy
z-x*|uZxi6UrgcA<+V7syRFigcedZnphy4I+>!JR%!p+}0CBhHUm_PbWLt8EWDyGtR
zVU)%zz+8FYJEe|QI~>NS9o>Rn3~1g%$0eQ`!lR@ZF2O92__?mx1rtva8{14&Kj1L0
zDaZ(xRC21rv8=fJO|)hhkn=UJGcknv`SnzJbkjtkmm+>?J%~|f+$2Sbx8vOAIgY2t
zqQT*KpE$b>z=kxqpl_!>-2K;g2dm}3JV23iDpVU^-or__aU{~34xQEW(|mEprL&b-
zAQSAsLrN#rJ|@c*=_coAKi$0zq;<n{1`a(dp4q&FX6;me8^xh4QSKfkBSWn=Y73T1
zujE#n-NH~OzshHtTI1dUA8g*S^<TUR{>K9IiTC{?&;K{{PJd1H8|<x_U!kw6wKPFv
zWSa~{mVVmJ8!OUTK{w2kW7@AAaHig9D~;*8e<R^;&75d*vnsKY`#8Fh*M)19VnjQh
z0#>KNh0y%+oVJU9m3t9~>S^EF8ZniI_zTt3H+C~_J}%``4jjf5yho+NMLCrcAJN*P
z^^L0M2Nk|oV{v_&cv{>_czfr@d)!?(MX2RGno!%Jx$h65%CqQ#<OTzaYAt>A0d5;|
zSSLyd*lk78{Jmt_-J$L6#h)e1B{JA5+7@mTA2cKQHMTmEgVqts${HgsFO~C=B_Q*(
zHl%u4XCA+FdC1CvH?&IhdHSiEW#v4eIhhZEQ+hV>M>Dkvof`t}fb!@dj0LrbRqUg5
z8nXf_+F;+Ir4&w^l=4m~sy#TR$Q8xfPB%72n=*iaN9EKWeXj`CkLbf69eW>JCVDPZ
z7L|9kyXOYG(A0Zx(eZiSb@JFFdT6i-rdyVPce<|Y|A~7p%E!+Vm5pq)E_mjl3TB&{
z7xkGp$iSk&UEtWes|0wb9iDlJf)%nsDc$a1kP0__Pvgop<&Te#x#)w#k-3S#)*eW*
znUIBK40-si<tGdE=jso)-}Yts(qDgQUI^yTzSb@~d`(4-lT(g_tPq#a1B8n}ja{r+
z6qRHg(hNiI`Ae=W@PAkCV=0R0Y*vjT0vmi;5_zE2EbKwS{+>M_X970Y(XHD$9MH=f
zxxGx(wa4Z;q^W3V0>lRag@tvPcuViWb!<la-{XR5CFa1A58B~76D+!$v`X;>iG;t2
z5-KFMfg<4J#MU$lBUwKHsdM*=Xc&102XwKxclrG1%i=4}FJah<ngjScI1V?!ufqD@
zVo^wKD&7+;VA)h<!7bt8rDOD9DU8cC8{SoF@xiI6t(6c2M)GtW@(O#(=RY#o&@qp=
zqdvbvR<H=DWw$|vHESxm5^K7!ovqd~^fHwDHOn^VstPfmVUdUln8}{JPsht3&w^$J
zV2aKQO82gqXkQsAe?P6$AfEm{xpERIQyBCbXBytG)}`Z7$*GukN--7?6^ml+eI#Rj
z<C-&e4y8ptINO-Mo2HI_aF)ffwM|-v{~04e{iD6SEcY6BWV)_;WSqLzIkUR>wrX;H
zNwp>$UiNsQ3MaH`j_r!Cf!2nGp?oQYWGDyw*oRPD)Jji};0ay%lW)Y}e_~utKE<_L
zAW#===qs>H+NFwJaOrgI)RmNr*QaH#W&q37EwXhR=bE;rxBx~wP_0#}8%G*VMyw0t
zOXoQ8i8jP(H)=AY#xJECZlA{!*{lM`Wp((OZTS&YORwOY5MEdRRM@+^ANnn3WENTU
zA3<jn`M4B5mk89pE!tl18BVKfPZa8Q%>O<bo-#*$9+^4)ihcTy(ha&0<>QOy5)T|{
zY;G!nWz5+Wt(#<-Sr@5cgAv1gCuY^U)Ic+>!QAozYINV2tObk6EFYy2AmNW0n)r&g
zKC+K(98CT!SCiRNi%Qcy2?^*e&zkhXK-*gD+1)epREUD@_8y6#qo9GdvS=?m7pBQ`
zkL)xGZw}JHFBf3X*09PMs%@LyD-6@bK$<NkelnB~c4q;rbInj;JW|`4n=CQsG)p<U
zhSYCxo)uv=!9QR?Ri;S`BWh?hZ#XViCNQ=b@d2|*CRaQjLO%p1;KwjXa@V)gv<x1h
zT!~8ypOIl4A3~UiF~Fq9pSQX97Ki*c%oI+W%%W@X$<*uxyf`Vdi=ZR<13nJ;5WCbA
zxjxyrh#!evzwMLg3kr~Rm*8O-VTF1HqiPq41-<>YKo{x5a39#&fGyXO3w6XU>6jJg
zQxb0!eyd)r8P}79d{lXm@XwyGF;M~{Y|HRvIVJl6MG<qJ>u643K(3krt#!mUF&&tM
z<wH=IF0xU-?L{o3^BDsY(4}BR9z>-{qM2sSo2s1@j!}h>Z+rA6Pc(peiB|1BSb{<f
z)Mc!;br>g@P{1VOv-kb2MJ5|L!vR}v>GSI@0<7h7Ey`Iq`4cv)8v39ONQF*(#v*Db
zNB_~;W^ZHpEvX>TpNcjEwqgc~S;?zigBbTgVqHJ$%9~EWjd99l7Ya*mEn>GbEF!ic
zTiJw8JQJ^ti0A(>+*#ha6svdftjY|(XtMW!CU}#pC^AEGg0!z^e{u6KNct<Buv^|V
zc6{zeG5-XQQosM)tUo~Dn0-Vpx%d)BW`rMq&mnWBChtj%b?1-dLr71v*c1L0Wi51~
z$}jH2wUF;z$5P3#=Is!nzU0{fp64>mD_L=|1h_F85eW|<ANfp^1Boq2qPHNh;@^;3
zY^t@K)=7Utnf;j1YGPBAMwy1|m)**Z9H(nly=DX+?3jqE@Tv8b<biM`4HG&6A*>d&
z+iZ@#_$CIQXazAg$AB$+7?7Q|`Sca-nC$sw5+|$(DDuQc{)a!^hpV0Kx)WHV*$GjO
z|LEJ?QV~#Qf$SxPaJFBkim9;NXMLaE_V9$4CY5uDt)dIV@{AVCq{`geO@^4SpUoRc
zPVkO7ol5!RI8EDt^|cnZYF*_zKo{IflvWA_^?@N?-+@@l++5RRzEjGcx9-;pT`$Bw
zYqm3fyCB@{Bh2RL_l6IB3$|M?yE=cV3>a6u#0604l9gb^&P;UI&K6>^A3r<GM&0}q
zZQF|D6K5vSgmmi2cs;~g8;y<c6;!Ok)*wFYgA@t)xzty57Dlt__I7k#1jdkwmT8`2
zpNc6gda_f-ik`N=)IH(X+W+by+HCe((9R<x0h$z^(-n(Lwo~gGE=8#~leCowB2j8K
zmo$-wAJPYO<%gN6Bdb*#`zgmf2}56KP-Q!n)$kaMXvEmD<^P~u9c2<*L-^#7LWFxT
zexzF%RL%Sq+Py7mTs$H3ev{^FL1E{4b0X)F!Dvfi9kF6UY?ln9m$m~WXES_p@waRw
zGvEqTbaK96`Njy8o$_IJKK*sN*G}C8ze$^uBcAs?Uw7ZP^v!*CB5YyW-3Ladn+BXa
zBmb0H|Ik@~1N#;?LUUo7j42SXW@ZM@P2cL8m(9yRkgJ=}JIMWGgOLNrvBF!1`v>ei
z_AsGQ4Ph7qJMYk+^0a=4`12DAaYopombf^7U%29p-_H&Hu0FqO+@n`^e<dOH;sf1i
zOum*zQI30}h9-;Lv-w9c|KV0Uwdfio|BMyQpP$*sccXLHFRwQ=xwZOya?1(-O?C0t
zPkYR@KtrJlLt{|73*O{{TH)r`;G4vGn+Th@!9pV!yz)M4i?}3m*z&!*j58C#(r8)G
zI014U4Y^M7kjw{m&ZZee@c*796fLn`2{P5%g8N{~JER`1Iop4FN+4L!ZRk?efFI|h
z9nvhNXp<2t`04EPds(7FVu2uEzx49oH%PTrAh>)LD62&Z84yk<jUE|);2NBP7odkl
zAoWtzH|5zZQQ$9Nw=KhRKEU*CE};p8!kht#FO)OpPfNx#d=+q&=URw%FscpNQVM(N
zboU?!5Nla;>M?K4rp<b6k`S})?hRhnY`XBdkmFUKHWE@7<s3Y4*3x@)LJY{wA0w8D
zl7qJT8|!%;k6d326(M%SO_i^nH3DQv&M%*em3h>E-FOj2zS#H`pWk3AGV5%vZY0F1
z&VL&c0mopw@;XD4Qf8}=H2Iu{Vc9X=d9#KP5u$xsT}<}l7uBv2d>vWdXQF`>_<RmI
z@k8DHS#b>6zd>Qkqko0@L$$)M-(3;=I!1JeN+rI>;xQSPDrF{CFaxPI^sok@u+J#M
za|fi2jTJ73_5xC67LB)FzWAh)!m=%c+%oP!)FAN02CIm?G2@F7h~Gn>I;UiEEu;C<
z);%{mKeh{tOdolre6l`Ubu6F4{op|tGN=Ad<=3cywRTiuWg{O(T@R}k`<aBH6Ps!;
zHgyaPt<fo8vz*EAP~oadyGCwZ?JMhzO5ix|o4fRH$>(MIXtG*44-UH&+4)(f(HhC1
zXsTq@i1&P?`-bqFAKa=oz$VRWlUTm*f{!U8!!N~$vB$ElIJZ0-MPoSq2y8Z>$Os?-
zGitN8Lb*rCC$GeItn-ey9Ac6UJ+857Sgm5CLje5}kRry*T%TnPML@s<9Yg&9Jc>75
z9_UG@JJPA!V$7TfAcPr|@Es-aqeJt6yVLvzFUY(eR}|GGERaSJoA{bPCayxFF9gc6
z^N|sr=T+@yO}@iNU&Th$wC-VJBDztJZk!3#RCDb&k;!k4YXrXpK0LoRkco;%sq4p9
zqSP9OCLHKHxQVL(9&zrHL3fl~$FAr4$$+J%-=#(cT0I+BR?h`OnYD2FF^**(Xzz2s
z#U!<x!GoDw&8{zAneuJaSk~FaK0Jf68Diw0(G$5Vf22M&lmJGZGRz#N7=f0t@0bB%
z<Awr+e$IwYXGF8rQyS^gHf*L}CtXe|SfvwgZA&ZN7oy&9-Ez|JKFG^14>p1!yAQ8q
zF_PD>c=N0{AM_3a7t9mUp^?$L6f#bY6OSkSHJZ6=c};=~Evb&aDUPk24+w1dPxB>;
zHCbF&kbo=5)dNhQ1*Cr@omSHHWAO^|I5C1T@)P0Udp&wAPqepw9%h%6p1ZG#IOnP#
z{uXSe?kNT%HP|H3^^N89$WH*`M;j3TK;=ta4?i2?JNb2U@R(s7rOV3j1>qa@j@KcH
zJlr;{VG$<Lg_b#8n1%UZ+saV}i637%XqL4bqv7EBCN%h=BU>cF0|Rt*46bb~aV|-q
z73E4Wdq=&cryrwo%JgSG+kUsHH$wBn&on#@&z-V!vo&}R{c2AiEHqO?WQ-+-$LQ;|
zSzsy5l3p8|_9Ndx<cbIC-{^T}8P;*a+CMAK4RUkCeXcvz?`4_AXR>MK)PB!T>0P7k
z&0CLgF@ySTJ=Bov9-*8aasg4`HBXV7GNBwSFWbfYpSUZwDVpY=r`DKG;QAq+)te2G
z3jx&_i{~qs7fS+B*mZzdUd0prA#xjI_$&supo1tyP>sGKT!YLB=Cpj>xaiZ2&;OCd
z7@~3TTVdi#^s^JD;Do?PT*OL`OohekdMverH^CeOJu2iQJPN++A9PQ@_?i+-l31q7
zsGebe^Uz2N$&&Im!nq>i#lZi3quVjmk&ofh?(5xyFQC{RbF-nue6Q`*?X*_#){G{@
zK6VgEs(n5yGLa=RVXuM-b3K?mqz0qy^q&O@{4h|_%MO1OeV8r4a$+ILh@P7F>Sjy*
z`NPx!G`aDXuVsN(6|i63h#SzB>Hv^01!&-CYDW(j*2dAsem{P{o%?R3<|we8Z3{o$
zD#M;c1M7HJ1P6B8TCQRtdbsTW{Digg;=Tbh>ZLgI{R((4_UG(Sikptwn^Z`kcz&IY
z0+NRJ^MlZY_n%$*l{qZ6#K6QWkMt{#=`}~c-spzOmr&=#tG8Vx`41nE*dJ5BnDXwx
zM?U;=@oq53vM7qIZp5zz{&;QGv8O^S^(hKv?&=`g5=s3wuV{6Ql*moEnrz!8Ni>)P
z>1uAq3&nbGE6lGHHl(l1UYr>`$O|3n3Y$mc{};v-(f4;jf;K*GAnTFZ17Hz43@FgV
ziYF@6)04!;wB=B(dn0QU9tZzoF)5My#Ad3M^JND`IGi!5bS+h+B2$1^BL@Pt`IAbo
zD)j5t9t+h&e7A5eJdOfMt4c+KJ8IXSSBX?Fe}VfE;+FW({Smz{KLO_Vg}SY0Xr^yF
z1yh>@=f`l(!w&jrxu=|7G0z1wFqE5uJoW2WH~)%B^K257mHJg-(EIY$j=GMdObJV1
zRn|;yWG0Gk2CwO6bswvia-uxcDePIVR%08pf&{wJ-AYdv*)72*>^j5x#3UaM-E{il
zk~&2g5nB`XZu_S3SN{e)AjE5wOs_bC_`Ncj;;<uNWjQZ=3c<pC$31yU(C}5!cQ5w|
zr>$v=fvJIad(>fnQ|6AI{V&`SZ2_}CjpF}SlN#1n&An*VSa%egX%sCk_;{f35__sJ
zOE^+UR`2JCbE!`(`mV4sOQK%d_;w9jI>M$c5^Y3wN@(kv{fh7uACHiAg-*_{UV3Ox
zxp}8j@X_c)@`B5g4*{rYr=jQ7nnbQeic%Bgn-<sUD^siRxGmr;OZKSVh5Ui)J-(ix
z_Hh}NyQqt6=bEdDN|4mPnpojse-LZ@JvFBE_d+!QDZrBJl+@0nkUL~C+cHrojz=m@
zh?*m1c4^jSZ>hWX^W$9FWS`dwVo76vy%ts0>Zbh2UvGm^{MpxM@{%>Y143I($OJfe
zEv*E>MJ(+Tv`bAP4K~lx5gs3mEVZ?7tZYrBH;-V9J5Bx-)`^MLk$l_PRpp6?^F_wo
zlV%W&v?Ydr?*)k05&BBKTxMXpTaA6|Qmo%`o%)m6vov2j7OvRi9Z-kplQ`yu@^3=f
zFd6Ivjkw9pp-AQo&E};^*;RXBXsMp`DT#SIUOwl_*1H<SdEmUu)cI%>*_!HuuEZ?>
z5!DSZS)x?A%vwFV!O1iQO%o;fK9I(%<Y@R4CYB+xOga2q;sVnW-hL|cuJ|%P6^eN>
z$+BLxXIs^+|8ROTUlMBHcFokLkLgvLEWN5zy-40Pk>a#Pdr7^9HIuYjas)=?c8yXs
zJKg~<P#Wv{kJRN$<R7H~4~k2HBePl^;%c}R(b%;6^D(G((@DMpS@Ce3YDZeXn_ynZ
zJZ@c?%RA`JAz|@k)wIhNYQe2vF93a?nQo1__i>ZJkTHb(x7#`Et7pBoDc1#3##xyM
z3}}lJ#$VdHnRhOTxUsU!Ziv*)`uE55lnXMS3zQr&NjQNO(;olsf)1uNe71-LxfUTn
z><wf=guB1749b0OP=g(ctcr_@$2Re>)M(OJ_&>rg74}GVOS@^kx`pSzJb@RY4ShyR
zgpl6Y%~N}Ed?s`=A9k)Ga-YfSiz8Z%{}{sCRT<cP6SK+nLhPuclAS6cth-H5@pq*L
zRPP$^ZF<r2nBMG>*RI%FPz!@xcRbf2MJM9o#p_NqdNim~b;E?;dRhDlGrPjCy_vl2
z_70gh4;S<Pnmf5G`Ttnc2!ZGJf*t(-w>Vyo?cOaCAh=6SOzQ}en{jzFI_0%XEfx8j
zNWFIdL-nht-6wHKB=T~D9QGsl%>mhNv>zIk6IJ=yW)5w2`To@u?IeJ~`~XHE8+$%1
z6-iC^E)-)noXcFG{Fo*BHxaic9kEceQ2597`9X1NMmjE_^I4Ed+t8GRH6Y85>O-3x
z>h<URe`d>nmv8;jPzLWJ)VXN+#P0)|6EGy1ZcLFp{NzV|oH)>N!1@Uy-{QrJ#+3_B
zTly^uFUV;yC^X#J^A>qTXUr%*tpBT)vbR?ZQiy~%TFl%B;!F_^kLIfY`61qpq>rN(
zGq1E~?$>2+Qq4f;m`^g<OPJ3hWW-E}u0z*H)4Gs{E`T^@WaWrCnA$x3CG_Y41*QX>
zi@XO$y03_pVr*+*)_~0g%)f9}BCi~w)cNz^d^6ql=&8w|k8@#HcvG$iCMHlhwd2Rn
z%KB1{`F!7>?v5BeW%NC*Ej(?6t=w&%41kxL2g1S4$HBv+&GT9qA|%Yi%f`(u%+1YR
zVPExc0nRSg_V0ZE{{V^eY0{?v^1qFs<?_zc+rr%jAYtudX+x{vY+-AoX=7pS>o#H|
Q^5g_ikWrPcku(qaFX2Wbe*gdg

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_2e83ff_256x240.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index f2bf8388370920783b94285cb75827ce4b4cc1c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4549
zcmeHK_fr#0w@yL`gaFc{D^V0dT0jt_h7t^f4$^rEQj}g5g#baS(xnI}2(MH@h)9zn
zp$O6h3{7bfL3)uU1VTRa&U`cXhx;GgXLk0S-Pvc(?z1yz&UtKXc$0;Rp9uf}u;`+-
zO#uMlsSDU*q&uA_boCBTH&~7J%~4X3wErLfRY0J5#phHY>p)XOGXNjkH87)b>!WPx
zi?{rcu2_Cf*?yJ_D%_fA4E(%}@D&*|iD<c4e24p|!7fFVU~|I<TzPF#!t2sELe*ka
zV4lgPO(qD4F8SZv>3aE9Ub8Q5I;s1Fr`|n8{`2cJ2=F%MrZyms{v7&r0rf>&2b|hJ
zJ{q9Y<DmusoN?CG)-ZqYZQUN`G+D<E=|R6<&U$M99>ZDkcFg(n&&yxSR~su6zj=B!
z7A|uH*>BQlsX*L!-`H5IUM{a6X_BjqY{XC%d=Nks#?H<z1G<#5)(BM|6VmyN-28c&
zJg(lxT-x8kp((+}r4PCrk`S1YLly>9fVRw$pQY7V-8n`;H-J#D<W$2dxG+BNvp6<8
z4akRGuP-O-E;2JcopflF4450JxrKoJG$`cBvW@%A6ad?j!#;o!(%N&Dgz>p7{n{!;
zoScGT%oF%zObcvCO77SmyV$UtWUT!copFB4dE_K&eiX_Bnfp5`Pve~cFs%LR)&K(m
zdcm5KpKirZWW@5_y?@P4--<pRU=&!UCnU>zd%eDXBF!_~L|3IGp2!7H2QyzkN0hXh
z@EnU9yPkCh-Twur>ORhmMa{YS(GCGKTKAP8QGU~#pi?RSqDf1=TYV`9(zki;!L9`0
z!2fFCr|G6poHD?}IA3l{==(~lGugVI)Ry5|MVtg+UblwXLe(BwDTybz5zFbGGA4D#
zm{^>@0knH8Ff!QT!pKg%f+tpK90VG1o3$w^WWSSrM*_7RTL(Na_%s<2HK57(Ba=iG
z;jb)+4{lTQ{;CB&*+o8{_eX9$0$&9<z9Ho{t~L=bzZCjlpz}ZCOquV_W_}|Lpe34y
zr%~UIhsdV4@+sad6Q!VVmBBF!NfzWXNZQbgJX+SjK?Ya!9W|#`po6HH2bovN;sO;s
zXMYKAZC~<v<MJ+K?lPR9U}rVZ-;ICP+9^BDnH7d;|0*Kr%}S^ZxUC@}Sf~ACEtTc1
z2HjejMU3w9E-s#>!RQW{z`gY|d$}e)8cI+gK7=ahxdPuk2dsWmawrJ;2QWsD=7HV^
zhDaN|xWU^oGXPXc{z#0n#$&~IfuK)twCPs@S58~Oo^55S`qvpIhKT3jO(2Y%-K{D_
zSY33w_!l~feJ$|;H=|XqdfaeoN<uX#E@ig7Iw2;Lmj;6&u3oS9{Qs31U^YyBvv$Dq
zp^<LF+m94fF(#sF6w6>2ih*F6V8WDL4$!{r5eGT!LzDhCP95*1)?ruWy1qxxFz}wN
z6uJtQ`(7N6@8n?JDGr$v%k#F)g*;_C=_jC=I505l2H1pl+hnX{(J+*KGw-Z8um<C)
z+DwYf$<fCSXCLBPFXuAWc_%|1kHL&k_8Fm{39RvkJ)FW3OY${PQ8^m<rFvsb!v+QQ
z=i}^r3N4RyT>X@Z^>(P1?+*XcvNAyxeG<jLGa#097cNH!qb}&w^0wDW!MLhKZ<(P@
z5YAmeV&>fWJFry_MPXlwX~=_J&H8Z+HF2pQ4!FvZ@F4Sv)hxIRg?Bm3<xJ<u=D^dK
zFl#YMm%VrdFgz1PkX2Yfw+<?$1GE$t9kVgKG#KdY1n6<hEzqsa7?L4YYq-k&teSL2
zA0#_{x_M~Uq=`K&M394A?ql(!;q{BdA^B%|7@<q?Qk0v2o-ifh+-vmd`e3-nML&<y
zF$0$$u4WENzd?BdYqu(&Vm>B_+zC_jek=&*sYe5s5<<l`V6pm~AJ_TkqjWASiartZ
z-|roSTqv@YTWoqM;Ai5|fY|l2)px0@u5~C;c#}7e$VRHk@WZVT8o$5UM6VF1ESv-i
z&!SQ-;8Fd|AU3*u{lI@crmiujpoH{lD&^$3$u^snPe}BJSpUFXH7qEzuZRX^j)1ZO
zLHjHqjj|+Gv?hl>dK8(q<wXCCp2#&Mbjwc_0&veCp8K)A>tsM2W;kk<Wo!soWSu;}
znb`x>!+)V^>Eqo@;d=~*CQpi~<fKO=5NpN?LUm*ZVC_be1ir?}eY7}R0!z0iZ`e=K
zXKMZfI-JQ%$*6KbpOW`m&P;<Z&Er*`UW$b>Ig;n+J5?dX0%zn(GE_9&2Gpy;#_sEo
z8%hfcAeZukljD?@z=nVjZ7nvCTKf*?&PT7qe;OF`&$dT$l(v&dW<w&q5^&`gh6~R(
zKt*dJ<QmOTc+dAp6$g!^m+YGM=<^5n4%;b)qCief053OUoD#x#H~y#rEc0F$1E|HX
z5wrsyXED1c<USg{veVoGn>V1oCxH}!1yXoYxeVd%wR*6#Yp9oBh7e#A$`D5%<sEq|
z<mXR8{bHYK;#pSaV3?h%Iua_%C)&B6;u6ns4yW2xu-q8+POHkTi27zl=ug^|@mIku
z85y-HSFvCxDd?1C-`^$=p9hb`-6KqQP3+j@)h}99_MCK8v$bAW7i<14&*yb6O>4U@
zac@v|fT;g4_0Ay|y>fNWPRm&8JJZzVAIa{P&5p>t3ZzAj{-B6uCArK0o~jKC(?WmI
zdW-6<sn5UULz%a-mZ}7cIN!8x4@@p8yj8v}`XY9=cO2+#EK(H^vn}8eDObnV%DFiA
zTk*p{QHnq{V&O-R%+p&(JTObTg8Ta(?`0I7{i@%_n>QtmCZGiD{Xl3%=D8kf$>7HH
zO_EM_%_ehwH-;!gPTt<TQjzaZeVh<^hEKrAf90sof4#qCpK|{CMSccXUqXtYdHX-t
zoZc;7%s)?`LN7>s`Mtn9Wkkr}YqTU;dXDp#rD{>2o&-7FiYWFLAI%=}>AW$EsTU5j
za#ZtF%}c-vvZHt(AP>1qZ3nBorw!8`R<AmQtYqQ2daX-zP6Tiw4&gVIMH1Bh>D}by
zD|$w?oQsIWi!@>qA?!!&ygx<Hq?IYk%%L=qI=mv3dgY7ypp@goD?zS7C%;gVLf1d8
z`-n*QmtV2sDRq%h3#)K(Ia<e+WB@es_Zf@YRmGsrPmfHdv7tQ1wh2+?n9>cyCp&$Q
zmImn#xK^d}!o*@*51$#?f}Ckas*Bf9i=J%qSFFEYQvXG_RHKmUH4FHW#$z5HEWkBd
zER}0l$v7qTZ6_iF3+J(9L&XASw<7*#^!s?Ryex}K!57skgL~bW85=7p)Pv2ip%Qwr
ziiIQo*_=VZ`y8QmONUUZJT4+9Ab(f-f_lY9TiO+0pV7iJD)&I3*0tH8-d&_Xvq`I1
z?AJg_JC;aWxP3vw+4{zl>l(6z;+ccT`^_h1Thi-KDod*I^f2#lfz{?1wUM^+&%*ZI
z`Vi${KZ4#+TZVta_*Q$h?LH4jzMW)X%$Js9c@`w+)<FH>%kZN_??H3qTcWsfI>4!q
zF+I)XZim*@*JV%4kG^H+Bx`_G%slQjwAbFAMgdr)-#1=rv6&`u*Gjp(33vY)`(^C+
zB*~$-kk8-JQS-WU*5b3(d{MemqFGk}$d-sp`dz+Qp1~w74>S#rC?<;jkh3DhcXm$h
zD_qC#R#jrJL2!^Gj;-neW3H}4-?b}bbeM{%x<R!pLF@$_1|MF1cPDnx!gq}OK(p4n
zP8C#2kF)F@sIYs}YJqTgrYK`H9@T>h#^F5Kj2*tN3_k8$+>Z5pV5QuRAJw}DP+|O#
zWq8L{5ZuGNWv>buVHTyrgaz%(_VboV;|#tryvFqB3LLAlo85Mg4t`K#dE)|@vs}wZ
znJlt^!2(nJ_T;xYS)=O(1(U&Q<D3@$;B@seS3rXLKsWU#poJxq+oW9vLNo_*Vw++@
z8R6(Y4_d=7I*AbQ0K0`vU%Yu@`rz}CaCP1Os(b7Ur6!m(eS>9}ftbXNFye;a?#d`T
z2M@!O^4*7hyk3aO8+@m^Wf*4GtW4Sa?H+e{vR5e}51#=vyG0A-nEZ~lSMWeg-CCJ>
z6Fok9?q-XJfK@xk%Ppb!Yr=K)JD%3tt!oZL#SdPAO1r=_?x2~v8*!7^9bqN|sBLgQ
zLn$-no{>XvU#s@i8?F!WS4%1xJdE_taD5X62`FS7dvAZX%XJxL(Zve_%^9g(rBj|A
zg3<}MD60z}+ec>W?ggbv5yCd-CzXXe{A0mf1A9_aV6MVGx)&viEUP}kaC!aWsk>@2
z?QW5H=FGkY-@HnT2?KyS!?N@}1<1!4Zp0egiXXW*q+iw{Za@@IFWch5lR}b#9XcL?
zLm{s}mMC)Gc#Obqk&dL`op>#>skmJ&`CoQvLQ)_z(ey2KdQq8WEZm$_y|vwKU+1X*
z?(E+Jmi<`*2sh_K=h~V2bqV@dZDR5jCGuu74um(xvKbc_DQd}JMxUo@ME57ERLQ>Y
zn0$2bnI044AMJ?*=`-nrUf0wOEG(q13^PN3in*M~NR%2M*1PLm6rh<ei^JG3d?ZnV
z*6;g#l{pKajVd8@#WW1igb3_FIvb)6nAsE9kp$#Y7NUcEfNdQnotvfC!B10wf3Kz>
zaI*NRQuzyw>0mjaCde#U?2f`xi2rCn;g(rM-kneJ&oUWA`DdfTXd0Fe1Fbq}mw=#k
zLyL-jUb@{L(-w!;=PK6=eWf~$q7}Q1Y^#i%wLR1v%FkvC8qFIug$g7MP}lSzW_hLK
z&V?IZ7Msu2NtU7x_-|g}WO)9ud(AxIFiaH<*Byz_Q8SmOQbVrVpVwu*sfTm}ax5M^
zDfe^qS~JuE<4g+Ve<f`%A;dQ$U^R;<$SX6&Y$e8q`;k~y->~~hu~c^@&DcW10?qfv
z^?9H9y@vspU*;soonncFf<vN<pO-fF+OMvP$0A>zVeAPMu(y2g5gNKc-izg~Qb=9a
z>8<o1r%-w|h8F2&RzUoRnujqwwRT=bk|c*(Sz~KO((KA^{bvgO1JY=c;Zv!*NAzJc
zZ45(ak>U!`al!HjbD%2L*zKLbOb6-I$uGZFvZ>O%>+I^Z<9CQjGqu!aF<=)%d`0jk
zy&J-ttxq~j^W-=Rj}6h@SxvFbIGGg2Mtq3;tchRu;fa2<XDiWp2e>k+V=)wg_vJC3
z{V@8mQ_CK#2@Y;bhaZ+n@LAO!M&=JPSV3xC*+wFH&lTc(H#A0-&|fIaaF1ez;|AwZ
z2Admk1wKxpKCkQ-5Ha_iDN3e)9halVFZK(6l!=RDJmcQ|{mcAt<S~s%z_CC9>c9n<
zxaeu+Offpsowy<nZ4>5vl>acGXMT1z@!T-T`<U04^xwv8Qpf+EN(5O7{i)F>(BKn|
zf&Ur@``uLtcxW{=V|O-&-Z-=>{iK*aeR8tzStS1c`oPFI**G`Us~cYtQKtT3F5|?q
z8$z)`X3$nvX2(I5%_pIoAXaMCIxic3jJ7g?90D~Wm#2?)v=anr3^l|jIgdP>cuyPe
z%Yi7XKxfB57bPcums10fMaalYBCbiw$e7E>DaqeZl93fhAe0aYM44Op{~~z#IJ>z%
z{J#kryTd%E1in8J%zRt}gB<-`02<Cdw_V`6UXFKMOkEtEANuvUsGJ@G=%Ng@D>bo?
F{sUG;a@YU>

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_454545_256x240.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_454545_256x240.png
deleted file mode 100644
index d6169e8bf9389ab9b5b7d2c6f0c5fe3e4d363105..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6992
zcmZ{Jbx<76vhMDpfgr(y1`QHmaR~%lf_s1jw?%>l3$g?j_W;3NgS%T`aR}}Z9Kzy3
zmf&*v-FxcQJNKRU$4vKBbyv@PGu>13O_;i>93BoO4gdhaQ;>&f0sz2A6>yA={@BZA
zI!itZkeQMk1Rz`XI+62n^yHKL2bV`F|KIKHpzRv~fYM$8BK6MW*I@?C4l4JhU&5+Z
zX?B6>M{wc*nf5t->YI0m%k!c6iV6D-HiA+N=Q{Bvn#`}m4j85ZvFzIFY|%J>xxbN+
z)KhhOMWAack{rDyA-k^9P{-{Y^-4&T)}WQ|)zSX7U*Jm-kJzQ#7H}DD8x^^@Hd^Id
zO}JQr`JnFakU}m<AynELzF2A`S^yWk-((#ld;J*n!rVV5Op4r$dmTfv2VEbb69>tj
z1A#B^`J~>9Aj!aCs_5V1v5fm^rO5!bpr=#5Ec4gVZ+s}W-{jz#54|=utEYq<tbUb6
z#GhjCVru}rasV%F^J98cu1!6s!*GGXMT8*GkA6$kjan3aS5#87H=k~YP&&sG0@+1R
z*m(IvIjMv5sLFD|P^)3aiH?2>V2QDVqeWLoK&SDCg)CL8cuq(~CMMZgT%6AWTd@*7
z6&71eU>T)Xe>ATJzEE*l7!d_4EfiRtlm6_$KqoujO=FRN&<+w0vNs>&-_Ed+(5C5$
zmkYkr=0{kY`<H8&RnlN#8N%ti&#jdYm)3PbRQTKgybyADa5t`G_y2%0{>cMqEqv<(
z_g<1p@{QK8lz=aO1*Gv<b~Vu<(gQNY-OkbGN7gkK<P_z99%6l}g{P#ck7X;2xX;zu
zA2fb%Pq>*be8bxc48H*~?C5sKsk6Y+G94lgYv>T~L|y)zUs?t_{Tkesms}ypzUDGt
zRKP9jp1&y^@&RZ)xNxKyc}wp*1n`O+;#z<R<sZ(fBH$HahSR9eZJa}qoc0GL&<N|(
z!Z&}P)sUb6qNc`gb7Gk<Da)j?div*wh{rLbIZc4WW@M)iebLD==zkW|2H>YQ0#N>+
zwL0RCF;cJTN#50JeIN3zGCFJL?|Pv`sHdd9Okxo&0#6;1k;Hzh-x1*puL6C4Rf06-
z@a?%qB!?Rcm-Kxu^;0S$aw3oi+ReC&%oRq{3G>G&kxB<N&wcmy^JDQ%9AeCw*GCx0
z)B=JM=S}u|G_QK;5%t$C%cAFRalEqEWb*1)1;c0Aq>}sa<KOYPYjY`FOeWFukB`_`
z)$_TdRmTJ4Gth(afAo|6loc)g>m-E4#4k>x`2Edch79Z`l~i|Vub!Rci8uT%U5Qm-
zqzrUOWT)C)V7C0Ot{iK@**yiK6J*$P=vs^p<%g&3l?e^uQP(SX{G^~DEz@uDlSwWC
z6HFn2>d!B-S;p7EJ46TDw;VlxIsE?PQTPYF)AjM54|{7S7g#H5O?B`H**ZP3#Rcm*
z14Vjb`0wAD5v>;=@y1`jQyS87ZX^RYr;e045q~!y3PGK@B^ND$Oe^By*Pn{6o@PbJ
z!lX~i+!?Z!hDHPe+ix8>vxm$X+}l3qzB?$x6vTUXWbL&MukaQe@6BjA#BLZ(saaH|
zggtTHoi}V+RQiLAF|y}jtq~lUu*VwWLl%v`4A%T<8BjfHLPOI12-{xii)iECHzfHd
zr62uYRj@yB%Cen7i_&0M+83`9EAR~5s_^5&9d+V~;i7mZj`xA~1xnBw*ODz`UG%eN
zwZ3T!bX~sAc;6U3Vl=#&c<0aF%RcBv$yV`;1STH=o*?s*_U2Co?5UH4rIxGb-_86C
z0V)FXqarc$Tp9jU$_LA;l|P&~n77aoKeiVuBf+GjpUp$fXB6kUWgiU(@RP6-ZEZ^!
z6&A#>(=ZWB&pdpM;h|6VqZAmie8G@Fcf$1v{(lni-_NX(c?|LZXW$5{s?(y<x%e8Q
z0(0-s=y3IeR>KDNjFt#Y{0GhcICF7V&#Q=1gJ<&oth1v|juBqBGovPk-dcNT(hWqc
zWJ6H4Mr-_$uiQGVcZ-Kh6@v_>YV?tg4|uPt-H=98>l5Q)dqz{@eqQ+5i>@XOx=<OJ
z1QlG3v1-S($r~`XQ~h5I=FE~)?JY-%1+n-6bV)&y#722Ja_;>Lw0Xjqh0_w6?9r}i
zHz^HH<3>U^Z|^f;3Ltd0j-A)8wr?S-+)b`ua{R?dJbK>}>9YdzQs<cZ{_&kBPS^v=
z^z0b4Y?s!pNtBCycL1(FomLn&U(FA|9w#ZXU<{M~hkGoOh59%4;G&kC0&aDEw8p2T
zt~`k)U3PrC)^_!tbDz?7b~oluz-B8mRvpTHUtTQm6=7uGG7T~ta7UJNvAuKGSZ4sa
zDG6B|bNKO|)8p=U{;!(%59Hl10p+G2nCvl6L2H&nf+=>=FH5)}5q~n<!ts6)bd6`H
zw|WR^4SPhLx+(<bL!au-K)(b(YXP?5TL8h8nrXVNaYoCzr6hh}Lsspq<%o9=9+bJI
zVOid#$al-${>^@mpnbkDf>;vFH7gTfo1GuAqIgTs<^LXm9fV(}{jL}_UeSnA>mB(5
z*^HS7)v)lv+8RF85S{DN^}DAJ3$UL@K!=hf7KRfi<aTf_Mdi_7*yv3qvJrBtsOQ}$
zu!`Q%Z)b7`ct4Y_4%D|P%8!o{1(nEI;*q2&ADQ&{><8`F6N!2;flN(lV=4S+jIOp$
z&wiGBqp2e~U)Y*0XNoN*D6?F9C?0~OqzKTZ|CIO*v}MVErdyBA9oC0?Y9)*eri{4v
zt17yAMm?p@V*cb#Hvw)krZA;q@IpgTXX8_PoUdYZBVTm!*+lbrHvpo=gZ{7Ug@PHF
ztf)&_aQ*FG3cvp$*nZCdEfz4`hu8SiZY!R){{6K*wg|@|8S79F+w9cQ{?B=>`ku`f
zj?Tob2hPNf?6M|5^{zL0{x-1?h%b{7uO!`AjnZ#vx{8VYmf}L=)Coi^a4gtedw<1E
z&98NFQ%awC#S$?PlDy6A7gUAtEOwf6Sub2*l}b`7VqbPLO7zKEBi+3)buf$LF-a0!
z-IDu7roL^8V&MvTlFnupTDE2HrkpfNtkC`xk!nfmAWQ$kb~wBHTLHj)w{aO{pHet(
zo-t4j3FMTX{Z2ibk_a&om22FD=D2D+L7fOa-^2!!;`&#lgUhp<vP$>n)<0<UOvMuc
z=OZP0?J3M+xzSdkb4|)H;d`-CJf{Idm|xO+{_$-lauSzs6`*-Sh~&%-YTG5^sYuWM
z?!|rrRJiLex`8?C)-q=52ej0Y6F-IoXHaI<gU}V$iIZTW8|M@6q-AM}X6#r%B$ejW
zU#cn_fCoLPUyO*6dZ0Wcd*B|se95ZXRft0A7cyiC!#kyc_Z~B!A)l+$wXC=R7fq)l
zw(7zCd7Lc5?M<nfZ#A&9tSGk~Rr1Yp3J`{!Z7SjP$NHt`OXn<4YUIsHBNgd1qe0FH
z%QzCpkz*KmnmAoT3pfa0A=|jP@?QVYbI<%0V2m!0`RQT~!El2jZ40(-3g)SpU>_`P
zPAvs$6X-Wo(Xn{=i6A|sYBOBI?JZNFts7##k;ah^QKUbGI$vXZW(eBj6Q1I4CQjPm
zp`vkoMXCER^+U(lGG(QG6C00(0K-*e&q_Kb$V!DRqfj(5@@bgKCR7{k9p%>dY+)5d
zepzE*kZG)Y%=Wp@W6NHyjIv-KVWidJy$;`Fy<ASEpN5GVh3%7%jA@>yp-ZL@k|n6d
z-ud<^O;$1tvrmX&CF`^y6LQen#4l1DbFF=xV*Yk<m<TG6W&JL+X;7dQW4tA;M${bt
z(8CrtQjj$;c>o(y@L=4Q9N#dHKuS8Wr8@783TREimPeayuWEgh(Glh^D46x(av1+!
z=ktQ1Q76vNEP&P`)WfsgTSyflWj4;eDSyt^%R~t!*1NQk333<LncO&QPKgyPQAC#h
zuR@tZ=T^ghxhvMW57HxiW8SAS-gtHsP|EkZ2P4K?6&@IS&vb<Q!n@4wNT|{=5|hm|
za+6w7Le+;u>xEZ3xBQBShRxrz252+a?C9G|#oO^9xDr1KUz&nUjD8&f#!VBPS`fm^
zw>P4kEeImD>VXgHnOPp0i||U+e(-EYG<h7^`%M820K>W5Y+WvPV0E7E7u3QmP97?d
z?zh65fjF@N^Hj`Kvw#meID+CQJB936N&AZ(oty?pl82s38*l2mW@&lEV3(rtTdb#N
zx*h>C)Vh;#NMk^vQiF-Kq2kCP!<TB4Kx55{veB9@5cv)Zl>@}(Q%!oys4KG^=Y|om
ze(PAL;ga^D@4{2ToH*SqLxjs(rN!;|qAg9SuDPfDHc#+fUE+%1<d%Tab4S*59A<g1
z)tYajT=l6A+d*E9y;1mTfH&xo{oUpf8Fu)ebo5k=t$tON%Y@K;-kF5T!J787u4vkS
ziWyrJSLL7)omYZqlAvp=8_!iy%&I8Qt-h!<z|_@1AT8mighZdv?$ju56wxNi_9`R!
zZg6+dp|}~*e;IgoL+o8fh-8)91w>a5gSHvD!d&2l8zOK;zr_$Z+%6C|;Y@#iL$H0Y
z^@`<)>wP)#c`2-;>1#!*76jk2r7JjI><+gry3kWX4ds)$71<XAp;C`pe}2dAW0qgK
zX=Uyhxa|TXd|g&hAHMf;45TMgu9uFM%yssxS1os|-0wPb4*C_BI!e3IM<N@4Du_pw
z48V7@75=LMa=@B(&m-pnr}BW?UTTfX*D3fA`YuLFsGY@URzI{A4BMU%#!SB&TcfcF
zWv%JJK+O3qhR(pa9;^?H<MOry;PVlvD2KNsxuinAS9f5I-oFQGD<Gnx6;PiRxj?UI
z^2@NnfqU-0$(bCiK+N+}#Ukf?(lGcQ-WopF2{02xcBQ0>awl@jgwo~@Ilplz0QPW(
zX;U;YX`3iK@B7RgQG8K};*vsN(XM*PT7$M&OpOuawA{WXNSjI)J;UI*F=e@+eBbl+
z#fE2F=g|oUATxJ}Dx5GHh<nvkfn19_*^id%nDA>${qqC~3}@K6K;x%gA^W$d!B^xH
zNejV0tgIQ+@vt}<QBnQXHz@g6IEcYIpsJ2)Ws5Jo#rl~u*S(KwYw7y>JZ7~Xq2H=W
z0$=)iMqAv`u~Ja7#=bYxJ@bky^*YHB{cjxy=HKG!>^(xQl><kX14mY@llJtMxSj)N
z`3$?ZYYKuNHo4(Yz2b%1<j@F?!TSTREUOejUE#q3GY#gSo+&U9^2)~jx$fu__TGdp
z#@!2{t7<b&*Ocw|IU@<eG@j)v4)|&ZFvIWk3vK6=>}3JV2B9yOS!*jkZBg-Z^~jGb
zq+rflL_Oy^Hqtv_Rqc98JA`0C+2!&UvDh9yxzT2s%R4FjMRLdJGtAX`n=F)Yw%r7X
zEEK$}pA-<568b@uSA_NLi@GRHOSiP0t@fgRw{Qa6_{Vj3@E}v%t?ucIDFD5T!5TGg
zb$;4K?M@B3##@3N2UbESO+uxFV9}S!?~|GvCC3)0PQ{t_pZ0q+$J}gsQ@{m8v!^9D
z!uk!rV~%gr@sb@iQEC+s+Q7MbSeoZ>lJ=P>O>l%uU6C}CNWihy3-Mnp`e=;jtEFco
zB*=DczVn^bRSez9S|{9}z&#^*SV!vJMrO#Z-p$l4e?39lFmcc&-8#eIlGKk9U-@Rx
zQ8?r7Hi2K3cHku#z%g9i#S?^&J^1xI+3RVN<5h&32x9DnAsP}bi&rJX;n1QjO4{IU
z`gFZveK0;i1<gBALcU}BqId8>m*<#?j>t#+r)}_(Hi+!+L>AyUSO;yV4LgWBE;FP}
zXB?1wA8H5NLIQ-)9-bfwYGy~Kjnc?oi}k-MbtTcyt$AMgYrFCC9Vx@W9iNuAh+W_C
zP<w>@Jl$^SqK8o~%R!cDy5xdy<uM!ChOg{-H_MP1wwN^k6suVX&3$y^r-W1Vhq~U*
zzIub9QiCD4lLyP9QOw21XwGn|CO;~8S{&g5A>ma=sL{7yGB!8*p{pRS+G1;X=$-Ml
z(aNAbWRU>^IWXqS_f3Je18@EP?*LiQsQ&kxPg-8VrEw+mEw$$f8>*?f(<L$^2<EIF
z#<ryEG-+aQM`e~+@>Y2Bjw97)DTN2-B>D7QwR#`K8n?=j6Q6}{j2P>-q6?B=Q=7lc
zRHYqg4)nXZ6kN5^UsR-*@-liMF(NixSw-tOn1(cV(O0q}g|R}DzFZN?hWIExV60HT
z+OQV`iRJJ1q9SXlBeWwPwyba%SfrT&xkBAO2e1mjBRe67vIEi*{p&gOwGA-*@h)g}
z<ZAkx>&gz%j5(cDCVB-J*MPMxpo{Kga48P!aylFLNP{jHQ<&!B{)6ha^m0axgnrIV
zz9w!NG363dJEd*R*Ls6<LRhq0XKMRgyUz`#1|Sjc)W=4<FPs-y>LrSSDOWDHIi{^t
zEE<kS1*Q|aZxhVq42+`1(N!V&AXa|WUKxuAEWF}fn5b%PViJgC`Me(Xg}Lgxa1$G&
z2n!qc(x{RV?-<9%g7k3huuXg4p}}PS8ghJDr~6BgG8*JZJ82~kw@ufg!-^qqPt@d5
z?whMg1qtngBq5KYu{pU#{yy^yT=r|5_O9qloI(LMKzH?<Mt6DiY~tvL<#|g1eJ7Ip
zi%Yc-uBzf>3l>G=eji-}6FFEho;T-3N+*<ilccH>lWM%swipv`flWB_LN+e6?0S#2
zYv<{a>K~iF&*C?S70EItez?Omk$QevNDjc#AhSIV6`Ko+zNfTE@GX?=F)dZETbYxe
z*A}X=Z<b_!e&uotm#j`=ZuT9Rz9Hvd-6|Y%)#4VDy=MON8|>~pxMmCc8OCcyi4YuY
z4X9)<>d1H<koi4-?x~kcjp5Z|#;bYh`5k(ySG~1xHx;@{FXDk11|q;;aae9@YqZ*S
z(FN+cY&w2v-^pTK7J|%O82k;i=D(N{)yUjMY@n{3pX%3#1Mipb(ntFbv{j5;|Hg=K
zmI%B`iUh816C{T-QOZG&8B|O5a-L?>DCn!(%kK7oGN5RgUXWyzvWMO;64A20#9;hV
zjA!3^9W|tk<25zIOgbNAbI>DRQSNPz`Xm{u+<-idJD<&ZK$@9KFIcD*Poz(6uQfI?
zBtt?r`uM(A4J?4fTR>9e#ua`GAyOvU3!17$j5Q2JnP{%>>sPkQBa*;+2YETi(`BaL
zNL-6ba&k3EI%ZUCR%JK=w!;*a&a<Xb&n@NoC1+(o>%|L8arxN+ocAjxOxHevxqvcl
zyWdPk5!#m6&TM7Rz}@VeGS?0wx|~@D0g@^iJbk3ara@H1!9=Ijl0xTJ^k+giPbG%)
zyaVkjG&5Vc*USApUEd2-%_}d5{KJG@CLsPFn(q{3A`08*@gG3XCT&&x5lbb|e$M!M
zv754_za7E=;A|;&Nj7&)P<G(!CKiLttxJcsHCynw8+LBcPKoo&llhNUBVJw+(i5Pt
zb0%q=1IajC%SJ6CD#B46P`R+X0+==76Uhj!v~&>dhHaTsN(1uq9+Y-VKxfyQ3mnx|
z?5!Q$`)8Wq1TzHZzD}lM+pU6}x}tQq()Mmwu5S5KZL4}!#&6)m*^@N}$phJY276T!
zFZDF7SG5Qp<W3D@^SiT`?X}96n~VCBtm{+HCa!xJ$4A(0J;Fno?qb+o)(8!vZVPAn
zP05#TF13&Up&aP*;ri~-ALodBStdXp?V##y$kpZenV9`7zmO*S;}xNi$(LTGYZ~Ub
z?c;dB_Gn~5M6n!FJt+GpC+fNnZYP9z$~v5Dc0?CT<B~^k@~bIile`mGOe~)Kt;ZSA
zN8*u2wFmwik2Zjg_)I5hczr0AIZ3yDE?#)i>Jw0)3pph-X(h<!T1Hw{te*MIIgX$G
z3`JjaxYv<_5g3Pe%zR&@Ryj{wIl9J6HA0&pjPblDk5<Xh@FtEeT+K4#g!z8;iH>;_
zUU*UTZEidO=VXj^vvkj@wB!B#>4{K&fKAIKOUrv40bNCgBX*s`r@xSjf-ZzGy5r}&
z3P+RfVUB9XTlk9tKJaV!hxZ%qtofSx5A*=v@Ae(PciD{cUxrLWfH8;ry`cG>!KSpR
z{yofDff(^S$&^$Mw1eF=jBKA9^j*})vouc)6JIs-HIq9g^jpYfhnRHfTd<7SS0m;i
z$;&b#3D;0tzPK+4$<~x1q8pgM5djc|@GKz!{?%@4_wFSrDgLB&?LgU6kmGu_It&fF
z6CVdmFpYnvgHzqTF-h6FOp_-!9+2*x8pD1^MZ-wLY{=#N-s3tSQaw@Hpr+YT#d{|k
zcDHAs#6Sd(&;$}0y!!_rUr~F6+V;*E&TgK^bs4)So_HDILoRQ7iBH3I#1=P|#8F$x
zE1H=2j#Lh2r<o^k-AjU%w7jJ;zTJzKv!fG<rGz{Q#P)gQztE2bAfU7J>xq}U#J5j4
zG@Dw^$S=tpC%^jM3D6PG*OLEh`;MukDe)cg?EV*d_upAZPZ_YptwyKXB8M?Bi>N+Z
ztl)JuZ0R4*5k{XjU#<`c@)8#+%J2^fYy-?wG!0e6W;R)kclJqUa37(Y%IbH7V0r>6
z&=}GBDflKC323|mlZBL%xx9fl!8p<1Sn+}8q?)njX<9{dzV@Ks8bqf|<AV2d-(gQ_
zAi%2PS<^z;JGe3S$Nx05YF`YKE^h3<pc=rmu@!C#gGI^FR;EeBVEgtYU;qSu{(wi>
zutHPq3mfmH#uxxqkv`y&HLM&itjaWfgvW$+8H)r4`F?~P%tV-W`AA^xJh3nzCj;uI
zw$?}ZZh;R;*i9euW7`k60YCg-0a)<BDK#ut9EE{%xN70j{Pg*iL_8^XK7>2KU<EXf
za{@pGW%io`a^ZOMhd`EeIkv|bKi~?jMe|470CCAm0m+Wfhb)Q`54#$~H2}MQ-|i4e
z)T4egN47RWd@FHLV^lKNhu!x01I6qr``*>U)D<df?hJht0A4VU04JD_lZWRW55K5@
zh$s&)2N*0027`-jO8?El-qFIw()0iCAayoD{^;=hp9orxmagum&QO4qg`*ktg@V1Q
a6;u;yYT@ZL2o-xY0w~C;LMo(9{QnC_7DmPZ

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_888888_256x240.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_888888_256x240.png
deleted file mode 100644
index d3e6e02a03d4cfdc6a2114f736aa57e8a898b98b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6999
zcmZ`;WmH_jk{;YGSb_`^g3BNSf#B`~!QI{6VF)%r5}ZH?Fd?{m@R>lcpuyb<3>FAZ
zkmbGIJ!jwU+aLE<-@aAd=d0V*UG?2~ElnjNd>VWJ06?UoEdLq+KznQgj&U&`?+SU|
z(vJe&T1`nF08=?)XMB9Z^HetSd6dfkyc7prBmn>#Uln;7-N1#z+z?m0-mrcthj}6w
zs$IVc?0MB*NqLmqw0W&IykMhE<715Sw-rtey|Ppy$7Oa-7Uhic!q-qv=X<<y`BJm=
z%C9L;I7oWi*)@bwJ&JH)CgFWb9-?=FD(|YwoqqG&^)M=HKD?~S_W9*E+B$o=;LtU5
z-g<d!|7&>ow+JFz5Rtu#ncw$ia8BfaFp!Yi96&?N2M}Pz&3@|7>i@(XAg^AF=PIm%
zdBX$f@sJ{q&aiPuPurDeR0+DWJ9uu32I4}3?gYQhgrA-CT%pJpK+O(p>XrI$V0R{U
zxLL1P<iuntpyBMuK^hJguQY!{px=h9G?J=TLE2KeRr8q=aW-I%!ctcz@`Z%iUoRP|
zfYd5gj+XC!95JHXVs><*w&<4n&}vYVOvojf#PYDL4(ItoaT&oAo$3+?MM4==Hj<Q(
zhh2UQS^0YCtMn`d^DoTUs~ZQlw|e_2+;%$80_cAru;wUAyPV&g)o>ngxIQx}zMlWZ
ztE?V0R?Bd4DcZR=d`R8wyk(WBBHVPK@fsNZ>@O^w0O_toe=?tOEEq`?M-7ebA&~A_
z$AYgPqmO$AqB*|o00_~AOGrx|)t(}H*c*UIHwEa(Q$Z_J63g&6xe|Ue7;_`*+AEjo
z$>}B}YxZb@2A}g}(mwvKc3PbCPzw_bm@esZ(8r*d#mGwhy3LL5ob@cd$X%d0i*q&O
zZg0x1xL9N4(u^ob0@@kq&I~8E@yO@hM^k5B%M>x&YbG95kUJE!MJH8`2%b}rHt6N8
zvgb0-wCgJt_Mh%h5V|ghbguuhZ0H?s1j2bALH81fm46qZjcQ2!%@Ok1f@Hj=rJW+2
zx%6M~{O7m-Pq=&pW6$X}Or`HSb&5_A2=lW@-ENQ%sj&|!f0-)qkUvh#yOjX<o8x}K
z2??n_JY8YhVeSt@pH647?m@RUxY-2HR5k<F4#BtN>Kf{j47){seq)+IN+TT6w#5e;
z-*Rbnh(^uun-FEGIa0yLpU}F#GyH*=!)l?j_-fp5t|G%g(Gib!Vcw`o+%4n}FHC?K
zNW5?|zY&kdZWBGM^!;Ve_)7p<AB7zMd_E`Js_f7teAKsuWbz}AGM%V0#wcdpO>OQZ
z#y=CNiOf#$!7D1x)`Oe98F8A^t;|ViZem=VG{a8Ov!eETW%fhn8PQs?*#0|j3?&}H
zQgLiWto=;)HPT|v;pN6w4Bfuv8ayF!!dE!$*VmLAH`&O4yBhxCy&xaQ4Q{`{+P@eK
zET+!LUS?ySJU5TVeI3=$EuvGs%OOqpyA0(;c0;X?z)eT&XIkPX>b6IMZUoeIt0O@l
z)TBE_r#j-sdJ7~zx6DeBjTdeIqLIyy_)0S_VZ;2j)4xFXpb}G<NY}$9*ea^JLsYjT
zvkKtDim}roygM`9a)Vu4<Bwa}$4D6_Sj;9?oJDIwp9N0l*yfH7)MLsYnuwAP!y35z
zP<Ex)%b4h51Fgp2gMGd|`_ph_#BE03vS&%pO1WCe&Ia(~M4I3E<5hP7A)^6)WaCm{
z0>!L1awC|Nrz122ncmG|%UxLJPaPgtw`DmX2w=n6CF)bm{BeRb(ca>s$T~6+-_K81
zszu{Z^Wnbz13nfBz8xmAb9*uAEy!-v-x_A~Q}siS0zl)%fbfT$EG-YZ^g`F8XbpNx
zcY@n+1yY~sR@-{#(9`?d;JQN&Hzx>z7hg#3LfPMRRj<1~QnD49Xr;-u{}qttfSY$#
z9~-zB5kMq%TIY|VU2^c@a+KoT5?1Em5gAwe52HpPYe>dWSI5@Xv`QRNaq!f#soe??
zX!sSe@T@Y?Lp4l!pauu`9hH+oVk<{D)V;gcZMAwZ&#`7<d|=I$Q$$xw&;^$L%}`b3
zH8UKDkwu(LU31N>X}FO?s#hB}pS}_&1FNXwWA`#RH*JE>`3onp2%ses#ccCT{QNf5
ztUwTqY1`c4Ok3Ij@-x%Y4XHMPiAhRgL)8KDF2<D4nvFIO`exe7`ALOf#&QD&da(OO
z>uGY^Lw<o^*#q?YJflt)CuZJ{;WBTWB%q0P(?`JWx5zny#d690=(81t)MOcz@~75?
zrlS>AkvXyGZFHG%d>i5BACL(hS=02&!5CF~lIP3>L$4Kn4Afe%0k&~ec-L>NT>Vr&
z-+V-;CM(TpCyUC*ORpm^G9>w*8^V9>e@`XQ9N+z5aS}|X28ft6589H8Y5Or5`vz?3
zxz2@?Dq?Rh^|ohQ_qlA9s4=tf*tC@M?h77#CP(f|Qvpu7n}V8OIZgAlsgmJN#=kya
z=~O;XDq(8-cs2OdS#x^iRTeEw9bg;qTfz3iGk53=%4i<}x#n(gPSTA?^6FWc-$L!}
z3~}NADQjs>a-@4=BCT&{pEN71rr&+PcNaJ|X!^w(k@Yq7KCRdFSr`dDngvcgfJKk%
z-hipFTFS%Zchw}rpUKmpWD;5SU!H<Q8C%}}RLTZxRSGPBY<9IuAF3nZYzb^&C{Z$e
zs>Bj&*<=tdDs|`0wF*cNBB<qYX=E6*El4Vv;w7axlV%h*n<mSiB_BL`F8=!QJ&3Qo
zUR1Q<`e?UE_rvS}^28iH;F63e>Te`jGjD+uC<$#39vSjr268557Ekkk`o)3ZcuxDj
z&yz=YzwcxL=%CblrlcoU$G%;8OvR3ZN%4@bre0jb`kE-F#G=*M<jD!=$a?ip);xDz
z#cw6_)Wk1Nsb(8SglA7PUt<<mwo1|HBsu4OE?Knh#_@^x#a3vFFG;U=e`ktm%uNv4
zU{F7Qc2Bn>q~h>*k4m&ETb(L}gn!Hjoxm!x;q`X)b~mKK{0;ApRz~}m4)#0AKDCM8
zQKn<qHb`MN^EE#=qSAbASE^!+0t|<Qr_2>WCeJ3zPUTbi&}+-HV@&jM2RH?HYfA@_
zhBt2Q(k2^TXNJ$cxyh{3lEElE7j-peQ0|w-lY-=S_PFaS+P7Y~SqWG&A0S!!T1%ID
zM9!y`>>Ez1@c`HF242r%v$hkF1g^9tP9%M^lMAFcgmu(`?{%<mJ~8St`J`5(8&b<l
zPv4yW^+_ZYMY^CaD>8y!exJrPwHnx_$Np%9@p0rNk~za0J+JoR>ov}a|I7zJ9=r~u
zKhxV!G0K2GqB7J1(VP%KJS{<bfNqRkmW5f%HX>U8$ar`e-1n*Z8t*H{YH`(D1aTQ|
znGcBGr5q(22X<sRc#!C`CG(^oE1$Edlm>B?mmYRh7S0PvGow4sL2i8;qdII_U4S@2
z;Cuh7H^DHq#(BVk=>~lazw}C~@iYe1?B}BFEt&=IQsNw9fN3oUpn`LBPh)5s(FHZ|
z#4-T&Q5wGp68+#K3U{_rqq^w990T>!jX7reXx8;|H@NE2?IfKHova!%MUZzSCeJ!f
z+A}cy7U1Q`odG@69{*ft6rPg}Rq^6`ax>ZSt_B^{<1Al#uV})(kp&(lA!2f)v3$b=
zTfEOKxG7<2Q^gGD4;V4fo>E<qf6i<K=}03YT_F&5q}8XG);?YY%azXhc2IoaqscEi
z5W$1KOy%LsW&Zo{X{XRaAxp0yh!9j2IKm}|6X<aCv8KQ=v@XA?o6AyInd<jeoKv$5
zFx2ddq7IpQ+-Zy}VXmrRY8fFw0>aNi4>!BI`()1uHjIW_Mo8%-f#@18wawG#rBu<^
z_$dxvm_U`V{zqs$rllbS`5QXh%me7--g8-1aYKVS?pd#mr%JF){7-lyGPQ1UMt(xJ
zcgt1Sej11S0(_x}+9^n!=5}y<Lei;Mb$#?lhrH{pxGS2uf+3;WV#6Fn_u&cQR1~*Q
zv|UW^jn|AQ5w}1uN4)vb@ap$wzPS8fI48^OO*!5=QYjMR-%zrl1|gxeFxK!J2&5Ym
z+0nRy2JgY&^o{gtyT0@@_Kj2k?ogD-v_@=jxMSu05+Q1O#Q<UDsr|uK0FXaOs&rBy
z!?jVWx!G$Np;Y{fC)I5e8r|QL9|xus>J@9?rgjb9n1M`_yAl%PT>(XWQfRN(!sRwM
z;Uh0((ce?s-w23V!V%wd=+;V8^K>83Yjx|f$@i?C-KkL}_=;Bw+rxX@L)@P4-RsvB
zg>cv=%UskAyr-C}DYZ<9J*?6gPCPn(_|W96QMe3yX}U~QMIm;UP2nS0?&}Oqp9@;g
znp1ekjD7^_)akR!Ox$FqPkEKi_;T@0Rq#~%wP1KMfPeu>Ji+r%*BXU#y80TejN*tT
zf_+gFlkP`14&fhu3yg^vadYoNqwj{)iEL@EBtmn^LlenEjaof7gOQC=0-td(O^b^d
z*5LN*Lml6*ZcW44>?7(!>P?)vkMSg*-`x}Dvqy^#TZtiixa*MfFtv@RjM0IF@Yib>
zyo`+d>#{HI?1fu1exJH`jkOc#??>P5&G3zWspz9fiOR07Wqbj7pkdhJ3We1iGj)Aa
zc}Ea04BzV!ys^8TQa0!xyIH}7Y|k+I8>*;LW<Y>gjo!vhFR@A6lM8SiHXL3`(8&$$
z3-pT;_m`U>fLd`VSq3%&X!f1AjGG#B@Q?P0Zl<Gcnxk#}`?qON+)^3(SA{qB>$)Zc
zFY>3ig1|@Usj1t~meSf_%zsS);zUcTl`B4DNjLX;qQ>SJu&S39D0_J(W3TfM79`}9
zrepV8JdBZhJeJ~q+B)1(LCINX2M^Z6X7s_*j+O|{I8G(w6x`Akz{(Jo<nShv<354>
zHdj8^A^tC_K0PVN3E-t-O^MB`ie;!9TSq@=?R@95!~#QVVEujIH!oBZz7;Qq4<Sx#
zMc<XlS=81u*n8JRDx6`Gjcsa#=hvVezcgFXjShTjIMDA0#$iaZh!DqqN4z!dYXKtB
zqL4uVA4{F)e=U22AOPkDFC`gNVe!&F{lw4t8~<!2Yi+>$5=zew@8Ib>j46f0WWke5
z!38}clJCN>j5oNqR9v67SZ2NGrM3+4`M)e&8{Vpkqh59sb>t_Tw8SJ|`p7YL&4($3
zgXO{{<Wk%T_)P+1)gkz)UD!Z}D82h9h6NcPB@*LXT2kqT%P)g69ev_AUD;Xn3fTC(
zs2w)0{qI7r$jpmh>IAai-BWq6|C0R>_{MI*G+{DjXYcUW@%OG-J(|=JpPJ9zVsj%g
zxDzn~F8BsrOq;TAr#|I6L5cLU*XbDG3XnQ-`zu3q;VcJ?3>k2?3uLZFpcVMO##!fV
zzvG+mV#hZV)f@6p7=1c9_s*y%bYF6S@!C@ugJSHt#D{gHi^kIzGayYn{6^y|Gj)MM
zmWPa`0inl3W#?s&EH~=cId@xsBKsE{Up5NZOI}!!s$4FadZpTu9(?D}>6$7P9Q(Y(
zF!1JiC<Rnc3_c~j@xI@!2zy*g%9h*Q3tX(uGyyP!X?WLA5YMUzAt^kKQNynaM<mxA
zq}!S_nz0oR5Naq6_TjJ!`-7i)2m;=skWH#|`YE&I=5X-eUNFgZ>qX6R!<6JPa}w1?
z#M@IA8=UjXd$euB4ld%N*?fRh4ep6HAT!%0`#C;6X{wtVk8ml+8X_{kF3Doe2>8}L
zkp`~BRozA@MwuCEMY!I)Hh6}agMGyukrh5xlbAMNW4-2eL>?~joh!Da0+ZYMixk$H
zMiusW5E;HG^D;?L5gbkaj%@zo$2&B4%zJVugF{nJS*I{hu=qD_E?)|@f_k!=g`KZ~
z29(SLciCm-Y_8vjhq@A#=NM2hlOWXs)`NVjPtx<@d?%t*8wlpVR#7jGaDXf{P82`C
z^go;k^XeR}<u|{aYf0q_%I0e2y!VK8_Na9u^yK;566?}}-NKKT;)j;<khuGzOd_=z
z5p%_}#!Q=l51V@s3h<);`h+Kul&mgdI{989^9p#ZhJS$(nxY4^&rm|u1MqnODIfK$
z%nbXy8*3i|c~?yH@A8LY9E-%5uXE#C)D=5z71y7At^|8#)kNAi?iMFJaJY{cjeOa5
zzi3i)JY^u_525=^O~Q7$ZQ6}o79Xo{b#mcgQNASDip$2i2G4A~2%5Zgad$#hS`!r=
z)blYE?2bcF2xLx_LPr!%B*fYHM0}IG*Lr#*;=1(>EM5x_x;x@Yx}V2|e9X&#ikm>=
zF!=!gtlXdT0UC@W)&o3+n^<zeZSv=H3duN;L&NAh_`l)D{h`7EJLZxi2g4y#aiwUQ
z->V`r$y>Do3J=EYcO@&P&|RXjMdJDTX$oydK1h5Ywb7_8{@qx!8Yx2oRj~Zzm9QwL
z$+=m6q#5~5dw>0^&3aHzsm>DP*XED>*}jID+MjakrSZ&(CE(Qna6RuD<|^wVjsGj^
z!i1mSd6(+OFq<i8MeJA>S+?UBg9g=p87YXHz=ASgeoI^G!_vTaCth}Yv84AHI8%Ej
zCv>L;tR072%L;N!?039-xqP{2<<^J}q+BOL(zuu(*lwZq6LL&%zVqtScp>0z-|f;U
z6B$%<=^?--XWF&b{AzVGiP+3ij(<Qsz3cs5^-Cp4NGXwccDuc&(a=k*%7#%f!d=61
zCPp%7p~0weOI5zUO$PEuTXwf~EbNf0X`ZB^kr2mXIrGs#RPR<OrOpqZvt{h5wmkZ{
zO2k)8K^y-|emm3Y<@a`P8A#b@>REP3vgZ)+Yu;6}f}G%WjtRbFN#Z|}yiY^jAfnnA
zZ?Tm%i6*r+_d~9$-`u=vmDn{>y=g8KVOumoEDyfniGByHAGH?8H=KNXR*{D(PyoY}
z4jWx*)4~cky{0<{cEMqjR=uT2jeR^<FC~nS*8o#b+J=*Q`M`9agh*Y%aYMA@xwPY%
ze@9Pj{j3W-U9}@-bS1@N)HPmDkv-d2hFPsQ+EF2F8Y6u<jg=Lj)?@G1T2rEf1=gLM
zbarc>n9zt-QphV)A$0I>I5=Kp;8NXMP<VSL=*0eMZCJI_o2-_uBPiv>ROtW;R#I@5
z$_?NPo)MzjC0g5(S^HSQX>zg{e@~|@Yj)AkpTc_*&bd9zIw%X~!|UF~cAE*Frc(Hp
zj@}l;MeWU1(ZkW5(G2bS0@E9aD~3UGx-x>@pMn^dz&Rn0YPG$q&kmSeq_qM1T>9Qm
zYI^YnW9*nJFo$bphmyM%(<**JE@a@vqfa*zrfR$6@t)&dcR=-kLi$xG`N*Gf*YfXh
za~m5tA<G$$?hzNOd}`=gd?fpi<nmVC^8fI9L1>`E&hxpb0Zce$yJ}~q3%Kjz`Kv_?
zn)3c?d1e4l8!E5uxo?KLyI{|k(A4Ul$R|NQgJnxzSS9{hN1tT`$b4h5B!|MH#gS3b
zssRIJ#@v&2Vre{WoTCq!^e>1%KI*VMj^gTxajcSOn~~TEF45sTA+4#ERq}y4QD|;g
z1ateBghNF{wT?^Zy}>nJO>3TJ8W9@%5UB#Ueuj+xa1tzLhoAk>Q$QW{^=YH1zN3tr
zyJbAqdyvuxEFi~u;n$MYsgekbXAx6zV?BB&JBOu*CkE)7{9#LitCT@Rq%u`#smT??
zp0QX}uWXyJuk=utr&yGdhHY`!DcHMps&UtWlV{>?`e3%#n8S6$R(YU<S_7+;9UsJO
zK>9y0;=Ud2nOhSNm{1I}mTso8#HO&<t~>u-C(#%}Js3&$!SNK(&=~0>4yW71nE-1|
z^d|N5LLYfY&p?xZB~k^@YIAY4K7`XI6`m<kRMX&SF!)}_YSh5Cc#!@;X|uMGktH}P
zig&dZl|hDwq`$3ta}nM}8BwA3RrDjBP}ul3t#BuH0Wag}EuVXiSlJaTGX%kw%iPAM
zgwRoD=v{uLH|Vk}6LZCuaiX`~kYO<#aecKv(I;dUN^UkB^O5UCN&qD-Mfjkvo}xTX
zT>yqf^3fSz*oUi&vtClWO`KAZte6+!ak88WHw<XUvkNzBM=QvNGrKN53c!4q`7rcd
z-dVd*L}j(58P@zHNqSkU05Y%32(UK`NnWW@M5H)iU0f;vE@mOJNJz}XHkmQ_&9e>v
zGfoaz^Lx${xwsZ#!TC6%M%q^PIt1Tt05yo@Q&BLrmPPOWse$_EkN6@*zl&vDX;d$7
z|EWSk!$^a<FpA;%WtE7#jv|5_wLxH1+VU4G()o)`;g`apYZ8J0hBS8J;OQHcAJqEA
zQe1TwcT=e_%(ag6NX#9|RrxJcK7{M|RP;t9`b>N2E|xQhNTQPTp+lgnJhb^w;x!+w
z)bEaRZu;bO#G`w>=0gDH8&X%&@4ZPZAc)zb2iU{<1>K!_SEJ3D%m<ITGa48sfVW;X
zDQB}i=}!r_+WOu^{yI*F!mImpkx*I7G0kxtvo5Pit{y&Ir<Wbz+J8$rI}&<JiH8ZH
zfRv0T82u9-i$BKwP{8ML*3?=_ev2~{drhW@!^*J%0_eNQMORu>d<ZtZD`6x3CQ!fe
zJj5}X8p;n6@O;bvT;k98XC+wBw`dfSx|Xl>m_6Q_8l=xeDcUR=6MQ(!Dh+(WM1t;i
z7h%@cKOjQ^$Z@9kYg59yiiiJOTDRQ*z<L|4CB;Y}eHYZ6%pqHho%b70IGgTDhX!B-
zVBH+6wQ^Y|`};LEcck;NLwIw{^RXlEE-bnN8#kLh^am67Z5dge0beZM-@B)9zT|f@
zIhd}_qchd}1c3`2y509G&%=h2&~C7d0O~ZB0(KgII7*^t@dFZMg_sI!p73Yib&>C4
zD5_utUXY+w)4(MUa9*a{JVdj8QsQWFhUP+5+Dqqt_XEPD5nv=-|BzKxD&o8p&j`@G
zF}BMzZYtqyeYt=xe)Hx5Cw<2;!<i7%<MBt-3tt68Ut23*J24w?yGH>K0P%x)K!QB{
z{JQ)?Vqj4*egQ5JNDKr5l{r=Xi-DVmt&@Gw|8F33_LKV2;MqTB(DAVM4Y2aI1IXBV
hSlcnGxLG;ay|%Nm4e}ba6Ms|!s3>U4SIb(y`47Y|2vz_9

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_cd0a0a_256x240.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 49370189231d006600b0f0c2967cad1583eba634..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4549
zcmeHK_fr#0w@yL`gaFc{D^V0dT0jt_h7t_DO6Mg=QF;{=0tBf_mm;7byix@LktRh#
z5u`-G(3BPtq!;M~LO%4)d^7il`ybqAcJ`dz*=Nq~vomMTd17R6n~8y!0RR9nX`?kw
z007{b3)rHkIh!Z6b&k$9n2q$zPy_~s{~!NVK!y;wdM1!nfQf-AfQRJ<nBJ)Eakk{;
zJHAL43@^L%0MjKUPIa^{{GzqsH7QfEXqi}Cr`zYjZg~`cOXEjud0kP$o6@%eH6j#X
zp7E7U1_+2I`QN+gI{8(evoCKus(Oc~-akVA^ZP6a@UHG{O+Xy&1@zeh>VvlOKeK;)
zG(fA@T?GI*=cKKvX7=#=x*g1MvYr*vi+;15^~~;rE_=zlF{dxTu6`?DZK_QC?%~-~
zxXc!0w@Ia@0<k}QVq-1)I6Qx*iLcVL;6s&gK>%SGD=VuM=t|036I5|bK<f)~^Ve0<
zxN19N=|Cr&x)=+G9_W5ZLO@0iNf1y0+A>3akyK@NV;ce80zy5LQw^%%g1EddqL}P7
zAP;7}p`4_>$jI<)(!NRDe~wUl2Lbz~U&xhZ6L-Mi58IN#JcL!Jb>u7w;&Pb=G?j|j
z+4;j5CveHSt*{{pnG-wAV&ig>k>+1?#rZDhk&-C+Q7Ct0?m<+Z+Iv1=SjY7(0$nxq
zk`*~W-I5nikKwr=c*9oDk~SS+7*M7oAkBSuy`f<u%_G}bTd5=-&jC*dGv2&_7q^`7
z7>gUbnRO05@D;1<HqMDb&AIwgj{q|ofeMf)-|0=znG}D~tfAVYx|9Ry-@Nc}R}66I
zcRk?qbaN<H5#Vl=FS8}^V<pvzWHmr+&v2>2PXct`w1wF~RUTU^h$gt=%W0m`Cw0Xb
zn_s*Iw0*)iGT7-%&x*f>!&j*t1{iXhwkybGzn6Yb1ht-6`9IYEJQ)#1P^bTyNu&tz
zRu;qux2t%4(*U3DBA?9rA-5ibuLB(35_6kYoAFm)34GMo`X6zo%ywrpzY_^)vF71v
z)c2DilF6NXvKP}tDJWcNaLins3AqfCH1H&imJMu>z!m++EvXggAWG(8=5>-NUj^6s
z--27)SG?akzYm$a3a^&4wImGm;GVa2Nl&w9g&{h=3GsU|SJ(O9RTJZ{*ZjGb%Jfc+
zX06OTMtgY|8_(2ecn@67x%Df1xi&r;S}liv1eMcq0lt3$SpBYGUl8;UV2l>c1q}p-
zNE*Jp#oakW04gPa!be%*FrvFa&}TT><XbgIPJ6+gO=YU;w;2Yyh!@~ZAdHmVqbyLp
zy6AZMFSHW-TjTw2M=M=-zvbARgld#u%4~goiccmj4F*G8JYVnm{VPRaG)R5BcF6Uy
ziDtsfml#wrCZuc_OJ^IZ3&AkJ1j)N>pnd6MHd5HfX1#5!D$Y}-)3(ZGeUFxo@PVWd
zx(b&0Q5=u!Vq@MZ4w)0l^Rmf>JYzT=s75ic>B6iUVH29|ld<AO!%)`Eyz`>KT3rw2
z7Gh*hjvi(>`v}{1HJ85LD;er=0;Y$u&ItTUV2(HFWfzQClC6ab%TP(LRGVTNH^`_z
zA7|@bXmO(D;;V>nutl~0u>Y5ul?kfo7b`x<fLPF6x*8pfx};Ud-BB+A<ERq8V~RFL
zICTe!m~rOsz*gDh1%1S(ArE)e8^(1hiAw`;z;(8ShnY_;XTjYlobypGdpcV-8;;7L
zyB3pl)su@)mumtKvJCU@(L$wkf|kOfV>X7D1_PWN0lf~n1=@8PLsIw}H5Zv*Rg+HW
z!(_+Lw~tJl)iFnf2vU%9AO=SqUcWpXl7Ft39=a4SLB9Rx2~%QDeTJWJ4u-p5_H{2E
z(|7*qVrrjs0LtTAyHoj0_fvw<y)YH8C;V`(1~hOfAyi}o7OThpX`OdIO6#h;@KX`L
z{k}oSr6L=d#pYLhzQ*p2h+R(`J?HwGI{Om2w|Vo3Y@~`5FWeHLcJSRgdIdja?#Neo
z9+heij~ZYEvC!n}1^nwib%Q<yC7@GVDI>#4vfiwGN~ATw_yz2$U_hDuMN}wb1e65`
z+Ghf(l_fEw)!FpWqsX)^N80DKc#a`~JHE;gfLs3X+|TV@M}7P--Eo^VeWU*(^W??N
z%wC`l?kiP859ewE-=i}yep*Z+B|RpBm@`%o$|E}fD_5#G@C{bxlll1)Sh^i)!)}T;
zQ~e*%(M(=SMwLDKjJ)4^ZW?@L9;fu|N-UJYfiyqgr3}FrI3ZV(p~B(TpguJgRv-J^
zP->VzsgxI-9H+1ZHUNZZYOsJ*I(FE1K6xJf(@39xz9W*Yw1Y@A9TMsjgDbu?Sa`7k
zDq0gF)vAZWdw)bK*{dbJVpX?8Up#zp)Il~72C}OIxH%Ey<PiG%@yCr|sSnz^fI8e-
zwWj}*EJnA4+{eS$c3N6t^ZJwzM36kNKmtcBm#V&hqXF#X66)!jApqEf(#6q6c}3m{
z`Spumuh@GUf1a5!7-p-iii8UD2zTwLILEVHz$$kaEH_2H*QjzWqP$%Z_>(rJ{FJau
zhKB8mRZN&kGCF11=fL>Ui{O#C2i4Qv6Fb&<4U6WLy{FwZENz$8MOqGIc|0$qX>8Xg
z?hQ&4@OqC@?;UZ_D%SMww2q~|H%VRone1lK;(*MnK$_?14GLLQlDhpKC|ffzEDRK_
zw<_P6`tn;glyNI-sfxdd{cYPeVRA|Co#I{Lm$9>b<3KMXp(_8FZ9ex%nR=Es_Qkma
z`HzI66uuh7!p~l*XLpXdU=}n5f&1<sq~x7^Yu?41H7AWGp!n>3L1=l#xn4@i;KuZA
zqE>e8CSya7E?$6?yuEj=BHxelBq8z~51*mm%5lBl`asD(`QpvXymT%;)hYaD9sk^L
ze7|@({~~P)EkFL%j{>ih5dr;g(c&b@IriTc%0&S>Vx)9SyvRFTG;7G`i$+W)o><+L
z<JxB`o_v;&9r-|jEaX0=1FZCcI!tp^vuYo*l7-{wvntU#<--cuhu>BdN>KTyZ<C#;
z=sCq=E+P^q)TEmTVLfK${v~`atxR5O4yBIN;uaz|C|=eBrJNjH3vvlM{f!bAxcO<_
zTS#)C{F)_Ksk4|$ScS9m@jA971E7|_PhZrbECO|Uc5FP23FR`fNr)=fE!{A9y3_x7
zX^`fSV^uOQOeD7L=((W{$cbvGym$k(=)od;&Fb3~)!#HrwQ{MRvw)vzTxQ|Hd>o_2
z61ldO^ivYwcOo({a4riLR4ib2E8=fP55$S&Wtms<zpPOj-0RVuv9^>zJ=_c%Dxnpr
zSUBdL%^3uI$PwtUun(okVk2_=^LHgLsa9;Xr(N^$9xY6xa1sJEZp;q#?IQVFjN3$F
zzXgyxFnH?1-AiIlR=1wsRFkeQo;iH7-*Q^ECAt2zvZMw_3-kIOP-CX6GSXiDMbNHC
z526_CTdgzHp5d1;zSU7<v(LqrZz~=U^R@LvmI=weMQ9j&6@HxPHE4!>hZj{$2RQcA
zr>7a;@6@>drtGQN@%QYUWHqposr!S*j=H<kC;*e>ho&p7*3(4JItk~u;cmZTzm6SD
z67Bm6dHgIK)NeXvEk0k(7p5u2n|AwyZ1C8mgYw1l3<gPAph<W{F<$tmjAeCvSJ&je
z+)dnWRVC&I1PeK4+o~ZLadaQ~tX(6a!<0-^^=qW7MP9;T@Zr_>_hJXlea1Ks)$6?K
zl|iMnSc^VFh3(rmbA<hKc`3v3s9xP*EY^d?$o|{P;FGS!?O2b8mWn;NQJn_>CHjw9
z2KQ|E!M)sDcFK?uMqvs}kl(IsKW~XRPUjQDZA5#az@aL;#dY`i@FzKzJI<dm%cXpj
z!8{8X%r~`fM|zi&HM(9<Fd3{e&Tj4pPFF2+0VJprdMLjDtxTDm#vM`+ycv)k(;O2@
z4@dXAQyYKNh=qU&tmfAJ@n(tXgD*zHRka7I9<VNy8tbO%=`TAIViGsP@Eg9nE2FGz
zTy#&%cOUh0dm<)p@tozBVVG%)B6;t?E$--auaZv|J_BfRjTXo;K8UrGb4N_wS($ko
zJwAHjcB?y|We3}<ErIwOg7pnM9#-3JYxYCM4_|{yyTLPVpqctxag&%GK?Z%OO>jP4
zDWmQKL;K+VHqEKG93SJamsHZZ8|s|n_%00Mlgl{q+Wumj>paS&jpGNJ(Nnrhr#w3O
zB@^zDR~J5YjLg<Q2uhWx4%?icR21y=iv@EK_9Ujj9EJTfFH7W^R=ow`vU<f+_f@1i
zTqALenf(hsd6ni9`T$kBWyuF}kWVw5h&8w+FLG~4udGv4A1|6-w#9`bh9m<!wcG=S
zLf(8Tk!Qd41cBKi9!tQxa2g~NQQJDwzpRqgNdb&_lXsNqMMb8ua5G}f)^?9wy@THS
z^M4Ci*5?Tz?3^==OIPZ*CFm2CiOJXG$lEPg5Y7n0VpLotuOX#7`XW^=dLU7$O8P_R
z<m1CHw7M~V(H=;U9)lj}O>I44VIg&8m=OY$&t*qOqEvV=Ufma>04+ROY(@s*BZ*?v
z0iPGEj9IvBR7rJrOe29RP|XUYvBqnG89jiVNk9%o0UF3h*w#_fg;`oH+%y^Z_iA!{
zr;DE}6~9s$4wwCFgG_@(?#V5M_>KA(Zka~p-TNH>Jd;kCcQz`Fs%G&hz_OEi1qfO<
zFs~TkrrGT^X|->Ap>(s*N21FxTE557rpnMs(_O{B{CqaQ;k;pUC|?qRvZezu%_|*u
zD%|ii-+ZA;v=Fw(efJC}!ShetYUitu!j#c)?U4vA6*EZ+CFHu@MQ!HWI!IR_+v4HV
za$g6}H3Ka$*0@0SchdF}LUc0%R=bFTyf&53R-kVTjKnbegaszWQrr~OV+*Sns6MxD
z&U?@AJ@UW$DknMa3`<O8ED~M(qO_^cZgo{O7WwKNeQyAtoy7<D(9i|aUMy#oT<Wq`
zU!~tTncSx~v`90v0^&VVKZ@b1v-K<zC)(FZ8(GN{XIFL`zL04j5=WB^o=Mz4rVX2E
zryDwt6qSpP3zj{c1647{ZtnzS+DoQRe*L|YO_AhYXH})1yhlu$s-(7v0K4hpD}py^
zT@hX^{gPSgrzcT3Oo-;rYKle1>7*bg;$!3&b=<l)SM=jO8?ml?z?DfY^Pvcw50}yG
z$I(w+8g^iHaBy=v{HRQf$FlAyGJlZH5>n^FG7`ysp%B-%p*E_3{z_hkyBEuyG&+sa
zS>K8)@OBLKer>mahzWEeE13LsoR6En+AaK1CN7TtoLkS2uk*u^CscejmI(?_1unou
zh0iKyvf;U&#1&C!yCD1H{73%1^Ru&w7luJzC)_^7|2AfmT7D0dB1jVG&rRL|`k$$E
zyf@fb@2^6@L#v?~yR$L0Mxj;dr^U4Clau|=BXNQ2gpqNQQEsSb53VAjO!ebj#;HXQ
zglvt>psuXUj)N*&PD3|A%#^BiZWi1ab!7rM1ZqMqPoHRMCh$|~YVl8V9(y!%pEcfB
z15lO$P7VRi3XXoxX9ggRkdhTg+z^+NGLw=~kiDfKB`u0TC?F7sGS~9|Mey`?a&>w1
ze-qSphq=xOJbxmXdb<P!IrupP)SSHUI>WU+9qu`sI6F8!^6hn2Iy(f=Mj2>Us$(Ai
E2b3c!L;wH)

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-1.10.2.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-1.10.2.js
deleted file mode 100644
index c5c648255c1..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-1.10.2.js
+++ /dev/null
@@ -1,9789 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.10.2
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-07-03T13:48Z
- */
-(function( window, undefined ) {
-
-// Can't do this because several apps including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-// Support: Firefox 18+
-//"use strict";
-var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<10
-	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	location = window.location,
-	document = window.document,
-	docElem = document.documentElement,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
-
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
-
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
-
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
-
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
-
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
-
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		if ( data === null ) {
-			return data;
-		}
-
-		if ( typeof data === "string" ) {
-
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
-
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
-
-					return ( new Function( "return " + data ) )();
-				}
-			}
-		}
-
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
-
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
-
-					if ( value === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
-
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
-			}
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
-
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
-
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
-
-				// ...except when executing function values
-				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
-				}
-			}
-
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// detach all dom ready events
-						detach();
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
-
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
-
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-/*!
- * Sizzle CSS Selector Engine v1.10.2
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2013-07-03
- */
-(function( window, undefined ) {
-
-var i,
-	support,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	outermostContext,
-	sortInput,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	hasDuplicate = false,
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
-
-	// Support tests
-	documentIsHTML = !isXML( doc );
-
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
-			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
-
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
-
-		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
-
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
-
-			return compare & 4 ? -1 : 1;
-		}
-
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val === undefined ?
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null :
-		val;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
-							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome<14
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
-		}
-	});
-}
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
-								}
-							});
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function( support ) {
-
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
-
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
-
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
-
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
-
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
-
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
-
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
-
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
-
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
-
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
-
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
-
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
-
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
-
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
-
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
-
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
-
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
-
-		div.cloneNode( true ).click();
-	}
-
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
-
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
-
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
-
-		body.appendChild( container ).appendChild( div );
-
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
-
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
-			}
-		}
-
-		body.removeChild( container );
-
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
-
-	return support;
-})({});
-
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var ret, thisCache,
-		internalKey = jQuery.expando,
-
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
-
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
-
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
-
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
-		}
-	}
-
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
-
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-		}
-	}
-
-	thisCache = cache[ id ];
-
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
-
-		thisCache = thisCache.data;
-	}
-
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
-
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
-
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
-
-		// Test for null|undefined property data
-		if ( ret == null ) {
-
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
-		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
-
-	var thisCache, i,
-		isNode = elem.nodeType,
-
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
-
-	if ( name ) {
-
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-		if ( thisCache ) {
-
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
-
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
-
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-						name = name.split(" ");
-					}
-				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
-
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
-			}
-
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
-				return;
-			}
-		}
-	}
-
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
-
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
-		}
-	}
-
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
-
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
-
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
-
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
-
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
-
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		return arguments.length > 1 ?
-
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
-
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
-
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-					elem.className = jQuery.trim( cur );
-
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
-
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( cur ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
-					}
-				}
-
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-			ret = jQuery.find.attr( elem, name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
-					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
-					}
-
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
-				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
-
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
-			}
-		}
-	}
-});
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
-
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
-
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
-					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
-
-						name.toLowerCase() :
-						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
-
-// fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
-			}
-		}
-	};
-}
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
-
-			ret.value = value += "";
-
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
-					ret.value :
-					null;
-		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		};
-	});
-}
-
-
-// Some attributes require a special call on IE
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
-			}
-		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
-	}
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
-
-		return handlerQueue;
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
-						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
-					}
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
-
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( jQuery.unique(all) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
-
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		});
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
-
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
-
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
-				}
-				elem.parentNode.removeChild( elem );
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
-
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
-
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
-				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
-
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, callback, allowIntersection ) {
-
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
-
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
-
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
-
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
-
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
-						}
-					}
-
-					callback.call( this[i], node, i );
-				}
-
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
-
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
-
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
-							}
-						}
-					}
-				}
-
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
-			}
-		}
-
-		return this;
-	}
-});
-
-// Support: IE<8
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
-	}
-	return elem;
-}
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
-	}
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
-
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
-		}
-
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
-
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
-
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
-
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
-			}
-		}
-	}
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
-
-// Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		destElements = srcElements = node = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
-
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
-
-			nodes = [],
-			i = 0;
-
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
-
-			if ( elem || elem === 0 ) {
-
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
-
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
-
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
-
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
-
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
-
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
-							}
-						}
-					}
-
-					jQuery.merge( nodes, tmp.childNodes );
-
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
-
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
-
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
-				}
-			}
-		}
-
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
-
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
-
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
-
-			contains = jQuery.contains( elem.ownerDocument, elem );
-
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
-
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
-
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
-					}
-				}
-			}
-		}
-
-		tmp = null;
-
-		return safe;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						core_deletedIds.push( id );
-					}
-				}
-			}
-		}
-	},
-
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
-
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
-				}
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-});
-
-// NOTE: we've included the "window" in window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
-
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
-
-		if ( computed ) {
-
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
-
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-
-// Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
-				}
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
-					}
-				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	}
-});
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
-
-	ajax_rquery = /\?/,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
-
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
-
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
-
-	return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement("script");
-
-				script.async = true;
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
-
-						// Dereference the script
-						script = null;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
-				}
-			}
-		};
-	}
-});
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
-		}
-	};
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
-
-// Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( err ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
-
-			// we're done with this property
-			return tween;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
-
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9
-// Panic based approach to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// enable finishing flag on private data
-			data.finish = true;
-
-			// empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
-	};
-};
-
-jQuery.offset = {
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
-
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || docElem;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-// Limit scope pollution from any deprecated API
-// (function() {
-
-// The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-// })();
-if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-	// Expose jQuery as module.exports in loaders that implement the Node
-	// module pattern (including browserify). Do not create the global, since
-	// the user will be storing it themselves locally, and globals are frowned
-	// upon in the Node module world.
-	module.exports = jQuery;
-} else {
-	// Otherwise expose jQuery to the global object as usual
-	window.jQuery = window.$ = jQuery;
-
-	// Register as a named AMD module, since jQuery can be concatenated with other
-	// files that may use define, but not via a proper concatenation script that
-	// understands anonymous AMD modules. A named AMD is safest and most robust
-	// way to register. Lowercase jquery is used because AMD module names are
-	// derived from file names, and jQuery is normally delivered in a lowercase
-	// file name. Do this after creating the global so that if an AMD module wants
-	// to call noConflict to hide this version of jQuery, it will work.
-	if ( typeof define === "function" && define.amd ) {
-		define( "jquery", [], function () { return jQuery; } );
-	}
-}
-
-})( window );
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.css
deleted file mode 100644
index 4f2fc19f06a..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.css
+++ /dev/null
@@ -1,544 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-05-20
-* http://jqueryui.com
-* Includes: core.css, autocomplete.css, menu.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
-
-/* Component containers
-----------------------------------*/
-.ui-widget {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1.1em;
-}
-.ui-widget .ui-widget {
-	font-size: 1em;
-}
-.ui-widget input,
-.ui-widget select,
-.ui-widget textarea,
-.ui-widget button {
-	font-family: Verdana,Arial,sans-serif;
-	font-size: 1em;
-}
-.ui-widget-content {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
-	color: #222222;
-}
-.ui-widget-content a {
-	color: #222222;
-}
-.ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
-	color: #222222;
-	font-weight: bold;
-}
-.ui-widget-header a {
-	color: #222222;
-}
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
-.ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #555555;
-}
-.ui-state-default a,
-.ui-state-default a:link,
-.ui-state-default a:visited {
-	color: #555555;
-	text-decoration: none;
-}
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus {
-	border: 1px solid #999999;
-	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active {
-	border: 1px solid #aaaaaa;
-	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
-	font-weight: normal;
-	color: #212121;
-}
-.ui-state-active a,
-.ui-state-active a:link,
-.ui-state-active a:visited {
-	color: #212121;
-	text-decoration: none;
-}
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight,
-.ui-widget-content .ui-state-highlight,
-.ui-widget-header .ui-state-highlight {
-	border: 1px solid #fcefa1;
-	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
-	color: #363636;
-}
-.ui-state-highlight a,
-.ui-widget-content .ui-state-highlight a,
-.ui-widget-header .ui-state-highlight a {
-	color: #363636;
-}
-.ui-state-error,
-.ui-widget-content .ui-state-error,
-.ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
-	color: #cd0a0a;
-}
-.ui-state-error a,
-.ui-widget-content .ui-state-error a,
-.ui-widget-header .ui-state-error a {
-	color: #cd0a0a;
-}
-.ui-state-error-text,
-.ui-widget-content .ui-state-error-text,
-.ui-widget-header .ui-state-error-text {
-	color: #cd0a0a;
-}
-.ui-priority-primary,
-.ui-widget-content .ui-priority-primary,
-.ui-widget-header .ui-priority-primary {
-	font-weight: bold;
-}
-.ui-priority-secondary,
-.ui-widget-content .ui-priority-secondary,
-.ui-widget-header .ui-priority-secondary {
-	opacity: .7;
-	filter:Alpha(Opacity=70); /* support: IE8 */
-	font-weight: normal;
-}
-.ui-state-disabled,
-.ui-widget-content .ui-state-disabled,
-.ui-widget-header .ui-state-disabled {
-	opacity: .35;
-	filter:Alpha(Opacity=35); /* support: IE8 */
-	background-image: none;
-}
-.ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
-}
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	width: 16px;
-	height: 16px;
-}
-.ui-icon,
-.ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png");
-}
-.ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png");
-}
-.ui-state-hover .ui-icon,
-.ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png");
-}
-.ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png");
-}
-.ui-state-error .ui-icon,
-.ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png");
-}
-
-/* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-left,
-.ui-corner-tl {
-	border-top-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-top,
-.ui-corner-right,
-.ui-corner-tr {
-	border-top-right-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-left,
-.ui-corner-bl {
-	border-bottom-left-radius: 4px;
-}
-.ui-corner-all,
-.ui-corner-bottom,
-.ui-corner-right,
-.ui-corner-br {
-	border-bottom-right-radius: 4px;
-}
-
-/* Overlays */
-.ui-widget-overlay {
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-}
-.ui-widget-shadow {
-	margin: -8px 0 0 -8px;
-	padding: 8px;
-	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
-	opacity: .3;
-	filter: Alpha(Opacity=30); /* support: IE8 */
-	border-radius: 8px;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.js
deleted file mode 100644
index e1a68a15bf1..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.js
+++ /dev/null
@@ -1,2610 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-05-20
-* http://jqueryui.com
-* Includes: core.js, widget.js, position.js, autocomplete.js, menu.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}(function( $ ) {
-/*!
- * jQuery UI Core 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/ui-core/
- */
-
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
-$.extend( $.ui, {
-	version: "1.11.4",
-
-	keyCode: {
-		BACKSPACE: 8,
-		COMMA: 188,
-		DELETE: 46,
-		DOWN: 40,
-		END: 35,
-		ENTER: 13,
-		ESCAPE: 27,
-		HOME: 36,
-		LEFT: 37,
-		PAGE_DOWN: 34,
-		PAGE_UP: 33,
-		PERIOD: 190,
-		RIGHT: 39,
-		SPACE: 32,
-		TAB: 9,
-		UP: 38
-	}
-});
-
-// plugins
-$.fn.extend({
-	scrollParent: function( includeHidden ) {
-		var position = this.css( "position" ),
-			excludeStaticParent = position === "absolute",
-			overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
-			scrollParent = this.parents().filter( function() {
-				var parent = $( this );
-				if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
-					return false;
-				}
-				return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + parent.css( "overflow-x" ) );
-			}).eq( 0 );
-
-		return position === "fixed" || !scrollParent.length ? $( this[ 0 ].ownerDocument || document ) : scrollParent;
-	},
-
-	uniqueId: (function() {
-		var uuid = 0;
-
-		return function() {
-			return this.each(function() {
-				if ( !this.id ) {
-					this.id = "ui-id-" + ( ++uuid );
-				}
-			});
-		};
-	})(),
-
-	removeUniqueId: function() {
-		return this.each(function() {
-			if ( /^ui-id-\d+$/.test( this.id ) ) {
-				$( this ).removeAttr( "id" );
-			}
-		});
-	}
-});
-
-// selectors
-function focusable( element, isTabIndexNotNaN ) {
-	var map, mapName, img,
-		nodeName = element.nodeName.toLowerCase();
-	if ( "area" === nodeName ) {
-		map = element.parentNode;
-		mapName = map.name;
-		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
-			return false;
-		}
-		img = $( "img[usemap='#" + mapName + "']" )[ 0 ];
-		return !!img && visible( img );
-	}
-	return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ?
-		!element.disabled :
-		"a" === nodeName ?
-			element.href || isTabIndexNotNaN :
-			isTabIndexNotNaN) &&
-		// the element and all of its ancestors must be visible
-		visible( element );
-}
-
-function visible( element ) {
-	return $.expr.filters.visible( element ) &&
-		!$( element ).parents().addBack().filter(function() {
-			return $.css( this, "visibility" ) === "hidden";
-		}).length;
-}
-
-$.extend( $.expr[ ":" ], {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo(function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		}) :
-		// support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		},
-
-	focusable: function( element ) {
-		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
-	},
-
-	tabbable: function( element ) {
-		var tabIndex = $.attr( element, "tabindex" ),
-			isTabIndexNaN = isNaN( tabIndex );
-		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
-	}
-});
-
-// support: jQuery <1.8
-if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
-
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			});
-			return size;
-		}
-
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each(function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			});
-		};
-
-		$.fn[ "outer" + name] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each(function() {
-				$( this).css( type, reduce( this, size, true, margin ) + "px" );
-			});
-		};
-	});
-}
-
-// support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
-if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
-	$.fn.removeData = (function( removeData ) {
-		return function( key ) {
-			if ( arguments.length ) {
-				return removeData.call( this, $.camelCase( key ) );
-			} else {
-				return removeData.call( this );
-			}
-		};
-	})( $.fn.removeData );
-}
-
-// deprecated
-$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
-$.fn.extend({
-	focus: (function( orig ) {
-		return function( delay, fn ) {
-			return typeof delay === "number" ?
-				this.each(function() {
-					var elem = this;
-					setTimeout(function() {
-						$( elem ).focus();
-						if ( fn ) {
-							fn.call( elem );
-						}
-					}, delay );
-				}) :
-				orig.apply( this, arguments );
-		};
-	})( $.fn.focus ),
-
-	disableSelection: (function() {
-		var eventType = "onselectstart" in document.createElement( "div" ) ?
-			"selectstart" :
-			"mousedown";
-
-		return function() {
-			return this.bind( eventType + ".ui-disableSelection", function( event ) {
-				event.preventDefault();
-			});
-		};
-	})(),
-
-	enableSelection: function() {
-		return this.unbind( ".ui-disableSelection" );
-	},
-
-	zIndex: function( zIndex ) {
-		if ( zIndex !== undefined ) {
-			return this.css( "zIndex", zIndex );
-		}
-
-		if ( this.length ) {
-			var elem = $( this[ 0 ] ), position, value;
-			while ( elem.length && elem[ 0 ] !== document ) {
-				// Ignore z-index if position is set to a value where z-index is ignored by the browser
-				// This makes behavior of this function consistent across browsers
-				// WebKit always returns auto if the element is positioned
-				position = elem.css( "position" );
-				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-					// IE returns 0 when zIndex is not specified
-					// other browsers return a string
-					// we ignore the case of nested elements with an explicit value of 0
-					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-					value = parseInt( elem.css( "zIndex" ), 10 );
-					if ( !isNaN( value ) && value !== 0 ) {
-						return value;
-					}
-				}
-				elem = elem.parent();
-			}
-		}
-
-		return 0;
-	}
-});
-
-// $.ui.plugin is deprecated. Use $.widget() extensions instead.
-$.ui.plugin = {
-	add: function( module, option, set ) {
-		var i,
-			proto = $.ui[ module ].prototype;
-		for ( i in set ) {
-			proto.plugins[ i ] = proto.plugins[ i ] || [];
-			proto.plugins[ i ].push( [ option, set[ i ] ] );
-		}
-	},
-	call: function( instance, name, args, allowDisconnected ) {
-		var i,
-			set = instance.plugins[ name ];
-
-		if ( !set ) {
-			return;
-		}
-
-		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
-			return;
-		}
-
-		for ( i = 0; i < set.length; i++ ) {
-			if ( instance.options[ set[ i ][ 0 ] ] ) {
-				set[ i ][ 1 ].apply( instance.element, args );
-			}
-		}
-	}
-};
-
-
-/*!
- * jQuery UI Widget 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/jQuery.widget/
- */
-
-
-var widget_uuid = 0,
-	widget_slice = Array.prototype.slice;
-
-$.cleanData = (function( orig ) {
-	return function( elems ) {
-		var events, elem, i;
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			try {
-
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
-		}
-		orig( elems );
-	};
-})( $.cleanData );
-
-$.widget = function( name, base, prototype ) {
-	var fullName, existingConstructor, constructor, basePrototype,
-		// proxiedPrototype allows the provided prototype to remain unmodified
-		// so that it can be used as a mixin for multiple widgets (#8876)
-		proxiedPrototype = {},
-		namespace = name.split( "." )[ 0 ];
-
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-		return !!$.data( elem, fullName );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	existingConstructor = $[ namespace ][ name ];
-	constructor = $[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
-			return new constructor( options, element );
-		}
-
-		// allow instantiation without initializing for simple inheritance
-		// must use "new" keyword (the code above always passes args)
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-	// extend with the existing constructor to carry over any static properties
-	$.extend( constructor, existingConstructor, {
-		version: prototype.version,
-		// copy the object used to create the prototype in case we need to
-		// redefine the widget later
-		_proto: $.extend( {}, prototype ),
-		// track widgets that inherit from this widget in case this widget is
-		// redefined after a widget inherits from it
-		_childConstructors: []
-	});
-
-	basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-	basePrototype.options = $.widget.extend( {}, basePrototype.options );
-	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
-			proxiedPrototype[ prop ] = value;
-			return;
-		}
-		proxiedPrototype[ prop ] = (function() {
-			var _super = function() {
-					return base.prototype[ prop ].apply( this, arguments );
-				},
-				_superApply = function( args ) {
-					return base.prototype[ prop ].apply( this, args );
-				};
-			return function() {
-				var __super = this._super,
-					__superApply = this._superApply,
-					returnValue;
-
-				this._super = _super;
-				this._superApply = _superApply;
-
-				returnValue = value.apply( this, arguments );
-
-				this._super = __super;
-				this._superApply = __superApply;
-
-				return returnValue;
-			};
-		})();
-	});
-	constructor.prototype = $.widget.extend( basePrototype, {
-		// TODO: remove support for widgetEventPrefix
-		// always use the name + a colon as the prefix, e.g., draggable:start
-		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
-	}, proxiedPrototype, {
-		constructor: constructor,
-		namespace: namespace,
-		widgetName: name,
-		widgetFullName: fullName
-	});
-
-	// If this widget is being redefined then we need to find all widgets that
-	// are inheriting from it and redefine all of them so that they inherit from
-	// the new version of this widget. We're essentially trying to replace one
-	// level in the prototype chain.
-	if ( existingConstructor ) {
-		$.each( existingConstructor._childConstructors, function( i, child ) {
-			var childPrototype = child.prototype;
-
-			// redefine the child widget using the same prototype that was
-			// originally used, but inherit from the new version of the base
-			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
-		});
-		// remove the list of existing child constructors from the old constructor
-		// so the old child constructors can be garbage collected
-		delete existingConstructor._childConstructors;
-	} else {
-		base._childConstructors.push( constructor );
-	}
-
-	$.widget.bridge( name, constructor );
-
-	return constructor;
-};
-
-$.widget.extend = function( target ) {
-	var input = widget_slice.call( arguments, 1 ),
-		inputIndex = 0,
-		inputLength = input.length,
-		key,
-		value;
-	for ( ; inputIndex < inputLength; inputIndex++ ) {
-		for ( key in input[ inputIndex ] ) {
-			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				// Clone objects
-				if ( $.isPlainObject( value ) ) {
-					target[ key ] = $.isPlainObject( target[ key ] ) ?
-						$.widget.extend( {}, target[ key ], value ) :
-						// Don't extend strings, arrays, etc. with objects
-						$.widget.extend( {}, value );
-				// Copy everything else by reference
-				} else {
-					target[ key ] = value;
-				}
-			}
-		}
-	}
-	return target;
-};
-
-$.widget.bridge = function( name, object ) {
-	var fullName = object.prototype.widgetFullName || name;
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = widget_slice.call( arguments, 1 ),
-			returnValue = this;
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var methodValue,
-					instance = $.data( this, fullName );
-				if ( options === "instance" ) {
-					returnValue = instance;
-					return false;
-				}
-				if ( !instance ) {
-					return $.error( "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'" );
-				}
-				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
-					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
-				}
-				methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue && methodValue.jquery ?
-						returnValue.pushStack( methodValue.get() ) :
-						methodValue;
-					return false;
-				}
-			});
-		} else {
-
-			// Allow multiple hashes to be passed on init
-			if ( args.length ) {
-				options = $.widget.extend.apply( null, [ options ].concat(args) );
-			}
-
-			this.each(function() {
-				var instance = $.data( this, fullName );
-				if ( instance ) {
-					instance.option( options || {} );
-					if ( instance._init ) {
-						instance._init();
-					}
-				} else {
-					$.data( this, fullName, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( /* options, element */ ) {};
-$.Widget._childConstructors = [];
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	defaultElement: "<div>",
-	options: {
-		disabled: false,
-
-		// callbacks
-		create: null
-	},
-	_createWidget: function( options, element ) {
-		element = $( element || this.defaultElement || this )[ 0 ];
-		this.element = $( element );
-		this.uuid = widget_uuid++;
-		this.eventNamespace = "." + this.widgetName + this.uuid;
-
-		this.bindings = $();
-		this.hoverable = $();
-		this.focusable = $();
-
-		if ( element !== this ) {
-			$.data( element, this.widgetFullName, this );
-			this._on( true, this.element, {
-				remove: function( event ) {
-					if ( event.target === element ) {
-						this.destroy();
-					}
-				}
-			});
-			this.document = $( element.style ?
-				// element within the document
-				element.ownerDocument :
-				// element is window or document
-				element.document || element );
-			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
-		}
-
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		this._create();
-		this._trigger( "create", null, this._getCreateEventData() );
-		this._init();
-	},
-	_getCreateOptions: $.noop,
-	_getCreateEventData: $.noop,
-	_create: $.noop,
-	_init: $.noop,
-
-	destroy: function() {
-		this._destroy();
-		// we can probably remove the unbind calls in 2.0
-		// all event bindings should go through this._on()
-		this.element
-			.unbind( this.eventNamespace )
-			.removeData( this.widgetFullName )
-			// support: jquery <1.6.3
-			// http://bugs.jquery.com/ticket/9413
-			.removeData( $.camelCase( this.widgetFullName ) );
-		this.widget()
-			.unbind( this.eventNamespace )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetFullName + "-disabled " +
-				"ui-state-disabled" );
-
-		// clean up events and states
-		this.bindings.unbind( this.eventNamespace );
-		this.hoverable.removeClass( "ui-state-hover" );
-		this.focusable.removeClass( "ui-state-focus" );
-	},
-	_destroy: $.noop,
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key,
-			parts,
-			curOption,
-			i;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.widget.extend( {}, this.options );
-		}
-
-		if ( typeof key === "string" ) {
-			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-			options = {};
-			parts = key.split( "." );
-			key = parts.shift();
-			if ( parts.length ) {
-				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-				for ( i = 0; i < parts.length - 1; i++ ) {
-					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-					curOption = curOption[ parts[ i ] ];
-				}
-				key = parts.pop();
-				if ( arguments.length === 1 ) {
-					return curOption[ key ] === undefined ? null : curOption[ key ];
-				}
-				curOption[ key ] = value;
-			} else {
-				if ( arguments.length === 1 ) {
-					return this.options[ key ] === undefined ? null : this.options[ key ];
-				}
-				options[ key ] = value;
-			}
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var key;
-
-		for ( key in options ) {
-			this._setOption( key, options[ key ] );
-		}
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				.toggleClass( this.widgetFullName + "-disabled", !!value );
-
-			// If the widget is becoming disabled, then nothing is interactive
-			if ( value ) {
-				this.hoverable.removeClass( "ui-state-hover" );
-				this.focusable.removeClass( "ui-state-focus" );
-			}
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOptions({ disabled: false });
-	},
-	disable: function() {
-		return this._setOptions({ disabled: true });
-	},
-
-	_on: function( suppressDisabledCheck, element, handlers ) {
-		var delegateElement,
-			instance = this;
-
-		// no suppressDisabledCheck flag, shuffle arguments
-		if ( typeof suppressDisabledCheck !== "boolean" ) {
-			handlers = element;
-			element = suppressDisabledCheck;
-			suppressDisabledCheck = false;
-		}
-
-		// no element argument, shuffle and use this.element
-		if ( !handlers ) {
-			handlers = element;
-			element = this.element;
-			delegateElement = this.widget();
-		} else {
-			element = delegateElement = $( element );
-			this.bindings = this.bindings.add( element );
-		}
-
-		$.each( handlers, function( event, handler ) {
-			function handlerProxy() {
-				// allow widgets to customize the disabled handling
-				// - disabled as an array instead of boolean
-				// - disabled class as method for disabling individual parts
-				if ( !suppressDisabledCheck &&
-						( instance.options.disabled === true ||
-							$( this ).hasClass( "ui-state-disabled" ) ) ) {
-					return;
-				}
-				return ( typeof handler === "string" ? instance[ handler ] : handler )
-					.apply( instance, arguments );
-			}
-
-			// copy the guid so direct unbinding works
-			if ( typeof handler !== "string" ) {
-				handlerProxy.guid = handler.guid =
-					handler.guid || handlerProxy.guid || $.guid++;
-			}
-
-			var match = event.match( /^([\w:-]*)\s*(.*)$/ ),
-				eventName = match[1] + instance.eventNamespace,
-				selector = match[2];
-			if ( selector ) {
-				delegateElement.delegate( selector, eventName, handlerProxy );
-			} else {
-				element.bind( eventName, handlerProxy );
-			}
-		});
-	},
-
-	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
-			this.eventNamespace;
-		element.unbind( eventName ).undelegate( eventName );
-
-		// Clear the stack to avoid memory leaks (#10056)
-		this.bindings = $( this.bindings.not( element ).get() );
-		this.focusable = $( this.focusable.not( element ).get() );
-		this.hoverable = $( this.hoverable.not( element ).get() );
-	},
-
-	_delay: function( handler, delay ) {
-		function handlerProxy() {
-			return ( typeof handler === "string" ? instance[ handler ] : handler )
-				.apply( instance, arguments );
-		}
-		var instance = this;
-		return setTimeout( handlerProxy, delay || 0 );
-	},
-
-	_hoverable: function( element ) {
-		this.hoverable = this.hoverable.add( element );
-		this._on( element, {
-			mouseenter: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-hover" );
-			},
-			mouseleave: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-hover" );
-			}
-		});
-	},
-
-	_focusable: function( element ) {
-		this.focusable = this.focusable.add( element );
-		this._on( element, {
-			focusin: function( event ) {
-				$( event.currentTarget ).addClass( "ui-state-focus" );
-			},
-			focusout: function( event ) {
-				$( event.currentTarget ).removeClass( "ui-state-focus" );
-			}
-		});
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
-			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-		if ( typeof options === "string" ) {
-			options = { effect: options };
-		}
-		var hasOptions,
-			effectName = !options ?
-				method :
-				options === true || typeof options === "number" ?
-					defaultEffect :
-					options.effect || defaultEffect;
-		options = options || {};
-		if ( typeof options === "number" ) {
-			options = { duration: options };
-		}
-		hasOptions = !$.isEmptyObject( options );
-		options.complete = callback;
-		if ( options.delay ) {
-			element.delay( options.delay );
-		}
-		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-			element[ method ]( options );
-		} else if ( effectName !== method && element[ effectName ] ) {
-			element[ effectName ]( options.duration, options.easing, callback );
-		} else {
-			element.queue(function( next ) {
-				$( this )[ method ]();
-				if ( callback ) {
-					callback.call( element[ 0 ] );
-				}
-				next();
-			});
-		}
-	};
-});
-
-var widget = $.widget;
-
-
-/*!
- * jQuery UI Position 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/position/
- */
-
-(function() {
-
-$.ui = $.ui || {};
-
-var cachedScrollbarWidth, supportsOffsetFractions,
-	max = Math.max,
-	abs = Math.abs,
-	round = Math.round,
-	rhorizontal = /left|center|right/,
-	rvertical = /top|center|bottom/,
-	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
-	rposition = /^\w+/,
-	rpercent = /%$/,
-	_position = $.fn.position;
-
-function getOffsets( offsets, width, height ) {
-	return [
-		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
-		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
-	];
-}
-
-function parseCss( element, property ) {
-	return parseInt( $.css( element, property ), 10 ) || 0;
-}
-
-function getDimensions( elem ) {
-	var raw = elem[0];
-	if ( raw.nodeType === 9 ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: 0, left: 0 }
-		};
-	}
-	if ( $.isWindow( raw ) ) {
-		return {
-			width: elem.width(),
-			height: elem.height(),
-			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
-		};
-	}
-	if ( raw.preventDefault ) {
-		return {
-			width: 0,
-			height: 0,
-			offset: { top: raw.pageY, left: raw.pageX }
-		};
-	}
-	return {
-		width: elem.outerWidth(),
-		height: elem.outerHeight(),
-		offset: elem.offset()
-	};
-}
-
-$.position = {
-	scrollbarWidth: function() {
-		if ( cachedScrollbarWidth !== undefined ) {
-			return cachedScrollbarWidth;
-		}
-		var w1, w2,
-			div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
-			innerDiv = div.children()[0];
-
-		$( "body" ).append( div );
-		w1 = innerDiv.offsetWidth;
-		div.css( "overflow", "scroll" );
-
-		w2 = innerDiv.offsetWidth;
-
-		if ( w1 === w2 ) {
-			w2 = div[0].clientWidth;
-		}
-
-		div.remove();
-
-		return (cachedScrollbarWidth = w1 - w2);
-	},
-	getScrollInfo: function( within ) {
-		var overflowX = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-x" ),
-			overflowY = within.isWindow || within.isDocument ? "" :
-				within.element.css( "overflow-y" ),
-			hasOverflowX = overflowX === "scroll" ||
-				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
-			hasOverflowY = overflowY === "scroll" ||
-				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
-		return {
-			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
-			height: hasOverflowX ? $.position.scrollbarWidth() : 0
-		};
-	},
-	getWithinInfo: function( element ) {
-		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[0] ),
-			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
-		return {
-			element: withinElement,
-			isWindow: isWindow,
-			isDocument: isDocument,
-			offset: withinElement.offset() || { left: 0, top: 0 },
-			scrollLeft: withinElement.scrollLeft(),
-			scrollTop: withinElement.scrollTop(),
-
-			// support: jQuery 1.6.x
-			// jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows
-			width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(),
-			height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight()
-		};
-	}
-};
-
-$.fn.position = function( options ) {
-	if ( !options || !options.of ) {
-		return _position.apply( this, arguments );
-	}
-
-	// make a copy, we don't want to modify arguments
-	options = $.extend( {}, options );
-
-	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
-		target = $( options.of ),
-		within = $.position.getWithinInfo( options.within ),
-		scrollInfo = $.position.getScrollInfo( within ),
-		collision = ( options.collision || "flip" ).split( " " ),
-		offsets = {};
-
-	dimensions = getDimensions( target );
-	if ( target[0].preventDefault ) {
-		// force left top to allow flipping
-		options.at = "left top";
-	}
-	targetWidth = dimensions.width;
-	targetHeight = dimensions.height;
-	targetOffset = dimensions.offset;
-	// clone to reuse original targetOffset later
-	basePosition = $.extend( {}, targetOffset );
-
-	// force my and at to have valid horizontal and vertical positions
-	// if a value is missing or invalid, it will be converted to center
-	$.each( [ "my", "at" ], function() {
-		var pos = ( options[ this ] || "" ).split( " " ),
-			horizontalOffset,
-			verticalOffset;
-
-		if ( pos.length === 1) {
-			pos = rhorizontal.test( pos[ 0 ] ) ?
-				pos.concat( [ "center" ] ) :
-				rvertical.test( pos[ 0 ] ) ?
-					[ "center" ].concat( pos ) :
-					[ "center", "center" ];
-		}
-		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
-		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
-
-		// calculate offsets
-		horizontalOffset = roffset.exec( pos[ 0 ] );
-		verticalOffset = roffset.exec( pos[ 1 ] );
-		offsets[ this ] = [
-			horizontalOffset ? horizontalOffset[ 0 ] : 0,
-			verticalOffset ? verticalOffset[ 0 ] : 0
-		];
-
-		// reduce to just the positions without the offsets
-		options[ this ] = [
-			rposition.exec( pos[ 0 ] )[ 0 ],
-			rposition.exec( pos[ 1 ] )[ 0 ]
-		];
-	});
-
-	// normalize collision option
-	if ( collision.length === 1 ) {
-		collision[ 1 ] = collision[ 0 ];
-	}
-
-	if ( options.at[ 0 ] === "right" ) {
-		basePosition.left += targetWidth;
-	} else if ( options.at[ 0 ] === "center" ) {
-		basePosition.left += targetWidth / 2;
-	}
-
-	if ( options.at[ 1 ] === "bottom" ) {
-		basePosition.top += targetHeight;
-	} else if ( options.at[ 1 ] === "center" ) {
-		basePosition.top += targetHeight / 2;
-	}
-
-	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
-	basePosition.left += atOffset[ 0 ];
-	basePosition.top += atOffset[ 1 ];
-
-	return this.each(function() {
-		var collisionPosition, using,
-			elem = $( this ),
-			elemWidth = elem.outerWidth(),
-			elemHeight = elem.outerHeight(),
-			marginLeft = parseCss( this, "marginLeft" ),
-			marginTop = parseCss( this, "marginTop" ),
-			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
-			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
-			position = $.extend( {}, basePosition ),
-			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
-
-		if ( options.my[ 0 ] === "right" ) {
-			position.left -= elemWidth;
-		} else if ( options.my[ 0 ] === "center" ) {
-			position.left -= elemWidth / 2;
-		}
-
-		if ( options.my[ 1 ] === "bottom" ) {
-			position.top -= elemHeight;
-		} else if ( options.my[ 1 ] === "center" ) {
-			position.top -= elemHeight / 2;
-		}
-
-		position.left += myOffset[ 0 ];
-		position.top += myOffset[ 1 ];
-
-		// if the browser doesn't support fractions, then round for consistent results
-		if ( !supportsOffsetFractions ) {
-			position.left = round( position.left );
-			position.top = round( position.top );
-		}
-
-		collisionPosition = {
-			marginLeft: marginLeft,
-			marginTop: marginTop
-		};
-
-		$.each( [ "left", "top" ], function( i, dir ) {
-			if ( $.ui.position[ collision[ i ] ] ) {
-				$.ui.position[ collision[ i ] ][ dir ]( position, {
-					targetWidth: targetWidth,
-					targetHeight: targetHeight,
-					elemWidth: elemWidth,
-					elemHeight: elemHeight,
-					collisionPosition: collisionPosition,
-					collisionWidth: collisionWidth,
-					collisionHeight: collisionHeight,
-					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
-					my: options.my,
-					at: options.at,
-					within: within,
-					elem: elem
-				});
-			}
-		});
-
-		if ( options.using ) {
-			// adds feedback as second argument to using callback, if present
-			using = function( props ) {
-				var left = targetOffset.left - position.left,
-					right = left + targetWidth - elemWidth,
-					top = targetOffset.top - position.top,
-					bottom = top + targetHeight - elemHeight,
-					feedback = {
-						target: {
-							element: target,
-							left: targetOffset.left,
-							top: targetOffset.top,
-							width: targetWidth,
-							height: targetHeight
-						},
-						element: {
-							element: elem,
-							left: position.left,
-							top: position.top,
-							width: elemWidth,
-							height: elemHeight
-						},
-						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
-						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
-					};
-				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
-					feedback.horizontal = "center";
-				}
-				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
-					feedback.vertical = "middle";
-				}
-				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
-					feedback.important = "horizontal";
-				} else {
-					feedback.important = "vertical";
-				}
-				options.using.call( this, props, feedback );
-			};
-		}
-
-		elem.offset( $.extend( position, { using: using } ) );
-	});
-};
-
-$.ui.position = {
-	fit: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
-				outerWidth = within.width,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = withinOffset - collisionPosLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
-				newOverRight;
-
-			// element is wider than within
-			if ( data.collisionWidth > outerWidth ) {
-				// element is initially over the left side of within
-				if ( overLeft > 0 && overRight <= 0 ) {
-					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
-					position.left += overLeft - newOverRight;
-				// element is initially over right side of within
-				} else if ( overRight > 0 && overLeft <= 0 ) {
-					position.left = withinOffset;
-				// element is initially over both left and right sides of within
-				} else {
-					if ( overLeft > overRight ) {
-						position.left = withinOffset + outerWidth - data.collisionWidth;
-					} else {
-						position.left = withinOffset;
-					}
-				}
-			// too far left -> align with left edge
-			} else if ( overLeft > 0 ) {
-				position.left += overLeft;
-			// too far right -> align with right edge
-			} else if ( overRight > 0 ) {
-				position.left -= overRight;
-			// adjust based on position and margin
-			} else {
-				position.left = max( position.left - collisionPosLeft, position.left );
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
-				outerHeight = data.within.height,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = withinOffset - collisionPosTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
-				newOverBottom;
-
-			// element is taller than within
-			if ( data.collisionHeight > outerHeight ) {
-				// element is initially over the top of within
-				if ( overTop > 0 && overBottom <= 0 ) {
-					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
-					position.top += overTop - newOverBottom;
-				// element is initially over bottom of within
-				} else if ( overBottom > 0 && overTop <= 0 ) {
-					position.top = withinOffset;
-				// element is initially over both top and bottom of within
-				} else {
-					if ( overTop > overBottom ) {
-						position.top = withinOffset + outerHeight - data.collisionHeight;
-					} else {
-						position.top = withinOffset;
-					}
-				}
-			// too far up -> align with top
-			} else if ( overTop > 0 ) {
-				position.top += overTop;
-			// too far down -> align with bottom edge
-			} else if ( overBottom > 0 ) {
-				position.top -= overBottom;
-			// adjust based on position and margin
-			} else {
-				position.top = max( position.top - collisionPosTop, position.top );
-			}
-		}
-	},
-	flip: {
-		left: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.left + within.scrollLeft,
-				outerWidth = within.width,
-				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
-				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
-				overLeft = collisionPosLeft - offsetLeft,
-				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
-				myOffset = data.my[ 0 ] === "left" ?
-					-data.elemWidth :
-					data.my[ 0 ] === "right" ?
-						data.elemWidth :
-						0,
-				atOffset = data.at[ 0 ] === "left" ?
-					data.targetWidth :
-					data.at[ 0 ] === "right" ?
-						-data.targetWidth :
-						0,
-				offset = -2 * data.offset[ 0 ],
-				newOverRight,
-				newOverLeft;
-
-			if ( overLeft < 0 ) {
-				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
-				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			} else if ( overRight > 0 ) {
-				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
-				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
-					position.left += myOffset + atOffset + offset;
-				}
-			}
-		},
-		top: function( position, data ) {
-			var within = data.within,
-				withinOffset = within.offset.top + within.scrollTop,
-				outerHeight = within.height,
-				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
-				collisionPosTop = position.top - data.collisionPosition.marginTop,
-				overTop = collisionPosTop - offsetTop,
-				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
-				top = data.my[ 1 ] === "top",
-				myOffset = top ?
-					-data.elemHeight :
-					data.my[ 1 ] === "bottom" ?
-						data.elemHeight :
-						0,
-				atOffset = data.at[ 1 ] === "top" ?
-					data.targetHeight :
-					data.at[ 1 ] === "bottom" ?
-						-data.targetHeight :
-						0,
-				offset = -2 * data.offset[ 1 ],
-				newOverTop,
-				newOverBottom;
-			if ( overTop < 0 ) {
-				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
-				if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			} else if ( overBottom > 0 ) {
-				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
-				if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
-					position.top += myOffset + atOffset + offset;
-				}
-			}
-		}
-	},
-	flipfit: {
-		left: function() {
-			$.ui.position.flip.left.apply( this, arguments );
-			$.ui.position.fit.left.apply( this, arguments );
-		},
-		top: function() {
-			$.ui.position.flip.top.apply( this, arguments );
-			$.ui.position.fit.top.apply( this, arguments );
-		}
-	}
-};
-
-// fraction support test
-(function() {
-	var testElement, testElementParent, testElementStyle, offsetLeft, i,
-		body = document.getElementsByTagName( "body" )[ 0 ],
-		div = document.createElement( "div" );
-
-	//Create a "fake body" for testing based on method used in jQuery.support
-	testElement = document.createElement( body ? "div" : "body" );
-	testElementStyle = {
-		visibility: "hidden",
-		width: 0,
-		height: 0,
-		border: 0,
-		margin: 0,
-		background: "none"
-	};
-	if ( body ) {
-		$.extend( testElementStyle, {
-			position: "absolute",
-			left: "-1000px",
-			top: "-1000px"
-		});
-	}
-	for ( i in testElementStyle ) {
-		testElement.style[ i ] = testElementStyle[ i ];
-	}
-	testElement.appendChild( div );
-	testElementParent = body || document.documentElement;
-	testElementParent.insertBefore( testElement, testElementParent.firstChild );
-
-	div.style.cssText = "position: absolute; left: 10.7432222px;";
-
-	offsetLeft = $( div ).offset().left;
-	supportsOffsetFractions = offsetLeft > 10 && offsetLeft < 11;
-
-	testElement.innerHTML = "";
-	testElementParent.removeChild( testElement );
-})();
-
-})();
-
-var position = $.ui.position;
-
-
-/*!
- * jQuery UI Menu 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/menu/
- */
-
-
-var menu = $.widget( "ui.menu", {
-	version: "1.11.4",
-	defaultElement: "<ul>",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-carat-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left-1 top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-
-		// Flag used to prevent firing of the click handler
-		// as the event bubbles up through nested menus
-		this.mouseHandled = false;
-		this.element
-			.uniqueId()
-			.addClass( "ui-menu ui-widget ui-widget-content" )
-			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
-			.attr({
-				role: this.options.role,
-				tabIndex: 0
-			});
-
-		if ( this.options.disabled ) {
-			this.element
-				.addClass( "ui-state-disabled" )
-				.attr( "aria-disabled", "true" );
-		}
-
-		this._on({
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item": function( event ) {
-				var target = $( event.target );
-				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.select( event );
-
-					// Only set the mouseHandled flag if the event will bubble, see #9469.
-					if ( !event.isPropagationStopped() ) {
-						this.mouseHandled = true;
-					}
-
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
-
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-				var target = $( event.currentTarget );
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				target.siblings( ".ui-state-active" ).removeClass( "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay(function() {
-					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
-						this.collapseAll( event );
-					}
-				});
-			},
-			keydown: "_keydown"
-		});
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				this.mouseHandled = false;
-			}
-		});
-	},
-
-	_destroy: function() {
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).addBack()
-				.removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons ui-front" )
-				.removeAttr( "role" )
-				.removeAttr( "tabIndex" )
-				.removeAttr( "aria-labelledby" )
-				.removeAttr( "aria-expanded" )
-				.removeAttr( "aria-hidden" )
-				.removeAttr( "aria-disabled" )
-				.removeUniqueId()
-				.show();
-
-		// Destroy menu items
-		this.element.find( ".ui-menu-item" )
-			.removeClass( "ui-menu-item" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-disabled" )
-			.removeUniqueId()
-			.removeClass( "ui-state-hover" )
-			.removeAttr( "tabIndex" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-haspopup" )
-			.children().each( function() {
-				var elem = $( this );
-				if ( elem.data( "ui-menu-submenu-carat" ) ) {
-					elem.remove();
-				}
-			});
-
-		// Destroy menu dividers
-		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip,
-			preventDefault = true;
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			character = String.fromCharCode( event.keyCode );
-			skip = false;
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				match = this._filterMenuItems( character );
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				this.previousFilter = character;
-				this.filterTimer = this._delay(function() {
-					delete this.previousFilter;
-				}, 1000 );
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.is( "[aria-haspopup='true']" ) ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus, items,
-			that = this,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
-
-		// Initialize nested menus
-		submenus.filter( ":not(.ui-menu)" )
-			.addClass( "ui-menu ui-widget ui-widget-content ui-front" )
-			.hide()
-			.attr({
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			})
-			.each(function() {
-				var menu = $( this ),
-					item = menu.parent(),
-					submenuCarat = $( "<span>" )
-						.addClass( "ui-menu-icon ui-icon " + icon )
-						.data( "ui-menu-submenu-carat", true );
-
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCarat );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			});
-
-		menus = submenus.add( this.element );
-		items = menus.find( this.options.items );
-
-		// Initialize menu-items containing spaces and/or dashes only as dividers
-		items.not( ".ui-menu-item" ).each(function() {
-			var item = $( this );
-			if ( that._isDivider( item ) ) {
-				item.addClass( "ui-widget-content ui-menu-divider" );
-			}
-		});
-
-		// Don't refresh list items that are already adapted
-		items.not( ".ui-menu-item, .ui-menu-divider" )
-			.addClass( "ui-menu-item" )
-			.uniqueId()
-			.attr({
-				tabIndex: -1,
-				role: this._itemRole()
-			});
-
-		// Add aria-disabled attribute to any disabled menu item
-		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			this.element.find( ".ui-menu-icon" )
-				.removeClass( this.options.icons.submenu )
-				.addClass( value.submenu );
-		}
-		if ( key === "disabled" ) {
-			this.element
-				.toggleClass( "ui-state-disabled", !!value )
-				.attr( "aria-disabled", value );
-		}
-		this._super( key, value );
-	},
-
-	focus: function( event, item ) {
-		var nested, focused;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-		focused = this.active.addClass( "ui-state-focus" ).removeClass( "ui-state-active" );
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		this.active
-			.parent()
-			.closest( ".ui-menu-item" )
-			.addClass( "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay(function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening(nested);
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.outerHeight();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this.active.removeClass( "ui-state-focus" );
-		this.active = null;
-
-		this._trigger( "blur", event, { item: this.active } );
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the carat icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay(function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend({
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay(function() {
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu
-			.find( ".ui-menu" )
-				.hide()
-				.attr( "aria-hidden", "true" )
-				.attr( "aria-expanded", "false" )
-			.end()
-			.find( ".ui-state-active" ).not( ".ui-state-focus" )
-				.removeClass( "ui-state-active" );
-	},
-
-	_closeOnDocumentClick: function( event ) {
-		return !$( event.target ).closest( ".ui-menu" ).length;
-	},
-
-	_isDivider: function( item ) {
-
-		// Match hyphen, em dash, en dash
-		return !/[^\-\u2014\u2013\s]/.test( item.text() );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-				.find( this.options.items )
-				.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay(function() {
-				this.focus( event, newItem );
-			});
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each(function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			});
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	},
-
-	_filterMenuItems: function(character) {
-		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-			regex = new RegExp( "^" + escapedCharacter, "i" );
-
-		return this.activeMenu
-			.find( this.options.items )
-
-			// Only match on items, not dividers or other content (#10571)
-			.filter( ".ui-menu-item" )
-			.filter(function() {
-				return regex.test( $.trim( $( this ).text() ) );
-			});
-	}
-});
-
-
-/*!
- * jQuery UI Autocomplete 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/autocomplete/
- */
-
-
-$.widget( "ui.autocomplete", {
-	version: "1.11.4",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
-
-	requestIndex: 0,
-	pending: 0,
-
-	_create: function() {
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		this.isMultiLine =
-			// Textareas are always multi-line
-			isTextarea ? true :
-			// Inputs are always single-line, even if inside a contentEditable element
-			// IE also treats inputs as contentEditable
-			isInput ? false :
-			// All other element types are determined by whether or not they're contentEditable
-			this.element.prop( "isContentEditable" );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this.element
-			.addClass( "ui-autocomplete-input" )
-			.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		});
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.addClass( "ui-autocomplete ui-front" )
-			.appendTo( this._appendTo() )
-			.menu({
-				// disable ARIA support, the live region takes care of that
-				role: null
-			})
-			.hide()
-			.menu( "instance" );
-
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay(function() {
-					delete this.cancelBlur;
-				});
-
-				// clicking on the scrollbar causes focus to shift to the body
-				// but we can't detect a mouseup or a click immediately afterward
-				// so we have to track the next mousedown and close the menu if
-				// the user clicks somewhere outside of the autocomplete
-				var menuElement = this.menu.element[ 0 ];
-				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
-					this._delay(function() {
-						var that = this;
-						this.document.one( "mousedown", function( event ) {
-							if ( event.target !== that.element[ 0 ] &&
-									event.target !== menuElement &&
-									!$.contains( menuElement, event.target ) ) {
-								that.close();
-							}
-						});
-					});
-				}
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.blur();
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						});
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) {
-					this.element.focus();
-					this.previous = previous;
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay(function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					});
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		});
-
-		this.liveRegion = $( "<span>", {
-				role: "status",
-				"aria-live": "assertive",
-				"aria-relevant": "additions"
-			})
-			.addClass( "ui-helper-hidden-accessible" )
-			.appendTo( this.document[ 0 ].body );
-
-		// turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		});
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element
-			.removeClass( "ui-autocomplete-input" )
-			.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax({
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response([]);
-					}
-				});
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay(function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this.element.addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy(function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this.element.removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			});
-		});
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend({
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		});
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" ).text( item.label ).appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	}
-});
-
-$.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		});
-	}
-});
-
-// live region extension, adding a `messages` option
-// NOTE: This is an experimental API. We are still investigating
-// a full solution for string manipulation and internationalization.
-$.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
-});
-
-var autocomplete = $.ui.autocomplete;
-
-
-
-}));
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.css
deleted file mode 100644
index 94816ca0055..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-05-20
-* http://jqueryui.com
-* Includes: core.css, autocomplete.css, menu.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.js
deleted file mode 100644
index e1ae5f606b6..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-05-20
-* http://jqueryui.com
-* Includes: core.js, widget.js, position.js, autocomplete.js, menu.js
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var s=0,n=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,a=n.call(arguments,1),o=0,r=a.length;r>o;o++)for(i in a[o])s=a[o][i],a[o].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(a){var o="string"==typeof a,r=n.call(arguments,1),h=this;return o?this.each(function(){var i,n=e.data(this,s);return"instance"===a?(h=n,!1):n?e.isFunction(n[a])&&"_"!==a.charAt(0)?(i=n[a].apply(n,r),i!==n&&void 0!==i?(h=i&&i.jquery?h.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+a+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+a+"'")}):(r.length&&(a=e.widget.extend.apply(null,[a].concat(r))),this.each(function(){var t=e.data(this,s);t?(t.option(a||{}),t._init&&t._init()):e.data(this,s,new i(a,this))})),h}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=s++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget,function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,N=e.extend({},y),M=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?N.left-=d:"center"===n.my[0]&&(N.left-=d/2),"bottom"===n.my[1]?N.top-=c:"center"===n.my[1]&&(N.top-=c/2),N.left+=M[0],N.top+=M[1],a||(N.left=h(N.left),N.top=h(N.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](N,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+M[0],p[1]+M[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-N.left,i=t+m-d,s=v.top-N.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:N.left,top:N.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(N,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.menu",{version:"1.11.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()
-},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete});
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.css
deleted file mode 100644
index 1a53ab4a15f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.css
+++ /dev/null
@@ -1,152 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.11.4
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/category/theming/
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden {
-	display: none;
-}
-.ui-helper-hidden-accessible {
-	border: 0;
-	clip: rect(0 0 0 0);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-}
-.ui-helper-reset {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	line-height: 1.3;
-	text-decoration: none;
-	font-size: 100%;
-	list-style: none;
-}
-.ui-helper-clearfix:before,
-.ui-helper-clearfix:after {
-	content: "";
-	display: table;
-	border-collapse: collapse;
-}
-.ui-helper-clearfix:after {
-	clear: both;
-}
-.ui-helper-clearfix {
-	min-height: 0; /* support: IE7 */
-}
-.ui-helper-zfix {
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	position: absolute;
-	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
-}
-
-.ui-front {
-	z-index: 100;
-}
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled {
-	cursor: default !important;
-}
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon {
-	display: block;
-	text-indent: -99999px;
-	overflow: hidden;
-	background-repeat: no-repeat;
-}
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-.ui-menu {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-	display: block;
-	outline: none;
-}
-.ui-menu .ui-menu {
-	position: absolute;
-}
-.ui-menu .ui-menu-item {
-	position: relative;
-	margin: 0;
-	padding: 3px 1em 3px .4em;
-	cursor: pointer;
-	min-height: 0; /* support: IE7 */
-	/* support: IE10, see #8844 */
-	list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");
-}
-.ui-menu .ui-menu-divider {
-	margin: 5px 0;
-	height: 0;
-	font-size: 0;
-	line-height: 0;
-	border-width: 1px 0 0 0;
-}
-.ui-menu .ui-state-focus,
-.ui-menu .ui-state-active {
-	margin: -1px;
-}
-
-/* icon support */
-.ui-menu-icons {
-	position: relative;
-}
-.ui-menu-icons .ui-menu-item {
-	padding-left: 2em;
-}
-
-/* left-aligned */
-.ui-menu .ui-icon {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: .2em;
-	margin: auto 0;
-}
-
-/* right-aligned */
-.ui-menu .ui-menu-icon {
-	left: auto;
-	right: 0;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.min.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.min.css
deleted file mode 100644
index 7f29f9a076f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jquery-ui.structure.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.11.4 - 2015-05-20
-* http://jqueryui.com
-* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.js
deleted file mode 100644
index a74cc709f68..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-
-JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
-<http://stuk.github.io/jszip-utils>
-
-(c) 2014 Stuart Knightley, David Duponchel
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
-
-*/
-;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-var global=typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};/* jshint evil: true, newcap: false */
-/* global IEBinaryToArray_ByteStr, IEBinaryToArray_ByteStr_Last */
-"use strict";
-
-// Adapted from http://stackoverflow.com/questions/1095102/how-do-i-load-binary-image-data-using-javascript-and-xmlhttprequest
-var IEBinaryToArray_ByteStr_Script =
-    "<!-- IEBinaryToArray_ByteStr -->\r\n"+
-    "<script type='text/vbscript'>\r\n"+
-    "Function IEBinaryToArray_ByteStr(Binary)\r\n"+
-    "   IEBinaryToArray_ByteStr = CStr(Binary)\r\n"+
-    "End Function\r\n"+
-    "Function IEBinaryToArray_ByteStr_Last(Binary)\r\n"+
-    "   Dim lastIndex\r\n"+
-    "   lastIndex = LenB(Binary)\r\n"+
-    "   if lastIndex mod 2 Then\r\n"+
-    "       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n"+
-    "   Else\r\n"+
-    "       IEBinaryToArray_ByteStr_Last = "+'""'+"\r\n"+
-    "   End If\r\n"+
-    "End Function\r\n"+
-    "</script>\r\n";
-
-// inject VBScript
-document.write(IEBinaryToArray_ByteStr_Script);
-
-global.JSZipUtils._getBinaryFromXHR = function (xhr) {
-    var binary = xhr.responseBody;
-    var byteMapping = {};
-    for ( var i = 0; i < 256; i++ ) {
-        for ( var j = 0; j < 256; j++ ) {
-            byteMapping[ String.fromCharCode( i + (j << 8) ) ] =
-                String.fromCharCode(i) + String.fromCharCode(j);
-        }
-    }
-    var rawBytes = IEBinaryToArray_ByteStr(binary);
-    var lastChr = IEBinaryToArray_ByteStr_Last(binary);
-    return rawBytes.replace(/[\s\S]/g, function( match ) {
-        return byteMapping[match];
-    }) + lastChr;
-};
-
-// enforcing Stuk's coding style
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{}]},{},[1])
-;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js
deleted file mode 100644
index 93d8bc8ef28..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils-ie.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
-
-JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
-<http://stuk.github.io/jszip-utils>
-
-(c) 2014 Stuart Knightley, David Duponchel
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
-
-*/
-!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(){var a="undefined"!=typeof self?self:"undefined"!=typeof window?window:{},b="<!-- IEBinaryToArray_ByteStr -->\r\n<script type='text/vbscript'>\r\nFunction IEBinaryToArray_ByteStr(Binary)\r\n   IEBinaryToArray_ByteStr = CStr(Binary)\r\nEnd Function\r\nFunction IEBinaryToArray_ByteStr_Last(Binary)\r\n   Dim lastIndex\r\n   lastIndex = LenB(Binary)\r\n   if lastIndex mod 2 Then\r\n       IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n   Else\r\n       IEBinaryToArray_ByteStr_Last = \"\"\r\n   End If\r\nEnd Function\r\n</script>\r\n";document.write(b),a.JSZipUtils._getBinaryFromXHR=function(a){for(var b=a.responseBody,c={},d=0;256>d;d++)for(var e=0;256>e;e++)c[String.fromCharCode(d+(e<<8))]=String.fromCharCode(d)+String.fromCharCode(e);var f=IEBinaryToArray_ByteStr(b),g=IEBinaryToArray_ByteStr_Last(b);return f.replace(/[\s\S]/g,function(a){return c[a]})+g}},{}]},{},[1]);
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.js
deleted file mode 100644
index 775895ec92d..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/*!
-
-JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
-<http://stuk.github.io/jszip-utils>
-
-(c) 2014 Stuart Knightley, David Duponchel
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
-
-*/
-!function(e){"object"==typeof exports?module.exports=e():"function"==typeof define&&define.amd?define(e):"undefined"!=typeof window?window.JSZipUtils=e():"undefined"!=typeof global?global.JSZipUtils=e():"undefined"!=typeof self&&(self.JSZipUtils=e())}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-'use strict';
-
-var JSZipUtils = {};
-// just use the responseText with xhr1, response with xhr2.
-// The transformation doesn't throw away high-order byte (with responseText)
-// because JSZip handles that case. If not used with JSZip, you may need to
-// do it, see https://developer.mozilla.org/En/Using_XMLHttpRequest#Handling_binary_data
-JSZipUtils._getBinaryFromXHR = function (xhr) {
-    // for xhr.responseText, the 0xFF mask is applied by JSZip
-    return xhr.response || xhr.responseText;
-};
-
-// taken from jQuery
-function createStandardXHR() {
-    try {
-        return new window.XMLHttpRequest();
-    } catch( e ) {}
-}
-
-function createActiveXHR() {
-    try {
-        return new window.ActiveXObject("Microsoft.XMLHTTP");
-    } catch( e ) {}
-}
-
-// Create the request object
-var createXHR = window.ActiveXObject ?
-    /* Microsoft failed to properly
-     * implement the XMLHttpRequest in IE7 (can't request local files),
-     * so we use the ActiveXObject when it is available
-     * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-     * we need a fallback.
-     */
-    function() {
-    return createStandardXHR() || createActiveXHR();
-} :
-    // For all other browsers, use the standard XMLHttpRequest object
-    createStandardXHR;
-
-
-
-JSZipUtils.getBinaryContent = function(path, callback) {
-    /*
-     * Here is the tricky part : getting the data.
-     * In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
-     * is enough, the result is in the standard xhr.responseText.
-     * cf https://developer.mozilla.org/En/XMLHttpRequest/Using_XMLHttpRequest#Receiving_binary_data_in_older_browsers
-     * In IE <= 9, we must use (the IE only) attribute responseBody
-     * (for binary data, its content is different from responseText).
-     * In IE 10, the 'charset=x-user-defined' trick doesn't work, only the
-     * responseType will work :
-     * http://msdn.microsoft.com/en-us/library/ie/hh673569%28v=vs.85%29.aspx#Binary_Object_upload_and_download
-     *
-     * I'd like to use jQuery to avoid this XHR madness, but it doesn't support
-     * the responseType attribute : http://bugs.jquery.com/ticket/11461
-     */
-    try {
-
-        var xhr = createXHR();
-
-        xhr.open('GET', path, true);
-
-        // recent browsers
-        if ("responseType" in xhr) {
-            xhr.responseType = "arraybuffer";
-        }
-
-        // older browser
-        if(xhr.overrideMimeType) {
-            xhr.overrideMimeType("text/plain; charset=x-user-defined");
-        }
-
-        xhr.onreadystatechange = function(evt) {
-            var file, err;
-            // use `xhr` and not `this`... thanks IE
-            if (xhr.readyState === 4) {
-                if (xhr.status === 200 || xhr.status === 0) {
-                    file = null;
-                    err = null;
-                    try {
-                        file = JSZipUtils._getBinaryFromXHR(xhr);
-                    } catch(e) {
-                        err = new Error(e);
-                    }
-                    callback(err, file);
-                } else {
-                    callback(new Error("Ajax error for " + path + " : " + this.status + " " + this.statusText), null);
-                }
-            }
-        };
-
-        xhr.send();
-
-    } catch (e) {
-        callback(new Error(e), null);
-    }
-};
-
-// export
-module.exports = JSZipUtils;
-
-// enforcing Stuk's coding style
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{}]},{},[1])
-(1)
-});
-;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.min.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.min.js
deleted file mode 100644
index 78c7f5e5aa8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip-utils/dist/jszip-utils.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
-
-JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
-<http://stuk.github.io/jszip-utils>
-
-(c) 2014 Stuart Knightley, David Duponchel
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
-
-*/
-!function(a){"object"==typeof exports?module.exports=a():"function"==typeof define&&define.amd?define(a):"undefined"!=typeof window?window.JSZipUtils=a():"undefined"!=typeof global?global.JSZipUtils=a():"undefined"!=typeof self&&(self.JSZipUtils=a())}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b){"use strict";function c(){try{return new window.XMLHttpRequest}catch(a){}}function d(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}}var e={};e._getBinaryFromXHR=function(a){return a.response||a.responseText};var f=window.ActiveXObject?function(){return c()||d()}:c;e.getBinaryContent=function(a,b){try{var c=f();c.open("GET",a,!0),"responseType"in c&&(c.responseType="arraybuffer"),c.overrideMimeType&&c.overrideMimeType("text/plain; charset=x-user-defined"),c.onreadystatechange=function(){var d,f;if(4===c.readyState)if(200===c.status||0===c.status){d=null,f=null;try{d=e._getBinaryFromXHR(c)}catch(g){f=new Error(g)}b(f,d)}else b(new Error("Ajax error for "+a+" : "+this.status+" "+this.statusText),null)},c.send()}catch(d){b(new Error(d),null)}},b.exports=e},{}]},{},[1])(1)});
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.js
deleted file mode 100644
index 7d5c4da8bf8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.js
+++ /dev/null
@@ -1,9155 +0,0 @@
-/*!
-
-JSZip - A Javascript class for generating and reading zip files
-<http://stuartk.com/jszip>
-
-(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
-
-JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/master/LICENSE
-*/
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.JSZip=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
-'use strict';
-// private property
-var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
-
-// public method for encoding
-exports.encode = function(input, utf8) {
-    var output = "";
-    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
-
-    while (i < input.length) {
-
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
-
-        enc1 = chr1 >> 2;
-        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-        enc4 = chr3 & 63;
-
-        if (isNaN(chr2)) {
-            enc3 = enc4 = 64;
-        }
-        else if (isNaN(chr3)) {
-            enc4 = 64;
-        }
-
-        output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-
-    }
-
-    return output;
-};
-
-// public method for decoding
-exports.decode = function(input, utf8) {
-    var output = "";
-    var chr1, chr2, chr3;
-    var enc1, enc2, enc3, enc4;
-    var i = 0;
-
-    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-    while (i < input.length) {
-
-        enc1 = _keyStr.indexOf(input.charAt(i++));
-        enc2 = _keyStr.indexOf(input.charAt(i++));
-        enc3 = _keyStr.indexOf(input.charAt(i++));
-        enc4 = _keyStr.indexOf(input.charAt(i++));
-
-        chr1 = (enc1 << 2) | (enc2 >> 4);
-        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-        chr3 = ((enc3 & 3) << 6) | enc4;
-
-        output = output + String.fromCharCode(chr1);
-
-        if (enc3 != 64) {
-            output = output + String.fromCharCode(chr2);
-        }
-        if (enc4 != 64) {
-            output = output + String.fromCharCode(chr3);
-        }
-
-    }
-
-    return output;
-
-};
-
-},{}],2:[function(_dereq_,module,exports){
-'use strict';
-function CompressedObject() {
-    this.compressedSize = 0;
-    this.uncompressedSize = 0;
-    this.crc32 = 0;
-    this.compressionMethod = null;
-    this.compressedContent = null;
-}
-
-CompressedObject.prototype = {
-    /**
-     * Return the decompressed content in an unspecified format.
-     * The format will depend on the decompressor.
-     * @return {Object} the decompressed content.
-     */
-    getContent: function() {
-        return null; // see implementation
-    },
-    /**
-     * Return the compressed content in an unspecified format.
-     * The format will depend on the compressed conten source.
-     * @return {Object} the compressed content.
-     */
-    getCompressedContent: function() {
-        return null; // see implementation
-    }
-};
-module.exports = CompressedObject;
-
-},{}],3:[function(_dereq_,module,exports){
-'use strict';
-exports.STORE = {
-    magic: "\x00\x00",
-    compress: function(content, compressionOptions) {
-        return content; // no compression
-    },
-    uncompress: function(content) {
-        return content; // no compression
-    },
-    compressInputType: null,
-    uncompressInputType: null
-};
-exports.DEFLATE = _dereq_('./flate');
-
-},{"./flate":8}],4:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-var table = [
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-];
-
-/**
- *
- *  Javascript crc32
- *  http://www.webtoolkit.info/
- *
- */
-module.exports = function crc32(input, crc) {
-    if (typeof input === "undefined" || !input.length) {
-        return 0;
-    }
-
-    var isArray = utils.getTypeOf(input) !== "string";
-
-    if (typeof(crc) == "undefined") {
-        crc = 0;
-    }
-    var x = 0;
-    var y = 0;
-    var b = 0;
-
-    crc = crc ^ (-1);
-    for (var i = 0, iTop = input.length; i < iTop; i++) {
-        b = isArray ? input[i] : input.charCodeAt(i);
-        y = (crc ^ b) & 0xFF;
-        x = table[y];
-        crc = (crc >>> 8) ^ x;
-    }
-
-    return crc ^ (-1);
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./utils":21}],5:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-function DataReader(data) {
-    this.data = null; // type : see implementation
-    this.length = 0;
-    this.index = 0;
-}
-DataReader.prototype = {
-    /**
-     * Check that the offset will not go too far.
-     * @param {string} offset the additional offset to check.
-     * @throws {Error} an Error if the offset is out of bounds.
-     */
-    checkOffset: function(offset) {
-        this.checkIndex(this.index + offset);
-    },
-    /**
-     * Check that the specifed index will not be too far.
-     * @param {string} newIndex the index to check.
-     * @throws {Error} an Error if the index is out of bounds.
-     */
-    checkIndex: function(newIndex) {
-        if (this.length < newIndex || newIndex < 0) {
-            throw new Error("End of data reached (data length = " + this.length + ", asked index = " + (newIndex) + "). Corrupted zip ?");
-        }
-    },
-    /**
-     * Change the index.
-     * @param {number} newIndex The new index.
-     * @throws {Error} if the new index is out of the data.
-     */
-    setIndex: function(newIndex) {
-        this.checkIndex(newIndex);
-        this.index = newIndex;
-    },
-    /**
-     * Skip the next n bytes.
-     * @param {number} n the number of bytes to skip.
-     * @throws {Error} if the new index is out of the data.
-     */
-    skip: function(n) {
-        this.setIndex(this.index + n);
-    },
-    /**
-     * Get the byte at the specified index.
-     * @param {number} i the index to use.
-     * @return {number} a byte.
-     */
-    byteAt: function(i) {
-        // see implementations
-    },
-    /**
-     * Get the next number with a given byte size.
-     * @param {number} size the number of bytes to read.
-     * @return {number} the corresponding number.
-     */
-    readInt: function(size) {
-        var result = 0,
-            i;
-        this.checkOffset(size);
-        for (i = this.index + size - 1; i >= this.index; i--) {
-            result = (result << 8) + this.byteAt(i);
-        }
-        this.index += size;
-        return result;
-    },
-    /**
-     * Get the next string with a given byte size.
-     * @param {number} size the number of bytes to read.
-     * @return {string} the corresponding string.
-     */
-    readString: function(size) {
-        return utils.transformTo("string", this.readData(size));
-    },
-    /**
-     * Get raw data without conversion, <size> bytes.
-     * @param {number} size the number of bytes to read.
-     * @return {Object} the raw data, implementation specific.
-     */
-    readData: function(size) {
-        // see implementations
-    },
-    /**
-     * Find the last occurence of a zip signature (4 bytes).
-     * @param {string} sig the signature to find.
-     * @return {number} the index of the last occurence, -1 if not found.
-     */
-    lastIndexOfSignature: function(sig) {
-        // see implementations
-    },
-    /**
-     * Get the next date.
-     * @return {Date} the date.
-     */
-    readDate: function() {
-        var dostime = this.readInt(4);
-        return new Date(
-        ((dostime >> 25) & 0x7f) + 1980, // year
-        ((dostime >> 21) & 0x0f) - 1, // month
-        (dostime >> 16) & 0x1f, // day
-        (dostime >> 11) & 0x1f, // hour
-        (dostime >> 5) & 0x3f, // minute
-        (dostime & 0x1f) << 1); // second
-    }
-};
-module.exports = DataReader;
-
-},{"./utils":21}],6:[function(_dereq_,module,exports){
-'use strict';
-exports.base64 = false;
-exports.binary = false;
-exports.dir = false;
-exports.createFolders = false;
-exports.date = null;
-exports.compression = null;
-exports.compressionOptions = null;
-exports.comment = null;
-exports.unixPermissions = null;
-exports.dosPermissions = null;
-
-},{}],7:[function(_dereq_,module,exports){
-'use strict';
-var utils = _dereq_('./utils');
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2binary = function(str) {
-    return utils.string2binary(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Uint8Array = function(str) {
-    return utils.transformTo("uint8array", str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.uint8Array2String = function(array) {
-    return utils.transformTo("string", array);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.string2Blob = function(str) {
-    var buffer = utils.transformTo("arraybuffer", str);
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.arrayBuffer2Blob = function(buffer) {
-    return utils.arrayBuffer2Blob(buffer);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.transformTo = function(outputType, input) {
-    return utils.transformTo(outputType, input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.getTypeOf = function(input) {
-    return utils.getTypeOf(input);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.checkSupport = function(type) {
-    return utils.checkSupport(type);
-};
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_16BITS = utils.MAX_VALUE_16BITS;
-
-/**
- * @deprecated
- * This value will be removed in a future version without replacement.
- */
-exports.MAX_VALUE_32BITS = utils.MAX_VALUE_32BITS;
-
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.pretty = function(str) {
-    return utils.pretty(str);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.findCompression = function(compressionMethod) {
-    return utils.findCompression(compressionMethod);
-};
-
-/**
- * @deprecated
- * This function will be removed in a future version without replacement.
- */
-exports.isRegExp = function (object) {
-    return utils.isRegExp(object);
-};
-
-
-},{"./utils":21}],8:[function(_dereq_,module,exports){
-'use strict';
-var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
-
-var pako = _dereq_("pako");
-exports.uncompressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-exports.compressInputType = USE_TYPEDARRAY ? "uint8array" : "array";
-
-exports.magic = "\x08\x00";
-exports.compress = function(input, compressionOptions) {
-    return pako.deflateRaw(input, {
-        level : compressionOptions.level || -1 // default compression
-    });
-};
-exports.uncompress =  function(input) {
-    return pako.inflateRaw(input);
-};
-
-},{"pako":24}],9:[function(_dereq_,module,exports){
-'use strict';
-
-var base64 = _dereq_('./base64');
-
-/**
-Usage:
-   zip = new JSZip();
-   zip.file("hello.txt", "Hello, World!").file("tempfile", "nothing");
-   zip.folder("images").file("smile.gif", base64Data, {base64: true});
-   zip.file("Xmas.txt", "Ho ho ho !", {date : new Date("December 25, 2007 00:00:01")});
-   zip.remove("tempfile");
-
-   base64zip = zip.generate();
-
-**/
-
-/**
- * Representation a of zip file in js
- * @constructor
- * @param {String=|ArrayBuffer=|Uint8Array=} data the data to load, if any (optional).
- * @param {Object=} options the options for creating this objects (optional).
- */
-function JSZip(data, options) {
-    // if this constructor is used without `new`, it adds `new` before itself:
-    if(!(this instanceof JSZip)) return new JSZip(data, options);
-
-    // object containing the files :
-    // {
-    //   "folder/" : {...},
-    //   "folder/data.txt" : {...}
-    // }
-    this.files = {};
-
-    this.comment = null;
-
-    // Where we are in the hierarchy
-    this.root = "";
-    if (data) {
-        this.load(data, options);
-    }
-    this.clone = function() {
-        var newObj = new JSZip();
-        for (var i in this) {
-            if (typeof this[i] !== "function") {
-                newObj[i] = this[i];
-            }
-        }
-        return newObj;
-    };
-}
-JSZip.prototype = _dereq_('./object');
-JSZip.prototype.load = _dereq_('./load');
-JSZip.support = _dereq_('./support');
-JSZip.defaults = _dereq_('./defaults');
-
-/**
- * @deprecated
- * This namespace will be removed in a future version without replacement.
- */
-JSZip.utils = _dereq_('./deprecatedPublicUtils');
-
-JSZip.base64 = {
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    encode : function(input) {
-        return base64.encode(input);
-    },
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    decode : function(input) {
-        return base64.decode(input);
-    }
-};
-JSZip.compressions = _dereq_('./compressions');
-module.exports = JSZip;
-
-},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(_dereq_,module,exports){
-'use strict';
-var base64 = _dereq_('./base64');
-var ZipEntries = _dereq_('./zipEntries');
-module.exports = function(data, options) {
-    var files, zipEntries, i, input;
-    options = options || {};
-    if (options.base64) {
-        data = base64.decode(data);
-    }
-
-    zipEntries = new ZipEntries(data, options);
-    files = zipEntries.files;
-    for (i = 0; i < files.length; i++) {
-        input = files[i];
-        this.file(input.fileName, input.decompressed, {
-            binary: true,
-            optimizedBinaryString: true,
-            date: input.date,
-            dir: input.dir,
-            comment : input.fileComment.length ? input.fileComment : null,
-            unixPermissions : input.unixPermissions,
-            dosPermissions : input.dosPermissions,
-            createFolders: options.createFolders
-        });
-    }
-    if (zipEntries.zipComment.length) {
-        this.comment = zipEntries.zipComment;
-    }
-
-    return this;
-};
-
-},{"./base64":1,"./zipEntries":22}],11:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-module.exports = function(data, encoding){
-    return new Buffer(data, encoding);
-};
-module.exports.test = function(b){
-    return Buffer.isBuffer(b);
-};
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],12:[function(_dereq_,module,exports){
-'use strict';
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-
-function NodeBufferReader(data) {
-    this.data = data;
-    this.length = this.data.length;
-    this.index = 0;
-}
-NodeBufferReader.prototype = new Uint8ArrayReader();
-
-/**
- * @see DataReader.readData
- */
-NodeBufferReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    var result = this.data.slice(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = NodeBufferReader;
-
-},{"./uint8ArrayReader":18}],13:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var utils = _dereq_('./utils');
-var crc32 = _dereq_('./crc32');
-var signature = _dereq_('./signature');
-var defaults = _dereq_('./defaults');
-var base64 = _dereq_('./base64');
-var compressions = _dereq_('./compressions');
-var CompressedObject = _dereq_('./compressedObject');
-var nodeBuffer = _dereq_('./nodeBuffer');
-var utf8 = _dereq_('./utf8');
-var StringWriter = _dereq_('./stringWriter');
-var Uint8ArrayWriter = _dereq_('./uint8ArrayWriter');
-
-/**
- * Returns the raw data of a ZipObject, decompress the content if necessary.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getRawData = function(file) {
-    if (file._data instanceof CompressedObject) {
-        file._data = file._data.getContent();
-        file.options.binary = true;
-        file.options.base64 = false;
-
-        if (utils.getTypeOf(file._data) === "uint8array") {
-            var copy = file._data;
-            // when reading an arraybuffer, the CompressedObject mechanism will keep it and subarray() a Uint8Array.
-            // if we request a file in the same format, we might get the same Uint8Array or its ArrayBuffer (the original zip file).
-            file._data = new Uint8Array(copy.length);
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            if (copy.length !== 0) {
-                file._data.set(copy, 0);
-            }
-        }
-    }
-    return file._data;
-};
-
-/**
- * Returns the data of a ZipObject in a binary form. If the content is an unicode string, encode it.
- * @param {ZipObject} file the file to use.
- * @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
- */
-var getBinaryData = function(file) {
-    var result = getRawData(file),
-        type = utils.getTypeOf(result);
-    if (type === "string") {
-        if (!file.options.binary) {
-            // unicode text !
-            // unicode string => binary string is a painful process, check if we can avoid it.
-            if (support.nodebuffer) {
-                return nodeBuffer(result, "utf-8");
-            }
-        }
-        return file.asBinary();
-    }
-    return result;
-};
-
-/**
- * Transform this._data into a string.
- * @param {function} filter a function String -> String, applied if not null on the result.
- * @return {String} the string representing this._data.
- */
-var dataToString = function(asUTF8) {
-    var result = getRawData(this);
-    if (result === null || typeof result === "undefined") {
-        return "";
-    }
-    // if the data is a base64 string, we decode it before checking the encoding !
-    if (this.options.base64) {
-        result = base64.decode(result);
-    }
-    if (asUTF8 && this.options.binary) {
-        // JSZip.prototype.utf8decode supports arrays as input
-        // skip to array => string step, utf8decode will do it.
-        result = out.utf8decode(result);
-    }
-    else {
-        // no utf8 transformation, do the array => string step.
-        result = utils.transformTo("string", result);
-    }
-
-    if (!asUTF8 && !this.options.binary) {
-        result = utils.transformTo("string", out.utf8encode(result));
-    }
-    return result;
-};
-/**
- * A simple object representing a file in the zip file.
- * @constructor
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data
- * @param {Object} options the options of the file
- */
-var ZipObject = function(name, data, options) {
-    this.name = name;
-    this.dir = options.dir;
-    this.date = options.date;
-    this.comment = options.comment;
-    this.unixPermissions = options.unixPermissions;
-    this.dosPermissions = options.dosPermissions;
-
-    this._data = data;
-    this.options = options;
-
-    /*
-     * This object contains initial values for dir and date.
-     * With them, we can check if the user changed the deprecated metadata in
-     * `ZipObject#options` or not.
-     */
-    this._initialMetadata = {
-      dir : options.dir,
-      date : options.date
-    };
-};
-
-ZipObject.prototype = {
-    /**
-     * Return the content as UTF8 string.
-     * @return {string} the UTF8 string.
-     */
-    asText: function() {
-        return dataToString.call(this, true);
-    },
-    /**
-     * Returns the binary content.
-     * @return {string} the content as binary.
-     */
-    asBinary: function() {
-        return dataToString.call(this, false);
-    },
-    /**
-     * Returns the content as a nodejs Buffer.
-     * @return {Buffer} the content as a Buffer.
-     */
-    asNodeBuffer: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("nodebuffer", result);
-    },
-    /**
-     * Returns the content as an Uint8Array.
-     * @return {Uint8Array} the content as an Uint8Array.
-     */
-    asUint8Array: function() {
-        var result = getBinaryData(this);
-        return utils.transformTo("uint8array", result);
-    },
-    /**
-     * Returns the content as an ArrayBuffer.
-     * @return {ArrayBuffer} the content as an ArrayBufer.
-     */
-    asArrayBuffer: function() {
-        return this.asUint8Array().buffer;
-    }
-};
-
-/**
- * Transform an integer into a string in hexadecimal.
- * @private
- * @param {number} dec the number to convert.
- * @param {number} bytes the number of bytes to generate.
- * @returns {string} the result.
- */
-var decToHex = function(dec, bytes) {
-    var hex = "",
-        i;
-    for (i = 0; i < bytes; i++) {
-        hex += String.fromCharCode(dec & 0xff);
-        dec = dec >>> 8;
-    }
-    return hex;
-};
-
-/**
- * Merge the objects passed as parameters into a new one.
- * @private
- * @param {...Object} var_args All objects to merge.
- * @return {Object} a new object with the data of the others.
- */
-var extend = function() {
-    var result = {}, i, attr;
-    for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
-        for (attr in arguments[i]) {
-            if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
-                result[attr] = arguments[i][attr];
-            }
-        }
-    }
-    return result;
-};
-
-/**
- * Transforms the (incomplete) options from the user into the complete
- * set of options to create a file.
- * @private
- * @param {Object} o the options from the user.
- * @return {Object} the complete set of options.
- */
-var prepareFileAttrs = function(o) {
-    o = o || {};
-    if (o.base64 === true && (o.binary === null || o.binary === undefined)) {
-        o.binary = true;
-    }
-    o = extend(o, defaults);
-    o.date = o.date || new Date();
-    if (o.compression !== null) o.compression = o.compression.toUpperCase();
-
-    return o;
-};
-
-/**
- * Add a file in the current folder.
- * @private
- * @param {string} name the name of the file
- * @param {String|ArrayBuffer|Uint8Array|Buffer} data the data of the file
- * @param {Object} o the options of the file
- * @return {Object} the new file.
- */
-var fileAdd = function(name, data, o) {
-    // be sure sub folders exist
-    var dataType = utils.getTypeOf(data),
-        parent;
-
-    o = prepareFileAttrs(o);
-
-    if (typeof o.unixPermissions === "string") {
-        o.unixPermissions = parseInt(o.unixPermissions, 8);
-    }
-
-    // UNX_IFDIR  0040000 see zipinfo.c
-    if (o.unixPermissions && (o.unixPermissions & 0x4000)) {
-        o.dir = true;
-    }
-    // Bit 4    Directory
-    if (o.dosPermissions && (o.dosPermissions & 0x0010)) {
-        o.dir = true;
-    }
-
-    if (o.dir) {
-        name = forceTrailingSlash(name);
-    }
-
-    if (o.createFolders && (parent = parentFolder(name))) {
-        folderAdd.call(this, parent, true);
-    }
-
-    if (o.dir || data === null || typeof data === "undefined") {
-        o.base64 = false;
-        o.binary = false;
-        data = null;
-        dataType = null;
-    }
-    else if (dataType === "string") {
-        if (o.binary && !o.base64) {
-            // optimizedBinaryString == true means that the file has already been filtered with a 0xFF mask
-            if (o.optimizedBinaryString !== true) {
-                // this is a string, not in a base64 format.
-                // Be sure that this is a correct "binary string"
-                data = utils.string2binary(data);
-            }
-        }
-    }
-    else { // arraybuffer, uint8array, ...
-        o.base64 = false;
-        o.binary = true;
-
-        if (!dataType && !(data instanceof CompressedObject)) {
-            throw new Error("The data of '" + name + "' is in an unsupported format !");
-        }
-
-        // special case : it's way easier to work with Uint8Array than with ArrayBuffer
-        if (dataType === "arraybuffer") {
-            data = utils.transformTo("uint8array", data);
-        }
-    }
-
-    var object = new ZipObject(name, data, o);
-    this.files[name] = object;
-    return object;
-};
-
-/**
- * Find the parent folder of the path.
- * @private
- * @param {string} path the path to use
- * @return {string} the parent folder, or ""
- */
-var parentFolder = function (path) {
-    if (path.slice(-1) == '/') {
-        path = path.substring(0, path.length - 1);
-    }
-    var lastSlash = path.lastIndexOf('/');
-    return (lastSlash > 0) ? path.substring(0, lastSlash) : "";
-};
-
-
-/**
- * Returns the path with a slash at the end.
- * @private
- * @param {String} path the path to check.
- * @return {String} the path with a trailing slash.
- */
-var forceTrailingSlash = function(path) {
-    // Check the name ends with a /
-    if (path.slice(-1) != "/") {
-        path += "/"; // IE doesn't like substr(-1)
-    }
-    return path;
-};
-/**
- * Add a (sub) folder in the current folder.
- * @private
- * @param {string} name the folder's name
- * @param {boolean=} [createFolders] If true, automatically create sub
- *  folders. Defaults to false.
- * @return {Object} the new folder.
- */
-var folderAdd = function(name, createFolders) {
-    createFolders = (typeof createFolders !== 'undefined') ? createFolders : false;
-
-    name = forceTrailingSlash(name);
-
-    // Does this folder already exist?
-    if (!this.files[name]) {
-        fileAdd.call(this, name, null, {
-            dir: true,
-            createFolders: createFolders
-        });
-    }
-    return this.files[name];
-};
-
-/**
- * Generate a JSZip.CompressedObject for a given zipOject.
- * @param {ZipObject} file the object to read.
- * @param {JSZip.compression} compression the compression to use.
- * @param {Object} compressionOptions the options to use when compressing.
- * @return {JSZip.CompressedObject} the compressed result.
- */
-var generateCompressedObjectFrom = function(file, compression, compressionOptions) {
-    var result = new CompressedObject(),
-        content;
-
-    // the data has not been decompressed, we might reuse things !
-    if (file._data instanceof CompressedObject) {
-        result.uncompressedSize = file._data.uncompressedSize;
-        result.crc32 = file._data.crc32;
-
-        if (result.uncompressedSize === 0 || file.dir) {
-            compression = compressions['STORE'];
-            result.compressedContent = "";
-            result.crc32 = 0;
-        }
-        else if (file._data.compressionMethod === compression.magic) {
-            result.compressedContent = file._data.getCompressedContent();
-        }
-        else {
-            content = file._data.getContent();
-            // need to decompress / recompress
-            result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-        }
-    }
-    else {
-        // have uncompressed data
-        content = getBinaryData(file);
-        if (!content || content.length === 0 || file.dir) {
-            compression = compressions['STORE'];
-            content = "";
-        }
-        result.uncompressedSize = content.length;
-        result.crc32 = crc32(content);
-        result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
-    }
-
-    result.compressedSize = result.compressedContent.length;
-    result.compressionMethod = compression.magic;
-
-    return result;
-};
-
-
-
-
-/**
- * Generate the UNIX part of the external file attributes.
- * @param {Object} unixPermissions the unix permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * adapted from http://unix.stackexchange.com/questions/14705/the-zip-formats-external-file-attribute :
- *
- * TTTTsstrwxrwxrwx0000000000ADVSHR
- * ^^^^____________________________ file type, see zipinfo.c (UNX_*)
- *     ^^^_________________________ setuid, setgid, sticky
- *        ^^^^^^^^^________________ permissions
- *                 ^^^^^^^^^^______ not used ?
- *                           ^^^^^^ DOS attribute bits : Archive, Directory, Volume label, System file, Hidden, Read only
- */
-var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
-
-    var result = unixPermissions;
-    if (!unixPermissions) {
-        // I can't use octal values in strict mode, hence the hexa.
-        //  040775 => 0x41fd
-        // 0100664 => 0x81b4
-        result = isDir ? 0x41fd : 0x81b4;
-    }
-
-    return (result & 0xFFFF) << 16;
-};
-
-/**
- * Generate the DOS part of the external file attributes.
- * @param {Object} dosPermissions the dos permissions or null.
- * @param {Boolean} isDir true if the entry is a directory, false otherwise.
- * @return {Number} a 32 bit integer.
- *
- * Bit 0     Read-Only
- * Bit 1     Hidden
- * Bit 2     System
- * Bit 3     Volume Label
- * Bit 4     Directory
- * Bit 5     Archive
- */
-var generateDosExternalFileAttr = function (dosPermissions, isDir) {
-
-    // the dir flag is already set for compatibility
-
-    return (dosPermissions || 0)  & 0x3F;
-};
-
-/**
- * Generate the various parts used in the construction of the final zip file.
- * @param {string} name the file name.
- * @param {ZipObject} file the file content.
- * @param {JSZip.CompressedObject} compressedObject the compressed object.
- * @param {number} offset the current offset from the start of the zip file.
- * @param {String} platform let's pretend we are this platform (change platform dependents fields)
- * @return {object} the zip parts.
- */
-var generateZipParts = function(name, file, compressedObject, offset, platform) {
-    var data = compressedObject.compressedContent,
-        utfEncodedFileName = utils.transformTo("string", utf8.utf8encode(file.name)),
-        comment = file.comment || "",
-        utfEncodedComment = utils.transformTo("string", utf8.utf8encode(comment)),
-        useUTF8ForFileName = utfEncodedFileName.length !== file.name.length,
-        useUTF8ForComment = utfEncodedComment.length !== comment.length,
-        o = file.options,
-        dosTime,
-        dosDate,
-        extraFields = "",
-        unicodePathExtraField = "",
-        unicodeCommentExtraField = "",
-        dir, date;
-
-
-    // handle the deprecated options.dir
-    if (file._initialMetadata.dir !== file.dir) {
-        dir = file.dir;
-    } else {
-        dir = o.dir;
-    }
-
-    // handle the deprecated options.date
-    if(file._initialMetadata.date !== file.date) {
-        date = file.date;
-    } else {
-        date = o.date;
-    }
-
-    var extFileAttr = 0;
-    var versionMadeBy = 0;
-    if (dir) {
-        // dos or unix, we set the dos dir flag
-        extFileAttr |= 0x00010;
-    }
-    if(platform === "UNIX") {
-        versionMadeBy = 0x031E; // UNIX, version 3.0
-        extFileAttr |= generateUnixExternalFileAttr(file.unixPermissions, dir);
-    } else { // DOS or other, fallback to DOS
-        versionMadeBy = 0x0014; // DOS, version 2.0
-        extFileAttr |= generateDosExternalFileAttr(file.dosPermissions, dir);
-    }
-
-    // date
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/65/16.html
-    // @see http://www.delorie.com/djgpp/doc/rbinter/it/66/16.html
-
-    dosTime = date.getHours();
-    dosTime = dosTime << 6;
-    dosTime = dosTime | date.getMinutes();
-    dosTime = dosTime << 5;
-    dosTime = dosTime | date.getSeconds() / 2;
-
-    dosDate = date.getFullYear() - 1980;
-    dosDate = dosDate << 4;
-    dosDate = dosDate | (date.getMonth() + 1);
-    dosDate = dosDate << 5;
-    dosDate = dosDate | date.getDate();
-
-    if (useUTF8ForFileName) {
-        // set the unicode path extra field. unzip needs at least one extra
-        // field to correctly handle unicode path, so using the path is as good
-        // as any other information. This could improve the situation with
-        // other archive managers too.
-        // This field is usually used without the utf8 flag, with a non
-        // unicode path in the header (winrar, winzip). This helps (a bit)
-        // with the messy Windows' default compressed folders feature but
-        // breaks on p7zip which doesn't seek the unicode path extra field.
-        // So for now, UTF-8 everywhere !
-        unicodePathExtraField =
-            // Version
-            decToHex(1, 1) +
-            // NameCRC32
-            decToHex(crc32(utfEncodedFileName), 4) +
-            // UnicodeName
-            utfEncodedFileName;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x70" +
-            // size
-            decToHex(unicodePathExtraField.length, 2) +
-            // content
-            unicodePathExtraField;
-    }
-
-    if(useUTF8ForComment) {
-
-        unicodeCommentExtraField =
-            // Version
-            decToHex(1, 1) +
-            // CommentCRC32
-            decToHex(this.crc32(utfEncodedComment), 4) +
-            // UnicodeName
-            utfEncodedComment;
-
-        extraFields +=
-            // Info-ZIP Unicode Path Extra Field
-            "\x75\x63" +
-            // size
-            decToHex(unicodeCommentExtraField.length, 2) +
-            // content
-            unicodeCommentExtraField;
-    }
-
-    var header = "";
-
-    // version needed to extract
-    header += "\x0A\x00";
-    // general purpose bit flag
-    // set bit 11 if utf8
-    header += (useUTF8ForFileName || useUTF8ForComment) ? "\x00\x08" : "\x00\x00";
-    // compression method
-    header += compressedObject.compressionMethod;
-    // last mod file time
-    header += decToHex(dosTime, 2);
-    // last mod file date
-    header += decToHex(dosDate, 2);
-    // crc-32
-    header += decToHex(compressedObject.crc32, 4);
-    // compressed size
-    header += decToHex(compressedObject.compressedSize, 4);
-    // uncompressed size
-    header += decToHex(compressedObject.uncompressedSize, 4);
-    // file name length
-    header += decToHex(utfEncodedFileName.length, 2);
-    // extra field length
-    header += decToHex(extraFields.length, 2);
-
-
-    var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName + extraFields;
-
-    var dirRecord = signature.CENTRAL_FILE_HEADER +
-    // version made by (00: DOS)
-    decToHex(versionMadeBy, 2) +
-    // file header (common to file and central directory)
-    header +
-    // file comment length
-    decToHex(utfEncodedComment.length, 2) +
-    // disk number start
-    "\x00\x00" +
-    // internal file attributes TODO
-    "\x00\x00" +
-    // external file attributes
-    decToHex(extFileAttr, 4) +
-    // relative offset of local header
-    decToHex(offset, 4) +
-    // file name
-    utfEncodedFileName +
-    // extra field
-    extraFields +
-    // file comment
-    utfEncodedComment;
-
-    return {
-        fileRecord: fileRecord,
-        dirRecord: dirRecord,
-        compressedObject: compressedObject
-    };
-};
-
-
-// return the actual prototype of JSZip
-var out = {
-    /**
-     * Read an existing zip and merge the data in the current JSZip object.
-     * The implementation is in jszip-load.js, don't forget to include it.
-     * @param {String|ArrayBuffer|Uint8Array|Buffer} stream  The stream to load
-     * @param {Object} options Options for loading the stream.
-     *  options.base64 : is the stream in base64 ? default : false
-     * @return {JSZip} the current JSZip object
-     */
-    load: function(stream, options) {
-        throw new Error("Load method is not defined. Is the file jszip-load.js included ?");
-    },
-
-    /**
-     * Filter nested files/folders with the specified function.
-     * @param {Function} search the predicate to use :
-     * function (relativePath, file) {...}
-     * It takes 2 arguments : the relative path and the file.
-     * @return {Array} An array of matching elements.
-     */
-    filter: function(search) {
-        var result = [],
-            filename, relativePath, file, fileClone;
-        for (filename in this.files) {
-            if (!this.files.hasOwnProperty(filename)) {
-                continue;
-            }
-            file = this.files[filename];
-            // return a new object, don't let the user mess with our internal objects :)
-            fileClone = new ZipObject(file.name, file._data, extend(file.options));
-            relativePath = filename.slice(this.root.length, filename.length);
-            if (filename.slice(0, this.root.length) === this.root && // the file is in the current root
-            search(relativePath, fileClone)) { // and the file matches the function
-                result.push(fileClone);
-            }
-        }
-        return result;
-    },
-
-    /**
-     * Add a file to the zip file, or search a file.
-     * @param   {string|RegExp} name The name of the file to add (if data is defined),
-     * the name of the file to find (if no data) or a regex to match files.
-     * @param   {String|ArrayBuffer|Uint8Array|Buffer} data  The file data, either raw or base64 encoded
-     * @param   {Object} o     File options
-     * @return  {JSZip|Object|Array} this JSZip object (when adding a file),
-     * a file (when searching by string) or an array of files (when searching by regex).
-     */
-    file: function(name, data, o) {
-        if (arguments.length === 1) {
-            if (utils.isRegExp(name)) {
-                var regexp = name;
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && regexp.test(relativePath);
-                });
-            }
-            else { // text
-                return this.filter(function(relativePath, file) {
-                    return !file.dir && relativePath === name;
-                })[0] || null;
-            }
-        }
-        else { // more than one argument : we have data !
-            name = this.root + name;
-            fileAdd.call(this, name, data, o);
-        }
-        return this;
-    },
-
-    /**
-     * Add a directory to the zip file, or search.
-     * @param   {String|RegExp} arg The name of the directory to add, or a regex to search folders.
-     * @return  {JSZip} an object with the new directory as the root, or an array containing matching folders.
-     */
-    folder: function(arg) {
-        if (!arg) {
-            return this;
-        }
-
-        if (utils.isRegExp(arg)) {
-            return this.filter(function(relativePath, file) {
-                return file.dir && arg.test(relativePath);
-            });
-        }
-
-        // else, name is a new folder
-        var name = this.root + arg;
-        var newFolder = folderAdd.call(this, name);
-
-        // Allow chaining by returning a new object with this folder as the root
-        var ret = this.clone();
-        ret.root = newFolder.name;
-        return ret;
-    },
-
-    /**
-     * Delete a file, or a directory and all sub-files, from the zip
-     * @param {string} name the name of the file to delete
-     * @return {JSZip} this JSZip object
-     */
-    remove: function(name) {
-        name = this.root + name;
-        var file = this.files[name];
-        if (!file) {
-            // Look for any folders
-            if (name.slice(-1) != "/") {
-                name += "/";
-            }
-            file = this.files[name];
-        }
-
-        if (file && !file.dir) {
-            // file
-            delete this.files[name];
-        } else {
-            // maybe a folder, delete recursively
-            var kids = this.filter(function(relativePath, file) {
-                return file.name.slice(0, name.length) === name;
-            });
-            for (var i = 0; i < kids.length; i++) {
-                delete this.files[kids[i].name];
-            }
-        }
-
-        return this;
-    },
-
-    /**
-     * Generate the complete zip file
-     * @param {Object} options the options to generate the zip file :
-     * - base64, (deprecated, use type instead) true to generate base64.
-     * - compression, "STORE" by default.
-     * - type, "base64" by default. Values are : string, base64, uint8array, arraybuffer, blob.
-     * @return {String|Uint8Array|ArrayBuffer|Buffer|Blob} the zip file
-     */
-    generate: function(options) {
-        options = extend(options || {}, {
-            base64: true,
-            compression: "STORE",
-            compressionOptions : null,
-            type: "base64",
-            platform: "DOS",
-            comment: null,
-            mimeType: 'application/zip'
-        });
-
-        utils.checkSupport(options.type);
-
-        // accept nodejs `process.platform`
-        if(
-          options.platform === 'darwin' ||
-          options.platform === 'freebsd' ||
-          options.platform === 'linux' ||
-          options.platform === 'sunos'
-        ) {
-          options.platform = "UNIX";
-        }
-        if (options.platform === 'win32') {
-          options.platform = "DOS";
-        }
-
-        var zipData = [],
-            localDirLength = 0,
-            centralDirLength = 0,
-            writer, i,
-            utfEncodedComment = utils.transformTo("string", this.utf8encode(options.comment || this.comment || ""));
-
-        // first, generate all the zip parts.
-        for (var name in this.files) {
-            if (!this.files.hasOwnProperty(name)) {
-                continue;
-            }
-            var file = this.files[name];
-
-            var compressionName = file.options.compression || options.compression.toUpperCase();
-            var compression = compressions[compressionName];
-            if (!compression) {
-                throw new Error(compressionName + " is not a valid compression method !");
-            }
-            var compressionOptions = file.options.compressionOptions || options.compressionOptions || {};
-
-            var compressedObject = generateCompressedObjectFrom.call(this, file, compression, compressionOptions);
-
-            var zipPart = generateZipParts.call(this, name, file, compressedObject, localDirLength, options.platform);
-            localDirLength += zipPart.fileRecord.length + compressedObject.compressedSize;
-            centralDirLength += zipPart.dirRecord.length;
-            zipData.push(zipPart);
-        }
-
-        var dirEnd = "";
-
-        // end of central dir signature
-        dirEnd = signature.CENTRAL_DIRECTORY_END +
-        // number of this disk
-        "\x00\x00" +
-        // number of the disk with the start of the central directory
-        "\x00\x00" +
-        // total number of entries in the central directory on this disk
-        decToHex(zipData.length, 2) +
-        // total number of entries in the central directory
-        decToHex(zipData.length, 2) +
-        // size of the central directory   4 bytes
-        decToHex(centralDirLength, 4) +
-        // offset of start of central directory with respect to the starting disk number
-        decToHex(localDirLength, 4) +
-        // .ZIP file comment length
-        decToHex(utfEncodedComment.length, 2) +
-        // .ZIP file comment
-        utfEncodedComment;
-
-
-        // we have all the parts (and the total length)
-        // time to create a writer !
-        var typeName = options.type.toLowerCase();
-        if(typeName==="uint8array"||typeName==="arraybuffer"||typeName==="blob"||typeName==="nodebuffer") {
-            writer = new Uint8ArrayWriter(localDirLength + centralDirLength + dirEnd.length);
-        }else{
-            writer = new StringWriter(localDirLength + centralDirLength + dirEnd.length);
-        }
-
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].fileRecord);
-            writer.append(zipData[i].compressedObject.compressedContent);
-        }
-        for (i = 0; i < zipData.length; i++) {
-            writer.append(zipData[i].dirRecord);
-        }
-
-        writer.append(dirEnd);
-
-        var zip = writer.finalize();
-
-
-
-        switch(options.type.toLowerCase()) {
-            // case "zip is an Uint8Array"
-            case "uint8array" :
-            case "arraybuffer" :
-            case "nodebuffer" :
-               return utils.transformTo(options.type.toLowerCase(), zip);
-            case "blob" :
-               return utils.arrayBuffer2Blob(utils.transformTo("arraybuffer", zip), options.mimeType);
-            // case "zip is a string"
-            case "base64" :
-               return (options.base64) ? base64.encode(zip) : zip;
-            default : // case "string" :
-               return zip;
-         }
-
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    crc32: function (input, crc) {
-        return crc32(input, crc);
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8encode: function (string) {
-        return utils.transformTo("string", utf8.utf8encode(string));
-    },
-
-    /**
-     * @deprecated
-     * This method will be removed in a future version without replacement.
-     */
-    utf8decode: function (input) {
-        return utf8.utf8decode(input);
-    }
-};
-module.exports = out;
-
-},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(_dereq_,module,exports){
-'use strict';
-exports.LOCAL_FILE_HEADER = "PK\x03\x04";
-exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
-exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
-exports.ZIP64_CENTRAL_DIRECTORY_LOCATOR = "PK\x06\x07";
-exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
-exports.DATA_DESCRIPTOR = "PK\x07\x08";
-
-},{}],15:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-var utils = _dereq_('./utils');
-
-function StringReader(data, optimizedBinaryString) {
-    this.data = data;
-    if (!optimizedBinaryString) {
-        this.data = utils.string2binary(this.data);
-    }
-    this.length = this.data.length;
-    this.index = 0;
-}
-StringReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-StringReader.prototype.byteAt = function(i) {
-    return this.data.charCodeAt(i);
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-StringReader.prototype.lastIndexOfSignature = function(sig) {
-    return this.data.lastIndexOf(sig);
-};
-/**
- * @see DataReader.readData
- */
-StringReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    // this will work because the constructor applied the "& 0xff" mask.
-    var result = this.data.slice(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = StringReader;
-
-},{"./dataReader":5,"./utils":21}],16:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to a string.
- * @constructor
- */
-var StringWriter = function() {
-    this.data = [];
-};
-StringWriter.prototype = {
-    /**
-     * Append any content to the current string.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        input = utils.transformTo("string", input);
-        this.data.push(input);
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {string} the generated string.
-     */
-    finalize: function() {
-        return this.data.join("");
-    }
-};
-
-module.exports = StringWriter;
-
-},{"./utils":21}],17:[function(_dereq_,module,exports){
-(function (Buffer){
-'use strict';
-exports.base64 = true;
-exports.array = true;
-exports.string = true;
-exports.arraybuffer = typeof ArrayBuffer !== "undefined" && typeof Uint8Array !== "undefined";
-// contains true if JSZip can read/generate nodejs Buffer, false otherwise.
-// Browserify will provide a Buffer implementation for browsers, which is
-// an augmented Uint8Array (i.e., can be used as either Buffer or U8).
-exports.nodebuffer = typeof Buffer !== "undefined";
-// contains true if JSZip can read/generate Uint8Array, false otherwise.
-exports.uint8array = typeof Uint8Array !== "undefined";
-
-if (typeof ArrayBuffer === "undefined") {
-    exports.blob = false;
-}
-else {
-    var buffer = new ArrayBuffer(0);
-    try {
-        exports.blob = new Blob([buffer], {
-            type: "application/zip"
-        }).size === 0;
-    }
-    catch (e) {
-        try {
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
-            var builder = new Builder();
-            builder.append(buffer);
-            exports.blob = builder.getBlob('application/zip').size === 0;
-        }
-        catch (e) {
-            exports.blob = false;
-        }
-    }
-}
-
-}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
-},{}],18:[function(_dereq_,module,exports){
-'use strict';
-var DataReader = _dereq_('./dataReader');
-
-function Uint8ArrayReader(data) {
-    if (data) {
-        this.data = data;
-        this.length = this.data.length;
-        this.index = 0;
-    }
-}
-Uint8ArrayReader.prototype = new DataReader();
-/**
- * @see DataReader.byteAt
- */
-Uint8ArrayReader.prototype.byteAt = function(i) {
-    return this.data[i];
-};
-/**
- * @see DataReader.lastIndexOfSignature
- */
-Uint8ArrayReader.prototype.lastIndexOfSignature = function(sig) {
-    var sig0 = sig.charCodeAt(0),
-        sig1 = sig.charCodeAt(1),
-        sig2 = sig.charCodeAt(2),
-        sig3 = sig.charCodeAt(3);
-    for (var i = this.length - 4; i >= 0; --i) {
-        if (this.data[i] === sig0 && this.data[i + 1] === sig1 && this.data[i + 2] === sig2 && this.data[i + 3] === sig3) {
-            return i;
-        }
-    }
-
-    return -1;
-};
-/**
- * @see DataReader.readData
- */
-Uint8ArrayReader.prototype.readData = function(size) {
-    this.checkOffset(size);
-    if(size === 0) {
-        // in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
-        return new Uint8Array(0);
-    }
-    var result = this.data.subarray(this.index, this.index + size);
-    this.index += size;
-    return result;
-};
-module.exports = Uint8ArrayReader;
-
-},{"./dataReader":5}],19:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-
-/**
- * An object to write any content to an Uint8Array.
- * @constructor
- * @param {number} length The length of the array.
- */
-var Uint8ArrayWriter = function(length) {
-    this.data = new Uint8Array(length);
-    this.index = 0;
-};
-Uint8ArrayWriter.prototype = {
-    /**
-     * Append any content to the current array.
-     * @param {Object} input the content to add.
-     */
-    append: function(input) {
-        if (input.length !== 0) {
-            // with an empty Uint8Array, Opera fails with a "Offset larger than array size"
-            input = utils.transformTo("uint8array", input);
-            this.data.set(input, this.index);
-            this.index += input.length;
-        }
-    },
-    /**
-     * Finalize the construction an return the result.
-     * @return {Uint8Array} the generated array.
-     */
-    finalize: function() {
-        return this.data;
-    }
-};
-
-module.exports = Uint8ArrayWriter;
-
-},{"./utils":21}],20:[function(_dereq_,module,exports){
-'use strict';
-
-var utils = _dereq_('./utils');
-var support = _dereq_('./support');
-var nodeBuffer = _dereq_('./nodeBuffer');
-
-/**
- * The following functions come from pako, from pako/lib/utils/strings
- * released under the MIT license, see pako https://github.com/nodeca/pako/
- */
-
-// Table with utf8 lengths (calculated by first byte of sequence)
-// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-// because max possible codepoint is 0x10ffff
-var _utf8len = new Array(256);
-for (var i=0; i<256; i++) {
-  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-// convert string to array (typed, when possible)
-var string2buf = function (str) {
-    var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
-    // count binary size
-    for (m_pos = 0; m_pos < str_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
-        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-            c2 = str.charCodeAt(m_pos+1);
-            if ((c2 & 0xfc00) === 0xdc00) {
-                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-                m_pos++;
-            }
-        }
-        buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
-    }
-
-    // allocate buffer
-    if (support.uint8array) {
-        buf = new Uint8Array(buf_len);
-    } else {
-        buf = new Array(buf_len);
-    }
-
-    // convert
-    for (i=0, m_pos = 0; i < buf_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
-        if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-            c2 = str.charCodeAt(m_pos+1);
-            if ((c2 & 0xfc00) === 0xdc00) {
-                c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-                m_pos++;
-            }
-        }
-        if (c < 0x80) {
-            /* one byte */
-            buf[i++] = c;
-        } else if (c < 0x800) {
-            /* two bytes */
-            buf[i++] = 0xC0 | (c >>> 6);
-            buf[i++] = 0x80 | (c & 0x3f);
-        } else if (c < 0x10000) {
-            /* three bytes */
-            buf[i++] = 0xE0 | (c >>> 12);
-            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-            buf[i++] = 0x80 | (c & 0x3f);
-        } else {
-            /* four bytes */
-            buf[i++] = 0xf0 | (c >>> 18);
-            buf[i++] = 0x80 | (c >>> 12 & 0x3f);
-            buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-            buf[i++] = 0x80 | (c & 0x3f);
-        }
-    }
-
-    return buf;
-};
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max   - length limit (mandatory);
-var utf8border = function(buf, max) {
-    var pos;
-
-    max = max || buf.length;
-    if (max > buf.length) { max = buf.length; }
-
-    // go back from last position, until start of sequence found
-    pos = max-1;
-    while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
-    // Fuckup - very small and broken sequence,
-    // return max, because we should return something anyway.
-    if (pos < 0) { return max; }
-
-    // If we came to start of buffer - that means vuffer is too small,
-    // return max too.
-    if (pos === 0) { return max; }
-
-    return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-// convert array to string
-var buf2string = function (buf) {
-    var str, i, out, c, c_len;
-    var len = buf.length;
-
-    // Reserve max possible length (2 words per char)
-    // NB: by unknown reasons, Array is significantly faster for
-    //     String.fromCharCode.apply than Uint16Array.
-    var utf16buf = new Array(len*2);
-
-    for (out=0, i=0; i<len;) {
-        c = buf[i++];
-        // quick process ascii
-        if (c < 0x80) { utf16buf[out++] = c; continue; }
-
-        c_len = _utf8len[c];
-        // skip 5 & 6 byte codes
-        if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
-        // apply mask on first byte
-        c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
-        // join the rest
-        while (c_len > 1 && i < len) {
-            c = (c << 6) | (buf[i++] & 0x3f);
-            c_len--;
-        }
-
-        // terminated by end of string?
-        if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
-        if (c < 0x10000) {
-            utf16buf[out++] = c;
-        } else {
-            c -= 0x10000;
-            utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
-            utf16buf[out++] = 0xdc00 | (c & 0x3ff);
-        }
-    }
-
-    // shrinkBuf(utf16buf, out)
-    if (utf16buf.length !== out) {
-        if(utf16buf.subarray) {
-            utf16buf = utf16buf.subarray(0, out);
-        } else {
-            utf16buf.length = out;
-        }
-    }
-
-    // return String.fromCharCode.apply(null, utf16buf);
-    return utils.applyFromCharCode(utf16buf);
-};
-
-
-// That's all for the pako functions.
-
-
-/**
- * Transform a javascript string into an array (typed if possible) of bytes,
- * UTF-8 encoded.
- * @param {String} str the string to encode
- * @return {Array|Uint8Array|Buffer} the UTF-8 encoded string.
- */
-exports.utf8encode = function utf8encode(str) {
-    if (support.nodebuffer) {
-        return nodeBuffer(str, "utf-8");
-    }
-
-    return string2buf(str);
-};
-
-
-/**
- * Transform a bytes array (or a representation) representing an UTF-8 encoded
- * string into a javascript string.
- * @param {Array|Uint8Array|Buffer} buf the data de decode
- * @return {String} the decoded string.
- */
-exports.utf8decode = function utf8decode(buf) {
-    if (support.nodebuffer) {
-        return utils.transformTo("nodebuffer", buf).toString("utf-8");
-    }
-
-    buf = utils.transformTo(support.uint8array ? "uint8array" : "array", buf);
-
-    // return buf2string(buf);
-    // Chrome prefers to work with "small" chunks of data
-    // for the method buf2string.
-    // Firefox and Chrome has their own shortcut, IE doesn't seem to really care.
-    var result = [], k = 0, len = buf.length, chunk = 65536;
-    while (k < len) {
-        var nextBoundary = utf8border(buf, Math.min(k + chunk, len));
-        if (support.uint8array) {
-            result.push(buf2string(buf.subarray(k, nextBoundary)));
-        } else {
-            result.push(buf2string(buf.slice(k, nextBoundary)));
-        }
-        k = nextBoundary;
-    }
-    return result.join("");
-
-};
-// vim: set shiftwidth=4 softtabstop=4:
-
-},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(_dereq_,module,exports){
-'use strict';
-var support = _dereq_('./support');
-var compressions = _dereq_('./compressions');
-var nodeBuffer = _dereq_('./nodeBuffer');
-/**
- * Convert a string to a "binary string" : a string containing only char codes between 0 and 255.
- * @param {string} str the string to transform.
- * @return {String} the binary string.
- */
-exports.string2binary = function(str) {
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
-        result += String.fromCharCode(str.charCodeAt(i) & 0xff);
-    }
-    return result;
-};
-exports.arrayBuffer2Blob = function(buffer, mimeType) {
-    exports.checkSupport("blob");
-	mimeType = mimeType || 'application/zip';
-
-    try {
-        // Blob constructor
-        return new Blob([buffer], {
-            type: mimeType
-        });
-    }
-    catch (e) {
-
-        try {
-            // deprecated, browser only, old way
-            var Builder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
-            var builder = new Builder();
-            builder.append(buffer);
-            return builder.getBlob(mimeType);
-        }
-        catch (e) {
-
-            // well, fuck ?!
-            throw new Error("Bug : can't construct the Blob.");
-        }
-    }
-
-
-};
-/**
- * The identity function.
- * @param {Object} input the input.
- * @return {Object} the same input.
- */
-function identity(input) {
-    return input;
-}
-
-/**
- * Fill in an array with a string.
- * @param {String} str the string to use.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to fill in (will be mutated).
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated array.
- */
-function stringToArrayLike(str, array) {
-    for (var i = 0; i < str.length; ++i) {
-        array[i] = str.charCodeAt(i) & 0xFF;
-    }
-    return array;
-}
-
-/**
- * Transform an array-like object to a string.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
- * @return {String} the result.
- */
-function arrayLikeToString(array) {
-    // Performances notes :
-    // --------------------
-    // String.fromCharCode.apply(null, array) is the fastest, see
-    // see http://jsperf.com/converting-a-uint8array-to-a-string/2
-    // but the stack is limited (and we can get huge arrays !).
-    //
-    // result += String.fromCharCode(array[i]); generate too many strings !
-    //
-    // This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
-    var chunk = 65536;
-    var result = [],
-        len = array.length,
-        type = exports.getTypeOf(array),
-        k = 0,
-        canUseApply = true;
-      try {
-         switch(type) {
-            case "uint8array":
-               String.fromCharCode.apply(null, new Uint8Array(0));
-               break;
-            case "nodebuffer":
-               String.fromCharCode.apply(null, nodeBuffer(0));
-               break;
-         }
-      } catch(e) {
-         canUseApply = false;
-      }
-
-      // no apply : slow and painful algorithm
-      // default browser on android 4.*
-      if (!canUseApply) {
-         var resultStr = "";
-         for(var i = 0; i < array.length;i++) {
-            resultStr += String.fromCharCode(array[i]);
-         }
-    return resultStr;
-    }
-    while (k < len && chunk > 1) {
-        try {
-            if (type === "array" || type === "nodebuffer") {
-                result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
-            }
-            else {
-                result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
-            }
-            k += chunk;
-        }
-        catch (e) {
-            chunk = Math.floor(chunk / 2);
-        }
-    }
-    return result.join("");
-}
-
-exports.applyFromCharCode = arrayLikeToString;
-
-
-/**
- * Copy the data from an array-like to an other array-like.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayFrom the origin array.
- * @param {Array|ArrayBuffer|Uint8Array|Buffer} arrayTo the destination array which will be mutated.
- * @return {Array|ArrayBuffer|Uint8Array|Buffer} the updated destination array.
- */
-function arrayLikeToArrayLike(arrayFrom, arrayTo) {
-    for (var i = 0; i < arrayFrom.length; i++) {
-        arrayTo[i] = arrayFrom[i];
-    }
-    return arrayTo;
-}
-
-// a matrix containing functions to transform everything into everything.
-var transform = {};
-
-// string to ?
-transform["string"] = {
-    "string": identity,
-    "array": function(input) {
-        return stringToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return transform["string"]["uint8array"](input).buffer;
-    },
-    "uint8array": function(input) {
-        return stringToArrayLike(input, new Uint8Array(input.length));
-    },
-    "nodebuffer": function(input) {
-        return stringToArrayLike(input, nodeBuffer(input.length));
-    }
-};
-
-// array to ?
-transform["array"] = {
-    "string": arrayLikeToString,
-    "array": identity,
-    "arraybuffer": function(input) {
-        return (new Uint8Array(input)).buffer;
-    },
-    "uint8array": function(input) {
-        return new Uint8Array(input);
-    },
-    "nodebuffer": function(input) {
-        return nodeBuffer(input);
-    }
-};
-
-// arraybuffer to ?
-transform["arraybuffer"] = {
-    "string": function(input) {
-        return arrayLikeToString(new Uint8Array(input));
-    },
-    "array": function(input) {
-        return arrayLikeToArrayLike(new Uint8Array(input), new Array(input.byteLength));
-    },
-    "arraybuffer": identity,
-    "uint8array": function(input) {
-        return new Uint8Array(input);
-    },
-    "nodebuffer": function(input) {
-        return nodeBuffer(new Uint8Array(input));
-    }
-};
-
-// uint8array to ?
-transform["uint8array"] = {
-    "string": arrayLikeToString,
-    "array": function(input) {
-        return arrayLikeToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return input.buffer;
-    },
-    "uint8array": identity,
-    "nodebuffer": function(input) {
-        return nodeBuffer(input);
-    }
-};
-
-// nodebuffer to ?
-transform["nodebuffer"] = {
-    "string": arrayLikeToString,
-    "array": function(input) {
-        return arrayLikeToArrayLike(input, new Array(input.length));
-    },
-    "arraybuffer": function(input) {
-        return transform["nodebuffer"]["uint8array"](input).buffer;
-    },
-    "uint8array": function(input) {
-        return arrayLikeToArrayLike(input, new Uint8Array(input.length));
-    },
-    "nodebuffer": identity
-};
-
-/**
- * Transform an input into any type.
- * The supported output type are : string, array, uint8array, arraybuffer, nodebuffer.
- * If no output type is specified, the unmodified input will be returned.
- * @param {String} outputType the output type.
- * @param {String|Array|ArrayBuffer|Uint8Array|Buffer} input the input to convert.
- * @throws {Error} an Error if the browser doesn't support the requested output type.
- */
-exports.transformTo = function(outputType, input) {
-    if (!input) {
-        // undefined, null, etc
-        // an empty string won't harm.
-        input = "";
-    }
-    if (!outputType) {
-        return input;
-    }
-    exports.checkSupport(outputType);
-    var inputType = exports.getTypeOf(input);
-    var result = transform[inputType][outputType](input);
-    return result;
-};
-
-/**
- * Return the type of the input.
- * The type will be in a format valid for JSZip.utils.transformTo : string, array, uint8array, arraybuffer.
- * @param {Object} input the input to identify.
- * @return {String} the (lowercase) type of the input.
- */
-exports.getTypeOf = function(input) {
-    if (typeof input === "string") {
-        return "string";
-    }
-    if (Object.prototype.toString.call(input) === "[object Array]") {
-        return "array";
-    }
-    if (support.nodebuffer && nodeBuffer.test(input)) {
-        return "nodebuffer";
-    }
-    if (support.uint8array && input instanceof Uint8Array) {
-        return "uint8array";
-    }
-    if (support.arraybuffer && input instanceof ArrayBuffer) {
-        return "arraybuffer";
-    }
-};
-
-/**
- * Throw an exception if the type is not supported.
- * @param {String} type the type to check.
- * @throws {Error} an Error if the browser doesn't support the requested type.
- */
-exports.checkSupport = function(type) {
-    var supported = support[type.toLowerCase()];
-    if (!supported) {
-        throw new Error(type + " is not supported by this browser");
-    }
-};
-exports.MAX_VALUE_16BITS = 65535;
-exports.MAX_VALUE_32BITS = -1; // well, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" is parsed as -1
-
-/**
- * Prettify a string read as binary.
- * @param {string} str the string to prettify.
- * @return {string} a pretty string.
- */
-exports.pretty = function(str) {
-    var res = '',
-        code, i;
-    for (i = 0; i < (str || "").length; i++) {
-        code = str.charCodeAt(i);
-        res += '\\x' + (code < 16 ? "0" : "") + code.toString(16).toUpperCase();
-    }
-    return res;
-};
-
-/**
- * Find a compression registered in JSZip.
- * @param {string} compressionMethod the method magic to find.
- * @return {Object|null} the JSZip compression object, null if none found.
- */
-exports.findCompression = function(compressionMethod) {
-    for (var method in compressions) {
-        if (!compressions.hasOwnProperty(method)) {
-            continue;
-        }
-        if (compressions[method].magic === compressionMethod) {
-            return compressions[method];
-        }
-    }
-    return null;
-};
-/**
-* Cross-window, cross-Node-context regular expression detection
-* @param  {Object}  object Anything
-* @return {Boolean}        true if the object is a regular expression,
-* false otherwise
-*/
-exports.isRegExp = function (object) {
-    return Object.prototype.toString.call(object) === "[object RegExp]";
-};
-
-
-},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var NodeBufferReader = _dereq_('./nodeBufferReader');
-var Uint8ArrayReader = _dereq_('./uint8ArrayReader');
-var utils = _dereq_('./utils');
-var sig = _dereq_('./signature');
-var ZipEntry = _dereq_('./zipEntry');
-var support = _dereq_('./support');
-var jszipProto = _dereq_('./object');
-//  class ZipEntries {{{
-/**
- * All the entries in the zip file.
- * @constructor
- * @param {String|ArrayBuffer|Uint8Array} data the binary stream to load.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntries(data, loadOptions) {
-    this.files = [];
-    this.loadOptions = loadOptions;
-    if (data) {
-        this.load(data);
-    }
-}
-ZipEntries.prototype = {
-    /**
-     * Check that the reader is on the speficied signature.
-     * @param {string} expectedSignature the expected signature.
-     * @throws {Error} if it is an other signature.
-     */
-    checkSignature: function(expectedSignature) {
-        var signature = this.reader.readString(4);
-        if (signature !== expectedSignature) {
-            throw new Error("Corrupted zip or bug : unexpected signature " + "(" + utils.pretty(signature) + ", expected " + utils.pretty(expectedSignature) + ")");
-        }
-    },
-    /**
-     * Read the end of the central directory.
-     */
-    readBlockEndOfCentral: function() {
-        this.diskNumber = this.reader.readInt(2);
-        this.diskWithCentralDirStart = this.reader.readInt(2);
-        this.centralDirRecordsOnThisDisk = this.reader.readInt(2);
-        this.centralDirRecords = this.reader.readInt(2);
-        this.centralDirSize = this.reader.readInt(4);
-        this.centralDirOffset = this.reader.readInt(4);
-
-        this.zipCommentLength = this.reader.readInt(2);
-        // warning : the encoding depends of the system locale
-        // On a linux machine with LANG=en_US.utf8, this field is utf8 encoded.
-        // On a windows machine, this field is encoded with the localized windows code page.
-        this.zipComment = this.reader.readString(this.zipCommentLength);
-        // To get consistent behavior with the generation part, we will assume that
-        // this is utf8 encoded.
-        this.zipComment = jszipProto.utf8decode(this.zipComment);
-    },
-    /**
-     * Read the end of the Zip 64 central directory.
-     * Not merged with the method readEndOfCentral :
-     * The end of central can coexist with its Zip64 brother,
-     * I don't want to read the wrong number of bytes !
-     */
-    readBlockZip64EndOfCentral: function() {
-        this.zip64EndOfCentralSize = this.reader.readInt(8);
-        this.versionMadeBy = this.reader.readString(2);
-        this.versionNeeded = this.reader.readInt(2);
-        this.diskNumber = this.reader.readInt(4);
-        this.diskWithCentralDirStart = this.reader.readInt(4);
-        this.centralDirRecordsOnThisDisk = this.reader.readInt(8);
-        this.centralDirRecords = this.reader.readInt(8);
-        this.centralDirSize = this.reader.readInt(8);
-        this.centralDirOffset = this.reader.readInt(8);
-
-        this.zip64ExtensibleData = {};
-        var extraDataSize = this.zip64EndOfCentralSize - 44,
-            index = 0,
-            extraFieldId,
-            extraFieldLength,
-            extraFieldValue;
-        while (index < extraDataSize) {
-            extraFieldId = this.reader.readInt(2);
-            extraFieldLength = this.reader.readInt(4);
-            extraFieldValue = this.reader.readString(extraFieldLength);
-            this.zip64ExtensibleData[extraFieldId] = {
-                id: extraFieldId,
-                length: extraFieldLength,
-                value: extraFieldValue
-            };
-        }
-    },
-    /**
-     * Read the end of the Zip 64 central directory locator.
-     */
-    readBlockZip64EndOfCentralLocator: function() {
-        this.diskWithZip64CentralDirStart = this.reader.readInt(4);
-        this.relativeOffsetEndOfZip64CentralDir = this.reader.readInt(8);
-        this.disksCount = this.reader.readInt(4);
-        if (this.disksCount > 1) {
-            throw new Error("Multi-volumes zip are not supported");
-        }
-    },
-    /**
-     * Read the local files, based on the offset read in the central part.
-     */
-    readLocalFiles: function() {
-        var i, file;
-        for (i = 0; i < this.files.length; i++) {
-            file = this.files[i];
-            this.reader.setIndex(file.localHeaderOffset);
-            this.checkSignature(sig.LOCAL_FILE_HEADER);
-            file.readLocalPart(this.reader);
-            file.handleUTF8();
-            file.processAttributes();
-        }
-    },
-    /**
-     * Read the central directory.
-     */
-    readCentralDir: function() {
-        var file;
-
-        this.reader.setIndex(this.centralDirOffset);
-        while (this.reader.readString(4) === sig.CENTRAL_FILE_HEADER) {
-            file = new ZipEntry({
-                zip64: this.zip64
-            }, this.loadOptions);
-            file.readCentralPart(this.reader);
-            this.files.push(file);
-        }
-    },
-    /**
-     * Read the end of central directory.
-     */
-    readEndOfCentral: function() {
-        var offset = this.reader.lastIndexOfSignature(sig.CENTRAL_DIRECTORY_END);
-        if (offset === -1) {
-            // Check if the content is a truncated zip or complete garbage.
-            // A "LOCAL_FILE_HEADER" is not required at the beginning (auto
-            // extractible zip for example) but it can give a good hint.
-            // If an ajax request was used without responseType, we will also
-            // get unreadable data.
-            var isGarbage = true;
-            try {
-                this.reader.setIndex(0);
-                this.checkSignature(sig.LOCAL_FILE_HEADER);
-                isGarbage = false;
-            } catch (e) {}
-
-            if (isGarbage) {
-                throw new Error("Can't find end of central directory : is this a zip file ? " +
-                                "If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html");
-            } else {
-                throw new Error("Corrupted zip : can't find end of central directory");
-            }
-        }
-        this.reader.setIndex(offset);
-        this.checkSignature(sig.CENTRAL_DIRECTORY_END);
-        this.readBlockEndOfCentral();
-
-
-        /* extract from the zip spec :
-            4)  If one of the fields in the end of central directory
-                record is too small to hold required data, the field
-                should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
-                ZIP64 format record should be created.
-            5)  The end of central directory record and the
-                Zip64 end of central directory locator record must
-                reside on the same disk when splitting or spanning
-                an archive.
-         */
-        if (this.diskNumber === utils.MAX_VALUE_16BITS || this.diskWithCentralDirStart === utils.MAX_VALUE_16BITS || this.centralDirRecordsOnThisDisk === utils.MAX_VALUE_16BITS || this.centralDirRecords === utils.MAX_VALUE_16BITS || this.centralDirSize === utils.MAX_VALUE_32BITS || this.centralDirOffset === utils.MAX_VALUE_32BITS) {
-            this.zip64 = true;
-
-            /*
-            Warning : the zip64 extension is supported, but ONLY if the 64bits integer read from
-            the zip file can fit into a 32bits integer. This cannot be solved : Javascript represents
-            all numbers as 64-bit double precision IEEE 754 floating point numbers.
-            So, we have 53bits for integers and bitwise operations treat everything as 32bits.
-            see https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/Bitwise_Operators
-            and http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf section 8.5
-            */
-
-            // should look for a zip64 EOCD locator
-            offset = this.reader.lastIndexOfSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
-            if (offset === -1) {
-                throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");
-            }
-            this.reader.setIndex(offset);
-            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_LOCATOR);
-            this.readBlockZip64EndOfCentralLocator();
-
-            // now the zip64 EOCD record
-            this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir);
-            this.checkSignature(sig.ZIP64_CENTRAL_DIRECTORY_END);
-            this.readBlockZip64EndOfCentral();
-        }
-    },
-    prepareReader: function(data) {
-        var type = utils.getTypeOf(data);
-        if (type === "string" && !support.uint8array) {
-            this.reader = new StringReader(data, this.loadOptions.optimizedBinaryString);
-        }
-        else if (type === "nodebuffer") {
-            this.reader = new NodeBufferReader(data);
-        }
-        else {
-            this.reader = new Uint8ArrayReader(utils.transformTo("uint8array", data));
-        }
-    },
-    /**
-     * Read a zip file and create ZipEntries.
-     * @param {String|ArrayBuffer|Uint8Array|Buffer} data the binary string representing a zip file.
-     */
-    load: function(data) {
-        this.prepareReader(data);
-        this.readEndOfCentral();
-        this.readCentralDir();
-        this.readLocalFiles();
-    }
-};
-// }}} end of ZipEntries
-module.exports = ZipEntries;
-
-},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(_dereq_,module,exports){
-'use strict';
-var StringReader = _dereq_('./stringReader');
-var utils = _dereq_('./utils');
-var CompressedObject = _dereq_('./compressedObject');
-var jszipProto = _dereq_('./object');
-
-var MADE_BY_DOS = 0x00;
-var MADE_BY_UNIX = 0x03;
-
-// class ZipEntry {{{
-/**
- * An entry in the zip file.
- * @constructor
- * @param {Object} options Options of the current file.
- * @param {Object} loadOptions Options for loading the stream.
- */
-function ZipEntry(options, loadOptions) {
-    this.options = options;
-    this.loadOptions = loadOptions;
-}
-ZipEntry.prototype = {
-    /**
-     * say if the file is encrypted.
-     * @return {boolean} true if the file is encrypted, false otherwise.
-     */
-    isEncrypted: function() {
-        // bit 1 is set
-        return (this.bitFlag & 0x0001) === 0x0001;
-    },
-    /**
-     * say if the file has utf-8 filename/comment.
-     * @return {boolean} true if the filename/comment is in utf-8, false otherwise.
-     */
-    useUTF8: function() {
-        // bit 11 is set
-        return (this.bitFlag & 0x0800) === 0x0800;
-    },
-    /**
-     * Prepare the function used to generate the compressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @return {Function} the callback to get the compressed content (the type depends of the DataReader class).
-     */
-    prepareCompressedContent: function(reader, from, length) {
-        return function() {
-            var previousIndex = reader.index;
-            reader.setIndex(from);
-            var compressedFileData = reader.readData(length);
-            reader.setIndex(previousIndex);
-
-            return compressedFileData;
-        };
-    },
-    /**
-     * Prepare the function used to generate the uncompressed content from this ZipFile.
-     * @param {DataReader} reader the reader to use.
-     * @param {number} from the offset from where we should read the data.
-     * @param {number} length the length of the data to read.
-     * @param {JSZip.compression} compression the compression used on this file.
-     * @param {number} uncompressedSize the uncompressed size to expect.
-     * @return {Function} the callback to get the uncompressed content (the type depends of the DataReader class).
-     */
-    prepareContent: function(reader, from, length, compression, uncompressedSize) {
-        return function() {
-
-            var compressedFileData = utils.transformTo(compression.uncompressInputType, this.getCompressedContent());
-            var uncompressedFileData = compression.uncompress(compressedFileData);
-
-            if (uncompressedFileData.length !== uncompressedSize) {
-                throw new Error("Bug : uncompressed data size mismatch");
-            }
-
-            return uncompressedFileData;
-        };
-    },
-    /**
-     * Read the local part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readLocalPart: function(reader) {
-        var compression, localExtraFieldsLength;
-
-        // we already know everything from the central dir !
-        // If the central dir data are false, we are doomed.
-        // On the bright side, the local part is scary  : zip64, data descriptors, both, etc.
-        // The less data we get here, the more reliable this should be.
-        // Let's skip the whole header and dash to the data !
-        reader.skip(22);
-        // in some zip created on windows, the filename stored in the central dir contains \ instead of /.
-        // Strangely, the filename here is OK.
-        // I would love to treat these zip files as corrupted (see http://www.info-zip.org/FAQ.html#backslashes
-        // or APPNOTE#4.4.17.1, "All slashes MUST be forward slashes '/'") but there are a lot of bad zip generators...
-        // Search "unzip mismatching "local" filename continuing with "central" filename version" on
-        // the internet.
-        //
-        // I think I see the logic here : the central directory is used to display
-        // content and the local directory is used to extract the files. Mixing / and \
-        // may be used to display \ to windows users and use / when extracting the files.
-        // Unfortunately, this lead also to some issues : http://seclists.org/fulldisclosure/2009/Sep/394
-        this.fileNameLength = reader.readInt(2);
-        localExtraFieldsLength = reader.readInt(2); // can't be sure this will be the same as the central dir
-        this.fileName = reader.readString(this.fileNameLength);
-        reader.skip(localExtraFieldsLength);
-
-        if (this.compressedSize == -1 || this.uncompressedSize == -1) {
-            throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory " + "(compressedSize == -1 || uncompressedSize == -1)");
-        }
-
-        compression = utils.findCompression(this.compressionMethod);
-        if (compression === null) { // no compression found
-            throw new Error("Corrupted zip : compression " + utils.pretty(this.compressionMethod) + " unknown (inner file : " + this.fileName + ")");
-        }
-        this.decompressed = new CompressedObject();
-        this.decompressed.compressedSize = this.compressedSize;
-        this.decompressed.uncompressedSize = this.uncompressedSize;
-        this.decompressed.crc32 = this.crc32;
-        this.decompressed.compressionMethod = this.compressionMethod;
-        this.decompressed.getCompressedContent = this.prepareCompressedContent(reader, reader.index, this.compressedSize, compression);
-        this.decompressed.getContent = this.prepareContent(reader, reader.index, this.compressedSize, compression, this.uncompressedSize);
-
-        // we need to compute the crc32...
-        if (this.loadOptions.checkCRC32) {
-            this.decompressed = utils.transformTo("string", this.decompressed.getContent());
-            if (jszipProto.crc32(this.decompressed) !== this.crc32) {
-                throw new Error("Corrupted zip : CRC32 mismatch");
-            }
-        }
-    },
-
-    /**
-     * Read the central part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readCentralPart: function(reader) {
-        this.versionMadeBy = reader.readInt(2);
-        this.versionNeeded = reader.readInt(2);
-        this.bitFlag = reader.readInt(2);
-        this.compressionMethod = reader.readString(2);
-        this.date = reader.readDate();
-        this.crc32 = reader.readInt(4);
-        this.compressedSize = reader.readInt(4);
-        this.uncompressedSize = reader.readInt(4);
-        this.fileNameLength = reader.readInt(2);
-        this.extraFieldsLength = reader.readInt(2);
-        this.fileCommentLength = reader.readInt(2);
-        this.diskNumberStart = reader.readInt(2);
-        this.internalFileAttributes = reader.readInt(2);
-        this.externalFileAttributes = reader.readInt(4);
-        this.localHeaderOffset = reader.readInt(4);
-
-        if (this.isEncrypted()) {
-            throw new Error("Encrypted zip are not supported");
-        }
-
-        this.fileName = reader.readString(this.fileNameLength);
-        this.readExtraFields(reader);
-        this.parseZIP64ExtraField(reader);
-        this.fileComment = reader.readString(this.fileCommentLength);
-    },
-
-    /**
-     * Parse the external file attributes and get the unix/dos permissions.
-     */
-    processAttributes: function () {
-        this.unixPermissions = null;
-        this.dosPermissions = null;
-        var madeBy = this.versionMadeBy >> 8;
-
-        // Check if we have the DOS directory flag set.
-        // We look for it in the DOS and UNIX permissions
-        // but some unknown platform could set it as a compatibility flag.
-        this.dir = this.externalFileAttributes & 0x0010 ? true : false;
-
-        if(madeBy === MADE_BY_DOS) {
-            // first 6 bits (0 to 5)
-            this.dosPermissions = this.externalFileAttributes & 0x3F;
-        }
-
-        if(madeBy === MADE_BY_UNIX) {
-            this.unixPermissions = (this.externalFileAttributes >> 16) & 0xFFFF;
-            // the octal permissions are in (this.unixPermissions & 0x01FF).toString(8);
-        }
-
-        // fail safe : if the name ends with a / it probably means a folder
-        if (!this.dir && this.fileName.slice(-1) === '/') {
-            this.dir = true;
-        }
-    },
-
-    /**
-     * Parse the ZIP64 extra field and merge the info in the current ZipEntry.
-     * @param {DataReader} reader the reader to use.
-     */
-    parseZIP64ExtraField: function(reader) {
-
-        if (!this.extraFields[0x0001]) {
-            return;
-        }
-
-        // should be something, preparing the extra reader
-        var extraReader = new StringReader(this.extraFields[0x0001].value);
-
-        // I really hope that these 64bits integer can fit in 32 bits integer, because js
-        // won't let us have more.
-        if (this.uncompressedSize === utils.MAX_VALUE_32BITS) {
-            this.uncompressedSize = extraReader.readInt(8);
-        }
-        if (this.compressedSize === utils.MAX_VALUE_32BITS) {
-            this.compressedSize = extraReader.readInt(8);
-        }
-        if (this.localHeaderOffset === utils.MAX_VALUE_32BITS) {
-            this.localHeaderOffset = extraReader.readInt(8);
-        }
-        if (this.diskNumberStart === utils.MAX_VALUE_32BITS) {
-            this.diskNumberStart = extraReader.readInt(4);
-        }
-    },
-    /**
-     * Read the central part of a zip file and add the info in this object.
-     * @param {DataReader} reader the reader to use.
-     */
-    readExtraFields: function(reader) {
-        var start = reader.index,
-            extraFieldId,
-            extraFieldLength,
-            extraFieldValue;
-
-        this.extraFields = this.extraFields || {};
-
-        while (reader.index < start + this.extraFieldsLength) {
-            extraFieldId = reader.readInt(2);
-            extraFieldLength = reader.readInt(2);
-            extraFieldValue = reader.readString(extraFieldLength);
-
-            this.extraFields[extraFieldId] = {
-                id: extraFieldId,
-                length: extraFieldLength,
-                value: extraFieldValue
-            };
-        }
-    },
-    /**
-     * Apply an UTF8 transformation if needed.
-     */
-    handleUTF8: function() {
-        if (this.useUTF8()) {
-            this.fileName = jszipProto.utf8decode(this.fileName);
-            this.fileComment = jszipProto.utf8decode(this.fileComment);
-        } else {
-            var upath = this.findExtraFieldUnicodePath();
-            if (upath !== null) {
-                this.fileName = upath;
-            }
-            var ucomment = this.findExtraFieldUnicodeComment();
-            if (ucomment !== null) {
-                this.fileComment = ucomment;
-            }
-        }
-    },
-
-    /**
-     * Find the unicode path declared in the extra field, if any.
-     * @return {String} the unicode path, null otherwise.
-     */
-    findExtraFieldUnicodePath: function() {
-        var upathField = this.extraFields[0x7075];
-        if (upathField) {
-            var extraReader = new StringReader(upathField.value);
-
-            // wrong version
-            if (extraReader.readInt(1) !== 1) {
-                return null;
-            }
-
-            // the crc of the filename changed, this field is out of date.
-            if (jszipProto.crc32(this.fileName) !== extraReader.readInt(4)) {
-                return null;
-            }
-
-            return jszipProto.utf8decode(extraReader.readString(upathField.length - 5));
-        }
-        return null;
-    },
-
-    /**
-     * Find the unicode comment declared in the extra field, if any.
-     * @return {String} the unicode comment, null otherwise.
-     */
-    findExtraFieldUnicodeComment: function() {
-        var ucommentField = this.extraFields[0x6375];
-        if (ucommentField) {
-            var extraReader = new StringReader(ucommentField.value);
-
-            // wrong version
-            if (extraReader.readInt(1) !== 1) {
-                return null;
-            }
-
-            // the crc of the comment changed, this field is out of date.
-            if (jszipProto.crc32(this.fileComment) !== extraReader.readInt(4)) {
-                return null;
-            }
-
-            return jszipProto.utf8decode(extraReader.readString(ucommentField.length - 5));
-        }
-        return null;
-    }
-};
-module.exports = ZipEntry;
-
-},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(_dereq_,module,exports){
-// Top level file is just a mixin of submodules & constants
-'use strict';
-
-var assign    = _dereq_('./lib/utils/common').assign;
-
-var deflate   = _dereq_('./lib/deflate');
-var inflate   = _dereq_('./lib/inflate');
-var constants = _dereq_('./lib/zlib/constants');
-
-var pako = {};
-
-assign(pako, deflate, inflate, constants);
-
-module.exports = pako;
-},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_deflate = _dereq_('./zlib/deflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-var Z_NO_FLUSH      = 0;
-var Z_FINISH        = 4;
-
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-
-var Z_DEFAULT_COMPRESSION = -1;
-
-var Z_DEFAULT_STRATEGY    = 0;
-
-var Z_DEFLATED  = 8;
-
-/* ===========================================================================*/
-
-
-/**
- * class Deflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[deflate]],
- * [[deflateRaw]] and [[gzip]].
- **/
-
-/* internal
- * Deflate.chunks -> Array
- *
- * Chunks of output data, if [[Deflate#onData]] not overriden.
- **/
-
-/**
- * Deflate.result -> Uint8Array|Array
- *
- * Compressed result, generated by default [[Deflate#onData]]
- * and [[Deflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Deflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Deflate.err -> Number
- *
- * Error code after deflate finished. 0 (Z_OK) on success.
- * You will not need it in real life, because deflate errors
- * are possible only on wrong options or bad `onData` / `onEnd`
- * custom handlers.
- **/
-
-/**
- * Deflate.msg -> String
- *
- * Error message, if [[Deflate.err]] != 0
- **/
-
-
-/**
- * new Deflate(options)
- * - options (Object): zlib deflate options.
- *
- * Creates new deflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `level`
- * - `windowBits`
- * - `memLevel`
- * - `strategy`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw deflate
- * - `gzip` (Boolean) - create gzip wrapper
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- *    (each char code [0..255])
- * - `header` (Object) - custom header for gzip
- *   - `text` (Boolean) - true if compressed data believed to be text
- *   - `time` (Number) - modification time, unix timestamp
- *   - `os` (Number) - operation system code
- *   - `extra` (Array) - array of bytes with extra data (max 65536)
- *   - `name` (String) - file name (binary string)
- *   - `comment` (String) - comment (binary string)
- *   - `hcrc` (Boolean) - true if header crc should be added
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var deflate = new pako.Deflate({ level: 3});
- *
- * deflate.push(chunk1, false);
- * deflate.push(chunk2, true);  // true -> last chunk
- *
- * if (deflate.err) { throw new Error(deflate.err); }
- *
- * console.log(deflate.result);
- * ```
- **/
-var Deflate = function(options) {
-
-  this.options = utils.assign({
-    level: Z_DEFAULT_COMPRESSION,
-    method: Z_DEFLATED,
-    chunkSize: 16384,
-    windowBits: 15,
-    memLevel: 8,
-    strategy: Z_DEFAULT_STRATEGY,
-    to: ''
-  }, options || {});
-
-  var opt = this.options;
-
-  if (opt.raw && (opt.windowBits > 0)) {
-    opt.windowBits = -opt.windowBits;
-  }
-
-  else if (opt.gzip && (opt.windowBits > 0) && (opt.windowBits < 16)) {
-    opt.windowBits += 16;
-  }
-
-  this.err    = 0;      // error code, if happens (0 = Z_OK)
-  this.msg    = '';     // error message
-  this.ended  = false;  // used to avoid multiple onEnd() calls
-  this.chunks = [];     // chunks of compressed data
-
-  this.strm = new zstream();
-  this.strm.avail_out = 0;
-
-  var status = zlib_deflate.deflateInit2(
-    this.strm,
-    opt.level,
-    opt.method,
-    opt.windowBits,
-    opt.memLevel,
-    opt.strategy
-  );
-
-  if (status !== Z_OK) {
-    throw new Error(msg[status]);
-  }
-
-  if (opt.header) {
-    zlib_deflate.deflateSetHeader(this.strm, opt.header);
-  }
-};
-
-/**
- * Deflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data. Strings will be converted to
- *   utf8 byte sequence.
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to deflate pipe, generating [[Deflate#onData]] calls with
- * new compressed chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Deflate#onEnd]].
- *
- * On fail call [[Deflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * array format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true);  // push last chunk
- * ```
- **/
-Deflate.prototype.push = function(data, mode) {
-  var strm = this.strm;
-  var chunkSize = this.options.chunkSize;
-  var status, _mode;
-
-  if (this.ended) { return false; }
-
-  _mode = (mode === ~~mode) ? mode : ((mode === true) ? Z_FINISH : Z_NO_FLUSH);
-
-  // Convert data if needed
-  if (typeof data === 'string') {
-    // If we need to compress text, change encoding to utf8.
-    strm.input = strings.string2buf(data);
-  } else {
-    strm.input = data;
-  }
-
-  strm.next_in = 0;
-  strm.avail_in = strm.input.length;
-
-  do {
-    if (strm.avail_out === 0) {
-      strm.output = new utils.Buf8(chunkSize);
-      strm.next_out = 0;
-      strm.avail_out = chunkSize;
-    }
-    status = zlib_deflate.deflate(strm, _mode);    /* no bad return value */
-
-    if (status !== Z_STREAM_END && status !== Z_OK) {
-      this.onEnd(status);
-      this.ended = true;
-      return false;
-    }
-    if (strm.avail_out === 0 || (strm.avail_in === 0 && _mode === Z_FINISH)) {
-      if (this.options.to === 'string') {
-        this.onData(strings.buf2binstring(utils.shrinkBuf(strm.output, strm.next_out)));
-      } else {
-        this.onData(utils.shrinkBuf(strm.output, strm.next_out));
-      }
-    }
-  } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== Z_STREAM_END);
-
-  // Finalize on the last chunk.
-  if (_mode === Z_FINISH) {
-    status = zlib_deflate.deflateEnd(this.strm);
-    this.onEnd(status);
-    this.ended = true;
-    return status === Z_OK;
-  }
-
-  return true;
-};
-
-
-/**
- * Deflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- *   on js engine support. When string output requested, each chunk
- *   will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Deflate.prototype.onData = function(chunk) {
-  this.chunks.push(chunk);
-};
-
-
-/**
- * Deflate#onEnd(status) -> Void
- * - status (Number): deflate status. 0 (Z_OK) on success,
- *   other if not.
- *
- * Called once after you tell deflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Deflate.prototype.onEnd = function(status) {
-  // On success - join
-  if (status === Z_OK) {
-    if (this.options.to === 'string') {
-      this.result = this.chunks.join('');
-    } else {
-      this.result = utils.flattenChunks(this.chunks);
-    }
-  }
-  this.chunks = [];
-  this.err = status;
-  this.msg = this.strm.msg;
-};
-
-
-/**
- * deflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * Compress `data` with deflate alrorythm and `options`.
- *
- * Supported options are:
- *
- * - level
- * - windowBits
- * - memLevel
- * - strategy
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- *   negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be "binary string"
- *    (each char code [0..255])
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , data = Uint8Array([1,2,3,4,5,6,7,8,9]);
- *
- * console.log(pako.deflate(data));
- * ```
- **/
-function deflate(input, options) {
-  var deflator = new Deflate(options);
-
-  deflator.push(input, true);
-
-  // That will never happens, if you don't cheat with options :)
-  if (deflator.err) { throw deflator.msg; }
-
-  return deflator.result;
-}
-
-
-/**
- * deflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function deflateRaw(input, options) {
-  options = options || {};
-  options.raw = true;
-  return deflate(input, options);
-}
-
-
-/**
- * gzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to compress.
- * - options (Object): zlib deflate options.
- *
- * The same as [[deflate]], but create gzip wrapper instead of
- * deflate one.
- **/
-function gzip(input, options) {
-  options = options || {};
-  options.gzip = true;
-  return deflate(input, options);
-}
-
-
-exports.Deflate = Deflate;
-exports.deflate = deflate;
-exports.deflateRaw = deflateRaw;
-exports.gzip = gzip;
-},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(_dereq_,module,exports){
-'use strict';
-
-
-var zlib_inflate = _dereq_('./zlib/inflate.js');
-var utils = _dereq_('./utils/common');
-var strings = _dereq_('./utils/strings');
-var c = _dereq_('./zlib/constants');
-var msg = _dereq_('./zlib/messages');
-var zstream = _dereq_('./zlib/zstream');
-var gzheader = _dereq_('./zlib/gzheader');
-
-
-/**
- * class Inflate
- *
- * Generic JS-style wrapper for zlib calls. If you don't need
- * streaming behaviour - use more simple functions: [[inflate]]
- * and [[inflateRaw]].
- **/
-
-/* internal
- * inflate.chunks -> Array
- *
- * Chunks of output data, if [[Inflate#onData]] not overriden.
- **/
-
-/**
- * Inflate.result -> Uint8Array|Array|String
- *
- * Uncompressed result, generated by default [[Inflate#onData]]
- * and [[Inflate#onEnd]] handlers. Filled after you push last chunk
- * (call [[Inflate#push]] with `Z_FINISH` / `true` param).
- **/
-
-/**
- * Inflate.err -> Number
- *
- * Error code after inflate finished. 0 (Z_OK) on success.
- * Should be checked if broken data possible.
- **/
-
-/**
- * Inflate.msg -> String
- *
- * Error message, if [[Inflate.err]] != 0
- **/
-
-
-/**
- * new Inflate(options)
- * - options (Object): zlib inflate options.
- *
- * Creates new inflator instance with specified params. Throws exception
- * on bad params. Supported options:
- *
- * - `windowBits`
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information on these.
- *
- * Additional options, for internal needs:
- *
- * - `chunkSize` - size of generated data chunks (16K by default)
- * - `raw` (Boolean) - do raw inflate
- * - `to` (String) - if equal to 'string', then result will be converted
- *   from utf8 to utf16 (javascript) string. When string output requested,
- *   chunk length can differ from `chunkSize`, depending on content.
- *
- * By default, when no options set, autodetect deflate/gzip data format via
- * wrapper header.
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , chunk1 = Uint8Array([1,2,3,4,5,6,7,8,9])
- *   , chunk2 = Uint8Array([10,11,12,13,14,15,16,17,18,19]);
- *
- * var inflate = new pako.Inflate({ level: 3});
- *
- * inflate.push(chunk1, false);
- * inflate.push(chunk2, true);  // true -> last chunk
- *
- * if (inflate.err) { throw new Error(inflate.err); }
- *
- * console.log(inflate.result);
- * ```
- **/
-var Inflate = function(options) {
-
-  this.options = utils.assign({
-    chunkSize: 16384,
-    windowBits: 0,
-    to: ''
-  }, options || {});
-
-  var opt = this.options;
-
-  // Force window size for `raw` data, if not set directly,
-  // because we have no header for autodetect.
-  if (opt.raw && (opt.windowBits >= 0) && (opt.windowBits < 16)) {
-    opt.windowBits = -opt.windowBits;
-    if (opt.windowBits === 0) { opt.windowBits = -15; }
-  }
-
-  // If `windowBits` not defined (and mode not raw) - set autodetect flag for gzip/deflate
-  if ((opt.windowBits >= 0) && (opt.windowBits < 16) &&
-      !(options && options.windowBits)) {
-    opt.windowBits += 32;
-  }
-
-  // Gzip header has no info about windows size, we can do autodetect only
-  // for deflate. So, if window size not set, force it to max when gzip possible
-  if ((opt.windowBits > 15) && (opt.windowBits < 48)) {
-    // bit 3 (16) -> gzipped data
-    // bit 4 (32) -> autodetect gzip/deflate
-    if ((opt.windowBits & 15) === 0) {
-      opt.windowBits |= 15;
-    }
-  }
-
-  this.err    = 0;      // error code, if happens (0 = Z_OK)
-  this.msg    = '';     // error message
-  this.ended  = false;  // used to avoid multiple onEnd() calls
-  this.chunks = [];     // chunks of compressed data
-
-  this.strm   = new zstream();
-  this.strm.avail_out = 0;
-
-  var status  = zlib_inflate.inflateInit2(
-    this.strm,
-    opt.windowBits
-  );
-
-  if (status !== c.Z_OK) {
-    throw new Error(msg[status]);
-  }
-
-  this.header = new gzheader();
-
-  zlib_inflate.inflateGetHeader(this.strm, this.header);
-};
-
-/**
- * Inflate#push(data[, mode]) -> Boolean
- * - data (Uint8Array|Array|String): input data
- * - mode (Number|Boolean): 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
- *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
- *
- * Sends input data to inflate pipe, generating [[Inflate#onData]] calls with
- * new output chunks. Returns `true` on success. The last data block must have
- * mode Z_FINISH (or `true`). That flush internal pending buffers and call
- * [[Inflate#onEnd]].
- *
- * On fail call [[Inflate#onEnd]] with error code and return false.
- *
- * We strongly recommend to use `Uint8Array` on input for best speed (output
- * format is detected automatically). Also, don't skip last param and always
- * use the same type in your code (boolean or number). That will improve JS speed.
- *
- * For regular `Array`-s make sure all elements are [0..255].
- *
- * ##### Example
- *
- * ```javascript
- * push(chunk, false); // push one of data chunks
- * ...
- * push(chunk, true);  // push last chunk
- * ```
- **/
-Inflate.prototype.push = function(data, mode) {
-  var strm = this.strm;
-  var chunkSize = this.options.chunkSize;
-  var status, _mode;
-  var next_out_utf8, tail, utf8str;
-
-  if (this.ended) { return false; }
-  _mode = (mode === ~~mode) ? mode : ((mode === true) ? c.Z_FINISH : c.Z_NO_FLUSH);
-
-  // Convert data if needed
-  if (typeof data === 'string') {
-    // Only binary strings can be decompressed on practice
-    strm.input = strings.binstring2buf(data);
-  } else {
-    strm.input = data;
-  }
-
-  strm.next_in = 0;
-  strm.avail_in = strm.input.length;
-
-  do {
-    if (strm.avail_out === 0) {
-      strm.output = new utils.Buf8(chunkSize);
-      strm.next_out = 0;
-      strm.avail_out = chunkSize;
-    }
-
-    status = zlib_inflate.inflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
-
-    if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
-      this.onEnd(status);
-      this.ended = true;
-      return false;
-    }
-
-    if (strm.next_out) {
-      if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
-
-        if (this.options.to === 'string') {
-
-          next_out_utf8 = strings.utf8border(strm.output, strm.next_out);
-
-          tail = strm.next_out - next_out_utf8;
-          utf8str = strings.buf2string(strm.output, next_out_utf8);
-
-          // move tail
-          strm.next_out = tail;
-          strm.avail_out = chunkSize - tail;
-          if (tail) { utils.arraySet(strm.output, strm.output, next_out_utf8, tail, 0); }
-
-          this.onData(utf8str);
-
-        } else {
-          this.onData(utils.shrinkBuf(strm.output, strm.next_out));
-        }
-      }
-    }
-  } while ((strm.avail_in > 0) && status !== c.Z_STREAM_END);
-
-  if (status === c.Z_STREAM_END) {
-    _mode = c.Z_FINISH;
-  }
-  // Finalize on the last chunk.
-  if (_mode === c.Z_FINISH) {
-    status = zlib_inflate.inflateEnd(this.strm);
-    this.onEnd(status);
-    this.ended = true;
-    return status === c.Z_OK;
-  }
-
-  return true;
-};
-
-
-/**
- * Inflate#onData(chunk) -> Void
- * - chunk (Uint8Array|Array|String): ouput data. Type of array depends
- *   on js engine support. When string output requested, each chunk
- *   will be string.
- *
- * By default, stores data blocks in `chunks[]` property and glue
- * those in `onEnd`. Override this handler, if you need another behaviour.
- **/
-Inflate.prototype.onData = function(chunk) {
-  this.chunks.push(chunk);
-};
-
-
-/**
- * Inflate#onEnd(status) -> Void
- * - status (Number): inflate status. 0 (Z_OK) on success,
- *   other if not.
- *
- * Called once after you tell inflate that input stream complete
- * or error happenned. By default - join collected chunks,
- * free memory and fill `results` / `err` properties.
- **/
-Inflate.prototype.onEnd = function(status) {
-  // On success - join
-  if (status === c.Z_OK) {
-    if (this.options.to === 'string') {
-      // Glue & convert here, until we teach pako to send
-      // utf8 alligned strings to onData
-      this.result = this.chunks.join('');
-    } else {
-      this.result = utils.flattenChunks(this.chunks);
-    }
-  }
-  this.chunks = [];
-  this.err = status;
-  this.msg = this.strm.msg;
-};
-
-
-/**
- * inflate(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Decompress `data` with inflate/ungzip and `options`. Autodetect
- * format via wrapper header by default. That's why we don't provide
- * separate `ungzip` method.
- *
- * Supported options are:
- *
- * - windowBits
- *
- * [http://zlib.net/manual.html#Advanced](http://zlib.net/manual.html#Advanced)
- * for more information.
- *
- * Sugar (options):
- *
- * - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
- *   negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then result will be converted
- *   from utf8 to utf16 (javascript) string. When string output requested,
- *   chunk length can differ from `chunkSize`, depending on content.
- *
- *
- * ##### Example:
- *
- * ```javascript
- * var pako = require('pako')
- *   , input = pako.deflate([1,2,3,4,5,6,7,8,9])
- *   , output;
- *
- * try {
- *   output = pako.inflate(input);
- * } catch (err)
- *   console.log(err);
- * }
- * ```
- **/
-function inflate(input, options) {
-  var inflator = new Inflate(options);
-
-  inflator.push(input, true);
-
-  // That will never happens, if you don't cheat with options :)
-  if (inflator.err) { throw inflator.msg; }
-
-  return inflator.result;
-}
-
-
-/**
- * inflateRaw(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * The same as [[inflate]], but creates raw data, without wrapper
- * (header and adler32 crc).
- **/
-function inflateRaw(input, options) {
-  options = options || {};
-  options.raw = true;
-  return inflate(input, options);
-}
-
-
-/**
- * ungzip(data[, options]) -> Uint8Array|Array|String
- * - data (Uint8Array|Array|String): input data to decompress.
- * - options (Object): zlib inflate options.
- *
- * Just shortcut to [[inflate]], because it autodetects format
- * by header.content. Done for convenience.
- **/
-
-
-exports.Inflate = Inflate;
-exports.inflate = inflate;
-exports.inflateRaw = inflateRaw;
-exports.ungzip  = inflate;
-
-},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(_dereq_,module,exports){
-'use strict';
-
-
-var TYPED_OK =  (typeof Uint8Array !== 'undefined') &&
-                (typeof Uint16Array !== 'undefined') &&
-                (typeof Int32Array !== 'undefined');
-
-
-exports.assign = function (obj /*from1, from2, from3, ...*/) {
-  var sources = Array.prototype.slice.call(arguments, 1);
-  while (sources.length) {
-    var source = sources.shift();
-    if (!source) { continue; }
-
-    if (typeof(source) !== 'object') {
-      throw new TypeError(source + 'must be non-object');
-    }
-
-    for (var p in source) {
-      if (source.hasOwnProperty(p)) {
-        obj[p] = source[p];
-      }
-    }
-  }
-
-  return obj;
-};
-
-
-// reduce buffer size, avoiding mem copy
-exports.shrinkBuf = function (buf, size) {
-  if (buf.length === size) { return buf; }
-  if (buf.subarray) { return buf.subarray(0, size); }
-  buf.length = size;
-  return buf;
-};
-
-
-var fnTyped = {
-  arraySet: function (dest, src, src_offs, len, dest_offs) {
-    if (src.subarray && dest.subarray) {
-      dest.set(src.subarray(src_offs, src_offs+len), dest_offs);
-      return;
-    }
-    // Fallback to ordinary array
-    for(var i=0; i<len; i++) {
-      dest[dest_offs + i] = src[src_offs + i];
-    }
-  },
-  // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
-    var i, l, len, pos, chunk, result;
-
-    // calculate data length
-    len = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
-      len += chunks[i].length;
-    }
-
-    // join chunks
-    result = new Uint8Array(len);
-    pos = 0;
-    for (i=0, l=chunks.length; i<l; i++) {
-      chunk = chunks[i];
-      result.set(chunk, pos);
-      pos += chunk.length;
-    }
-
-    return result;
-  }
-};
-
-var fnUntyped = {
-  arraySet: function (dest, src, src_offs, len, dest_offs) {
-    for(var i=0; i<len; i++) {
-      dest[dest_offs + i] = src[src_offs + i];
-    }
-  },
-  // Join array of chunks to single array.
-  flattenChunks: function(chunks) {
-    return [].concat.apply([], chunks);
-  }
-};
-
-
-// Enable/Disable typed arrays use, for testing
-//
-exports.setTyped = function (on) {
-  if (on) {
-    exports.Buf8  = Uint8Array;
-    exports.Buf16 = Uint16Array;
-    exports.Buf32 = Int32Array;
-    exports.assign(exports, fnTyped);
-  } else {
-    exports.Buf8  = Array;
-    exports.Buf16 = Array;
-    exports.Buf32 = Array;
-    exports.assign(exports, fnUntyped);
-  }
-};
-
-exports.setTyped(TYPED_OK);
-},{}],28:[function(_dereq_,module,exports){
-// String encode/decode helpers
-'use strict';
-
-
-var utils = _dereq_('./common');
-
-
-// Quick check if we can use fast array to bin string conversion
-//
-// - apply(Array) can fail on Android 2.2
-// - apply(Uint8Array) can fail on iOS 5.1 Safary
-//
-var STR_APPLY_OK = true;
-var STR_APPLY_UIA_OK = true;
-
-try { String.fromCharCode.apply(null, [0]); } catch(__) { STR_APPLY_OK = false; }
-try { String.fromCharCode.apply(null, new Uint8Array(1)); } catch(__) { STR_APPLY_UIA_OK = false; }
-
-
-// Table with utf8 lengths (calculated by first byte of sequence)
-// Note, that 5 & 6-byte values and some 4-byte values can not be represented in JS,
-// because max possible codepoint is 0x10ffff
-var _utf8len = new utils.Buf8(256);
-for (var i=0; i<256; i++) {
-  _utf8len[i] = (i >= 252 ? 6 : i >= 248 ? 5 : i >= 240 ? 4 : i >= 224 ? 3 : i >= 192 ? 2 : 1);
-}
-_utf8len[254]=_utf8len[254]=1; // Invalid sequence start
-
-
-// convert string to array (typed, when possible)
-exports.string2buf = function (str) {
-  var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
-
-  // count binary size
-  for (m_pos = 0; m_pos < str_len; m_pos++) {
-    c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
-      if ((c2 & 0xfc00) === 0xdc00) {
-        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-        m_pos++;
-      }
-    }
-    buf_len += c < 0x80 ? 1 : c < 0x800 ? 2 : c < 0x10000 ? 3 : 4;
-  }
-
-  // allocate buffer
-  buf = new utils.Buf8(buf_len);
-
-  // convert
-  for (i=0, m_pos = 0; i < buf_len; m_pos++) {
-    c = str.charCodeAt(m_pos);
-    if ((c & 0xfc00) === 0xd800 && (m_pos+1 < str_len)) {
-      c2 = str.charCodeAt(m_pos+1);
-      if ((c2 & 0xfc00) === 0xdc00) {
-        c = 0x10000 + ((c - 0xd800) << 10) + (c2 - 0xdc00);
-        m_pos++;
-      }
-    }
-    if (c < 0x80) {
-      /* one byte */
-      buf[i++] = c;
-    } else if (c < 0x800) {
-      /* two bytes */
-      buf[i++] = 0xC0 | (c >>> 6);
-      buf[i++] = 0x80 | (c & 0x3f);
-    } else if (c < 0x10000) {
-      /* three bytes */
-      buf[i++] = 0xE0 | (c >>> 12);
-      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-      buf[i++] = 0x80 | (c & 0x3f);
-    } else {
-      /* four bytes */
-      buf[i++] = 0xf0 | (c >>> 18);
-      buf[i++] = 0x80 | (c >>> 12 & 0x3f);
-      buf[i++] = 0x80 | (c >>> 6 & 0x3f);
-      buf[i++] = 0x80 | (c & 0x3f);
-    }
-  }
-
-  return buf;
-};
-
-// Helper (used in 2 places)
-function buf2binstring(buf, len) {
-  // use fallback for big arrays to avoid stack overflow
-  if (len < 65537) {
-    if ((buf.subarray && STR_APPLY_UIA_OK) || (!buf.subarray && STR_APPLY_OK)) {
-      return String.fromCharCode.apply(null, utils.shrinkBuf(buf, len));
-    }
-  }
-
-  var result = '';
-  for(var i=0; i < len; i++) {
-    result += String.fromCharCode(buf[i]);
-  }
-  return result;
-}
-
-
-// Convert byte array to binary string
-exports.buf2binstring = function(buf) {
-  return buf2binstring(buf, buf.length);
-};
-
-
-// Convert binary string (typed, when possible)
-exports.binstring2buf = function(str) {
-  var buf = new utils.Buf8(str.length);
-  for(var i=0, len=buf.length; i < len; i++) {
-    buf[i] = str.charCodeAt(i);
-  }
-  return buf;
-};
-
-
-// convert array to string
-exports.buf2string = function (buf, max) {
-  var i, out, c, c_len;
-  var len = max || buf.length;
-
-  // Reserve max possible length (2 words per char)
-  // NB: by unknown reasons, Array is significantly faster for
-  //     String.fromCharCode.apply than Uint16Array.
-  var utf16buf = new Array(len*2);
-
-  for (out=0, i=0; i<len;) {
-    c = buf[i++];
-    // quick process ascii
-    if (c < 0x80) { utf16buf[out++] = c; continue; }
-
-    c_len = _utf8len[c];
-    // skip 5 & 6 byte codes
-    if (c_len > 4) { utf16buf[out++] = 0xfffd; i += c_len-1; continue; }
-
-    // apply mask on first byte
-    c &= c_len === 2 ? 0x1f : c_len === 3 ? 0x0f : 0x07;
-    // join the rest
-    while (c_len > 1 && i < len) {
-      c = (c << 6) | (buf[i++] & 0x3f);
-      c_len--;
-    }
-
-    // terminated by end of string?
-    if (c_len > 1) { utf16buf[out++] = 0xfffd; continue; }
-
-    if (c < 0x10000) {
-      utf16buf[out++] = c;
-    } else {
-      c -= 0x10000;
-      utf16buf[out++] = 0xd800 | ((c >> 10) & 0x3ff);
-      utf16buf[out++] = 0xdc00 | (c & 0x3ff);
-    }
-  }
-
-  return buf2binstring(utf16buf, out);
-};
-
-
-// Calculate max possible position in utf8 buffer,
-// that will not break sequence. If that's not possible
-// - (very small limits) return max size as is.
-//
-// buf[] - utf8 bytes array
-// max   - length limit (mandatory);
-exports.utf8border = function(buf, max) {
-  var pos;
-
-  max = max || buf.length;
-  if (max > buf.length) { max = buf.length; }
-
-  // go back from last position, until start of sequence found
-  pos = max-1;
-  while (pos >= 0 && (buf[pos] & 0xC0) === 0x80) { pos--; }
-
-  // Fuckup - very small and broken sequence,
-  // return max, because we should return something anyway.
-  if (pos < 0) { return max; }
-
-  // If we came to start of buffer - that means vuffer is too small,
-  // return max too.
-  if (pos === 0) { return max; }
-
-  return (pos + _utf8len[buf[pos]] > max) ? pos : max;
-};
-
-},{"./common":27}],29:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: adler32 takes 12% for level 0 and 2% for level 6.
-// It doesn't worth to make additional optimizationa as in original.
-// Small size is preferable.
-
-function adler32(adler, buf, len, pos) {
-  var s1 = (adler & 0xffff) |0
-    , s2 = ((adler >>> 16) & 0xffff) |0
-    , n = 0;
-
-  while (len !== 0) {
-    // Set limit ~ twice less than 5552, to keep
-    // s2 in 31-bits, because we force signed ints.
-    // in other case %= will fail.
-    n = len > 2000 ? 2000 : len;
-    len -= n;
-
-    do {
-      s1 = (s1 + buf[pos++]) |0;
-      s2 = (s2 + s1) |0;
-    } while (--n);
-
-    s1 %= 65521;
-    s2 %= 65521;
-  }
-
-  return (s1 | (s2 << 16)) |0;
-}
-
-
-module.exports = adler32;
-},{}],30:[function(_dereq_,module,exports){
-module.exports = {
-
-  /* Allowed flush values; see deflate() and inflate() below for details */
-  Z_NO_FLUSH:         0,
-  Z_PARTIAL_FLUSH:    1,
-  Z_SYNC_FLUSH:       2,
-  Z_FULL_FLUSH:       3,
-  Z_FINISH:           4,
-  Z_BLOCK:            5,
-  Z_TREES:            6,
-
-  /* Return codes for the compression/decompression functions. Negative values
-  * are errors, positive values are used for special but normal events.
-  */
-  Z_OK:               0,
-  Z_STREAM_END:       1,
-  Z_NEED_DICT:        2,
-  Z_ERRNO:           -1,
-  Z_STREAM_ERROR:    -2,
-  Z_DATA_ERROR:      -3,
-  //Z_MEM_ERROR:     -4,
-  Z_BUF_ERROR:       -5,
-  //Z_VERSION_ERROR: -6,
-
-  /* compression levels */
-  Z_NO_COMPRESSION:         0,
-  Z_BEST_SPEED:             1,
-  Z_BEST_COMPRESSION:       9,
-  Z_DEFAULT_COMPRESSION:   -1,
-
-
-  Z_FILTERED:               1,
-  Z_HUFFMAN_ONLY:           2,
-  Z_RLE:                    3,
-  Z_FIXED:                  4,
-  Z_DEFAULT_STRATEGY:       0,
-
-  /* Possible values of the data_type field (though see inflate()) */
-  Z_BINARY:                 0,
-  Z_TEXT:                   1,
-  //Z_ASCII:                1, // = Z_TEXT (deprecated)
-  Z_UNKNOWN:                2,
-
-  /* The deflate compression method */
-  Z_DEFLATED:               8
-  //Z_NULL:                 null // Use -1 or null inline, depending on var type
-};
-},{}],31:[function(_dereq_,module,exports){
-'use strict';
-
-// Note: we can't get significant speed boost here.
-// So write code to minimize size - no pregenerated tables
-// and array tools dependencies.
-
-
-// Use ordinary array, since untyped makes no boost here
-function makeTable() {
-  var c, table = [];
-
-  for(var n =0; n < 256; n++){
-    c = n;
-    for(var k =0; k < 8; k++){
-      c = ((c&1) ? (0xEDB88320 ^ (c >>> 1)) : (c >>> 1));
-    }
-    table[n] = c;
-  }
-
-  return table;
-}
-
-// Create table on load. Just 255 signed longs. Not a problem.
-var crcTable = makeTable();
-
-
-function crc32(crc, buf, len, pos) {
-  var t = crcTable
-    , end = pos + len;
-
-  crc = crc ^ (-1);
-
-  for (var i = pos; i < end; i++ ) {
-    crc = (crc >>> 8) ^ t[(crc ^ buf[i]) & 0xFF];
-  }
-
-  return (crc ^ (-1)); // >>> 0;
-}
-
-
-module.exports = crc32;
-},{}],32:[function(_dereq_,module,exports){
-'use strict';
-
-var utils   = _dereq_('../utils/common');
-var trees   = _dereq_('./trees');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var msg   = _dereq_('./messages');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-var Z_NO_FLUSH      = 0;
-var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH    = 2;
-var Z_FULL_FLUSH    = 3;
-var Z_FINISH        = 4;
-var Z_BLOCK         = 5;
-//var Z_TREES         = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-//var Z_NEED_DICT     = 2;
-//var Z_ERRNO         = -1;
-var Z_STREAM_ERROR  = -2;
-var Z_DATA_ERROR    = -3;
-//var Z_MEM_ERROR     = -4;
-var Z_BUF_ERROR     = -5;
-//var Z_VERSION_ERROR = -6;
-
-
-/* compression levels */
-//var Z_NO_COMPRESSION      = 0;
-//var Z_BEST_SPEED          = 1;
-//var Z_BEST_COMPRESSION    = 9;
-var Z_DEFAULT_COMPRESSION = -1;
-
-
-var Z_FILTERED            = 1;
-var Z_HUFFMAN_ONLY        = 2;
-var Z_RLE                 = 3;
-var Z_FIXED               = 4;
-var Z_DEFAULT_STRATEGY    = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-//var Z_BINARY              = 0;
-//var Z_TEXT                = 1;
-//var Z_ASCII               = 1; // = Z_TEXT
-var Z_UNKNOWN             = 2;
-
-
-/* The deflate compression method */
-var Z_DEFLATED  = 8;
-
-/*============================================================================*/
-
-
-var MAX_MEM_LEVEL = 9;
-/* Maximum value for memLevel in deflateInit2 */
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_MEM_LEVEL = 8;
-
-
-var LENGTH_CODES  = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-var LITERALS      = 256;
-/* number of literal bytes 0..255 */
-var L_CODES       = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-var D_CODES       = 30;
-/* number of distance codes */
-var BL_CODES      = 19;
-/* number of codes used to transfer the bit lengths */
-var HEAP_SIZE     = 2*L_CODES + 1;
-/* maximum heap size */
-var MAX_BITS  = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var MIN_MATCH = 3;
-var MAX_MATCH = 258;
-var MIN_LOOKAHEAD = (MAX_MATCH + MIN_MATCH + 1);
-
-var PRESET_DICT = 0x20;
-
-var INIT_STATE = 42;
-var EXTRA_STATE = 69;
-var NAME_STATE = 73;
-var COMMENT_STATE = 91;
-var HCRC_STATE = 103;
-var BUSY_STATE = 113;
-var FINISH_STATE = 666;
-
-var BS_NEED_MORE      = 1; /* block not completed, need more input or more output */
-var BS_BLOCK_DONE     = 2; /* block flush performed */
-var BS_FINISH_STARTED = 3; /* finish started, need only more output at next deflate */
-var BS_FINISH_DONE    = 4; /* finish done, accept no more input or output */
-
-var OS_CODE = 0x03; // Unix :) . Don't detect, use this default.
-
-function err(strm, errorCode) {
-  strm.msg = msg[errorCode];
-  return errorCode;
-}
-
-function rank(f) {
-  return ((f) << 1) - ((f) > 4 ? 9 : 0);
-}
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->output buffer and copying into it.
- * (See also read_buf()).
- */
-function flush_pending(strm) {
-  var s = strm.state;
-
-  //_tr_flush_bits(s);
-  var len = s.pending;
-  if (len > strm.avail_out) {
-    len = strm.avail_out;
-  }
-  if (len === 0) { return; }
-
-  utils.arraySet(strm.output, s.pending_buf, s.pending_out, len, strm.next_out);
-  strm.next_out += len;
-  s.pending_out += len;
-  strm.total_out += len;
-  strm.avail_out -= len;
-  s.pending -= len;
-  if (s.pending === 0) {
-    s.pending_out = 0;
-  }
-}
-
-
-function flush_block_only (s, last) {
-  trees._tr_flush_block(s, (s.block_start >= 0 ? s.block_start : -1), s.strstart - s.block_start, last);
-  s.block_start = s.strstart;
-  flush_pending(s.strm);
-}
-
-
-function put_byte(s, b) {
-  s.pending_buf[s.pending++] = b;
-}
-
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-function putShortMSB(s, b) {
-//  put_byte(s, (Byte)(b >> 8));
-//  put_byte(s, (Byte)(b & 0xff));
-  s.pending_buf[s.pending++] = (b >>> 8) & 0xff;
-  s.pending_buf[s.pending++] = b & 0xff;
-}
-
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->input buffer and copying from it.
- * (See also flush_pending()).
- */
-function read_buf(strm, buf, start, size) {
-  var len = strm.avail_in;
-
-  if (len > size) { len = size; }
-  if (len === 0) { return 0; }
-
-  strm.avail_in -= len;
-
-  utils.arraySet(buf, strm.input, strm.next_in, len, start);
-  if (strm.state.wrap === 1) {
-    strm.adler = adler32(strm.adler, buf, len, start);
-  }
-
-  else if (strm.state.wrap === 2) {
-    strm.adler = crc32(strm.adler, buf, len, start);
-  }
-
-  strm.next_in += len;
-  strm.total_in += len;
-
-  return len;
-}
-
-
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-function longest_match(s, cur_match) {
-  var chain_length = s.max_chain_length;      /* max hash chain length */
-  var scan = s.strstart; /* current string */
-  var match;                       /* matched string */
-  var len;                           /* length of current match */
-  var best_len = s.prev_length;              /* best match length so far */
-  var nice_match = s.nice_match;             /* stop if match long enough */
-  var limit = (s.strstart > (s.w_size - MIN_LOOKAHEAD)) ?
-      s.strstart - (s.w_size - MIN_LOOKAHEAD) : 0/*NIL*/;
-
-  var _win = s.window; // shortcut
-
-  var wmask = s.w_mask;
-  var prev  = s.prev;
-
-  /* Stop when cur_match becomes <= limit. To simplify the code,
-   * we prevent matches with the string of window index 0.
-   */
-
-  var strend = s.strstart + MAX_MATCH;
-  var scan_end1  = _win[scan + best_len - 1];
-  var scan_end   = _win[scan + best_len];
-
-  /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-   * It is easy to get rid of this optimization if necessary.
-   */
-  // Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-  /* Do not waste too much time if we already have a good match: */
-  if (s.prev_length >= s.good_match) {
-    chain_length >>= 2;
-  }
-  /* Do not look for matches beyond the end of the input. This is necessary
-   * to make deflate deterministic.
-   */
-  if (nice_match > s.lookahead) { nice_match = s.lookahead; }
-
-  // Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-  do {
-    // Assert(cur_match < s->strstart, "no future");
-    match = cur_match;
-
-    /* Skip to next match if the match length cannot increase
-     * or if the match length is less than 2.  Note that the checks below
-     * for insufficient lookahead only occur occasionally for performance
-     * reasons.  Therefore uninitialized memory will be accessed, and
-     * conditional jumps will be made that depend on those values.
-     * However the length of the match is limited to the lookahead, so
-     * the output of deflate is not affected by the uninitialized values.
-     */
-
-    if (_win[match + best_len]     !== scan_end  ||
-        _win[match + best_len - 1] !== scan_end1 ||
-        _win[match]                !== _win[scan] ||
-        _win[++match]              !== _win[scan + 1]) {
-      continue;
-    }
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2;
-    match++;
-    // Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-      /*jshint noempty:false*/
-    } while (_win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             _win[++scan] === _win[++match] && _win[++scan] === _win[++match] &&
-             scan < strend);
-
-    // Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (strend - scan);
-    scan = strend - MAX_MATCH;
-
-    if (len > best_len) {
-      s.match_start = cur_match;
-      best_len = len;
-      if (len >= nice_match) {
-        break;
-      }
-      scan_end1  = _win[scan + best_len - 1];
-      scan_end   = _win[scan + best_len];
-    }
-  } while ((cur_match = prev[cur_match & wmask]) > limit && --chain_length !== 0);
-
-  if (best_len <= s.lookahead) {
-    return best_len;
-  }
-  return s.lookahead;
-}
-
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-function fill_window(s) {
-  var _w_size = s.w_size;
-  var p, n, m, more, str;
-
-  //Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-  do {
-    more = s.window_size - s.lookahead - s.strstart;
-
-    // JS ints have 32 bit, block below not needed
-    /* Deal with !@#$% 64K limit: */
-    //if (sizeof(int) <= 2) {
-    //    if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-    //        more = wsize;
-    //
-    //  } else if (more == (unsigned)(-1)) {
-    //        /* Very unlikely, but possible on 16 bit machine if
-    //         * strstart == 0 && lookahead == 1 (input done a byte at time)
-    //         */
-    //        more--;
-    //    }
-    //}
-
-
-    /* If the window is almost full and there is insufficient lookahead,
-     * move the upper half to the lower one to make room in the upper half.
-     */
-    if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
-
-      utils.arraySet(s.window, s.window, _w_size, _w_size, 0);
-      s.match_start -= _w_size;
-      s.strstart -= _w_size;
-      /* we now have strstart >= MAX_DIST */
-      s.block_start -= _w_size;
-
-      /* Slide the hash table (could be avoided with 32 bit values
-       at the expense of memory usage). We slide even when level == 0
-       to keep the hash table consistent if we switch back to level > 0
-       later. (Using level 0 permanently is not an optimal usage of
-       zlib, so we don't care about this pathological case.)
-       */
-
-      n = s.hash_size;
-      p = n;
-      do {
-        m = s.head[--p];
-        s.head[p] = (m >= _w_size ? m - _w_size : 0);
-      } while (--n);
-
-      n = _w_size;
-      p = n;
-      do {
-        m = s.prev[--p];
-        s.prev[p] = (m >= _w_size ? m - _w_size : 0);
-        /* If n is not on any hash chain, prev[n] is garbage but
-         * its value will never be used.
-         */
-      } while (--n);
-
-      more += _w_size;
-    }
-    if (s.strm.avail_in === 0) {
-      break;
-    }
-
-    /* If there was no sliding:
-     *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-     *    more == window_size - lookahead - strstart
-     * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-     * => more >= window_size - 2*WSIZE + 2
-     * In the BIG_MEM or MMAP case (not yet supported),
-     *   window_size == input_size + MIN_LOOKAHEAD  &&
-     *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-     * Otherwise, window_size == 2*WSIZE so more >= 2.
-     * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-     */
-    //Assert(more >= 2, "more < 2");
-    n = read_buf(s.strm, s.window, s.strstart + s.lookahead, more);
-    s.lookahead += n;
-
-    /* Initialize the hash value now that we have some input: */
-    if (s.lookahead + s.insert >= MIN_MATCH) {
-      str = s.strstart - s.insert;
-      s.ins_h = s.window[str];
-
-      /* UPDATE_HASH(s, s->ins_h, s->window[str + 1]); */
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + 1]) & s.hash_mask;
-//#if MIN_MATCH != 3
-//        Call update_hash() MIN_MATCH-3 more times
-//#endif
-      while (s.insert) {
-        /* UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); */
-        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[str + MIN_MATCH-1]) & s.hash_mask;
-
-        s.prev[str & s.w_mask] = s.head[s.ins_h];
-        s.head[s.ins_h] = str;
-        str++;
-        s.insert--;
-        if (s.lookahead + s.insert < MIN_MATCH) {
-          break;
-        }
-      }
-    }
-    /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-     * but this is not important since only literal bytes will be emitted.
-     */
-
-  } while (s.lookahead < MIN_LOOKAHEAD && s.strm.avail_in !== 0);
-
-  /* If the WIN_INIT bytes after the end of the current data have never been
-   * written, then zero those bytes in order to avoid memory check reports of
-   * the use of uninitialized (or uninitialised as Julian writes) bytes by
-   * the longest match routines.  Update the high water mark for the next
-   * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-   * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-   */
-//  if (s.high_water < s.window_size) {
-//    var curr = s.strstart + s.lookahead;
-//    var init = 0;
-//
-//    if (s.high_water < curr) {
-//      /* Previous high water mark below current data -- zero WIN_INIT
-//       * bytes or up to end of window, whichever is less.
-//       */
-//      init = s.window_size - curr;
-//      if (init > WIN_INIT)
-//        init = WIN_INIT;
-//      zmemzero(s->window + curr, (unsigned)init);
-//      s->high_water = curr + init;
-//    }
-//    else if (s->high_water < (ulg)curr + WIN_INIT) {
-//      /* High water mark at or above current data, but below current data
-//       * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-//       * to end of window, whichever is less.
-//       */
-//      init = (ulg)curr + WIN_INIT - s->high_water;
-//      if (init > s->window_size - s->high_water)
-//        init = s->window_size - s->high_water;
-//      zmemzero(s->window + s->high_water, (unsigned)init);
-//      s->high_water += init;
-//    }
-//  }
-//
-//  Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-//    "not enough room for search");
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-function deflate_stored(s, flush) {
-  /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-   * to pending_buf_size, and each stored block has a 5 byte header:
-   */
-  var max_block_size = 0xffff;
-
-  if (max_block_size > s.pending_buf_size - 5) {
-    max_block_size = s.pending_buf_size - 5;
-  }
-
-  /* Copy as much as possible from input to output: */
-  for (;;) {
-    /* Fill the window as much as possible: */
-    if (s.lookahead <= 1) {
-
-      //Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-      //  s->block_start >= (long)s->w_size, "slide too late");
-//      if (!(s.strstart < s.w_size + (s.w_size - MIN_LOOKAHEAD) ||
-//        s.block_start >= s.w_size)) {
-//        throw  new Error("slide too late");
-//      }
-
-      fill_window(s);
-      if (s.lookahead === 0 && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-
-      if (s.lookahead === 0) {
-        break;
-      }
-      /* flush the current block */
-    }
-    //Assert(s->block_start >= 0L, "block gone");
-//    if (s.block_start < 0) throw new Error("block gone");
-
-    s.strstart += s.lookahead;
-    s.lookahead = 0;
-
-    /* Emit a stored block if pending_buf will be full: */
-    var max_start = s.block_start + max_block_size;
-
-    if (s.strstart === 0 || s.strstart >= max_start) {
-      /* strstart == 0 is possible when wraparound on 16-bit machine */
-      s.lookahead = s.strstart - max_start;
-      s.strstart = max_start;
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-
-
-    }
-    /* Flush if we may have to slide, otherwise block_start may become
-     * negative and the data will be gone:
-     */
-    if (s.strstart - s.block_start >= (s.w_size - MIN_LOOKAHEAD)) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-
-  s.insert = 0;
-
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-
-  if (s.strstart > s.block_start) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-
-  return BS_NEED_MORE;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-function deflate_fast(s, flush) {
-  var hash_head;        /* head of the hash chain */
-  var bflush;           /* set if current block must be flushed */
-
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the next match, plus MIN_MATCH bytes to insert the
-     * string following the next match.
-     */
-    if (s.lookahead < MIN_LOOKAHEAD) {
-      fill_window(s);
-      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) {
-        break; /* flush the current block */
-      }
-    }
-
-    /* Insert the string window[strstart .. strstart+2] in the
-     * dictionary, and set hash_head to the head of the hash chain:
-     */
-    hash_head = 0/*NIL*/;
-    if (s.lookahead >= MIN_MATCH) {
-      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-      s.head[s.ins_h] = s.strstart;
-      /***/
-    }
-
-    /* Find the longest match, discarding those <= prev_length.
-     * At this point we have always match_length < MIN_MATCH
-     */
-    if (hash_head !== 0/*NIL*/ && ((s.strstart - hash_head) <= (s.w_size - MIN_LOOKAHEAD))) {
-      /* To simplify the code, we prevent matches with the string
-       * of window index 0 (in particular we have to avoid a match
-       * of the string with itself at the start of the input file).
-       */
-      s.match_length = longest_match(s, hash_head);
-      /* longest_match() sets match_start */
-    }
-    if (s.match_length >= MIN_MATCH) {
-      // check_match(s, s.strstart, s.match_start, s.match_length); // for debug only
-
-      /*** _tr_tally_dist(s, s.strstart - s.match_start,
-                     s.match_length - MIN_MATCH, bflush); ***/
-      bflush = trees._tr_tally(s, s.strstart - s.match_start, s.match_length - MIN_MATCH);
-
-      s.lookahead -= s.match_length;
-
-      /* Insert new strings in the hash table only if the match length
-       * is not too large. This saves time but degrades compression.
-       */
-      if (s.match_length <= s.max_lazy_match/*max_insert_length*/ && s.lookahead >= MIN_MATCH) {
-        s.match_length--; /* string at strstart already in table */
-        do {
-          s.strstart++;
-          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-          s.head[s.ins_h] = s.strstart;
-          /***/
-          /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-           * always MIN_MATCH bytes ahead.
-           */
-        } while (--s.match_length !== 0);
-        s.strstart++;
-      } else
-      {
-        s.strstart += s.match_length;
-        s.match_length = 0;
-        s.ins_h = s.window[s.strstart];
-        /* UPDATE_HASH(s, s.ins_h, s.window[s.strstart+1]); */
-        s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + 1]) & s.hash_mask;
-
-//#if MIN_MATCH != 3
-//                Call UPDATE_HASH() MIN_MATCH-3 more times
-//#endif
-        /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-         * matter since it will be recomputed at next deflate call.
-         */
-      }
-    } else {
-      /* No match, output a literal byte */
-      //Tracevv((stderr,"%c", s.window[s.strstart]));
-      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
-      s.lookahead--;
-      s.strstart++;
-    }
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = ((s.strstart < (MIN_MATCH-1)) ? s.strstart : MIN_MATCH-1);
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-function deflate_slow(s, flush) {
-  var hash_head;          /* head of hash chain */
-  var bflush;              /* set if current block must be flushed */
-
-  var max_insert;
-
-  /* Process the input block. */
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the next match, plus MIN_MATCH bytes to insert the
-     * string following the next match.
-     */
-    if (s.lookahead < MIN_LOOKAHEAD) {
-      fill_window(s);
-      if (s.lookahead < MIN_LOOKAHEAD && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) { break; } /* flush the current block */
-    }
-
-    /* Insert the string window[strstart .. strstart+2] in the
-     * dictionary, and set hash_head to the head of the hash chain:
-     */
-    hash_head = 0/*NIL*/;
-    if (s.lookahead >= MIN_MATCH) {
-      /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-      s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-      hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-      s.head[s.ins_h] = s.strstart;
-      /***/
-    }
-
-    /* Find the longest match, discarding those <= prev_length.
-     */
-    s.prev_length = s.match_length;
-    s.prev_match = s.match_start;
-    s.match_length = MIN_MATCH-1;
-
-    if (hash_head !== 0/*NIL*/ && s.prev_length < s.max_lazy_match &&
-        s.strstart - hash_head <= (s.w_size-MIN_LOOKAHEAD)/*MAX_DIST(s)*/) {
-      /* To simplify the code, we prevent matches with the string
-       * of window index 0 (in particular we have to avoid a match
-       * of the string with itself at the start of the input file).
-       */
-      s.match_length = longest_match(s, hash_head);
-      /* longest_match() sets match_start */
-
-      if (s.match_length <= 5 &&
-         (s.strategy === Z_FILTERED || (s.match_length === MIN_MATCH && s.strstart - s.match_start > 4096/*TOO_FAR*/))) {
-
-        /* If prev_match is also MIN_MATCH, match_start is garbage
-         * but we will ignore the current match anyway.
-         */
-        s.match_length = MIN_MATCH-1;
-      }
-    }
-    /* If there was a match at the previous step and the current
-     * match is not better, output the previous match:
-     */
-    if (s.prev_length >= MIN_MATCH && s.match_length <= s.prev_length) {
-      max_insert = s.strstart + s.lookahead - MIN_MATCH;
-      /* Do not insert strings in hash table beyond this. */
-
-      //check_match(s, s.strstart-1, s.prev_match, s.prev_length);
-
-      /***_tr_tally_dist(s, s.strstart - 1 - s.prev_match,
-                     s.prev_length - MIN_MATCH, bflush);***/
-      bflush = trees._tr_tally(s, s.strstart - 1- s.prev_match, s.prev_length - MIN_MATCH);
-      /* Insert in hash table all strings up to the end of the match.
-       * strstart-1 and strstart are already inserted. If there is not
-       * enough lookahead, the last two strings are not inserted in
-       * the hash table.
-       */
-      s.lookahead -= s.prev_length-1;
-      s.prev_length -= 2;
-      do {
-        if (++s.strstart <= max_insert) {
-          /*** INSERT_STRING(s, s.strstart, hash_head); ***/
-          s.ins_h = ((s.ins_h << s.hash_shift) ^ s.window[s.strstart + MIN_MATCH - 1]) & s.hash_mask;
-          hash_head = s.prev[s.strstart & s.w_mask] = s.head[s.ins_h];
-          s.head[s.ins_h] = s.strstart;
-          /***/
-        }
-      } while (--s.prev_length !== 0);
-      s.match_available = 0;
-      s.match_length = MIN_MATCH-1;
-      s.strstart++;
-
-      if (bflush) {
-        /*** FLUSH_BLOCK(s, 0); ***/
-        flush_block_only(s, false);
-        if (s.strm.avail_out === 0) {
-          return BS_NEED_MORE;
-        }
-        /***/
-      }
-
-    } else if (s.match_available) {
-      /* If there was no match at the previous position, output a
-       * single literal. If there was a match but the current match
-       * is longer, truncate the previous match to a single literal.
-       */
-      //Tracevv((stderr,"%c", s->window[s->strstart-1]));
-      /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
-      if (bflush) {
-        /*** FLUSH_BLOCK_ONLY(s, 0) ***/
-        flush_block_only(s, false);
-        /***/
-      }
-      s.strstart++;
-      s.lookahead--;
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-    } else {
-      /* There is no previous match to compare with, wait for
-       * the next step to decide.
-       */
-      s.match_available = 1;
-      s.strstart++;
-      s.lookahead--;
-    }
-  }
-  //Assert (flush != Z_NO_FLUSH, "no flush?");
-  if (s.match_available) {
-    //Tracevv((stderr,"%c", s->window[s->strstart-1]));
-    /*** _tr_tally_lit(s, s.window[s.strstart-1], bflush); ***/
-    bflush = trees._tr_tally(s, 0, s.window[s.strstart-1]);
-
-    s.match_available = 0;
-  }
-  s.insert = s.strstart < MIN_MATCH-1 ? s.strstart : MIN_MATCH-1;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-
-  return BS_BLOCK_DONE;
-}
-
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-function deflate_rle(s, flush) {
-  var bflush;            /* set if current block must be flushed */
-  var prev;              /* byte at distance one to match */
-  var scan, strend;      /* scan goes up to strend for length of run */
-
-  var _win = s.window;
-
-  for (;;) {
-    /* Make sure that we always have enough lookahead, except
-     * at the end of the input file. We need MAX_MATCH bytes
-     * for the longest run, plus one for the unrolled loop.
-     */
-    if (s.lookahead <= MAX_MATCH) {
-      fill_window(s);
-      if (s.lookahead <= MAX_MATCH && flush === Z_NO_FLUSH) {
-        return BS_NEED_MORE;
-      }
-      if (s.lookahead === 0) { break; } /* flush the current block */
-    }
-
-    /* See how many times the previous byte repeats */
-    s.match_length = 0;
-    if (s.lookahead >= MIN_MATCH && s.strstart > 0) {
-      scan = s.strstart - 1;
-      prev = _win[scan];
-      if (prev === _win[++scan] && prev === _win[++scan] && prev === _win[++scan]) {
-        strend = s.strstart + MAX_MATCH;
-        do {
-          /*jshint noempty:false*/
-        } while (prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 prev === _win[++scan] && prev === _win[++scan] &&
-                 scan < strend);
-        s.match_length = MAX_MATCH - (strend - scan);
-        if (s.match_length > s.lookahead) {
-          s.match_length = s.lookahead;
-        }
-      }
-      //Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-    }
-
-    /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-    if (s.match_length >= MIN_MATCH) {
-      //check_match(s, s.strstart, s.strstart - 1, s.match_length);
-
-      /*** _tr_tally_dist(s, 1, s.match_length - MIN_MATCH, bflush); ***/
-      bflush = trees._tr_tally(s, 1, s.match_length - MIN_MATCH);
-
-      s.lookahead -= s.match_length;
-      s.strstart += s.match_length;
-      s.match_length = 0;
-    } else {
-      /* No match, output a literal byte */
-      //Tracevv((stderr,"%c", s->window[s->strstart]));
-      /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-      bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-
-      s.lookahead--;
-      s.strstart++;
-    }
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = 0;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-function deflate_huff(s, flush) {
-  var bflush;             /* set if current block must be flushed */
-
-  for (;;) {
-    /* Make sure that we have a literal to write. */
-    if (s.lookahead === 0) {
-      fill_window(s);
-      if (s.lookahead === 0) {
-        if (flush === Z_NO_FLUSH) {
-          return BS_NEED_MORE;
-        }
-        break;      /* flush the current block */
-      }
-    }
-
-    /* Output a literal byte */
-    s.match_length = 0;
-    //Tracevv((stderr,"%c", s->window[s->strstart]));
-    /*** _tr_tally_lit(s, s.window[s.strstart], bflush); ***/
-    bflush = trees._tr_tally(s, 0, s.window[s.strstart]);
-    s.lookahead--;
-    s.strstart++;
-    if (bflush) {
-      /*** FLUSH_BLOCK(s, 0); ***/
-      flush_block_only(s, false);
-      if (s.strm.avail_out === 0) {
-        return BS_NEED_MORE;
-      }
-      /***/
-    }
-  }
-  s.insert = 0;
-  if (flush === Z_FINISH) {
-    /*** FLUSH_BLOCK(s, 1); ***/
-    flush_block_only(s, true);
-    if (s.strm.avail_out === 0) {
-      return BS_FINISH_STARTED;
-    }
-    /***/
-    return BS_FINISH_DONE;
-  }
-  if (s.last_lit) {
-    /*** FLUSH_BLOCK(s, 0); ***/
-    flush_block_only(s, false);
-    if (s.strm.avail_out === 0) {
-      return BS_NEED_MORE;
-    }
-    /***/
-  }
-  return BS_BLOCK_DONE;
-}
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-var Config = function (good_length, max_lazy, nice_length, max_chain, func) {
-  this.good_length = good_length;
-  this.max_lazy = max_lazy;
-  this.nice_length = nice_length;
-  this.max_chain = max_chain;
-  this.func = func;
-};
-
-var configuration_table;
-
-configuration_table = [
-  /*      good lazy nice chain */
-  new Config(0, 0, 0, 0, deflate_stored),          /* 0 store only */
-  new Config(4, 4, 8, 4, deflate_fast),            /* 1 max speed, no lazy matches */
-  new Config(4, 5, 16, 8, deflate_fast),           /* 2 */
-  new Config(4, 6, 32, 32, deflate_fast),          /* 3 */
-
-  new Config(4, 4, 16, 16, deflate_slow),          /* 4 lazy matches */
-  new Config(8, 16, 32, 32, deflate_slow),         /* 5 */
-  new Config(8, 16, 128, 128, deflate_slow),       /* 6 */
-  new Config(8, 32, 128, 256, deflate_slow),       /* 7 */
-  new Config(32, 128, 258, 1024, deflate_slow),    /* 8 */
-  new Config(32, 258, 258, 4096, deflate_slow)     /* 9 max compression */
-];
-
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-function lm_init(s) {
-  s.window_size = 2 * s.w_size;
-
-  /*** CLEAR_HASH(s); ***/
-  zero(s.head); // Fill with NIL (= 0);
-
-  /* Set the default configuration parameters:
-   */
-  s.max_lazy_match = configuration_table[s.level].max_lazy;
-  s.good_match = configuration_table[s.level].good_length;
-  s.nice_match = configuration_table[s.level].nice_length;
-  s.max_chain_length = configuration_table[s.level].max_chain;
-
-  s.strstart = 0;
-  s.block_start = 0;
-  s.lookahead = 0;
-  s.insert = 0;
-  s.match_length = s.prev_length = MIN_MATCH - 1;
-  s.match_available = 0;
-  s.ins_h = 0;
-}
-
-
-function DeflateState() {
-  this.strm = null;            /* pointer back to this zlib stream */
-  this.status = 0;            /* as the name implies */
-  this.pending_buf = null;      /* output still pending */
-  this.pending_buf_size = 0;  /* size of pending_buf */
-  this.pending_out = 0;       /* next pending byte to output to the stream */
-  this.pending = 0;           /* nb of bytes in the pending buffer */
-  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
-  this.gzhead = null;         /* gzip header information to write */
-  this.gzindex = 0;           /* where in extra, name, or comment */
-  this.method = Z_DEFLATED; /* can only be DEFLATED */
-  this.last_flush = -1;   /* value of flush param for previous deflate call */
-
-  this.w_size = 0;  /* LZ77 window size (32K by default) */
-  this.w_bits = 0;  /* log2(w_size)  (8..16) */
-  this.w_mask = 0;  /* w_size - 1 */
-
-  this.window = null;
-  /* Sliding window. Input bytes are read into the second half of the window,
-   * and move to the first half later to keep a dictionary of at least wSize
-   * bytes. With this organization, matches are limited to a distance of
-   * wSize-MAX_MATCH bytes, but this ensures that IO is always
-   * performed with a length multiple of the block size.
-   */
-
-  this.window_size = 0;
-  /* Actual size of window: 2*wSize, except when the user input buffer
-   * is directly used as sliding window.
-   */
-
-  this.prev = null;
-  /* Link to older string with same hash index. To limit the size of this
-   * array to 64K, this link is maintained only for the last 32K strings.
-   * An index in this array is thus a window index modulo 32K.
-   */
-
-  this.head = null;   /* Heads of the hash chains or NIL. */
-
-  this.ins_h = 0;       /* hash index of string to be inserted */
-  this.hash_size = 0;   /* number of elements in hash table */
-  this.hash_bits = 0;   /* log2(hash_size) */
-  this.hash_mask = 0;   /* hash_size-1 */
-
-  this.hash_shift = 0;
-  /* Number of bits by which ins_h must be shifted at each input
-   * step. It must be such that after MIN_MATCH steps, the oldest
-   * byte no longer takes part in the hash key, that is:
-   *   hash_shift * MIN_MATCH >= hash_bits
-   */
-
-  this.block_start = 0;
-  /* Window position at the beginning of the current output block. Gets
-   * negative when the window is moved backwards.
-   */
-
-  this.match_length = 0;      /* length of best match */
-  this.prev_match = 0;        /* previous match */
-  this.match_available = 0;   /* set if previous match exists */
-  this.strstart = 0;          /* start of string to insert */
-  this.match_start = 0;       /* start of matching string */
-  this.lookahead = 0;         /* number of valid bytes ahead in window */
-
-  this.prev_length = 0;
-  /* Length of the best match at previous step. Matches not greater than this
-   * are discarded. This is used in the lazy match evaluation.
-   */
-
-  this.max_chain_length = 0;
-  /* To speed up deflation, hash chains are never searched beyond this
-   * length.  A higher limit improves compression ratio but degrades the
-   * speed.
-   */
-
-  this.max_lazy_match = 0;
-  /* Attempt to find a better match only when the current match is strictly
-   * smaller than this value. This mechanism is used only for compression
-   * levels >= 4.
-   */
-  // That's alias to max_lazy_match, don't use directly
-  //this.max_insert_length = 0;
-  /* Insert new strings in the hash table only if the match length is not
-   * greater than this length. This saves time but degrades compression.
-   * max_insert_length is used only for compression levels <= 3.
-   */
-
-  this.level = 0;     /* compression level (1..9) */
-  this.strategy = 0;  /* favor or force Huffman coding*/
-
-  this.good_match = 0;
-  /* Use a faster search when the previous match is longer than this */
-
-  this.nice_match = 0; /* Stop searching when current match exceeds this */
-
-              /* used by trees.c: */
-
-  /* Didn't use ct_data typedef below to suppress compiler warning */
-
-  // struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-  // struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-  // struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-  // Use flat array of DOUBLE size, with interleaved fata,
-  // because JS does not support effective
-  this.dyn_ltree  = new utils.Buf16(HEAP_SIZE * 2);
-  this.dyn_dtree  = new utils.Buf16((2*D_CODES+1) * 2);
-  this.bl_tree    = new utils.Buf16((2*BL_CODES+1) * 2);
-  zero(this.dyn_ltree);
-  zero(this.dyn_dtree);
-  zero(this.bl_tree);
-
-  this.l_desc   = null;         /* desc. for literal tree */
-  this.d_desc   = null;         /* desc. for distance tree */
-  this.bl_desc  = null;         /* desc. for bit length tree */
-
-  //ush bl_count[MAX_BITS+1];
-  this.bl_count = new utils.Buf16(MAX_BITS+1);
-  /* number of codes at each bit length for an optimal tree */
-
-  //int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-  this.heap = new utils.Buf16(2*L_CODES+1);  /* heap used to build the Huffman trees */
-  zero(this.heap);
-
-  this.heap_len = 0;               /* number of elements in the heap */
-  this.heap_max = 0;               /* element of largest frequency */
-  /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-   * The same heap array is used to build all trees.
-   */
-
-  this.depth = new utils.Buf16(2*L_CODES+1); //uch depth[2*L_CODES+1];
-  zero(this.depth);
-  /* Depth of each subtree used as tie breaker for trees of equal frequency
-   */
-
-  this.l_buf = 0;          /* buffer index for literals or lengths */
-
-  this.lit_bufsize = 0;
-  /* Size of match buffer for literals/lengths.  There are 4 reasons for
-   * limiting lit_bufsize to 64K:
-   *   - frequencies can be kept in 16 bit counters
-   *   - if compression is not successful for the first block, all input
-   *     data is still in the window so we can still emit a stored block even
-   *     when input comes from standard input.  (This can also be done for
-   *     all blocks if lit_bufsize is not greater than 32K.)
-   *   - if compression is not successful for a file smaller than 64K, we can
-   *     even emit a stored file instead of a stored block (saving 5 bytes).
-   *     This is applicable only for zip (not gzip or zlib).
-   *   - creating new Huffman trees less frequently may not provide fast
-   *     adaptation to changes in the input data statistics. (Take for
-   *     example a binary file with poorly compressible code followed by
-   *     a highly compressible string table.) Smaller buffer sizes give
-   *     fast adaptation but have of course the overhead of transmitting
-   *     trees more frequently.
-   *   - I can't count above 4
-   */
-
-  this.last_lit = 0;      /* running index in l_buf */
-
-  this.d_buf = 0;
-  /* Buffer index for distances. To simplify the code, d_buf and l_buf have
-   * the same number of elements. To use different lengths, an extra flag
-   * array would be necessary.
-   */
-
-  this.opt_len = 0;       /* bit length of current block with optimal trees */
-  this.static_len = 0;    /* bit length of current block with static trees */
-  this.matches = 0;       /* number of string matches in current block */
-  this.insert = 0;        /* bytes at end of window left to insert */
-
-
-  this.bi_buf = 0;
-  /* Output buffer. bits are inserted starting at the bottom (least
-   * significant bits).
-   */
-  this.bi_valid = 0;
-  /* Number of valid bits in bi_buf.  All bits above the last valid bit
-   * are always zero.
-   */
-
-  // Used for window memory init. We safely ignore it for JS. That makes
-  // sense only for pointers and memory check tools.
-  //this.high_water = 0;
-  /* High water mark offset in window for initialized bytes -- bytes above
-   * this are set to zero in order to avoid memory check warnings when
-   * longest match routines access bytes past the input.  This is then
-   * updated to the new high water mark.
-   */
-}
-
-
-function deflateResetKeep(strm) {
-  var s;
-
-  if (!strm || !strm.state) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-  strm.total_in = strm.total_out = 0;
-  strm.data_type = Z_UNKNOWN;
-
-  s = strm.state;
-  s.pending = 0;
-  s.pending_out = 0;
-
-  if (s.wrap < 0) {
-    s.wrap = -s.wrap;
-    /* was made negative by deflate(..., Z_FINISH); */
-  }
-  s.status = (s.wrap ? INIT_STATE : BUSY_STATE);
-  strm.adler = (s.wrap === 2) ?
-    0  // crc32(0, Z_NULL, 0)
-  :
-    1; // adler32(0, Z_NULL, 0)
-  s.last_flush = Z_NO_FLUSH;
-  trees._tr_init(s);
-  return Z_OK;
-}
-
-
-function deflateReset(strm) {
-  var ret = deflateResetKeep(strm);
-  if (ret === Z_OK) {
-    lm_init(strm.state);
-  }
-  return ret;
-}
-
-
-function deflateSetHeader(strm, head) {
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  if (strm.state.wrap !== 2) { return Z_STREAM_ERROR; }
-  strm.state.gzhead = head;
-  return Z_OK;
-}
-
-
-function deflateInit2(strm, level, method, windowBits, memLevel, strategy) {
-  if (!strm) { // === Z_NULL
-    return Z_STREAM_ERROR;
-  }
-  var wrap = 1;
-
-  if (level === Z_DEFAULT_COMPRESSION) {
-    level = 6;
-  }
-
-  if (windowBits < 0) { /* suppress zlib wrapper */
-    wrap = 0;
-    windowBits = -windowBits;
-  }
-
-  else if (windowBits > 15) {
-    wrap = 2;           /* write gzip wrapper instead */
-    windowBits -= 16;
-  }
-
-
-  if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method !== Z_DEFLATED ||
-    windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-    strategy < 0 || strategy > Z_FIXED) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-
-  if (windowBits === 8) {
-    windowBits = 9;
-  }
-  /* until 256-byte window bug fixed */
-
-  var s = new DeflateState();
-
-  strm.state = s;
-  s.strm = strm;
-
-  s.wrap = wrap;
-  s.gzhead = null;
-  s.w_bits = windowBits;
-  s.w_size = 1 << s.w_bits;
-  s.w_mask = s.w_size - 1;
-
-  s.hash_bits = memLevel + 7;
-  s.hash_size = 1 << s.hash_bits;
-  s.hash_mask = s.hash_size - 1;
-  s.hash_shift = ~~((s.hash_bits + MIN_MATCH - 1) / MIN_MATCH);
-
-  s.window = new utils.Buf8(s.w_size * 2);
-  s.head = new utils.Buf16(s.hash_size);
-  s.prev = new utils.Buf16(s.w_size);
-
-  // Don't need mem init magic for JS.
-  //s.high_water = 0;  /* nothing written to s->window yet */
-
-  s.lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-  s.pending_buf_size = s.lit_bufsize * 4;
-  s.pending_buf = new utils.Buf8(s.pending_buf_size);
-
-  s.d_buf = s.lit_bufsize >> 1;
-  s.l_buf = (1 + 2) * s.lit_bufsize;
-
-  s.level = level;
-  s.strategy = strategy;
-  s.method = method;
-
-  return deflateReset(strm);
-}
-
-function deflateInit(strm, level) {
-  return deflateInit2(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-}
-
-
-function deflate(strm, flush) {
-  var old_flush, s;
-  var beg, val; // for gzip header write only
-
-  if (!strm || !strm.state ||
-    flush > Z_BLOCK || flush < 0) {
-    return strm ? err(strm, Z_STREAM_ERROR) : Z_STREAM_ERROR;
-  }
-
-  s = strm.state;
-
-  if (!strm.output ||
-      (!strm.input && strm.avail_in !== 0) ||
-      (s.status === FINISH_STATE && flush !== Z_FINISH)) {
-    return err(strm, (strm.avail_out === 0) ? Z_BUF_ERROR : Z_STREAM_ERROR);
-  }
-
-  s.strm = strm; /* just in case */
-  old_flush = s.last_flush;
-  s.last_flush = flush;
-
-  /* Write the header */
-  if (s.status === INIT_STATE) {
-
-    if (s.wrap === 2) { // GZIP header
-      strm.adler = 0;  //crc32(0L, Z_NULL, 0);
-      put_byte(s, 31);
-      put_byte(s, 139);
-      put_byte(s, 8);
-      if (!s.gzhead) { // s->gzhead == Z_NULL
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, 0);
-        put_byte(s, s.level === 9 ? 2 :
-                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
-                     4 : 0));
-        put_byte(s, OS_CODE);
-        s.status = BUSY_STATE;
-      }
-      else {
-        put_byte(s, (s.gzhead.text ? 1 : 0) +
-                    (s.gzhead.hcrc ? 2 : 0) +
-                    (!s.gzhead.extra ? 0 : 4) +
-                    (!s.gzhead.name ? 0 : 8) +
-                    (!s.gzhead.comment ? 0 : 16)
-                );
-        put_byte(s, s.gzhead.time & 0xff);
-        put_byte(s, (s.gzhead.time >> 8) & 0xff);
-        put_byte(s, (s.gzhead.time >> 16) & 0xff);
-        put_byte(s, (s.gzhead.time >> 24) & 0xff);
-        put_byte(s, s.level === 9 ? 2 :
-                    (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2 ?
-                     4 : 0));
-        put_byte(s, s.gzhead.os & 0xff);
-        if (s.gzhead.extra && s.gzhead.extra.length) {
-          put_byte(s, s.gzhead.extra.length & 0xff);
-          put_byte(s, (s.gzhead.extra.length >> 8) & 0xff);
-        }
-        if (s.gzhead.hcrc) {
-          strm.adler = crc32(strm.adler, s.pending_buf, s.pending, 0);
-        }
-        s.gzindex = 0;
-        s.status = EXTRA_STATE;
-      }
-    }
-    else // DEFLATE header
-    {
-      var header = (Z_DEFLATED + ((s.w_bits - 8) << 4)) << 8;
-      var level_flags = -1;
-
-      if (s.strategy >= Z_HUFFMAN_ONLY || s.level < 2) {
-        level_flags = 0;
-      } else if (s.level < 6) {
-        level_flags = 1;
-      } else if (s.level === 6) {
-        level_flags = 2;
-      } else {
-        level_flags = 3;
-      }
-      header |= (level_flags << 6);
-      if (s.strstart !== 0) { header |= PRESET_DICT; }
-      header += 31 - (header % 31);
-
-      s.status = BUSY_STATE;
-      putShortMSB(s, header);
-
-      /* Save the adler32 of the preset dictionary: */
-      if (s.strstart !== 0) {
-        putShortMSB(s, strm.adler >>> 16);
-        putShortMSB(s, strm.adler & 0xffff);
-      }
-      strm.adler = 1; // adler32(0L, Z_NULL, 0);
-    }
-  }
-
-//#ifdef GZIP
-  if (s.status === EXTRA_STATE) {
-    if (s.gzhead.extra/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-
-      while (s.gzindex < (s.gzhead.extra.length & 0xffff)) {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            break;
-          }
-        }
-        put_byte(s, s.gzhead.extra[s.gzindex] & 0xff);
-        s.gzindex++;
-      }
-      if (s.gzhead.hcrc && s.pending > beg) {
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (s.gzindex === s.gzhead.extra.length) {
-        s.gzindex = 0;
-        s.status = NAME_STATE;
-      }
-    }
-    else {
-      s.status = NAME_STATE;
-    }
-  }
-  if (s.status === NAME_STATE) {
-    if (s.gzhead.name/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-      //int val;
-
-      do {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            val = 1;
-            break;
-          }
-        }
-        // JS specific: little magic to add zero terminator to end of string
-        if (s.gzindex < s.gzhead.name.length) {
-          val = s.gzhead.name.charCodeAt(s.gzindex++) & 0xff;
-        } else {
-          val = 0;
-        }
-        put_byte(s, val);
-      } while (val !== 0);
-
-      if (s.gzhead.hcrc && s.pending > beg){
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (val === 0) {
-        s.gzindex = 0;
-        s.status = COMMENT_STATE;
-      }
-    }
-    else {
-      s.status = COMMENT_STATE;
-    }
-  }
-  if (s.status === COMMENT_STATE) {
-    if (s.gzhead.comment/* != Z_NULL*/) {
-      beg = s.pending;  /* start of bytes to update crc */
-      //int val;
-
-      do {
-        if (s.pending === s.pending_buf_size) {
-          if (s.gzhead.hcrc && s.pending > beg) {
-            strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-          }
-          flush_pending(strm);
-          beg = s.pending;
-          if (s.pending === s.pending_buf_size) {
-            val = 1;
-            break;
-          }
-        }
-        // JS specific: little magic to add zero terminator to end of string
-        if (s.gzindex < s.gzhead.comment.length) {
-          val = s.gzhead.comment.charCodeAt(s.gzindex++) & 0xff;
-        } else {
-          val = 0;
-        }
-        put_byte(s, val);
-      } while (val !== 0);
-
-      if (s.gzhead.hcrc && s.pending > beg) {
-        strm.adler = crc32(strm.adler, s.pending_buf, s.pending - beg, beg);
-      }
-      if (val === 0) {
-        s.status = HCRC_STATE;
-      }
-    }
-    else {
-      s.status = HCRC_STATE;
-    }
-  }
-  if (s.status === HCRC_STATE) {
-    if (s.gzhead.hcrc) {
-      if (s.pending + 2 > s.pending_buf_size) {
-        flush_pending(strm);
-      }
-      if (s.pending + 2 <= s.pending_buf_size) {
-        put_byte(s, strm.adler & 0xff);
-        put_byte(s, (strm.adler >> 8) & 0xff);
-        strm.adler = 0; //crc32(0L, Z_NULL, 0);
-        s.status = BUSY_STATE;
-      }
-    }
-    else {
-      s.status = BUSY_STATE;
-    }
-  }
-//#endif
-
-  /* Flush as much pending output as possible */
-  if (s.pending !== 0) {
-    flush_pending(strm);
-    if (strm.avail_out === 0) {
-      /* Since avail_out is 0, deflate will be called again with
-       * more output space, but possibly with both pending and
-       * avail_in equal to zero. There won't be anything to do,
-       * but this is not an error situation so make sure we
-       * return OK instead of BUF_ERROR at next call of deflate:
-       */
-      s.last_flush = -1;
-      return Z_OK;
-    }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-  } else if (strm.avail_in === 0 && rank(flush) <= rank(old_flush) &&
-    flush !== Z_FINISH) {
-    return err(strm, Z_BUF_ERROR);
-  }
-
-  /* User must not provide more input after the first FINISH: */
-  if (s.status === FINISH_STATE && strm.avail_in !== 0) {
-    return err(strm, Z_BUF_ERROR);
-  }
-
-  /* Start a new block or continue the current one.
-   */
-  if (strm.avail_in !== 0 || s.lookahead !== 0 ||
-    (flush !== Z_NO_FLUSH && s.status !== FINISH_STATE)) {
-    var bstate = (s.strategy === Z_HUFFMAN_ONLY) ? deflate_huff(s, flush) :
-      (s.strategy === Z_RLE ? deflate_rle(s, flush) :
-        configuration_table[s.level].func(s, flush));
-
-    if (bstate === BS_FINISH_STARTED || bstate === BS_FINISH_DONE) {
-      s.status = FINISH_STATE;
-    }
-    if (bstate === BS_NEED_MORE || bstate === BS_FINISH_STARTED) {
-      if (strm.avail_out === 0) {
-        s.last_flush = -1;
-        /* avoid BUF_ERROR next call, see above */
-      }
-      return Z_OK;
-      /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-       * of deflate should use the same flush parameter to make sure
-       * that the flush is complete. So we don't have to output an
-       * empty block here, this will be done at next call. This also
-       * ensures that for a very small output buffer, we emit at most
-       * one empty block.
-       */
-    }
-    if (bstate === BS_BLOCK_DONE) {
-      if (flush === Z_PARTIAL_FLUSH) {
-        trees._tr_align(s);
-      }
-      else if (flush !== Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-
-        trees._tr_stored_block(s, 0, 0, false);
-        /* For a full flush, this empty block will be recognized
-         * as a special marker by inflate_sync().
-         */
-        if (flush === Z_FULL_FLUSH) {
-          /*** CLEAR_HASH(s); ***/             /* forget history */
-          zero(s.head); // Fill with NIL (= 0);
-
-          if (s.lookahead === 0) {
-            s.strstart = 0;
-            s.block_start = 0;
-            s.insert = 0;
-          }
-        }
-      }
-      flush_pending(strm);
-      if (strm.avail_out === 0) {
-        s.last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-        return Z_OK;
-      }
-    }
-  }
-  //Assert(strm->avail_out > 0, "bug2");
-  //if (strm.avail_out <= 0) { throw new Error("bug2");}
-
-  if (flush !== Z_FINISH) { return Z_OK; }
-  if (s.wrap <= 0) { return Z_STREAM_END; }
-
-  /* Write the trailer */
-  if (s.wrap === 2) {
-    put_byte(s, strm.adler & 0xff);
-    put_byte(s, (strm.adler >> 8) & 0xff);
-    put_byte(s, (strm.adler >> 16) & 0xff);
-    put_byte(s, (strm.adler >> 24) & 0xff);
-    put_byte(s, strm.total_in & 0xff);
-    put_byte(s, (strm.total_in >> 8) & 0xff);
-    put_byte(s, (strm.total_in >> 16) & 0xff);
-    put_byte(s, (strm.total_in >> 24) & 0xff);
-  }
-  else
-  {
-    putShortMSB(s, strm.adler >>> 16);
-    putShortMSB(s, strm.adler & 0xffff);
-  }
-
-  flush_pending(strm);
-  /* If avail_out is zero, the application will call deflate again
-   * to flush the rest.
-   */
-  if (s.wrap > 0) { s.wrap = -s.wrap; }
-  /* write the trailer only once! */
-  return s.pending !== 0 ? Z_OK : Z_STREAM_END;
-}
-
-function deflateEnd(strm) {
-  var status;
-
-  if (!strm/*== Z_NULL*/ || !strm.state/*== Z_NULL*/) {
-    return Z_STREAM_ERROR;
-  }
-
-  status = strm.state.status;
-  if (status !== INIT_STATE &&
-    status !== EXTRA_STATE &&
-    status !== NAME_STATE &&
-    status !== COMMENT_STATE &&
-    status !== HCRC_STATE &&
-    status !== BUSY_STATE &&
-    status !== FINISH_STATE
-  ) {
-    return err(strm, Z_STREAM_ERROR);
-  }
-
-  strm.state = null;
-
-  return status === BUSY_STATE ? err(strm, Z_DATA_ERROR) : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state
- */
-//function deflateCopy(dest, source) {
-//
-//}
-
-exports.deflateInit = deflateInit;
-exports.deflateInit2 = deflateInit2;
-exports.deflateReset = deflateReset;
-exports.deflateResetKeep = deflateResetKeep;
-exports.deflateSetHeader = deflateSetHeader;
-exports.deflate = deflate;
-exports.deflateEnd = deflateEnd;
-exports.deflateInfo = 'pako deflate (from Nodeca project)';
-
-/* Not implemented
-exports.deflateBound = deflateBound;
-exports.deflateCopy = deflateCopy;
-exports.deflateSetDictionary = deflateSetDictionary;
-exports.deflateParams = deflateParams;
-exports.deflatePending = deflatePending;
-exports.deflatePrime = deflatePrime;
-exports.deflateTune = deflateTune;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(_dereq_,module,exports){
-'use strict';
-
-
-function GZheader() {
-  /* true if compressed data believed to be text */
-  this.text       = 0;
-  /* modification time */
-  this.time       = 0;
-  /* extra flags (not used when writing a gzip file) */
-  this.xflags     = 0;
-  /* operating system */
-  this.os         = 0;
-  /* pointer to extra field or Z_NULL if none */
-  this.extra      = null;
-  /* extra field length (valid if extra != Z_NULL) */
-  this.extra_len  = 0; // Actually, we don't need it in JS,
-                       // but leave for few code modifications
-
-  //
-  // Setup limits is not necessary because in js we should not preallocate memory 
-  // for inflate use constant limit in 65536 bytes
-  //
-
-  /* space at extra (only when reading header) */
-  // this.extra_max  = 0;
-  /* pointer to zero-terminated file name or Z_NULL */
-  this.name       = '';
-  /* space at name (only when reading header) */
-  // this.name_max   = 0;
-  /* pointer to zero-terminated comment or Z_NULL */
-  this.comment    = '';
-  /* space at comment (only when reading header) */
-  // this.comm_max   = 0;
-  /* true if there was or will be a header crc */
-  this.hcrc       = 0;
-  /* true when done reading gzip header (not used when writing a gzip file) */
-  this.done       = false;
-}
-
-module.exports = GZheader;
-},{}],34:[function(_dereq_,module,exports){
-'use strict';
-
-// See state defs from inflate.js
-var BAD = 30;       /* got a data error -- remain here until reset */
-var TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state.mode === LEN
-        strm.avail_in >= 6
-        strm.avail_out >= 258
-        start >= strm.avail_out
-        state.bits < 8
-
-   On return, state.mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm.avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm.avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-module.exports = function inflate_fast(strm, start) {
-  var state;
-  var _in;                    /* local strm.input */
-  var last;                   /* have enough input while in < last */
-  var _out;                   /* local strm.output */
-  var beg;                    /* inflate()'s initial strm.output */
-  var end;                    /* while out < end, enough space available */
-//#ifdef INFLATE_STRICT
-  var dmax;                   /* maximum distance from zlib header */
-//#endif
-  var wsize;                  /* window size or zero if not using window */
-  var whave;                  /* valid bytes in the window */
-  var wnext;                  /* window write index */
-  var window;                 /* allocated sliding window, if wsize != 0 */
-  var hold;                   /* local strm.hold */
-  var bits;                   /* local strm.bits */
-  var lcode;                  /* local strm.lencode */
-  var dcode;                  /* local strm.distcode */
-  var lmask;                  /* mask for first level of length codes */
-  var dmask;                  /* mask for first level of distance codes */
-  var here;                   /* retrieved table entry */
-  var op;                     /* code bits, operation, extra bits, or */
-                              /*  window position, window bytes to copy */
-  var len;                    /* match length, unused bytes */
-  var dist;                   /* match distance */
-  var from;                   /* where to copy match from */
-  var from_source;
-
-
-  var input, output; // JS specific, because we have no pointers
-
-  /* copy state to local variables */
-  state = strm.state;
-  //here = state.here;
-  _in = strm.next_in;
-  input = strm.input;
-  last = _in + (strm.avail_in - 5);
-  _out = strm.next_out;
-  output = strm.output;
-  beg = _out - (start - strm.avail_out);
-  end = _out + (strm.avail_out - 257);
-//#ifdef INFLATE_STRICT
-  dmax = state.dmax;
-//#endif
-  wsize = state.wsize;
-  whave = state.whave;
-  wnext = state.wnext;
-  window = state.window;
-  hold = state.hold;
-  bits = state.bits;
-  lcode = state.lencode;
-  dcode = state.distcode;
-  lmask = (1 << state.lenbits) - 1;
-  dmask = (1 << state.distbits) - 1;
-
-
-  /* decode literals and length/distances until end-of-block or not enough
-     input data or output space */
-
-  top:
-  do {
-    if (bits < 15) {
-      hold += input[_in++] << bits;
-      bits += 8;
-      hold += input[_in++] << bits;
-      bits += 8;
-    }
-
-    here = lcode[hold & lmask];
-
-    dolen:
-    for (;;) { // Goto emulation
-      op = here >>> 24/*here.bits*/;
-      hold >>>= op;
-      bits -= op;
-      op = (here >>> 16) & 0xff/*here.op*/;
-      if (op === 0) {                          /* literal */
-        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-        //        "inflate:         literal '%c'\n" :
-        //        "inflate:         literal 0x%02x\n", here.val));
-        output[_out++] = here & 0xffff/*here.val*/;
-      }
-      else if (op & 16) {                     /* length base */
-        len = here & 0xffff/*here.val*/;
-        op &= 15;                           /* number of extra bits */
-        if (op) {
-          if (bits < op) {
-            hold += input[_in++] << bits;
-            bits += 8;
-          }
-          len += hold & ((1 << op) - 1);
-          hold >>>= op;
-          bits -= op;
-        }
-        //Tracevv((stderr, "inflate:         length %u\n", len));
-        if (bits < 15) {
-          hold += input[_in++] << bits;
-          bits += 8;
-          hold += input[_in++] << bits;
-          bits += 8;
-        }
-        here = dcode[hold & dmask];
-
-        dodist:
-        for (;;) { // goto emulation
-          op = here >>> 24/*here.bits*/;
-          hold >>>= op;
-          bits -= op;
-          op = (here >>> 16) & 0xff/*here.op*/;
-
-          if (op & 16) {                      /* distance base */
-            dist = here & 0xffff/*here.val*/;
-            op &= 15;                       /* number of extra bits */
-            if (bits < op) {
-              hold += input[_in++] << bits;
-              bits += 8;
-              if (bits < op) {
-                hold += input[_in++] << bits;
-                bits += 8;
-              }
-            }
-            dist += hold & ((1 << op) - 1);
-//#ifdef INFLATE_STRICT
-            if (dist > dmax) {
-              strm.msg = 'invalid distance too far back';
-              state.mode = BAD;
-              break top;
-            }
-//#endif
-            hold >>>= op;
-            bits -= op;
-            //Tracevv((stderr, "inflate:         distance %u\n", dist));
-            op = _out - beg;                /* max distance in output */
-            if (dist > op) {                /* see if copy from window */
-              op = dist - op;               /* distance back in window */
-              if (op > whave) {
-                if (state.sane) {
-                  strm.msg = 'invalid distance too far back';
-                  state.mode = BAD;
-                  break top;
-                }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-//                if (len <= op - whave) {
-//                  do {
-//                    output[_out++] = 0;
-//                  } while (--len);
-//                  continue top;
-//                }
-//                len -= op - whave;
-//                do {
-//                  output[_out++] = 0;
-//                } while (--op > whave);
-//                if (op === 0) {
-//                  from = _out - dist;
-//                  do {
-//                    output[_out++] = output[from++];
-//                  } while (--len);
-//                  continue top;
-//                }
-//#endif
-              }
-              from = 0; // window index
-              from_source = window;
-              if (wnext === 0) {           /* very common case */
-                from += wsize - op;
-                if (op < len) {         /* some from window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = _out - dist;  /* rest from output */
-                  from_source = output;
-                }
-              }
-              else if (wnext < op) {      /* wrap around window */
-                from += wsize + wnext - op;
-                op -= wnext;
-                if (op < len) {         /* some from end of window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = 0;
-                  if (wnext < len) {  /* some from start of window */
-                    op = wnext;
-                    len -= op;
-                    do {
-                      output[_out++] = window[from++];
-                    } while (--op);
-                    from = _out - dist;      /* rest from output */
-                    from_source = output;
-                  }
-                }
-              }
-              else {                      /* contiguous in window */
-                from += wnext - op;
-                if (op < len) {         /* some from window */
-                  len -= op;
-                  do {
-                    output[_out++] = window[from++];
-                  } while (--op);
-                  from = _out - dist;  /* rest from output */
-                  from_source = output;
-                }
-              }
-              while (len > 2) {
-                output[_out++] = from_source[from++];
-                output[_out++] = from_source[from++];
-                output[_out++] = from_source[from++];
-                len -= 3;
-              }
-              if (len) {
-                output[_out++] = from_source[from++];
-                if (len > 1) {
-                  output[_out++] = from_source[from++];
-                }
-              }
-            }
-            else {
-              from = _out - dist;          /* copy direct from output */
-              do {                        /* minimum length is three */
-                output[_out++] = output[from++];
-                output[_out++] = output[from++];
-                output[_out++] = output[from++];
-                len -= 3;
-              } while (len > 2);
-              if (len) {
-                output[_out++] = output[from++];
-                if (len > 1) {
-                  output[_out++] = output[from++];
-                }
-              }
-            }
-          }
-          else if ((op & 64) === 0) {          /* 2nd level distance code */
-            here = dcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
-            continue dodist;
-          }
-          else {
-            strm.msg = 'invalid distance code';
-            state.mode = BAD;
-            break top;
-          }
-
-          break; // need to emulate goto via "continue"
-        }
-      }
-      else if ((op & 64) === 0) {              /* 2nd level length code */
-        here = lcode[(here & 0xffff)/*here.val*/ + (hold & ((1 << op) - 1))];
-        continue dolen;
-      }
-      else if (op & 32) {                     /* end-of-block */
-        //Tracevv((stderr, "inflate:         end of block\n"));
-        state.mode = TYPE;
-        break top;
-      }
-      else {
-        strm.msg = 'invalid literal/length code';
-        state.mode = BAD;
-        break top;
-      }
-
-      break; // need to emulate goto via "continue"
-    }
-  } while (_in < last && _out < end);
-
-  /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-  len = bits >> 3;
-  _in -= len;
-  bits -= len << 3;
-  hold &= (1 << bits) - 1;
-
-  /* update state and return */
-  strm.next_in = _in;
-  strm.next_out = _out;
-  strm.avail_in = (_in < last ? 5 + (last - _in) : 5 - (_in - last));
-  strm.avail_out = (_out < end ? 257 + (end - _out) : 257 - (_out - end));
-  state.hold = hold;
-  state.bits = bits;
-  return;
-};
-
-},{}],35:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-var adler32 = _dereq_('./adler32');
-var crc32   = _dereq_('./crc32');
-var inflate_fast = _dereq_('./inffast');
-var inflate_table = _dereq_('./inftrees');
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-/* Allowed flush values; see deflate() and inflate() below for details */
-//var Z_NO_FLUSH      = 0;
-//var Z_PARTIAL_FLUSH = 1;
-//var Z_SYNC_FLUSH    = 2;
-//var Z_FULL_FLUSH    = 3;
-var Z_FINISH        = 4;
-var Z_BLOCK         = 5;
-var Z_TREES         = 6;
-
-
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-var Z_OK            = 0;
-var Z_STREAM_END    = 1;
-var Z_NEED_DICT     = 2;
-//var Z_ERRNO         = -1;
-var Z_STREAM_ERROR  = -2;
-var Z_DATA_ERROR    = -3;
-var Z_MEM_ERROR     = -4;
-var Z_BUF_ERROR     = -5;
-//var Z_VERSION_ERROR = -6;
-
-/* The deflate compression method */
-var Z_DEFLATED  = 8;
-
-
-/* STATES ====================================================================*/
-/* ===========================================================================*/
-
-
-var    HEAD = 1;       /* i: waiting for magic header */
-var    FLAGS = 2;      /* i: waiting for method and flags (gzip) */
-var    TIME = 3;       /* i: waiting for modification time (gzip) */
-var    OS = 4;         /* i: waiting for extra flags and operating system (gzip) */
-var    EXLEN = 5;      /* i: waiting for extra length (gzip) */
-var    EXTRA = 6;      /* i: waiting for extra bytes (gzip) */
-var    NAME = 7;       /* i: waiting for end of file name (gzip) */
-var    COMMENT = 8;    /* i: waiting for end of comment (gzip) */
-var    HCRC = 9;       /* i: waiting for header crc (gzip) */
-var    DICTID = 10;    /* i: waiting for dictionary check value */
-var    DICT = 11;      /* waiting for inflateSetDictionary() call */
-var        TYPE = 12;      /* i: waiting for type bits, including last-flag bit */
-var        TYPEDO = 13;    /* i: same, but skip check to exit inflate on new block */
-var        STORED = 14;    /* i: waiting for stored size (length and complement) */
-var        COPY_ = 15;     /* i/o: same as COPY below, but only first time in */
-var        COPY = 16;      /* i/o: waiting for input or output to copy stored block */
-var        TABLE = 17;     /* i: waiting for dynamic block table lengths */
-var        LENLENS = 18;   /* i: waiting for code length code lengths */
-var        CODELENS = 19;  /* i: waiting for length/lit and distance code lengths */
-var            LEN_ = 20;      /* i: same as LEN below, but only first time in */
-var            LEN = 21;       /* i: waiting for length/lit/eob code */
-var            LENEXT = 22;    /* i: waiting for length extra bits */
-var            DIST = 23;      /* i: waiting for distance code */
-var            DISTEXT = 24;   /* i: waiting for distance extra bits */
-var            MATCH = 25;     /* o: waiting for output space to copy string */
-var            LIT = 26;       /* o: waiting for output space to write literal */
-var    CHECK = 27;     /* i: waiting for 32-bit check value */
-var    LENGTH = 28;    /* i: waiting for 32-bit length (gzip) */
-var    DONE = 29;      /* finished check, done -- remain here until reset */
-var    BAD = 30;       /* got a data error -- remain here until reset */
-var    MEM = 31;       /* got an inflate() memory error -- remain here until reset */
-var    SYNC = 32;      /* looking for synchronization bytes to restart inflate() */
-
-/* ===========================================================================*/
-
-
-
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH =  (ENOUGH_LENS+ENOUGH_DISTS);
-
-var MAX_WBITS = 15;
-/* 32K LZ77 window */
-var DEF_WBITS = MAX_WBITS;
-
-
-function ZSWAP32(q) {
-  return  (((q >>> 24) & 0xff) +
-          ((q >>> 8) & 0xff00) +
-          ((q & 0xff00) << 8) +
-          ((q & 0xff) << 24));
-}
-
-
-function InflateState() {
-  this.mode = 0;             /* current inflate mode */
-  this.last = false;          /* true if processing last block */
-  this.wrap = 0;              /* bit 0 true for zlib, bit 1 true for gzip */
-  this.havedict = false;      /* true if dictionary provided */
-  this.flags = 0;             /* gzip header method and flags (0 if zlib) */
-  this.dmax = 0;              /* zlib header max distance (INFLATE_STRICT) */
-  this.check = 0;             /* protected copy of check value */
-  this.total = 0;             /* protected copy of output count */
-  // TODO: may be {}
-  this.head = null;           /* where to save gzip header information */
-
-  /* sliding window */
-  this.wbits = 0;             /* log base 2 of requested window size */
-  this.wsize = 0;             /* window size or zero if not using window */
-  this.whave = 0;             /* valid bytes in the window */
-  this.wnext = 0;             /* window write index */
-  this.window = null;         /* allocated sliding window, if needed */
-
-  /* bit accumulator */
-  this.hold = 0;              /* input bit accumulator */
-  this.bits = 0;              /* number of bits in "in" */
-
-  /* for string and stored block copying */
-  this.length = 0;            /* literal or length of data to copy */
-  this.offset = 0;            /* distance back to copy string from */
-
-  /* for table and code decoding */
-  this.extra = 0;             /* extra bits needed */
-
-  /* fixed and dynamic code tables */
-  this.lencode = null;          /* starting table for length/literal codes */
-  this.distcode = null;         /* starting table for distance codes */
-  this.lenbits = 0;           /* index bits for lencode */
-  this.distbits = 0;          /* index bits for distcode */
-
-  /* dynamic table building */
-  this.ncode = 0;             /* number of code length code lengths */
-  this.nlen = 0;              /* number of length code lengths */
-  this.ndist = 0;             /* number of distance code lengths */
-  this.have = 0;              /* number of code lengths in lens[] */
-  this.next = null;              /* next available space in codes[] */
-
-  this.lens = new utils.Buf16(320); /* temporary storage for code lengths */
-  this.work = new utils.Buf16(288); /* work area for code table building */
-
-  /*
-   because we don't have pointers in js, we use lencode and distcode directly
-   as buffers so we don't need codes
-  */
-  //this.codes = new utils.Buf32(ENOUGH);       /* space for code tables */
-  this.lendyn = null;              /* dynamic table for length/literal codes (JS specific) */
-  this.distdyn = null;             /* dynamic table for distance codes (JS specific) */
-  this.sane = 0;                   /* if false, allow invalid distance too far */
-  this.back = 0;                   /* bits back of last unprocessed length/lit */
-  this.was = 0;                    /* initial length of match */
-}
-
-function inflateResetKeep(strm) {
-  var state;
-
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  strm.total_in = strm.total_out = state.total = 0;
-  strm.msg = ''; /*Z_NULL*/
-  if (state.wrap) {       /* to support ill-conceived Java test suite */
-    strm.adler = state.wrap & 1;
-  }
-  state.mode = HEAD;
-  state.last = 0;
-  state.havedict = 0;
-  state.dmax = 32768;
-  state.head = null/*Z_NULL*/;
-  state.hold = 0;
-  state.bits = 0;
-  //state.lencode = state.distcode = state.next = state.codes;
-  state.lencode = state.lendyn = new utils.Buf32(ENOUGH_LENS);
-  state.distcode = state.distdyn = new utils.Buf32(ENOUGH_DISTS);
-
-  state.sane = 1;
-  state.back = -1;
-  //Tracev((stderr, "inflate: reset\n"));
-  return Z_OK;
-}
-
-function inflateReset(strm) {
-  var state;
-
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  state.wsize = 0;
-  state.whave = 0;
-  state.wnext = 0;
-  return inflateResetKeep(strm);
-
-}
-
-function inflateReset2(strm, windowBits) {
-  var wrap;
-  var state;
-
-  /* get the state */
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-
-  /* extract wrap request from windowBits parameter */
-  if (windowBits < 0) {
-    wrap = 0;
-    windowBits = -windowBits;
-  }
-  else {
-    wrap = (windowBits >> 4) + 1;
-    if (windowBits < 48) {
-      windowBits &= 15;
-    }
-  }
-
-  /* set number of window bits, free window if different */
-  if (windowBits && (windowBits < 8 || windowBits > 15)) {
-    return Z_STREAM_ERROR;
-  }
-  if (state.window !== null && state.wbits !== windowBits) {
-    state.window = null;
-  }
-
-  /* update state and reset the rest of it */
-  state.wrap = wrap;
-  state.wbits = windowBits;
-  return inflateReset(strm);
-}
-
-function inflateInit2(strm, windowBits) {
-  var ret;
-  var state;
-
-  if (!strm) { return Z_STREAM_ERROR; }
-  //strm.msg = Z_NULL;                 /* in case we return an error */
-
-  state = new InflateState();
-
-  //if (state === Z_NULL) return Z_MEM_ERROR;
-  //Tracev((stderr, "inflate: allocated\n"));
-  strm.state = state;
-  state.window = null/*Z_NULL*/;
-  ret = inflateReset2(strm, windowBits);
-  if (ret !== Z_OK) {
-    strm.state = null/*Z_NULL*/;
-  }
-  return ret;
-}
-
-function inflateInit(strm) {
-  return inflateInit2(strm, DEF_WBITS);
-}
-
-
-/*
- Return state with length and distance decoding tables and index sizes set to
- fixed code decoding.  Normally this returns fixed tables from inffixed.h.
- If BUILDFIXED is defined, then instead this routine builds the tables the
- first time it's called, and returns those tables the first time and
- thereafter.  This reduces the size of the code by about 2K bytes, in
- exchange for a little execution time.  However, BUILDFIXED should not be
- used for threaded applications, since the rewriting of the tables and virgin
- may not be thread-safe.
- */
-var virgin = true;
-
-var lenfix, distfix; // We have no pointers in JS, so keep tables separate
-
-function fixedtables(state) {
-  /* build fixed huffman tables if first call (may not be thread safe) */
-  if (virgin) {
-    var sym;
-
-    lenfix = new utils.Buf32(512);
-    distfix = new utils.Buf32(32);
-
-    /* literal/length table */
-    sym = 0;
-    while (sym < 144) { state.lens[sym++] = 8; }
-    while (sym < 256) { state.lens[sym++] = 9; }
-    while (sym < 280) { state.lens[sym++] = 7; }
-    while (sym < 288) { state.lens[sym++] = 8; }
-
-    inflate_table(LENS,  state.lens, 0, 288, lenfix,   0, state.work, {bits: 9});
-
-    /* distance table */
-    sym = 0;
-    while (sym < 32) { state.lens[sym++] = 5; }
-
-    inflate_table(DISTS, state.lens, 0, 32,   distfix, 0, state.work, {bits: 5});
-
-    /* do this just once */
-    virgin = false;
-  }
-
-  state.lencode = lenfix;
-  state.lenbits = 9;
-  state.distcode = distfix;
-  state.distbits = 5;
-}
-
-
-/*
- Update the window with the last wsize (normally 32K) bytes written before
- returning.  If window does not exist yet, create it.  This is only called
- when a window is already in use, or when output has been written during this
- inflate call, but the end of the deflate stream has not been reached yet.
- It is also called to create a window for dictionary data when a dictionary
- is loaded.
-
- Providing output buffers larger than 32K to inflate() should provide a speed
- advantage, since only the last 32K of output is copied to the sliding window
- upon return from inflate(), and since all distances after the first 32K of
- output will fall in the output data, making match copies simpler and faster.
- The advantage may be dependent on the size of the processor's data caches.
- */
-function updatewindow(strm, src, end, copy) {
-  var dist;
-  var state = strm.state;
-
-  /* if it hasn't been done already, allocate space for the window */
-  if (state.window === null) {
-    state.wsize = 1 << state.wbits;
-    state.wnext = 0;
-    state.whave = 0;
-
-    state.window = new utils.Buf8(state.wsize);
-  }
-
-  /* copy state->wsize or less output bytes into the circular window */
-  if (copy >= state.wsize) {
-    utils.arraySet(state.window,src, end - state.wsize, state.wsize, 0);
-    state.wnext = 0;
-    state.whave = state.wsize;
-  }
-  else {
-    dist = state.wsize - state.wnext;
-    if (dist > copy) {
-      dist = copy;
-    }
-    //zmemcpy(state->window + state->wnext, end - copy, dist);
-    utils.arraySet(state.window,src, end - copy, dist, state.wnext);
-    copy -= dist;
-    if (copy) {
-      //zmemcpy(state->window, end - copy, copy);
-      utils.arraySet(state.window,src, end - copy, copy, 0);
-      state.wnext = copy;
-      state.whave = state.wsize;
-    }
-    else {
-      state.wnext += dist;
-      if (state.wnext === state.wsize) { state.wnext = 0; }
-      if (state.whave < state.wsize) { state.whave += dist; }
-    }
-  }
-  return 0;
-}
-
-function inflate(strm, flush) {
-  var state;
-  var input, output;          // input/output buffers
-  var next;                   /* next input INDEX */
-  var put;                    /* next output INDEX */
-  var have, left;             /* available input and output */
-  var hold;                   /* bit buffer */
-  var bits;                   /* bits in bit buffer */
-  var _in, _out;              /* save starting available input and output */
-  var copy;                   /* number of stored or match bytes to copy */
-  var from;                   /* where to copy match bytes from */
-  var from_source;
-  var here = 0;               /* current decoding table entry */
-  var here_bits, here_op, here_val; // paked "here" denormalized (JS specific)
-  //var last;                   /* parent table entry */
-  var last_bits, last_op, last_val; // paked "last" denormalized (JS specific)
-  var len;                    /* length to copy for repeats, bits to drop */
-  var ret;                    /* return code */
-  var hbuf = new utils.Buf8(4);    /* buffer for gzip header crc calculation */
-  var opts;
-
-  var n; // temporary var for NEED_BITS
-
-  var order = /* permutation of code lengths */
-    [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
-
-
-  if (!strm || !strm.state || !strm.output ||
-      (!strm.input && strm.avail_in !== 0)) {
-    return Z_STREAM_ERROR;
-  }
-
-  state = strm.state;
-  if (state.mode === TYPE) { state.mode = TYPEDO; }    /* skip check */
-
-
-  //--- LOAD() ---
-  put = strm.next_out;
-  output = strm.output;
-  left = strm.avail_out;
-  next = strm.next_in;
-  input = strm.input;
-  have = strm.avail_in;
-  hold = state.hold;
-  bits = state.bits;
-  //---
-
-  _in = have;
-  _out = left;
-  ret = Z_OK;
-
-  inf_leave: // goto emulation
-  for (;;) {
-    switch (state.mode) {
-    case HEAD:
-      if (state.wrap === 0) {
-        state.mode = TYPEDO;
-        break;
-      }
-      //=== NEEDBITS(16);
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if ((state.wrap & 2) && hold === 0x8b1f) {  /* gzip header */
-        state.check = 0/*crc32(0L, Z_NULL, 0)*/;
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        state.mode = FLAGS;
-        break;
-      }
-      state.flags = 0;           /* expect zlib header */
-      if (state.head) {
-        state.head.done = false;
-      }
-      if (!(state.wrap & 1) ||   /* check if zlib header allowed */
-        (((hold & 0xff)/*BITS(8)*/ << 8) + (hold >> 8)) % 31) {
-        strm.msg = 'incorrect header check';
-        state.mode = BAD;
-        break;
-      }
-      if ((hold & 0x0f)/*BITS(4)*/ !== Z_DEFLATED) {
-        strm.msg = 'unknown compression method';
-        state.mode = BAD;
-        break;
-      }
-      //--- DROPBITS(4) ---//
-      hold >>>= 4;
-      bits -= 4;
-      //---//
-      len = (hold & 0x0f)/*BITS(4)*/ + 8;
-      if (state.wbits === 0) {
-        state.wbits = len;
-      }
-      else if (len > state.wbits) {
-        strm.msg = 'invalid window size';
-        state.mode = BAD;
-        break;
-      }
-      state.dmax = 1 << len;
-      //Tracev((stderr, "inflate:   zlib header ok\n"));
-      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
-      state.mode = hold & 0x200 ? DICTID : TYPE;
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      break;
-    case FLAGS:
-      //=== NEEDBITS(16); */
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.flags = hold;
-      if ((state.flags & 0xff) !== Z_DEFLATED) {
-        strm.msg = 'unknown compression method';
-        state.mode = BAD;
-        break;
-      }
-      if (state.flags & 0xe000) {
-        strm.msg = 'unknown header flags set';
-        state.mode = BAD;
-        break;
-      }
-      if (state.head) {
-        state.head.text = ((hold >> 8) & 1);
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = TIME;
-      /* falls through */
-    case TIME:
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if (state.head) {
-        state.head.time = hold;
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC4(state.check, hold)
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        hbuf[2] = (hold >>> 16) & 0xff;
-        hbuf[3] = (hold >>> 24) & 0xff;
-        state.check = crc32(state.check, hbuf, 4, 0);
-        //===
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = OS;
-      /* falls through */
-    case OS:
-      //=== NEEDBITS(16); */
-      while (bits < 16) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if (state.head) {
-        state.head.xflags = (hold & 0xff);
-        state.head.os = (hold >> 8);
-      }
-      if (state.flags & 0x0200) {
-        //=== CRC2(state.check, hold);
-        hbuf[0] = hold & 0xff;
-        hbuf[1] = (hold >>> 8) & 0xff;
-        state.check = crc32(state.check, hbuf, 2, 0);
-        //===//
-      }
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = EXLEN;
-      /* falls through */
-    case EXLEN:
-      if (state.flags & 0x0400) {
-        //=== NEEDBITS(16); */
-        while (bits < 16) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.length = hold;
-        if (state.head) {
-          state.head.extra_len = hold;
-        }
-        if (state.flags & 0x0200) {
-          //=== CRC2(state.check, hold);
-          hbuf[0] = hold & 0xff;
-          hbuf[1] = (hold >>> 8) & 0xff;
-          state.check = crc32(state.check, hbuf, 2, 0);
-          //===//
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-      }
-      else if (state.head) {
-        state.head.extra = null/*Z_NULL*/;
-      }
-      state.mode = EXTRA;
-      /* falls through */
-    case EXTRA:
-      if (state.flags & 0x0400) {
-        copy = state.length;
-        if (copy > have) { copy = have; }
-        if (copy) {
-          if (state.head) {
-            len = state.head.extra_len - state.length;
-            if (!state.head.extra) {
-              // Use untyped array for more conveniend processing later
-              state.head.extra = new Array(state.head.extra_len);
-            }
-            utils.arraySet(
-              state.head.extra,
-              input,
-              next,
-              // extra field is limited to 65536 bytes
-              // - no need for additional size check
-              copy,
-              /*len + copy > state.head.extra_max - len ? state.head.extra_max : copy,*/
-              len
-            );
-            //zmemcpy(state.head.extra + len, next,
-            //        len + copy > state.head.extra_max ?
-            //        state.head.extra_max - len : copy);
-          }
-          if (state.flags & 0x0200) {
-            state.check = crc32(state.check, input, copy, next);
-          }
-          have -= copy;
-          next += copy;
-          state.length -= copy;
-        }
-        if (state.length) { break inf_leave; }
-      }
-      state.length = 0;
-      state.mode = NAME;
-      /* falls through */
-    case NAME:
-      if (state.flags & 0x0800) {
-        if (have === 0) { break inf_leave; }
-        copy = 0;
-        do {
-          // TODO: 2 or 1 bytes?
-          len = input[next + copy++];
-          /* use constant limit because in js we should not preallocate memory */
-          if (state.head && len &&
-              (state.length < 65536 /*state.head.name_max*/)) {
-            state.head.name += String.fromCharCode(len);
-          }
-        } while (len && copy < have);
-
-        if (state.flags & 0x0200) {
-          state.check = crc32(state.check, input, copy, next);
-        }
-        have -= copy;
-        next += copy;
-        if (len) { break inf_leave; }
-      }
-      else if (state.head) {
-        state.head.name = null;
-      }
-      state.length = 0;
-      state.mode = COMMENT;
-      /* falls through */
-    case COMMENT:
-      if (state.flags & 0x1000) {
-        if (have === 0) { break inf_leave; }
-        copy = 0;
-        do {
-          len = input[next + copy++];
-          /* use constant limit because in js we should not preallocate memory */
-          if (state.head && len &&
-              (state.length < 65536 /*state.head.comm_max*/)) {
-            state.head.comment += String.fromCharCode(len);
-          }
-        } while (len && copy < have);
-        if (state.flags & 0x0200) {
-          state.check = crc32(state.check, input, copy, next);
-        }
-        have -= copy;
-        next += copy;
-        if (len) { break inf_leave; }
-      }
-      else if (state.head) {
-        state.head.comment = null;
-      }
-      state.mode = HCRC;
-      /* falls through */
-    case HCRC:
-      if (state.flags & 0x0200) {
-        //=== NEEDBITS(16); */
-        while (bits < 16) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        if (hold !== (state.check & 0xffff)) {
-          strm.msg = 'header crc mismatch';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-      }
-      if (state.head) {
-        state.head.hcrc = ((state.flags >> 9) & 1);
-        state.head.done = true;
-      }
-      strm.adler = state.check = 0 /*crc32(0L, Z_NULL, 0)*/;
-      state.mode = TYPE;
-      break;
-    case DICTID:
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      strm.adler = state.check = ZSWAP32(hold);
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = DICT;
-      /* falls through */
-    case DICT:
-      if (state.havedict === 0) {
-        //--- RESTORE() ---
-        strm.next_out = put;
-        strm.avail_out = left;
-        strm.next_in = next;
-        strm.avail_in = have;
-        state.hold = hold;
-        state.bits = bits;
-        //---
-        return Z_NEED_DICT;
-      }
-      strm.adler = state.check = 1/*adler32(0L, Z_NULL, 0)*/;
-      state.mode = TYPE;
-      /* falls through */
-    case TYPE:
-      if (flush === Z_BLOCK || flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case TYPEDO:
-      if (state.last) {
-        //--- BYTEBITS() ---//
-        hold >>>= bits & 7;
-        bits -= bits & 7;
-        //---//
-        state.mode = CHECK;
-        break;
-      }
-      //=== NEEDBITS(3); */
-      while (bits < 3) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.last = (hold & 0x01)/*BITS(1)*/;
-      //--- DROPBITS(1) ---//
-      hold >>>= 1;
-      bits -= 1;
-      //---//
-
-      switch ((hold & 0x03)/*BITS(2)*/) {
-      case 0:                             /* stored block */
-        //Tracev((stderr, "inflate:     stored block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = STORED;
-        break;
-      case 1:                             /* fixed block */
-        fixedtables(state);
-        //Tracev((stderr, "inflate:     fixed codes block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = LEN_;             /* decode codes */
-        if (flush === Z_TREES) {
-          //--- DROPBITS(2) ---//
-          hold >>>= 2;
-          bits -= 2;
-          //---//
-          break inf_leave;
-        }
-        break;
-      case 2:                             /* dynamic block */
-        //Tracev((stderr, "inflate:     dynamic codes block%s\n",
-        //        state.last ? " (last)" : ""));
-        state.mode = TABLE;
-        break;
-      case 3:
-        strm.msg = 'invalid block type';
-        state.mode = BAD;
-      }
-      //--- DROPBITS(2) ---//
-      hold >>>= 2;
-      bits -= 2;
-      //---//
-      break;
-    case STORED:
-      //--- BYTEBITS() ---// /* go to byte boundary */
-      hold >>>= bits & 7;
-      bits -= bits & 7;
-      //---//
-      //=== NEEDBITS(32); */
-      while (bits < 32) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      if ((hold & 0xffff) !== ((hold >>> 16) ^ 0xffff)) {
-        strm.msg = 'invalid stored block lengths';
-        state.mode = BAD;
-        break;
-      }
-      state.length = hold & 0xffff;
-      //Tracev((stderr, "inflate:       stored length %u\n",
-      //        state.length));
-      //=== INITBITS();
-      hold = 0;
-      bits = 0;
-      //===//
-      state.mode = COPY_;
-      if (flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case COPY_:
-      state.mode = COPY;
-      /* falls through */
-    case COPY:
-      copy = state.length;
-      if (copy) {
-        if (copy > have) { copy = have; }
-        if (copy > left) { copy = left; }
-        if (copy === 0) { break inf_leave; }
-        //--- zmemcpy(put, next, copy); ---
-        utils.arraySet(output, input, next, copy, put);
-        //---//
-        have -= copy;
-        next += copy;
-        left -= copy;
-        put += copy;
-        state.length -= copy;
-        break;
-      }
-      //Tracev((stderr, "inflate:       stored end\n"));
-      state.mode = TYPE;
-      break;
-    case TABLE:
-      //=== NEEDBITS(14); */
-      while (bits < 14) {
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-      }
-      //===//
-      state.nlen = (hold & 0x1f)/*BITS(5)*/ + 257;
-      //--- DROPBITS(5) ---//
-      hold >>>= 5;
-      bits -= 5;
-      //---//
-      state.ndist = (hold & 0x1f)/*BITS(5)*/ + 1;
-      //--- DROPBITS(5) ---//
-      hold >>>= 5;
-      bits -= 5;
-      //---//
-      state.ncode = (hold & 0x0f)/*BITS(4)*/ + 4;
-      //--- DROPBITS(4) ---//
-      hold >>>= 4;
-      bits -= 4;
-      //---//
-//#ifndef PKZIP_BUG_WORKAROUND
-      if (state.nlen > 286 || state.ndist > 30) {
-        strm.msg = 'too many length or distance symbols';
-        state.mode = BAD;
-        break;
-      }
-//#endif
-      //Tracev((stderr, "inflate:       table sizes ok\n"));
-      state.have = 0;
-      state.mode = LENLENS;
-      /* falls through */
-    case LENLENS:
-      while (state.have < state.ncode) {
-        //=== NEEDBITS(3);
-        while (bits < 3) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.lens[order[state.have++]] = (hold & 0x07);//BITS(3);
-        //--- DROPBITS(3) ---//
-        hold >>>= 3;
-        bits -= 3;
-        //---//
-      }
-      while (state.have < 19) {
-        state.lens[order[state.have++]] = 0;
-      }
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      //state.next = state.codes;
-      //state.lencode = state.next;
-      // Switch to use dynamic table
-      state.lencode = state.lendyn;
-      state.lenbits = 7;
-
-      opts = {bits: state.lenbits};
-      ret = inflate_table(CODES, state.lens, 0, 19, state.lencode, 0, state.work, opts);
-      state.lenbits = opts.bits;
-
-      if (ret) {
-        strm.msg = 'invalid code lengths set';
-        state.mode = BAD;
-        break;
-      }
-      //Tracev((stderr, "inflate:       code lengths ok\n"));
-      state.have = 0;
-      state.mode = CODELENS;
-      /* falls through */
-    case CODELENS:
-      while (state.have < state.nlen + state.ndist) {
-        for (;;) {
-          here = state.lencode[hold & ((1 << state.lenbits) - 1)];/*BITS(state.lenbits)*/
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        if (here_val < 16) {
-          //--- DROPBITS(here.bits) ---//
-          hold >>>= here_bits;
-          bits -= here_bits;
-          //---//
-          state.lens[state.have++] = here_val;
-        }
-        else {
-          if (here_val === 16) {
-            //=== NEEDBITS(here.bits + 2);
-            n = here_bits + 2;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            if (state.have === 0) {
-              strm.msg = 'invalid bit length repeat';
-              state.mode = BAD;
-              break;
-            }
-            len = state.lens[state.have - 1];
-            copy = 3 + (hold & 0x03);//BITS(2);
-            //--- DROPBITS(2) ---//
-            hold >>>= 2;
-            bits -= 2;
-            //---//
-          }
-          else if (here_val === 17) {
-            //=== NEEDBITS(here.bits + 3);
-            n = here_bits + 3;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            len = 0;
-            copy = 3 + (hold & 0x07);//BITS(3);
-            //--- DROPBITS(3) ---//
-            hold >>>= 3;
-            bits -= 3;
-            //---//
-          }
-          else {
-            //=== NEEDBITS(here.bits + 7);
-            n = here_bits + 7;
-            while (bits < n) {
-              if (have === 0) { break inf_leave; }
-              have--;
-              hold += input[next++] << bits;
-              bits += 8;
-            }
-            //===//
-            //--- DROPBITS(here.bits) ---//
-            hold >>>= here_bits;
-            bits -= here_bits;
-            //---//
-            len = 0;
-            copy = 11 + (hold & 0x7f);//BITS(7);
-            //--- DROPBITS(7) ---//
-            hold >>>= 7;
-            bits -= 7;
-            //---//
-          }
-          if (state.have + copy > state.nlen + state.ndist) {
-            strm.msg = 'invalid bit length repeat';
-            state.mode = BAD;
-            break;
-          }
-          while (copy--) {
-            state.lens[state.have++] = len;
-          }
-        }
-      }
-
-      /* handle error breaks in while */
-      if (state.mode === BAD) { break; }
-
-      /* check for end-of-block code (better have one) */
-      if (state.lens[256] === 0) {
-        strm.msg = 'invalid code -- missing end-of-block';
-        state.mode = BAD;
-        break;
-      }
-
-      /* build code tables -- note: do not change the lenbits or distbits
-         values here (9 and 6) without reading the comments in inftrees.h
-         concerning the ENOUGH constants, which depend on those values */
-      state.lenbits = 9;
-
-      opts = {bits: state.lenbits};
-      ret = inflate_table(LENS, state.lens, 0, state.nlen, state.lencode, 0, state.work, opts);
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      // state.next_index = opts.table_index;
-      state.lenbits = opts.bits;
-      // state.lencode = state.next;
-
-      if (ret) {
-        strm.msg = 'invalid literal/lengths set';
-        state.mode = BAD;
-        break;
-      }
-
-      state.distbits = 6;
-      //state.distcode.copy(state.codes);
-      // Switch to use dynamic table
-      state.distcode = state.distdyn;
-      opts = {bits: state.distbits};
-      ret = inflate_table(DISTS, state.lens, state.nlen, state.ndist, state.distcode, 0, state.work, opts);
-      // We have separate tables & no pointers. 2 commented lines below not needed.
-      // state.next_index = opts.table_index;
-      state.distbits = opts.bits;
-      // state.distcode = state.next;
-
-      if (ret) {
-        strm.msg = 'invalid distances set';
-        state.mode = BAD;
-        break;
-      }
-      //Tracev((stderr, 'inflate:       codes ok\n'));
-      state.mode = LEN_;
-      if (flush === Z_TREES) { break inf_leave; }
-      /* falls through */
-    case LEN_:
-      state.mode = LEN;
-      /* falls through */
-    case LEN:
-      if (have >= 6 && left >= 258) {
-        //--- RESTORE() ---
-        strm.next_out = put;
-        strm.avail_out = left;
-        strm.next_in = next;
-        strm.avail_in = have;
-        state.hold = hold;
-        state.bits = bits;
-        //---
-        inflate_fast(strm, _out);
-        //--- LOAD() ---
-        put = strm.next_out;
-        output = strm.output;
-        left = strm.avail_out;
-        next = strm.next_in;
-        input = strm.input;
-        have = strm.avail_in;
-        hold = state.hold;
-        bits = state.bits;
-        //---
-
-        if (state.mode === TYPE) {
-          state.back = -1;
-        }
-        break;
-      }
-      state.back = 0;
-      for (;;) {
-        here = state.lencode[hold & ((1 << state.lenbits) -1)];  /*BITS(state.lenbits)*/
-        here_bits = here >>> 24;
-        here_op = (here >>> 16) & 0xff;
-        here_val = here & 0xffff;
-
-        if (here_bits <= bits) { break; }
-        //--- PULLBYTE() ---//
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-        //---//
-      }
-      if (here_op && (here_op & 0xf0) === 0) {
-        last_bits = here_bits;
-        last_op = here_op;
-        last_val = here_val;
-        for (;;) {
-          here = state.lencode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((last_bits + here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        //--- DROPBITS(last.bits) ---//
-        hold >>>= last_bits;
-        bits -= last_bits;
-        //---//
-        state.back += last_bits;
-      }
-      //--- DROPBITS(here.bits) ---//
-      hold >>>= here_bits;
-      bits -= here_bits;
-      //---//
-      state.back += here_bits;
-      state.length = here_val;
-      if (here_op === 0) {
-        //Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-        //        "inflate:         literal '%c'\n" :
-        //        "inflate:         literal 0x%02x\n", here.val));
-        state.mode = LIT;
-        break;
-      }
-      if (here_op & 32) {
-        //Tracevv((stderr, "inflate:         end of block\n"));
-        state.back = -1;
-        state.mode = TYPE;
-        break;
-      }
-      if (here_op & 64) {
-        strm.msg = 'invalid literal/length code';
-        state.mode = BAD;
-        break;
-      }
-      state.extra = here_op & 15;
-      state.mode = LENEXT;
-      /* falls through */
-    case LENEXT:
-      if (state.extra) {
-        //=== NEEDBITS(state.extra);
-        n = state.extra;
-        while (bits < n) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.length += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
-        //--- DROPBITS(state.extra) ---//
-        hold >>>= state.extra;
-        bits -= state.extra;
-        //---//
-        state.back += state.extra;
-      }
-      //Tracevv((stderr, "inflate:         length %u\n", state.length));
-      state.was = state.length;
-      state.mode = DIST;
-      /* falls through */
-    case DIST:
-      for (;;) {
-        here = state.distcode[hold & ((1 << state.distbits) -1)];/*BITS(state.distbits)*/
-        here_bits = here >>> 24;
-        here_op = (here >>> 16) & 0xff;
-        here_val = here & 0xffff;
-
-        if ((here_bits) <= bits) { break; }
-        //--- PULLBYTE() ---//
-        if (have === 0) { break inf_leave; }
-        have--;
-        hold += input[next++] << bits;
-        bits += 8;
-        //---//
-      }
-      if ((here_op & 0xf0) === 0) {
-        last_bits = here_bits;
-        last_op = here_op;
-        last_val = here_val;
-        for (;;) {
-          here = state.distcode[last_val +
-                  ((hold & ((1 << (last_bits + last_op)) -1))/*BITS(last.bits + last.op)*/ >> last_bits)];
-          here_bits = here >>> 24;
-          here_op = (here >>> 16) & 0xff;
-          here_val = here & 0xffff;
-
-          if ((last_bits + here_bits) <= bits) { break; }
-          //--- PULLBYTE() ---//
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-          //---//
-        }
-        //--- DROPBITS(last.bits) ---//
-        hold >>>= last_bits;
-        bits -= last_bits;
-        //---//
-        state.back += last_bits;
-      }
-      //--- DROPBITS(here.bits) ---//
-      hold >>>= here_bits;
-      bits -= here_bits;
-      //---//
-      state.back += here_bits;
-      if (here_op & 64) {
-        strm.msg = 'invalid distance code';
-        state.mode = BAD;
-        break;
-      }
-      state.offset = here_val;
-      state.extra = (here_op) & 15;
-      state.mode = DISTEXT;
-      /* falls through */
-    case DISTEXT:
-      if (state.extra) {
-        //=== NEEDBITS(state.extra);
-        n = state.extra;
-        while (bits < n) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        state.offset += hold & ((1 << state.extra) -1)/*BITS(state.extra)*/;
-        //--- DROPBITS(state.extra) ---//
-        hold >>>= state.extra;
-        bits -= state.extra;
-        //---//
-        state.back += state.extra;
-      }
-//#ifdef INFLATE_STRICT
-      if (state.offset > state.dmax) {
-        strm.msg = 'invalid distance too far back';
-        state.mode = BAD;
-        break;
-      }
-//#endif
-      //Tracevv((stderr, "inflate:         distance %u\n", state.offset));
-      state.mode = MATCH;
-      /* falls through */
-    case MATCH:
-      if (left === 0) { break inf_leave; }
-      copy = _out - left;
-      if (state.offset > copy) {         /* copy from window */
-        copy = state.offset - copy;
-        if (copy > state.whave) {
-          if (state.sane) {
-            strm.msg = 'invalid distance too far back';
-            state.mode = BAD;
-            break;
-          }
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-//#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-//          Trace((stderr, "inflate.c too far\n"));
-//          copy -= state.whave;
-//          if (copy > state.length) { copy = state.length; }
-//          if (copy > left) { copy = left; }
-//          left -= copy;
-//          state.length -= copy;
-//          do {
-//            output[put++] = 0;
-//          } while (--copy);
-//          if (state.length === 0) { state.mode = LEN; }
-//          break;
-//#endif
-        }
-        if (copy > state.wnext) {
-          copy -= state.wnext;
-          from = state.wsize - copy;
-        }
-        else {
-          from = state.wnext - copy;
-        }
-        if (copy > state.length) { copy = state.length; }
-        from_source = state.window;
-      }
-      else {                              /* copy from output */
-        from_source = output;
-        from = put - state.offset;
-        copy = state.length;
-      }
-      if (copy > left) { copy = left; }
-      left -= copy;
-      state.length -= copy;
-      do {
-        output[put++] = from_source[from++];
-      } while (--copy);
-      if (state.length === 0) { state.mode = LEN; }
-      break;
-    case LIT:
-      if (left === 0) { break inf_leave; }
-      output[put++] = state.length;
-      left--;
-      state.mode = LEN;
-      break;
-    case CHECK:
-      if (state.wrap) {
-        //=== NEEDBITS(32);
-        while (bits < 32) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          // Use '|' insdead of '+' to make sure that result is signed
-          hold |= input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        _out -= left;
-        strm.total_out += _out;
-        state.total += _out;
-        if (_out) {
-          strm.adler = state.check =
-              /*UPDATE(state.check, put - _out, _out);*/
-              (state.flags ? crc32(state.check, output, _out, put - _out) : adler32(state.check, output, _out, put - _out));
-
-        }
-        _out = left;
-        // NB: crc32 stored as signed 32-bit int, ZSWAP32 returns signed too
-        if ((state.flags ? hold : ZSWAP32(hold)) !== state.check) {
-          strm.msg = 'incorrect data check';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        //Tracev((stderr, "inflate:   check matches trailer\n"));
-      }
-      state.mode = LENGTH;
-      /* falls through */
-    case LENGTH:
-      if (state.wrap && state.flags) {
-        //=== NEEDBITS(32);
-        while (bits < 32) {
-          if (have === 0) { break inf_leave; }
-          have--;
-          hold += input[next++] << bits;
-          bits += 8;
-        }
-        //===//
-        if (hold !== (state.total & 0xffffffff)) {
-          strm.msg = 'incorrect length check';
-          state.mode = BAD;
-          break;
-        }
-        //=== INITBITS();
-        hold = 0;
-        bits = 0;
-        //===//
-        //Tracev((stderr, "inflate:   length matches trailer\n"));
-      }
-      state.mode = DONE;
-      /* falls through */
-    case DONE:
-      ret = Z_STREAM_END;
-      break inf_leave;
-    case BAD:
-      ret = Z_DATA_ERROR;
-      break inf_leave;
-    case MEM:
-      return Z_MEM_ERROR;
-    case SYNC:
-      /* falls through */
-    default:
-      return Z_STREAM_ERROR;
-    }
-  }
-
-  // inf_leave <- here is real place for "goto inf_leave", emulated via "break inf_leave"
-
-  /*
-     Return from inflate(), updating the total counts and the check value.
-     If there was no progress during the inflate() call, return a buffer
-     error.  Call updatewindow() to create and/or update the window state.
-     Note: a memory error from inflate() is non-recoverable.
-   */
-
-  //--- RESTORE() ---
-  strm.next_out = put;
-  strm.avail_out = left;
-  strm.next_in = next;
-  strm.avail_in = have;
-  state.hold = hold;
-  state.bits = bits;
-  //---
-
-  if (state.wsize || (_out !== strm.avail_out && state.mode < BAD &&
-                      (state.mode < CHECK || flush !== Z_FINISH))) {
-    if (updatewindow(strm, strm.output, strm.next_out, _out - strm.avail_out)) {
-      state.mode = MEM;
-      return Z_MEM_ERROR;
-    }
-  }
-  _in -= strm.avail_in;
-  _out -= strm.avail_out;
-  strm.total_in += _in;
-  strm.total_out += _out;
-  state.total += _out;
-  if (state.wrap && _out) {
-    strm.adler = state.check = /*UPDATE(state.check, strm.next_out - _out, _out);*/
-      (state.flags ? crc32(state.check, output, _out, strm.next_out - _out) : adler32(state.check, output, _out, strm.next_out - _out));
-  }
-  strm.data_type = state.bits + (state.last ? 64 : 0) +
-                    (state.mode === TYPE ? 128 : 0) +
-                    (state.mode === LEN_ || state.mode === COPY_ ? 256 : 0);
-  if (((_in === 0 && _out === 0) || flush === Z_FINISH) && ret === Z_OK) {
-    ret = Z_BUF_ERROR;
-  }
-  return ret;
-}
-
-function inflateEnd(strm) {
-
-  if (!strm || !strm.state /*|| strm->zfree == (free_func)0*/) {
-    return Z_STREAM_ERROR;
-  }
-
-  var state = strm.state;
-  if (state.window) {
-    state.window = null;
-  }
-  strm.state = null;
-  return Z_OK;
-}
-
-function inflateGetHeader(strm, head) {
-  var state;
-
-  /* check state */
-  if (!strm || !strm.state) { return Z_STREAM_ERROR; }
-  state = strm.state;
-  if ((state.wrap & 2) === 0) { return Z_STREAM_ERROR; }
-
-  /* save header structure */
-  state.head = head;
-  head.done = false;
-  return Z_OK;
-}
-
-
-exports.inflateReset = inflateReset;
-exports.inflateReset2 = inflateReset2;
-exports.inflateResetKeep = inflateResetKeep;
-exports.inflateInit = inflateInit;
-exports.inflateInit2 = inflateInit2;
-exports.inflate = inflate;
-exports.inflateEnd = inflateEnd;
-exports.inflateGetHeader = inflateGetHeader;
-exports.inflateInfo = 'pako inflate (from Nodeca project)';
-
-/* Not implemented
-exports.inflateCopy = inflateCopy;
-exports.inflateGetDictionary = inflateGetDictionary;
-exports.inflateMark = inflateMark;
-exports.inflatePrime = inflatePrime;
-exports.inflateSetDictionary = inflateSetDictionary;
-exports.inflateSync = inflateSync;
-exports.inflateSyncPoint = inflateSyncPoint;
-exports.inflateUndermine = inflateUndermine;
-*/
-},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-var MAXBITS = 15;
-var ENOUGH_LENS = 852;
-var ENOUGH_DISTS = 592;
-//var ENOUGH = (ENOUGH_LENS+ENOUGH_DISTS);
-
-var CODES = 0;
-var LENS = 1;
-var DISTS = 2;
-
-var lbase = [ /* Length codes 257..285 base */
-  3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-  35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
-];
-
-var lext = [ /* Length codes 257..285 extra */
-  16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-  19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78
-];
-
-var dbase = [ /* Distance codes 0..29 base */
-  1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-  257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-  8193, 12289, 16385, 24577, 0, 0
-];
-
-var dext = [ /* Distance codes 0..29 extra */
-  16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-  23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-  28, 28, 29, 29, 64, 64
-];
-
-module.exports = function inflate_table(type, lens, lens_index, codes, table, table_index, work, opts)
-{
-  var bits = opts.bits;
-      //here = opts.here; /* table entry for duplication */
-
-  var len = 0;               /* a code's length in bits */
-  var sym = 0;               /* index of code symbols */
-  var min = 0, max = 0;          /* minimum and maximum code lengths */
-  var root = 0;              /* number of index bits for root table */
-  var curr = 0;              /* number of index bits for current table */
-  var drop = 0;              /* code bits to drop for sub-table */
-  var left = 0;                   /* number of prefix codes available */
-  var used = 0;              /* code entries in table used */
-  var huff = 0;              /* Huffman code */
-  var incr;              /* for incrementing code, index */
-  var fill;              /* index for replicating entries */
-  var low;               /* low bits for current root entry */
-  var mask;              /* mask for low root bits */
-  var next;             /* next available space in table */
-  var base = null;     /* base value table to use */
-  var base_index = 0;
-//  var shoextra;    /* extra bits table to use */
-  var end;                    /* use base and extra for symbol > end */
-  var count = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];    /* number of codes of each length */
-  var offs = new utils.Buf16(MAXBITS+1); //[MAXBITS+1];     /* offsets in table for each length */
-  var extra = null;
-  var extra_index = 0;
-
-  var here_bits, here_op, here_val;
-
-  /*
-   Process a set of code lengths to create a canonical Huffman code.  The
-   code lengths are lens[0..codes-1].  Each length corresponds to the
-   symbols 0..codes-1.  The Huffman code is generated by first sorting the
-   symbols by length from short to long, and retaining the symbol order
-   for codes with equal lengths.  Then the code starts with all zero bits
-   for the first code of the shortest length, and the codes are integer
-   increments for the same length, and zeros are appended as the length
-   increases.  For the deflate format, these bits are stored backwards
-   from their more natural integer increment ordering, and so when the
-   decoding tables are built in the large loop below, the integer codes
-   are incremented backwards.
-
-   This routine assumes, but does not check, that all of the entries in
-   lens[] are in the range 0..MAXBITS.  The caller must assure this.
-   1..MAXBITS is interpreted as that code length.  zero means that that
-   symbol does not occur in this code.
-
-   The codes are sorted by computing a count of codes for each length,
-   creating from that a table of starting indices for each length in the
-   sorted table, and then entering the symbols in order in the sorted
-   table.  The sorted table is work[], with that space being provided by
-   the caller.
-
-   The length counts are used for other purposes as well, i.e. finding
-   the minimum and maximum length codes, determining if there are any
-   codes at all, checking for a valid set of lengths, and looking ahead
-   at length counts to determine sub-table sizes when building the
-   decoding tables.
-   */
-
-  /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-  for (len = 0; len <= MAXBITS; len++) {
-    count[len] = 0;
-  }
-  for (sym = 0; sym < codes; sym++) {
-    count[lens[lens_index + sym]]++;
-  }
-
-  /* bound code lengths, force root to be within code lengths */
-  root = bits;
-  for (max = MAXBITS; max >= 1; max--) {
-    if (count[max] !== 0) { break; }
-  }
-  if (root > max) {
-    root = max;
-  }
-  if (max === 0) {                     /* no symbols to code at all */
-    //table.op[opts.table_index] = 64;  //here.op = (var char)64;    /* invalid code marker */
-    //table.bits[opts.table_index] = 1;   //here.bits = (var char)1;
-    //table.val[opts.table_index++] = 0;   //here.val = (var short)0;
-    table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
-
-    //table.op[opts.table_index] = 64;
-    //table.bits[opts.table_index] = 1;
-    //table.val[opts.table_index++] = 0;
-    table[table_index++] = (1 << 24) | (64 << 16) | 0;
-
-    opts.bits = 1;
-    return 0;     /* no symbols, but wait for decoding to report error */
-  }
-  for (min = 1; min < max; min++) {
-    if (count[min] !== 0) { break; }
-  }
-  if (root < min) {
-    root = min;
-  }
-
-  /* check for an over-subscribed or incomplete set of lengths */
-  left = 1;
-  for (len = 1; len <= MAXBITS; len++) {
-    left <<= 1;
-    left -= count[len];
-    if (left < 0) {
-      return -1;
-    }        /* over-subscribed */
-  }
-  if (left > 0 && (type === CODES || max !== 1)) {
-    return -1;                      /* incomplete set */
-  }
-
-  /* generate offsets into symbol table for each length for sorting */
-  offs[1] = 0;
-  for (len = 1; len < MAXBITS; len++) {
-    offs[len + 1] = offs[len] + count[len];
-  }
-
-  /* sort symbols by length, by symbol order within each length */
-  for (sym = 0; sym < codes; sym++) {
-    if (lens[lens_index + sym] !== 0) {
-      work[offs[lens[lens_index + sym]]++] = sym;
-    }
-  }
-
-  /*
-   Create and fill in decoding tables.  In this loop, the table being
-   filled is at next and has curr index bits.  The code being used is huff
-   with length len.  That code is converted to an index by dropping drop
-   bits off of the bottom.  For codes where len is less than drop + curr,
-   those top drop + curr - len bits are incremented through all values to
-   fill the table with replicated entries.
-
-   root is the number of index bits for the root table.  When len exceeds
-   root, sub-tables are created pointed to by the root entry with an index
-   of the low root bits of huff.  This is saved in low to check for when a
-   new sub-table should be started.  drop is zero when the root table is
-   being filled, and drop is root when sub-tables are being filled.
-
-   When a new sub-table is needed, it is necessary to look ahead in the
-   code lengths to determine what size sub-table is needed.  The length
-   counts are used for this, and so count[] is decremented as codes are
-   entered in the tables.
-
-   used keeps track of how many table entries have been allocated from the
-   provided *table space.  It is checked for LENS and DIST tables against
-   the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-   the initial root table size constants.  See the comments in inftrees.h
-   for more information.
-
-   sym increments through all symbols, and the loop terminates when
-   all codes of length max, i.e. all codes, have been processed.  This
-   routine permits incomplete codes, so another loop after this one fills
-   in the rest of the decoding tables with invalid code markers.
-   */
-
-  /* set up for code type */
-  // poor man optimization - use if-else instead of switch,
-  // to avoid deopts in old v8
-  if (type === CODES) {
-      base = extra = work;    /* dummy value--not used */
-      end = 19;
-  } else if (type === LENS) {
-      base = lbase;
-      base_index -= 257;
-      extra = lext;
-      extra_index -= 257;
-      end = 256;
-  } else {                    /* DISTS */
-      base = dbase;
-      extra = dext;
-      end = -1;
-  }
-
-  /* initialize opts for loop */
-  huff = 0;                   /* starting code */
-  sym = 0;                    /* starting code symbol */
-  len = min;                  /* starting code length */
-  next = table_index;              /* current table to fill in */
-  curr = root;                /* current table index bits */
-  drop = 0;                   /* current bits to drop from code for index */
-  low = -1;                   /* trigger new sub-table when len > root */
-  used = 1 << root;          /* use root table entries */
-  mask = used - 1;            /* mask for comparing low */
-
-  /* check available table space */
-  if ((type === LENS && used > ENOUGH_LENS) ||
-    (type === DISTS && used > ENOUGH_DISTS)) {
-    return 1;
-  }
-
-  var i=0;
-  /* process all codes and make table entries */
-  for (;;) {
-    i++;
-    /* create table entry */
-    here_bits = len - drop;
-    if (work[sym] < end) {
-      here_op = 0;
-      here_val = work[sym];
-    }
-    else if (work[sym] > end) {
-      here_op = extra[extra_index + work[sym]];
-      here_val = base[base_index + work[sym]];
-    }
-    else {
-      here_op = 32 + 64;         /* end of block */
-      here_val = 0;
-    }
-
-    /* replicate for those indices with low len bits equal to huff */
-    incr = 1 << (len - drop);
-    fill = 1 << curr;
-    min = fill;                 /* save offset to next table */
-    do {
-      fill -= incr;
-      table[next + (huff >> drop) + fill] = (here_bits << 24) | (here_op << 16) | here_val |0;
-    } while (fill !== 0);
-
-    /* backwards increment the len-bit code huff */
-    incr = 1 << (len - 1);
-    while (huff & incr) {
-      incr >>= 1;
-    }
-    if (incr !== 0) {
-      huff &= incr - 1;
-      huff += incr;
-    } else {
-      huff = 0;
-    }
-
-    /* go to next symbol, update count, len */
-    sym++;
-    if (--count[len] === 0) {
-      if (len === max) { break; }
-      len = lens[lens_index + work[sym]];
-    }
-
-    /* create new sub-table if needed */
-    if (len > root && (huff & mask) !== low) {
-      /* if first time, transition to sub-tables */
-      if (drop === 0) {
-        drop = root;
-      }
-
-      /* increment past last table */
-      next += min;            /* here min is 1 << curr */
-
-      /* determine length of next table */
-      curr = len - drop;
-      left = 1 << curr;
-      while (curr + drop < max) {
-        left -= count[curr + drop];
-        if (left <= 0) { break; }
-        curr++;
-        left <<= 1;
-      }
-
-      /* check for enough space */
-      used += 1 << curr;
-      if ((type === LENS && used > ENOUGH_LENS) ||
-        (type === DISTS && used > ENOUGH_DISTS)) {
-        return 1;
-      }
-
-      /* point entry in root table to sub-table */
-      low = huff & mask;
-      /*table.op[low] = curr;
-      table.bits[low] = root;
-      table.val[low] = next - opts.table_index;*/
-      table[low] = (root << 24) | (curr << 16) | (next - table_index) |0;
-    }
-  }
-
-  /* fill in remaining table entry if code is incomplete (guaranteed to have
-   at most one remaining entry, since if the code is incomplete, the
-   maximum code length that was allowed to get this far is one bit) */
-  if (huff !== 0) {
-    //table.op[next + huff] = 64;            /* invalid code marker */
-    //table.bits[next + huff] = len - drop;
-    //table.val[next + huff] = 0;
-    table[next + huff] = ((len - drop) << 24) | (64 << 16) |0;
-  }
-
-  /* set return parameters */
-  //opts.table_index += used;
-  opts.bits = root;
-  return 0;
-};
-
-},{"../utils/common":27}],37:[function(_dereq_,module,exports){
-'use strict';
-
-module.exports = {
-  '2':    'need dictionary',     /* Z_NEED_DICT       2  */
-  '1':    'stream end',          /* Z_STREAM_END      1  */
-  '0':    '',                    /* Z_OK              0  */
-  '-1':   'file error',          /* Z_ERRNO         (-1) */
-  '-2':   'stream error',        /* Z_STREAM_ERROR  (-2) */
-  '-3':   'data error',          /* Z_DATA_ERROR    (-3) */
-  '-4':   'insufficient memory', /* Z_MEM_ERROR     (-4) */
-  '-5':   'buffer error',        /* Z_BUF_ERROR     (-5) */
-  '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
-};
-},{}],38:[function(_dereq_,module,exports){
-'use strict';
-
-
-var utils = _dereq_('../utils/common');
-
-/* Public constants ==========================================================*/
-/* ===========================================================================*/
-
-
-//var Z_FILTERED          = 1;
-//var Z_HUFFMAN_ONLY      = 2;
-//var Z_RLE               = 3;
-var Z_FIXED               = 4;
-//var Z_DEFAULT_STRATEGY  = 0;
-
-/* Possible values of the data_type field (though see inflate()) */
-var Z_BINARY              = 0;
-var Z_TEXT                = 1;
-//var Z_ASCII             = 1; // = Z_TEXT
-var Z_UNKNOWN             = 2;
-
-/*============================================================================*/
-
-
-function zero(buf) { var len = buf.length; while (--len >= 0) { buf[len] = 0; } }
-
-// From zutil.h
-
-var STORED_BLOCK = 0;
-var STATIC_TREES = 1;
-var DYN_TREES    = 2;
-/* The three kinds of block type */
-
-var MIN_MATCH    = 3;
-var MAX_MATCH    = 258;
-/* The minimum and maximum match lengths */
-
-// From deflate.h
-/* ===========================================================================
- * Internal compression state.
- */
-
-var LENGTH_CODES  = 29;
-/* number of length codes, not counting the special END_BLOCK code */
-
-var LITERALS      = 256;
-/* number of literal bytes 0..255 */
-
-var L_CODES       = LITERALS + 1 + LENGTH_CODES;
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-var D_CODES       = 30;
-/* number of distance codes */
-
-var BL_CODES      = 19;
-/* number of codes used to transfer the bit lengths */
-
-var HEAP_SIZE     = 2*L_CODES + 1;
-/* maximum heap size */
-
-var MAX_BITS      = 15;
-/* All codes must not exceed MAX_BITS bits */
-
-var Buf_size      = 16;
-/* size of bit buffer in bi_buf */
-
-
-/* ===========================================================================
- * Constants
- */
-
-var MAX_BL_BITS = 7;
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-var END_BLOCK   = 256;
-/* end of block literal code */
-
-var REP_3_6     = 16;
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-var REPZ_3_10   = 17;
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-var REPZ_11_138 = 18;
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-var extra_lbits =   /* extra bits for each length code */
-  [0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0];
-
-var extra_dbits =   /* extra bits for each distance code */
-  [0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13];
-
-var extra_blbits =  /* extra bits for each bit length code */
-  [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7];
-
-var bl_order =
-  [16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-// We pre-fill arrays with 0 to avoid uninitialized gaps
-
-var DIST_CODE_LEN = 512; /* see definition of array dist_code below */
-
-// !!!! Use flat array insdead of structure, Freq = i*2, Len = i*2+1
-var static_ltree  = new Array((L_CODES+2) * 2);
-zero(static_ltree);
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-var static_dtree  = new Array(D_CODES * 2);
-zero(static_dtree);
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-var _dist_code    = new Array(DIST_CODE_LEN);
-zero(_dist_code);
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-var _length_code  = new Array(MAX_MATCH-MIN_MATCH+1);
-zero(_length_code);
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-var base_length   = new Array(LENGTH_CODES);
-zero(base_length);
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-var base_dist     = new Array(D_CODES);
-zero(base_dist);
-/* First normalized distance for each code (0 = distance of 1) */
-
-
-var StaticTreeDesc = function (static_tree, extra_bits, extra_base, elems, max_length) {
-
-  this.static_tree  = static_tree;  /* static tree or NULL */
-  this.extra_bits   = extra_bits;   /* extra bits for each code or NULL */
-  this.extra_base   = extra_base;   /* base index for extra_bits */
-  this.elems        = elems;        /* max number of elements in the tree */
-  this.max_length   = max_length;   /* max bit length for the codes */
-
-  // show if `static_tree` has data or dummy - needed for monomorphic objects
-  this.has_stree    = static_tree && static_tree.length;
-};
-
-
-var static_l_desc;
-var static_d_desc;
-var static_bl_desc;
-
-
-var TreeDesc = function(dyn_tree, stat_desc) {
-  this.dyn_tree = dyn_tree;     /* the dynamic tree */
-  this.max_code = 0;            /* largest code with non zero frequency */
-  this.stat_desc = stat_desc;   /* the corresponding static tree */
-};
-
-
-
-function d_code(dist) {
-  return dist < 256 ? _dist_code[dist] : _dist_code[256 + (dist >>> 7)];
-}
-
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-function put_short (s, w) {
-//    put_byte(s, (uch)((w) & 0xff));
-//    put_byte(s, (uch)((ush)(w) >> 8));
-  s.pending_buf[s.pending++] = (w) & 0xff;
-  s.pending_buf[s.pending++] = (w >>> 8) & 0xff;
-}
-
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-function send_bits(s, value, length) {
-  if (s.bi_valid > (Buf_size - length)) {
-    s.bi_buf |= (value << s.bi_valid) & 0xffff;
-    put_short(s, s.bi_buf);
-    s.bi_buf = value >> (Buf_size - s.bi_valid);
-    s.bi_valid += length - Buf_size;
-  } else {
-    s.bi_buf |= (value << s.bi_valid) & 0xffff;
-    s.bi_valid += length;
-  }
-}
-
-
-function send_code(s, c, tree) {
-  send_bits(s, tree[c*2]/*.Code*/, tree[c*2 + 1]/*.Len*/);
-}
-
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-function bi_reverse(code, len) {
-  var res = 0;
-  do {
-    res |= code & 1;
-    code >>>= 1;
-    res <<= 1;
-  } while (--len > 0);
-  return res >>> 1;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-function bi_flush(s) {
-  if (s.bi_valid === 16) {
-    put_short(s, s.bi_buf);
-    s.bi_buf = 0;
-    s.bi_valid = 0;
-
-  } else if (s.bi_valid >= 8) {
-    s.pending_buf[s.pending++] = s.bi_buf & 0xff;
-    s.bi_buf >>= 8;
-    s.bi_valid -= 8;
-  }
-}
-
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-function gen_bitlen(s, desc)
-//    deflate_state *s;
-//    tree_desc *desc;    /* the tree descriptor */
-{
-  var tree            = desc.dyn_tree;
-  var max_code        = desc.max_code;
-  var stree           = desc.stat_desc.static_tree;
-  var has_stree       = desc.stat_desc.has_stree;
-  var extra           = desc.stat_desc.extra_bits;
-  var base            = desc.stat_desc.extra_base;
-  var max_length      = desc.stat_desc.max_length;
-  var h;              /* heap index */
-  var n, m;           /* iterate over the tree elements */
-  var bits;           /* bit length */
-  var xbits;          /* extra bits */
-  var f;              /* frequency */
-  var overflow = 0;   /* number of elements with bit length too large */
-
-  for (bits = 0; bits <= MAX_BITS; bits++) {
-    s.bl_count[bits] = 0;
-  }
-
-  /* In a first pass, compute the optimal bit lengths (which may
-   * overflow in the case of the bit length tree).
-   */
-  tree[s.heap[s.heap_max]*2 + 1]/*.Len*/ = 0; /* root of the heap */
-
-  for (h = s.heap_max+1; h < HEAP_SIZE; h++) {
-    n = s.heap[h];
-    bits = tree[tree[n*2 +1]/*.Dad*/ * 2 + 1]/*.Len*/ + 1;
-    if (bits > max_length) {
-      bits = max_length;
-      overflow++;
-    }
-    tree[n*2 + 1]/*.Len*/ = bits;
-    /* We overwrite tree[n].Dad which is no longer needed */
-
-    if (n > max_code) { continue; } /* not a leaf node */
-
-    s.bl_count[bits]++;
-    xbits = 0;
-    if (n >= base) {
-      xbits = extra[n-base];
-    }
-    f = tree[n * 2]/*.Freq*/;
-    s.opt_len += f * (bits + xbits);
-    if (has_stree) {
-      s.static_len += f * (stree[n*2 + 1]/*.Len*/ + xbits);
-    }
-  }
-  if (overflow === 0) { return; }
-
-  // Trace((stderr,"\nbit length overflow\n"));
-  /* This happens for example on obj2 and pic of the Calgary corpus */
-
-  /* Find the first bit length which could increase: */
-  do {
-    bits = max_length-1;
-    while (s.bl_count[bits] === 0) { bits--; }
-    s.bl_count[bits]--;      /* move one leaf down the tree */
-    s.bl_count[bits+1] += 2; /* move one overflow item as its brother */
-    s.bl_count[max_length]--;
-    /* The brother of the overflow item also moves one step up,
-     * but this does not affect bl_count[max_length]
-     */
-    overflow -= 2;
-  } while (overflow > 0);
-
-  /* Now recompute all bit lengths, scanning in increasing frequency.
-   * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-   * lengths instead of fixing only the wrong ones. This idea is taken
-   * from 'ar' written by Haruhiko Okumura.)
-   */
-  for (bits = max_length; bits !== 0; bits--) {
-    n = s.bl_count[bits];
-    while (n !== 0) {
-      m = s.heap[--h];
-      if (m > max_code) { continue; }
-      if (tree[m*2 + 1]/*.Len*/ !== bits) {
-        // Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-        s.opt_len += (bits - tree[m*2 + 1]/*.Len*/)*tree[m*2]/*.Freq*/;
-        tree[m*2 + 1]/*.Len*/ = bits;
-      }
-      n--;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-function gen_codes(tree, max_code, bl_count)
-//    ct_data *tree;             /* the tree to decorate */
-//    int max_code;              /* largest code with non zero frequency */
-//    ushf *bl_count;            /* number of codes at each bit length */
-{
-  var next_code = new Array(MAX_BITS+1); /* next code value for each bit length */
-  var code = 0;              /* running code value */
-  var bits;                  /* bit index */
-  var n;                     /* code index */
-
-  /* The distribution counts are first used to generate the code values
-   * without bit reversal.
-   */
-  for (bits = 1; bits <= MAX_BITS; bits++) {
-    next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-  }
-  /* Check that the bit counts in bl_count are consistent. The last code
-   * must be all ones.
-   */
-  //Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-  //        "inconsistent bit counts");
-  //Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-  for (n = 0;  n <= max_code; n++) {
-    var len = tree[n*2 + 1]/*.Len*/;
-    if (len === 0) { continue; }
-    /* Now reverse the bits */
-    tree[n*2]/*.Code*/ = bi_reverse(next_code[len]++, len);
-
-    //Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-    //     n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-  }
-}
-
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-function tr_static_init() {
-  var n;        /* iterates over tree elements */
-  var bits;     /* bit counter */
-  var length;   /* length value */
-  var code;     /* code value */
-  var dist;     /* distance index */
-  var bl_count = new Array(MAX_BITS+1);
-  /* number of codes at each bit length for an optimal tree */
-
-  // do check in _tr_init()
-  //if (static_init_done) return;
-
-  /* For some embedded targets, global variables are not initialized: */
-/*#ifdef NO_INIT_GLOBAL_POINTERS
-  static_l_desc.static_tree = static_ltree;
-  static_l_desc.extra_bits = extra_lbits;
-  static_d_desc.static_tree = static_dtree;
-  static_d_desc.extra_bits = extra_dbits;
-  static_bl_desc.extra_bits = extra_blbits;
-#endif*/
-
-  /* Initialize the mapping length (0..255) -> length code (0..28) */
-  length = 0;
-  for (code = 0; code < LENGTH_CODES-1; code++) {
-    base_length[code] = length;
-    for (n = 0; n < (1<<extra_lbits[code]); n++) {
-      _length_code[length++] = code;
-    }
-  }
-  //Assert (length == 256, "tr_static_init: length != 256");
-  /* Note that the length 255 (match length 258) can be represented
-   * in two different ways: code 284 + 5 bits or code 285, so we
-   * overwrite length_code[255] to use the best encoding:
-   */
-  _length_code[length-1] = code;
-
-  /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-  dist = 0;
-  for (code = 0 ; code < 16; code++) {
-    base_dist[code] = dist;
-    for (n = 0; n < (1<<extra_dbits[code]); n++) {
-      _dist_code[dist++] = code;
-    }
-  }
-  //Assert (dist == 256, "tr_static_init: dist != 256");
-  dist >>= 7; /* from now on, all distances are divided by 128 */
-  for ( ; code < D_CODES; code++) {
-    base_dist[code] = dist << 7;
-    for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-      _dist_code[256 + dist++] = code;
-    }
-  }
-  //Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-  /* Construct the codes of the static literal tree */
-  for (bits = 0; bits <= MAX_BITS; bits++) {
-    bl_count[bits] = 0;
-  }
-
-  n = 0;
-  while (n <= 143) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
-    n++;
-    bl_count[8]++;
-  }
-  while (n <= 255) {
-    static_ltree[n*2 + 1]/*.Len*/ = 9;
-    n++;
-    bl_count[9]++;
-  }
-  while (n <= 279) {
-    static_ltree[n*2 + 1]/*.Len*/ = 7;
-    n++;
-    bl_count[7]++;
-  }
-  while (n <= 287) {
-    static_ltree[n*2 + 1]/*.Len*/ = 8;
-    n++;
-    bl_count[8]++;
-  }
-  /* Codes 286 and 287 do not exist, but we must include them in the
-   * tree construction to get a canonical Huffman tree (longest code
-   * all ones)
-   */
-  gen_codes(static_ltree, L_CODES+1, bl_count);
-
-  /* The static distance tree is trivial: */
-  for (n = 0; n < D_CODES; n++) {
-    static_dtree[n*2 + 1]/*.Len*/ = 5;
-    static_dtree[n*2]/*.Code*/ = bi_reverse(n, 5);
-  }
-
-  // Now data ready and we can init static trees
-  static_l_desc = new StaticTreeDesc(static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS);
-  static_d_desc = new StaticTreeDesc(static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS);
-  static_bl_desc =new StaticTreeDesc(new Array(0), extra_blbits, 0,         BL_CODES, MAX_BL_BITS);
-
-  //static_init_done = true;
-}
-
-
-/* ===========================================================================
- * Initialize a new block.
- */
-function init_block(s) {
-  var n; /* iterates over tree elements */
-
-  /* Initialize the trees. */
-  for (n = 0; n < L_CODES;  n++) { s.dyn_ltree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < D_CODES;  n++) { s.dyn_dtree[n*2]/*.Freq*/ = 0; }
-  for (n = 0; n < BL_CODES; n++) { s.bl_tree[n*2]/*.Freq*/ = 0; }
-
-  s.dyn_ltree[END_BLOCK*2]/*.Freq*/ = 1;
-  s.opt_len = s.static_len = 0;
-  s.last_lit = s.matches = 0;
-}
-
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-function bi_windup(s)
-{
-  if (s.bi_valid > 8) {
-    put_short(s, s.bi_buf);
-  } else if (s.bi_valid > 0) {
-    //put_byte(s, (Byte)s->bi_buf);
-    s.pending_buf[s.pending++] = s.bi_buf;
-  }
-  s.bi_buf = 0;
-  s.bi_valid = 0;
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-function copy_block(s, buf, len, header)
-//DeflateState *s;
-//charf    *buf;    /* the input data */
-//unsigned len;     /* its length */
-//int      header;  /* true if block header must be written */
-{
-  bi_windup(s);        /* align on byte boundary */
-
-  if (header) {
-    put_short(s, len);
-    put_short(s, ~len);
-  }
-//  while (len--) {
-//    put_byte(s, *buf++);
-//  }
-  utils.arraySet(s.pending_buf, s.window, buf, len, s.pending);
-  s.pending += len;
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-function smaller(tree, n, m, depth) {
-  var _n2 = n*2;
-  var _m2 = m*2;
-  return (tree[_n2]/*.Freq*/ < tree[_m2]/*.Freq*/ ||
-         (tree[_n2]/*.Freq*/ === tree[_m2]/*.Freq*/ && depth[n] <= depth[m]));
-}
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-function pqdownheap(s, tree, k)
-//    deflate_state *s;
-//    ct_data *tree;  /* the tree to restore */
-//    int k;               /* node to move down */
-{
-  var v = s.heap[k];
-  var j = k << 1;  /* left son of k */
-  while (j <= s.heap_len) {
-    /* Set j to the smallest of the two sons: */
-    if (j < s.heap_len &&
-      smaller(tree, s.heap[j+1], s.heap[j], s.depth)) {
-      j++;
-    }
-    /* Exit if v is smaller than both sons */
-    if (smaller(tree, v, s.heap[j], s.depth)) { break; }
-
-    /* Exchange v with the smallest son */
-    s.heap[k] = s.heap[j];
-    k = j;
-
-    /* And continue down the tree, setting j to the left son of k */
-    j <<= 1;
-  }
-  s.heap[k] = v;
-}
-
-
-// inlined manually
-// var SMALLEST = 1;
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-function compress_block(s, ltree, dtree)
-//    deflate_state *s;
-//    const ct_data *ltree; /* literal tree */
-//    const ct_data *dtree; /* distance tree */
-{
-  var dist;           /* distance of matched string */
-  var lc;             /* match length or unmatched char (if dist == 0) */
-  var lx = 0;         /* running index in l_buf */
-  var code;           /* the code to send */
-  var extra;          /* number of extra bits to send */
-
-  if (s.last_lit !== 0) {
-    do {
-      dist = (s.pending_buf[s.d_buf + lx*2] << 8) | (s.pending_buf[s.d_buf + lx*2 + 1]);
-      lc = s.pending_buf[s.l_buf + lx];
-      lx++;
-
-      if (dist === 0) {
-        send_code(s, lc, ltree); /* send a literal byte */
-        //Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-      } else {
-        /* Here, lc is the match length - MIN_MATCH */
-        code = _length_code[lc];
-        send_code(s, code+LITERALS+1, ltree); /* send the length code */
-        extra = extra_lbits[code];
-        if (extra !== 0) {
-          lc -= base_length[code];
-          send_bits(s, lc, extra);       /* send the extra length bits */
-        }
-        dist--; /* dist is now the match distance - 1 */
-        code = d_code(dist);
-        //Assert (code < D_CODES, "bad d_code");
-
-        send_code(s, code, dtree);       /* send the distance code */
-        extra = extra_dbits[code];
-        if (extra !== 0) {
-          dist -= base_dist[code];
-          send_bits(s, dist, extra);   /* send the extra distance bits */
-        }
-      } /* literal or match pair ? */
-
-      /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-      //Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-      //       "pendingBuf overflow");
-
-    } while (lx < s.last_lit);
-  }
-
-  send_code(s, END_BLOCK, ltree);
-}
-
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-function build_tree(s, desc)
-//    deflate_state *s;
-//    tree_desc *desc; /* the tree descriptor */
-{
-  var tree     = desc.dyn_tree;
-  var stree    = desc.stat_desc.static_tree;
-  var has_stree = desc.stat_desc.has_stree;
-  var elems    = desc.stat_desc.elems;
-  var n, m;          /* iterate over heap elements */
-  var max_code = -1; /* largest code with non zero frequency */
-  var node;          /* new node being created */
-
-  /* Construct the initial heap, with least frequent element in
-   * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-   * heap[0] is not used.
-   */
-  s.heap_len = 0;
-  s.heap_max = HEAP_SIZE;
-
-  for (n = 0; n < elems; n++) {
-    if (tree[n * 2]/*.Freq*/ !== 0) {
-      s.heap[++s.heap_len] = max_code = n;
-      s.depth[n] = 0;
-
-    } else {
-      tree[n*2 + 1]/*.Len*/ = 0;
-    }
-  }
-
-  /* The pkzip format requires that at least one distance code exists,
-   * and that at least one bit should be sent even if there is only one
-   * possible code. So to avoid special checks later on we force at least
-   * two codes of non zero frequency.
-   */
-  while (s.heap_len < 2) {
-    node = s.heap[++s.heap_len] = (max_code < 2 ? ++max_code : 0);
-    tree[node * 2]/*.Freq*/ = 1;
-    s.depth[node] = 0;
-    s.opt_len--;
-
-    if (has_stree) {
-      s.static_len -= stree[node*2 + 1]/*.Len*/;
-    }
-    /* node is 0 or 1 so it does not have extra bits */
-  }
-  desc.max_code = max_code;
-
-  /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-   * establish sub-heaps of increasing lengths:
-   */
-  for (n = (s.heap_len >> 1/*int /2*/); n >= 1; n--) { pqdownheap(s, tree, n); }
-
-  /* Construct the Huffman tree by repeatedly combining the least two
-   * frequent nodes.
-   */
-  node = elems;              /* next internal node of the tree */
-  do {
-    //pqremove(s, tree, n);  /* n = node of least frequency */
-    /*** pqremove ***/
-    n = s.heap[1/*SMALLEST*/];
-    s.heap[1/*SMALLEST*/] = s.heap[s.heap_len--];
-    pqdownheap(s, tree, 1/*SMALLEST*/);
-    /***/
-
-    m = s.heap[1/*SMALLEST*/]; /* m = node of next least frequency */
-
-    s.heap[--s.heap_max] = n; /* keep the nodes sorted by frequency */
-    s.heap[--s.heap_max] = m;
-
-    /* Create a new node father of n and m */
-    tree[node * 2]/*.Freq*/ = tree[n * 2]/*.Freq*/ + tree[m * 2]/*.Freq*/;
-    s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
-    tree[n*2 + 1]/*.Dad*/ = tree[m*2 + 1]/*.Dad*/ = node;
-
-    /* and insert the new node in the heap */
-    s.heap[1/*SMALLEST*/] = node++;
-    pqdownheap(s, tree, 1/*SMALLEST*/);
-
-  } while (s.heap_len >= 2);
-
-  s.heap[--s.heap_max] = s.heap[1/*SMALLEST*/];
-
-  /* At this point, the fields freq and dad are set. We can now
-   * generate the bit lengths.
-   */
-  gen_bitlen(s, desc);
-
-  /* The field len is now set, we can generate the bit codes */
-  gen_codes(tree, max_code, s.bl_count);
-}
-
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-function scan_tree(s, tree, max_code)
-//    deflate_state *s;
-//    ct_data *tree;   /* the tree to be scanned */
-//    int max_code;    /* and its largest code of non zero frequency */
-{
-  var n;                     /* iterates over all tree elements */
-  var prevlen = -1;          /* last emitted length */
-  var curlen;                /* length of current code */
-
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
-  var count = 0;             /* repeat count of the current code */
-  var max_count = 7;         /* max repeat count */
-  var min_count = 4;         /* min repeat count */
-
-  if (nextlen === 0) {
-    max_count = 138;
-    min_count = 3;
-  }
-  tree[(max_code+1)*2 + 1]/*.Len*/ = 0xffff; /* guard */
-
-  for (n = 0; n <= max_code; n++) {
-    curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
-    if (++count < max_count && curlen === nextlen) {
-      continue;
-
-    } else if (count < min_count) {
-      s.bl_tree[curlen * 2]/*.Freq*/ += count;
-
-    } else if (curlen !== 0) {
-
-      if (curlen !== prevlen) { s.bl_tree[curlen * 2]/*.Freq*/++; }
-      s.bl_tree[REP_3_6*2]/*.Freq*/++;
-
-    } else if (count <= 10) {
-      s.bl_tree[REPZ_3_10*2]/*.Freq*/++;
-
-    } else {
-      s.bl_tree[REPZ_11_138*2]/*.Freq*/++;
-    }
-
-    count = 0;
-    prevlen = curlen;
-
-    if (nextlen === 0) {
-      max_count = 138;
-      min_count = 3;
-
-    } else if (curlen === nextlen) {
-      max_count = 6;
-      min_count = 3;
-
-    } else {
-      max_count = 7;
-      min_count = 4;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-function send_tree(s, tree, max_code)
-//    deflate_state *s;
-//    ct_data *tree; /* the tree to be scanned */
-//    int max_code;       /* and its largest code of non zero frequency */
-{
-  var n;                     /* iterates over all tree elements */
-  var prevlen = -1;          /* last emitted length */
-  var curlen;                /* length of current code */
-
-  var nextlen = tree[0*2 + 1]/*.Len*/; /* length of next code */
-
-  var count = 0;             /* repeat count of the current code */
-  var max_count = 7;         /* max repeat count */
-  var min_count = 4;         /* min repeat count */
-
-  /* tree[max_code+1].Len = -1; */  /* guard already set */
-  if (nextlen === 0) {
-    max_count = 138;
-    min_count = 3;
-  }
-
-  for (n = 0; n <= max_code; n++) {
-    curlen = nextlen;
-    nextlen = tree[(n+1)*2 + 1]/*.Len*/;
-
-    if (++count < max_count && curlen === nextlen) {
-      continue;
-
-    } else if (count < min_count) {
-      do { send_code(s, curlen, s.bl_tree); } while (--count !== 0);
-
-    } else if (curlen !== 0) {
-      if (curlen !== prevlen) {
-        send_code(s, curlen, s.bl_tree);
-        count--;
-      }
-      //Assert(count >= 3 && count <= 6, " 3_6?");
-      send_code(s, REP_3_6, s.bl_tree);
-      send_bits(s, count-3, 2);
-
-    } else if (count <= 10) {
-      send_code(s, REPZ_3_10, s.bl_tree);
-      send_bits(s, count-3, 3);
-
-    } else {
-      send_code(s, REPZ_11_138, s.bl_tree);
-      send_bits(s, count-11, 7);
-    }
-
-    count = 0;
-    prevlen = curlen;
-    if (nextlen === 0) {
-      max_count = 138;
-      min_count = 3;
-
-    } else if (curlen === nextlen) {
-      max_count = 6;
-      min_count = 3;
-
-    } else {
-      max_count = 7;
-      min_count = 4;
-    }
-  }
-}
-
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-function build_bl_tree(s) {
-  var max_blindex;  /* index of last bit length code of non zero freq */
-
-  /* Determine the bit length frequencies for literal and distance trees */
-  scan_tree(s, s.dyn_ltree, s.l_desc.max_code);
-  scan_tree(s, s.dyn_dtree, s.d_desc.max_code);
-
-  /* Build the bit length tree: */
-  build_tree(s, s.bl_desc);
-  /* opt_len now includes the length of the tree representations, except
-   * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-   */
-
-  /* Determine the number of bit length codes to send. The pkzip format
-   * requires that at least 4 bit length codes be sent. (appnote.txt says
-   * 3 but the actual value used is 4.)
-   */
-  for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-    if (s.bl_tree[bl_order[max_blindex]*2 + 1]/*.Len*/ !== 0) {
-      break;
-    }
-  }
-  /* Update opt_len to include the bit length tree and counts */
-  s.opt_len += 3*(max_blindex+1) + 5+5+4;
-  //Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-  //        s->opt_len, s->static_len));
-
-  return max_blindex;
-}
-
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-function send_all_trees(s, lcodes, dcodes, blcodes)
-//    deflate_state *s;
-//    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-  var rank;                    /* index in bl_order */
-
-  //Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-  //Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-  //        "too many codes");
-  //Tracev((stderr, "\nbl counts: "));
-  send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-  send_bits(s, dcodes-1,   5);
-  send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-  for (rank = 0; rank < blcodes; rank++) {
-    //Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-    send_bits(s, s.bl_tree[bl_order[rank]*2 + 1]/*.Len*/, 3);
-  }
-  //Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-  send_tree(s, s.dyn_ltree, lcodes-1); /* literal tree */
-  //Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-  send_tree(s, s.dyn_dtree, dcodes-1); /* distance tree */
-  //Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-function detect_data_type(s) {
-  /* black_mask is the bit mask of black-listed bytes
-   * set bits 0..6, 14..25, and 28..31
-   * 0xf3ffc07f = binary 11110011111111111100000001111111
-   */
-  var black_mask = 0xf3ffc07f;
-  var n;
-
-  /* Check for non-textual ("black-listed") bytes. */
-  for (n = 0; n <= 31; n++, black_mask >>>= 1) {
-    if ((black_mask & 1) && (s.dyn_ltree[n*2]/*.Freq*/ !== 0)) {
-      return Z_BINARY;
-    }
-  }
-
-  /* Check for textual ("white-listed") bytes. */
-  if (s.dyn_ltree[9 * 2]/*.Freq*/ !== 0 || s.dyn_ltree[10 * 2]/*.Freq*/ !== 0 ||
-      s.dyn_ltree[13 * 2]/*.Freq*/ !== 0) {
-    return Z_TEXT;
-  }
-  for (n = 32; n < LITERALS; n++) {
-    if (s.dyn_ltree[n * 2]/*.Freq*/ !== 0) {
-      return Z_TEXT;
-    }
-  }
-
-  /* There are no "black-listed" or "white-listed" bytes:
-   * this stream either is empty or has tolerated ("gray-listed") bytes only.
-   */
-  return Z_BINARY;
-}
-
-
-var static_init_done = false;
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-function _tr_init(s)
-{
-
-  if (!static_init_done) {
-    tr_static_init();
-    static_init_done = true;
-  }
-
-  s.l_desc  = new TreeDesc(s.dyn_ltree, static_l_desc);
-  s.d_desc  = new TreeDesc(s.dyn_dtree, static_d_desc);
-  s.bl_desc = new TreeDesc(s.bl_tree, static_bl_desc);
-
-  s.bi_buf = 0;
-  s.bi_valid = 0;
-
-  /* Initialize the first block of the first file: */
-  init_block(s);
-}
-
-
-/* ===========================================================================
- * Send a stored block
- */
-function _tr_stored_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf;       /* input block */
-//ulg stored_len;   /* length of input block */
-//int last;         /* one if this is the last block for a file */
-{
-  send_bits(s, (STORED_BLOCK<<1)+(last ? 1 : 0), 3);    /* send block type */
-  copy_block(s, buf, stored_len, true); /* with header */
-}
-
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-function _tr_align(s) {
-  send_bits(s, STATIC_TREES<<1, 3);
-  send_code(s, END_BLOCK, static_ltree);
-  bi_flush(s);
-}
-
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-function _tr_flush_block(s, buf, stored_len, last)
-//DeflateState *s;
-//charf *buf;       /* input block, or NULL if too old */
-//ulg stored_len;   /* length of input block */
-//int last;         /* one if this is the last block for a file */
-{
-  var opt_lenb, static_lenb;  /* opt_len and static_len in bytes */
-  var max_blindex = 0;        /* index of last bit length code of non zero freq */
-
-  /* Build the Huffman trees unless a stored block is forced */
-  if (s.level > 0) {
-
-    /* Check if the file is binary or text */
-    if (s.strm.data_type === Z_UNKNOWN) {
-      s.strm.data_type = detect_data_type(s);
-    }
-
-    /* Construct the literal and distance trees */
-    build_tree(s, s.l_desc);
-    // Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-    //        s->static_len));
-
-    build_tree(s, s.d_desc);
-    // Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-    //        s->static_len));
-    /* At this point, opt_len and static_len are the total bit lengths of
-     * the compressed block data, excluding the tree representations.
-     */
-
-    /* Build the bit length tree for the above two trees, and get the index
-     * in bl_order of the last bit length code to send.
-     */
-    max_blindex = build_bl_tree(s);
-
-    /* Determine the best encoding. Compute the block lengths in bytes. */
-    opt_lenb = (s.opt_len+3+7) >>> 3;
-    static_lenb = (s.static_len+3+7) >>> 3;
-
-    // Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-    //        opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-    //        s->last_lit));
-
-    if (static_lenb <= opt_lenb) { opt_lenb = static_lenb; }
-
-  } else {
-    // Assert(buf != (char*)0, "lost buf");
-    opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-  }
-
-  if ((stored_len+4 <= opt_lenb) && (buf !== -1)) {
-    /* 4: two words for the lengths */
-
-    /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-     * Otherwise we can't have processed more than WSIZE input bytes since
-     * the last block flush, because compression would have been
-     * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-     * transform a block into a stored block.
-     */
-    _tr_stored_block(s, buf, stored_len, last);
-
-  } else if (s.strategy === Z_FIXED || static_lenb === opt_lenb) {
-
-    send_bits(s, (STATIC_TREES<<1) + (last ? 1 : 0), 3);
-    compress_block(s, static_ltree, static_dtree);
-
-  } else {
-    send_bits(s, (DYN_TREES<<1) + (last ? 1 : 0), 3);
-    send_all_trees(s, s.l_desc.max_code+1, s.d_desc.max_code+1, max_blindex+1);
-    compress_block(s, s.dyn_ltree, s.dyn_dtree);
-  }
-  // Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-  /* The above check is made mod 2^32, for files larger than 512 MB
-   * and uLong implemented on 32 bits.
-   */
-  init_block(s);
-
-  if (last) {
-    bi_windup(s);
-  }
-  // Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-  //       s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-function _tr_tally(s, dist, lc)
-//    deflate_state *s;
-//    unsigned dist;  /* distance of matched string */
-//    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-  //var out_length, in_length, dcode;
-
-  s.pending_buf[s.d_buf + s.last_lit * 2]     = (dist >>> 8) & 0xff;
-  s.pending_buf[s.d_buf + s.last_lit * 2 + 1] = dist & 0xff;
-
-  s.pending_buf[s.l_buf + s.last_lit] = lc & 0xff;
-  s.last_lit++;
-
-  if (dist === 0) {
-    /* lc is the unmatched char */
-    s.dyn_ltree[lc*2]/*.Freq*/++;
-  } else {
-    s.matches++;
-    /* Here, lc is the match length - MIN_MATCH */
-    dist--;             /* dist = match distance - 1 */
-    //Assert((ush)dist < (ush)MAX_DIST(s) &&
-    //       (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-    //       (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-    s.dyn_ltree[(_length_code[lc]+LITERALS+1) * 2]/*.Freq*/++;
-    s.dyn_dtree[d_code(dist) * 2]/*.Freq*/++;
-  }
-
-// (!) This block is disabled in zlib defailts,
-// don't enable it for binary compatibility
-
-//#ifdef TRUNCATE_BLOCK
-//  /* Try to guess if it is profitable to stop the current block here */
-//  if ((s.last_lit & 0x1fff) === 0 && s.level > 2) {
-//    /* Compute an upper bound for the compressed length */
-//    out_length = s.last_lit*8;
-//    in_length = s.strstart - s.block_start;
-//
-//    for (dcode = 0; dcode < D_CODES; dcode++) {
-//      out_length += s.dyn_dtree[dcode*2]/*.Freq*/ * (5 + extra_dbits[dcode]);
-//    }
-//    out_length >>>= 3;
-//    //Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-//    //       s->last_lit, in_length, out_length,
-//    //       100L - out_length*100L/in_length));
-//    if (s.matches < (s.last_lit>>1)/*int /2*/ && out_length < (in_length>>1)/*int /2*/) {
-//      return true;
-//    }
-//  }
-//#endif
-
-  return (s.last_lit === s.lit_bufsize-1);
-  /* We avoid equality with lit_bufsize because of wraparound at 64K
-   * on 16 bit machines and because stored blocks are restricted to
-   * 64K-1 bytes.
-   */
-}
-
-exports._tr_init  = _tr_init;
-exports._tr_stored_block = _tr_stored_block;
-exports._tr_flush_block  = _tr_flush_block;
-exports._tr_tally = _tr_tally;
-exports._tr_align = _tr_align;
-},{"../utils/common":27}],39:[function(_dereq_,module,exports){
-'use strict';
-
-
-function ZStream() {
-  /* next input byte */
-  this.input = null; // JS specific, because we have no pointers
-  this.next_in = 0;
-  /* number of bytes available at input */
-  this.avail_in = 0;
-  /* total number of input bytes read so far */
-  this.total_in = 0;
-  /* next output byte should be put there */
-  this.output = null; // JS specific, because we have no pointers
-  this.next_out = 0;
-  /* remaining free space at output */
-  this.avail_out = 0;
-  /* total number of bytes output so far */
-  this.total_out = 0;
-  /* last error message, NULL if no error */
-  this.msg = ''/*Z_NULL*/;
-  /* not visible by applications */
-  this.state = null;
-  /* best guess about the data type: binary or text */
-  this.data_type = 2/*Z_UNKNOWN*/;
-  /* adler32 value of the uncompressed data */
-  this.adler = 0;
-}
-
-module.exports = ZStream;
-},{}]},{},[9])
-(9)
-});
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.min.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.min.js
deleted file mode 100644
index 8b8c550763c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/jquery/jszip/dist/jszip.min.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
-
-JSZip - A Javascript class for generating and reading zip files
-<http://stuartk.com/jszip>
-
-(c) 2009-2014 Stuart Knightley <stuart [at] stuartk.com>
-Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
-
-JSZip uses the library pako released under the MIT license :
-https://github.com/nodeca/pako/blob/master/LICENSE
-*/
-!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;"undefined"!=typeof window?b=window:"undefined"!=typeof global?b=global:"undefined"!=typeof self&&(b=self),b.JSZip=a()}}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){"use strict";var d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";c.encode=function(a){for(var b,c,e,f,g,h,i,j="",k=0;k<a.length;)b=a.charCodeAt(k++),c=a.charCodeAt(k++),e=a.charCodeAt(k++),f=b>>2,g=(3&b)<<4|c>>4,h=(15&c)<<2|e>>6,i=63&e,isNaN(c)?h=i=64:isNaN(e)&&(i=64),j=j+d.charAt(f)+d.charAt(g)+d.charAt(h)+d.charAt(i);return j},c.decode=function(a){var b,c,e,f,g,h,i,j="",k=0;for(a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<a.length;)f=d.indexOf(a.charAt(k++)),g=d.indexOf(a.charAt(k++)),h=d.indexOf(a.charAt(k++)),i=d.indexOf(a.charAt(k++)),b=f<<2|g>>4,c=(15&g)<<4|h>>2,e=(3&h)<<6|i,j+=String.fromCharCode(b),64!=h&&(j+=String.fromCharCode(c)),64!=i&&(j+=String.fromCharCode(e));return j}},{}],2:[function(a,b){"use strict";function c(){this.compressedSize=0,this.uncompressedSize=0,this.crc32=0,this.compressionMethod=null,this.compressedContent=null}c.prototype={getContent:function(){return null},getCompressedContent:function(){return null}},b.exports=c},{}],3:[function(a,b,c){"use strict";c.STORE={magic:"\x00\x00",compress:function(a){return a},uncompress:function(a){return a},compressInputType:null,uncompressInputType:null},c.DEFLATE=a("./flate")},{"./flate":8}],4:[function(a,b){"use strict";var c=a("./utils"),d=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,2932959818,3654703836,1088359270,936918e3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117];b.exports=function(a,b){if("undefined"==typeof a||!a.length)return 0;var e="string"!==c.getTypeOf(a);"undefined"==typeof b&&(b=0);var f=0,g=0,h=0;b=-1^b;for(var i=0,j=a.length;j>i;i++)h=e?a[i]:a.charCodeAt(i),g=255&(b^h),f=d[g],b=b>>>8^f;return-1^b}},{"./utils":21}],5:[function(a,b){"use strict";function c(){this.data=null,this.length=0,this.index=0}var d=a("./utils");c.prototype={checkOffset:function(a){this.checkIndex(this.index+a)},checkIndex:function(a){if(this.length<a||0>a)throw new Error("End of data reached (data length = "+this.length+", asked index = "+a+"). Corrupted zip ?")},setIndex:function(a){this.checkIndex(a),this.index=a},skip:function(a){this.setIndex(this.index+a)},byteAt:function(){},readInt:function(a){var b,c=0;for(this.checkOffset(a),b=this.index+a-1;b>=this.index;b--)c=(c<<8)+this.byteAt(b);return this.index+=a,c},readString:function(a){return d.transformTo("string",this.readData(a))},readData:function(){},lastIndexOfSignature:function(){},readDate:function(){var a=this.readInt(4);return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&31,a>>5&63,(31&a)<<1)}},b.exports=c},{"./utils":21}],6:[function(a,b,c){"use strict";c.base64=!1,c.binary=!1,c.dir=!1,c.createFolders=!1,c.date=null,c.compression=null,c.compressionOptions=null,c.comment=null,c.unixPermissions=null,c.dosPermissions=null},{}],7:[function(a,b,c){"use strict";var d=a("./utils");c.string2binary=function(a){return d.string2binary(a)},c.string2Uint8Array=function(a){return d.transformTo("uint8array",a)},c.uint8Array2String=function(a){return d.transformTo("string",a)},c.string2Blob=function(a){var b=d.transformTo("arraybuffer",a);return d.arrayBuffer2Blob(b)},c.arrayBuffer2Blob=function(a){return d.arrayBuffer2Blob(a)},c.transformTo=function(a,b){return d.transformTo(a,b)},c.getTypeOf=function(a){return d.getTypeOf(a)},c.checkSupport=function(a){return d.checkSupport(a)},c.MAX_VALUE_16BITS=d.MAX_VALUE_16BITS,c.MAX_VALUE_32BITS=d.MAX_VALUE_32BITS,c.pretty=function(a){return d.pretty(a)},c.findCompression=function(a){return d.findCompression(a)},c.isRegExp=function(a){return d.isRegExp(a)}},{"./utils":21}],8:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,e=a("pako");c.uncompressInputType=d?"uint8array":"array",c.compressInputType=d?"uint8array":"array",c.magic="\b\x00",c.compress=function(a,b){return e.deflateRaw(a,{level:b.level||-1})},c.uncompress=function(a){return e.inflateRaw(a)}},{pako:24}],9:[function(a,b){"use strict";function c(a,b){return this instanceof c?(this.files={},this.comment=null,this.root="",a&&this.load(a,b),void(this.clone=function(){var a=new c;for(var b in this)"function"!=typeof this[b]&&(a[b]=this[b]);return a})):new c(a,b)}var d=a("./base64");c.prototype=a("./object"),c.prototype.load=a("./load"),c.support=a("./support"),c.defaults=a("./defaults"),c.utils=a("./deprecatedPublicUtils"),c.base64={encode:function(a){return d.encode(a)},decode:function(a){return d.decode(a)}},c.compressions=a("./compressions"),b.exports=c},{"./base64":1,"./compressions":3,"./defaults":6,"./deprecatedPublicUtils":7,"./load":10,"./object":13,"./support":17}],10:[function(a,b){"use strict";var c=a("./base64"),d=a("./zipEntries");b.exports=function(a,b){var e,f,g,h;for(b=b||{},b.base64&&(a=c.decode(a)),f=new d(a,b),e=f.files,g=0;g<e.length;g++)h=e[g],this.file(h.fileName,h.decompressed,{binary:!0,optimizedBinaryString:!0,date:h.date,dir:h.dir,comment:h.fileComment.length?h.fileComment:null,unixPermissions:h.unixPermissions,dosPermissions:h.dosPermissions,createFolders:b.createFolders});return f.zipComment.length&&(this.comment=f.zipComment),this}},{"./base64":1,"./zipEntries":22}],11:[function(a,b){(function(a){"use strict";b.exports=function(b,c){return new a(b,c)},b.exports.test=function(b){return a.isBuffer(b)}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],12:[function(a,b){"use strict";function c(a){this.data=a,this.length=this.data.length,this.index=0}var d=a("./uint8ArrayReader");c.prototype=new d,c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./uint8ArrayReader":18}],13:[function(a,b){"use strict";var c=a("./support"),d=a("./utils"),e=a("./crc32"),f=a("./signature"),g=a("./defaults"),h=a("./base64"),i=a("./compressions"),j=a("./compressedObject"),k=a("./nodeBuffer"),l=a("./utf8"),m=a("./stringWriter"),n=a("./uint8ArrayWriter"),o=function(a){if(a._data instanceof j&&(a._data=a._data.getContent(),a.options.binary=!0,a.options.base64=!1,"uint8array"===d.getTypeOf(a._data))){var b=a._data;a._data=new Uint8Array(b.length),0!==b.length&&a._data.set(b,0)}return a._data},p=function(a){var b=o(a),e=d.getTypeOf(b);return"string"===e?!a.options.binary&&c.nodebuffer?k(b,"utf-8"):a.asBinary():b},q=function(a){var b=o(this);return null===b||"undefined"==typeof b?"":(this.options.base64&&(b=h.decode(b)),b=a&&this.options.binary?D.utf8decode(b):d.transformTo("string",b),a||this.options.binary||(b=d.transformTo("string",D.utf8encode(b))),b)},r=function(a,b,c){this.name=a,this.dir=c.dir,this.date=c.date,this.comment=c.comment,this.unixPermissions=c.unixPermissions,this.dosPermissions=c.dosPermissions,this._data=b,this.options=c,this._initialMetadata={dir:c.dir,date:c.date}};r.prototype={asText:function(){return q.call(this,!0)},asBinary:function(){return q.call(this,!1)},asNodeBuffer:function(){var a=p(this);return d.transformTo("nodebuffer",a)},asUint8Array:function(){var a=p(this);return d.transformTo("uint8array",a)},asArrayBuffer:function(){return this.asUint8Array().buffer}};var s=function(a,b){var c,d="";for(c=0;b>c;c++)d+=String.fromCharCode(255&a),a>>>=8;return d},t=function(){var a,b,c={};for(a=0;a<arguments.length;a++)for(b in arguments[a])arguments[a].hasOwnProperty(b)&&"undefined"==typeof c[b]&&(c[b]=arguments[a][b]);return c},u=function(a){return a=a||{},a.base64!==!0||null!==a.binary&&void 0!==a.binary||(a.binary=!0),a=t(a,g),a.date=a.date||new Date,null!==a.compression&&(a.compression=a.compression.toUpperCase()),a},v=function(a,b,c){var e,f=d.getTypeOf(b);if(c=u(c),"string"==typeof c.unixPermissions&&(c.unixPermissions=parseInt(c.unixPermissions,8)),c.unixPermissions&&16384&c.unixPermissions&&(c.dir=!0),c.dosPermissions&&16&c.dosPermissions&&(c.dir=!0),c.dir&&(a=x(a)),c.createFolders&&(e=w(a))&&y.call(this,e,!0),c.dir||null===b||"undefined"==typeof b)c.base64=!1,c.binary=!1,b=null,f=null;else if("string"===f)c.binary&&!c.base64&&c.optimizedBinaryString!==!0&&(b=d.string2binary(b));else{if(c.base64=!1,c.binary=!0,!(f||b instanceof j))throw new Error("The data of '"+a+"' is in an unsupported format !");"arraybuffer"===f&&(b=d.transformTo("uint8array",b))}var g=new r(a,b,c);return this.files[a]=g,g},w=function(a){"/"==a.slice(-1)&&(a=a.substring(0,a.length-1));var b=a.lastIndexOf("/");return b>0?a.substring(0,b):""},x=function(a){return"/"!=a.slice(-1)&&(a+="/"),a},y=function(a,b){return b="undefined"!=typeof b?b:!1,a=x(a),this.files[a]||v.call(this,a,null,{dir:!0,createFolders:b}),this.files[a]},z=function(a,b,c){var f,g=new j;return a._data instanceof j?(g.uncompressedSize=a._data.uncompressedSize,g.crc32=a._data.crc32,0===g.uncompressedSize||a.dir?(b=i.STORE,g.compressedContent="",g.crc32=0):a._data.compressionMethod===b.magic?g.compressedContent=a._data.getCompressedContent():(f=a._data.getContent(),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c))):(f=p(a),(!f||0===f.length||a.dir)&&(b=i.STORE,f=""),g.uncompressedSize=f.length,g.crc32=e(f),g.compressedContent=b.compress(d.transformTo(b.compressInputType,f),c)),g.compressedSize=g.compressedContent.length,g.compressionMethod=b.magic,g},A=function(a,b){var c=a;return a||(c=b?16893:33204),(65535&c)<<16},B=function(a){return 63&(a||0)},C=function(a,b,c,g,h){var i,j,k,m,n=(c.compressedContent,d.transformTo("string",l.utf8encode(b.name))),o=b.comment||"",p=d.transformTo("string",l.utf8encode(o)),q=n.length!==b.name.length,r=p.length!==o.length,t=b.options,u="",v="",w="";k=b._initialMetadata.dir!==b.dir?b.dir:t.dir,m=b._initialMetadata.date!==b.date?b.date:t.date;var x=0,y=0;k&&(x|=16),"UNIX"===h?(y=798,x|=A(b.unixPermissions,k)):(y=20,x|=B(b.dosPermissions,k)),i=m.getHours(),i<<=6,i|=m.getMinutes(),i<<=5,i|=m.getSeconds()/2,j=m.getFullYear()-1980,j<<=4,j|=m.getMonth()+1,j<<=5,j|=m.getDate(),q&&(v=s(1,1)+s(e(n),4)+n,u+="up"+s(v.length,2)+v),r&&(w=s(1,1)+s(this.crc32(p),4)+p,u+="uc"+s(w.length,2)+w);var z="";z+="\n\x00",z+=q||r?"\x00\b":"\x00\x00",z+=c.compressionMethod,z+=s(i,2),z+=s(j,2),z+=s(c.crc32,4),z+=s(c.compressedSize,4),z+=s(c.uncompressedSize,4),z+=s(n.length,2),z+=s(u.length,2);var C=f.LOCAL_FILE_HEADER+z+n+u,D=f.CENTRAL_FILE_HEADER+s(y,2)+z+s(p.length,2)+"\x00\x00\x00\x00"+s(x,4)+s(g,4)+n+u+p;return{fileRecord:C,dirRecord:D,compressedObject:c}},D={load:function(){throw new Error("Load method is not defined. Is the file jszip-load.js included ?")},filter:function(a){var b,c,d,e,f=[];for(b in this.files)this.files.hasOwnProperty(b)&&(d=this.files[b],e=new r(d.name,d._data,t(d.options)),c=b.slice(this.root.length,b.length),b.slice(0,this.root.length)===this.root&&a(c,e)&&f.push(e));return f},file:function(a,b,c){if(1===arguments.length){if(d.isRegExp(a)){var e=a;return this.filter(function(a,b){return!b.dir&&e.test(a)})}return this.filter(function(b,c){return!c.dir&&b===a})[0]||null}return a=this.root+a,v.call(this,a,b,c),this},folder:function(a){if(!a)return this;if(d.isRegExp(a))return this.filter(function(b,c){return c.dir&&a.test(b)});var b=this.root+a,c=y.call(this,b),e=this.clone();return e.root=c.name,e},remove:function(a){a=this.root+a;var b=this.files[a];if(b||("/"!=a.slice(-1)&&(a+="/"),b=this.files[a]),b&&!b.dir)delete this.files[a];else for(var c=this.filter(function(b,c){return c.name.slice(0,a.length)===a}),d=0;d<c.length;d++)delete this.files[c[d].name];return this},generate:function(a){a=t(a||{},{base64:!0,compression:"STORE",compressionOptions:null,type:"base64",platform:"DOS",comment:null,mimeType:"application/zip"}),d.checkSupport(a.type),("darwin"===a.platform||"freebsd"===a.platform||"linux"===a.platform||"sunos"===a.platform)&&(a.platform="UNIX"),"win32"===a.platform&&(a.platform="DOS");var b,c,e=[],g=0,j=0,k=d.transformTo("string",this.utf8encode(a.comment||this.comment||""));for(var l in this.files)if(this.files.hasOwnProperty(l)){var o=this.files[l],p=o.options.compression||a.compression.toUpperCase(),q=i[p];if(!q)throw new Error(p+" is not a valid compression method !");var r=o.options.compressionOptions||a.compressionOptions||{},u=z.call(this,o,q,r),v=C.call(this,l,o,u,g,a.platform);g+=v.fileRecord.length+u.compressedSize,j+=v.dirRecord.length,e.push(v)}var w="";w=f.CENTRAL_DIRECTORY_END+"\x00\x00\x00\x00"+s(e.length,2)+s(e.length,2)+s(j,4)+s(g,4)+s(k.length,2)+k;var x=a.type.toLowerCase();for(b="uint8array"===x||"arraybuffer"===x||"blob"===x||"nodebuffer"===x?new n(g+j+w.length):new m(g+j+w.length),c=0;c<e.length;c++)b.append(e[c].fileRecord),b.append(e[c].compressedObject.compressedContent);for(c=0;c<e.length;c++)b.append(e[c].dirRecord);b.append(w);var y=b.finalize();switch(a.type.toLowerCase()){case"uint8array":case"arraybuffer":case"nodebuffer":return d.transformTo(a.type.toLowerCase(),y);case"blob":return d.arrayBuffer2Blob(d.transformTo("arraybuffer",y),a.mimeType);case"base64":return a.base64?h.encode(y):y;default:return y}},crc32:function(a,b){return e(a,b)},utf8encode:function(a){return d.transformTo("string",l.utf8encode(a))},utf8decode:function(a){return l.utf8decode(a)}};b.exports=D},{"./base64":1,"./compressedObject":2,"./compressions":3,"./crc32":4,"./defaults":6,"./nodeBuffer":11,"./signature":14,"./stringWriter":16,"./support":17,"./uint8ArrayWriter":19,"./utf8":20,"./utils":21}],14:[function(a,b,c){"use strict";c.LOCAL_FILE_HEADER="PK",c.CENTRAL_FILE_HEADER="PK
",c.CENTRAL_DIRECTORY_END="PK",c.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",c.ZIP64_CENTRAL_DIRECTORY_END="PK",c.DATA_DESCRIPTOR="PK\b"},{}],15:[function(a,b){"use strict";function c(a,b){this.data=a,b||(this.data=e.string2binary(this.data)),this.length=this.data.length,this.index=0}var d=a("./dataReader"),e=a("./utils");c.prototype=new d,c.prototype.byteAt=function(a){return this.data.charCodeAt(a)},c.prototype.lastIndexOfSignature=function(a){return this.data.lastIndexOf(a)},c.prototype.readData=function(a){this.checkOffset(a);var b=this.data.slice(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5,"./utils":21}],16:[function(a,b){"use strict";var c=a("./utils"),d=function(){this.data=[]};d.prototype={append:function(a){a=c.transformTo("string",a),this.data.push(a)},finalize:function(){return this.data.join("")}},b.exports=d},{"./utils":21}],17:[function(a,b,c){(function(a){"use strict";if(c.base64=!0,c.array=!0,c.string=!0,c.arraybuffer="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof Uint8Array,c.nodebuffer="undefined"!=typeof a,c.uint8array="undefined"!=typeof Uint8Array,"undefined"==typeof ArrayBuffer)c.blob=!1;else{var b=new ArrayBuffer(0);try{c.blob=0===new Blob([b],{type:"application/zip"}).size}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;f.append(b),c.blob=0===f.getBlob("application/zip").size}catch(d){c.blob=!1}}}}).call(this,"undefined"!=typeof Buffer?Buffer:void 0)},{}],18:[function(a,b){"use strict";function c(a){a&&(this.data=a,this.length=this.data.length,this.index=0)}var d=a("./dataReader");c.prototype=new d,c.prototype.byteAt=function(a){return this.data[a]},c.prototype.lastIndexOfSignature=function(a){for(var b=a.charCodeAt(0),c=a.charCodeAt(1),d=a.charCodeAt(2),e=a.charCodeAt(3),f=this.length-4;f>=0;--f)if(this.data[f]===b&&this.data[f+1]===c&&this.data[f+2]===d&&this.data[f+3]===e)return f;return-1},c.prototype.readData=function(a){if(this.checkOffset(a),0===a)return new Uint8Array(0);var b=this.data.subarray(this.index,this.index+a);return this.index+=a,b},b.exports=c},{"./dataReader":5}],19:[function(a,b){"use strict";var c=a("./utils"),d=function(a){this.data=new Uint8Array(a),this.index=0};d.prototype={append:function(a){0!==a.length&&(a=c.transformTo("uint8array",a),this.data.set(a,this.index),this.index+=a.length)},finalize:function(){return this.data}},b.exports=d},{"./utils":21}],20:[function(a,b,c){"use strict";for(var d=a("./utils"),e=a("./support"),f=a("./nodeBuffer"),g=new Array(256),h=0;256>h;h++)g[h]=h>=252?6:h>=248?5:h>=240?4:h>=224?3:h>=192?2:1;g[254]=g[254]=1;var i=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=e.uint8array?new Uint8Array(i):new Array(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},j=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+g[a[c]]>b?c:b},k=function(a){var b,c,e,f,h=a.length,i=new Array(2*h);for(c=0,b=0;h>b;)if(e=a[b++],128>e)i[c++]=e;else if(f=g[e],f>4)i[c++]=65533,b+=f-1;else{for(e&=2===f?31:3===f?15:7;f>1&&h>b;)e=e<<6|63&a[b++],f--;f>1?i[c++]=65533:65536>e?i[c++]=e:(e-=65536,i[c++]=55296|e>>10&1023,i[c++]=56320|1023&e)}return i.length!==c&&(i.subarray?i=i.subarray(0,c):i.length=c),d.applyFromCharCode(i)};c.utf8encode=function(a){return e.nodebuffer?f(a,"utf-8"):i(a)},c.utf8decode=function(a){if(e.nodebuffer)return d.transformTo("nodebuffer",a).toString("utf-8");a=d.transformTo(e.uint8array?"uint8array":"array",a);for(var b=[],c=0,f=a.length,g=65536;f>c;){var h=j(a,Math.min(c+g,f));b.push(e.uint8array?k(a.subarray(c,h)):k(a.slice(c,h))),c=h}return b.join("")}},{"./nodeBuffer":11,"./support":17,"./utils":21}],21:[function(a,b,c){"use strict";function d(a){return a}function e(a,b){for(var c=0;c<a.length;++c)b[c]=255&a.charCodeAt(c);return b}function f(a){var b=65536,d=[],e=a.length,f=c.getTypeOf(a),g=0,h=!0;try{switch(f){case"uint8array":String.fromCharCode.apply(null,new Uint8Array(0));break;case"nodebuffer":String.fromCharCode.apply(null,j(0))}}catch(i){h=!1}if(!h){for(var k="",l=0;l<a.length;l++)k+=String.fromCharCode(a[l]);return k}for(;e>g&&b>1;)try{d.push("array"===f||"nodebuffer"===f?String.fromCharCode.apply(null,a.slice(g,Math.min(g+b,e))):String.fromCharCode.apply(null,a.subarray(g,Math.min(g+b,e)))),g+=b}catch(i){b=Math.floor(b/2)}return d.join("")}function g(a,b){for(var c=0;c<a.length;c++)b[c]=a[c];return b}var h=a("./support"),i=a("./compressions"),j=a("./nodeBuffer");c.string2binary=function(a){for(var b="",c=0;c<a.length;c++)b+=String.fromCharCode(255&a.charCodeAt(c));return b},c.arrayBuffer2Blob=function(a,b){c.checkSupport("blob"),b=b||"application/zip";try{return new Blob([a],{type:b})}catch(d){try{var e=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder||window.MSBlobBuilder,f=new e;return f.append(a),f.getBlob(b)}catch(d){throw new Error("Bug : can't construct the Blob.")}}},c.applyFromCharCode=f;var k={};k.string={string:d,array:function(a){return e(a,new Array(a.length))},arraybuffer:function(a){return k.string.uint8array(a).buffer},uint8array:function(a){return e(a,new Uint8Array(a.length))},nodebuffer:function(a){return e(a,j(a.length))}},k.array={string:f,array:d,arraybuffer:function(a){return new Uint8Array(a).buffer},uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(a)}},k.arraybuffer={string:function(a){return f(new Uint8Array(a))},array:function(a){return g(new Uint8Array(a),new Array(a.byteLength))},arraybuffer:d,uint8array:function(a){return new Uint8Array(a)},nodebuffer:function(a){return j(new Uint8Array(a))}},k.uint8array={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return a.buffer},uint8array:d,nodebuffer:function(a){return j(a)}},k.nodebuffer={string:f,array:function(a){return g(a,new Array(a.length))},arraybuffer:function(a){return k.nodebuffer.uint8array(a).buffer},uint8array:function(a){return g(a,new Uint8Array(a.length))},nodebuffer:d},c.transformTo=function(a,b){if(b||(b=""),!a)return b;c.checkSupport(a);var d=c.getTypeOf(b),e=k[d][a](b);return e},c.getTypeOf=function(a){return"string"==typeof a?"string":"[object Array]"===Object.prototype.toString.call(a)?"array":h.nodebuffer&&j.test(a)?"nodebuffer":h.uint8array&&a instanceof Uint8Array?"uint8array":h.arraybuffer&&a instanceof ArrayBuffer?"arraybuffer":void 0},c.checkSupport=function(a){var b=h[a.toLowerCase()];if(!b)throw new Error(a+" is not supported by this browser")},c.MAX_VALUE_16BITS=65535,c.MAX_VALUE_32BITS=-1,c.pretty=function(a){var b,c,d="";for(c=0;c<(a||"").length;c++)b=a.charCodeAt(c),d+="\\x"+(16>b?"0":"")+b.toString(16).toUpperCase();return d},c.findCompression=function(a){for(var b in i)if(i.hasOwnProperty(b)&&i[b].magic===a)return i[b];return null},c.isRegExp=function(a){return"[object RegExp]"===Object.prototype.toString.call(a)}},{"./compressions":3,"./nodeBuffer":11,"./support":17}],22:[function(a,b){"use strict";function c(a,b){this.files=[],this.loadOptions=b,a&&this.load(a)}var d=a("./stringReader"),e=a("./nodeBufferReader"),f=a("./uint8ArrayReader"),g=a("./utils"),h=a("./signature"),i=a("./zipEntry"),j=a("./support"),k=a("./object");c.prototype={checkSignature:function(a){var b=this.reader.readString(4);if(b!==a)throw new Error("Corrupted zip or bug : unexpected signature ("+g.pretty(b)+", expected "+g.pretty(a)+")")},readBlockEndOfCentral:function(){this.diskNumber=this.reader.readInt(2),this.diskWithCentralDirStart=this.reader.readInt(2),this.centralDirRecordsOnThisDisk=this.reader.readInt(2),this.centralDirRecords=this.reader.readInt(2),this.centralDirSize=this.reader.readInt(4),this.centralDirOffset=this.reader.readInt(4),this.zipCommentLength=this.reader.readInt(2),this.zipComment=this.reader.readString(this.zipCommentLength),this.zipComment=k.utf8decode(this.zipComment)},readBlockZip64EndOfCentral:function(){this.zip64EndOfCentralSize=this.reader.readInt(8),this.versionMadeBy=this.reader.readString(2),this.versionNeeded=this.reader.readInt(2),this.diskNumber=this.reader.readInt(4),this.diskWithCentralDirStart=this.reader.readInt(4),this.centralDirRecordsOnThisDisk=this.reader.readInt(8),this.centralDirRecords=this.reader.readInt(8),this.centralDirSize=this.reader.readInt(8),this.centralDirOffset=this.reader.readInt(8),this.zip64ExtensibleData={};for(var a,b,c,d=this.zip64EndOfCentralSize-44,e=0;d>e;)a=this.reader.readInt(2),b=this.reader.readInt(4),c=this.reader.readString(b),this.zip64ExtensibleData[a]={id:a,length:b,value:c}},readBlockZip64EndOfCentralLocator:function(){if(this.diskWithZip64CentralDirStart=this.reader.readInt(4),this.relativeOffsetEndOfZip64CentralDir=this.reader.readInt(8),this.disksCount=this.reader.readInt(4),this.disksCount>1)throw new Error("Multi-volumes zip are not supported")},readLocalFiles:function(){var a,b;for(a=0;a<this.files.length;a++)b=this.files[a],this.reader.setIndex(b.localHeaderOffset),this.checkSignature(h.LOCAL_FILE_HEADER),b.readLocalPart(this.reader),b.handleUTF8(),b.processAttributes()},readCentralDir:function(){var a;for(this.reader.setIndex(this.centralDirOffset);this.reader.readString(4)===h.CENTRAL_FILE_HEADER;)a=new i({zip64:this.zip64},this.loadOptions),a.readCentralPart(this.reader),this.files.push(a)},readEndOfCentral:function(){var a=this.reader.lastIndexOfSignature(h.CENTRAL_DIRECTORY_END);if(-1===a){var b=!0;try{this.reader.setIndex(0),this.checkSignature(h.LOCAL_FILE_HEADER),b=!1}catch(c){}throw new Error(b?"Can't find end of central directory : is this a zip file ? If it is, see http://stuk.github.io/jszip/documentation/howto/read_zip.html":"Corrupted zip : can't find end of central directory")}if(this.reader.setIndex(a),this.checkSignature(h.CENTRAL_DIRECTORY_END),this.readBlockEndOfCentral(),this.diskNumber===g.MAX_VALUE_16BITS||this.diskWithCentralDirStart===g.MAX_VALUE_16BITS||this.centralDirRecordsOnThisDisk===g.MAX_VALUE_16BITS||this.centralDirRecords===g.MAX_VALUE_16BITS||this.centralDirSize===g.MAX_VALUE_32BITS||this.centralDirOffset===g.MAX_VALUE_32BITS){if(this.zip64=!0,a=this.reader.lastIndexOfSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),-1===a)throw new Error("Corrupted zip : can't find the ZIP64 end of central directory locator");this.reader.setIndex(a),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_LOCATOR),this.readBlockZip64EndOfCentralLocator(),this.reader.setIndex(this.relativeOffsetEndOfZip64CentralDir),this.checkSignature(h.ZIP64_CENTRAL_DIRECTORY_END),this.readBlockZip64EndOfCentral()}},prepareReader:function(a){var b=g.getTypeOf(a);this.reader="string"!==b||j.uint8array?"nodebuffer"===b?new e(a):new f(g.transformTo("uint8array",a)):new d(a,this.loadOptions.optimizedBinaryString)},load:function(a){this.prepareReader(a),this.readEndOfCentral(),this.readCentralDir(),this.readLocalFiles()}},b.exports=c},{"./nodeBufferReader":12,"./object":13,"./signature":14,"./stringReader":15,"./support":17,"./uint8ArrayReader":18,"./utils":21,"./zipEntry":23}],23:[function(a,b){"use strict";function c(a,b){this.options=a,this.loadOptions=b}var d=a("./stringReader"),e=a("./utils"),f=a("./compressedObject"),g=a("./object"),h=0,i=3;c.prototype={isEncrypted:function(){return 1===(1&this.bitFlag)},useUTF8:function(){return 2048===(2048&this.bitFlag)},prepareCompressedContent:function(a,b,c){return function(){var d=a.index;a.setIndex(b);var e=a.readData(c);return a.setIndex(d),e}},prepareContent:function(a,b,c,d,f){return function(){var a=e.transformTo(d.uncompressInputType,this.getCompressedContent()),b=d.uncompress(a);if(b.length!==f)throw new Error("Bug : uncompressed data size mismatch");return b}},readLocalPart:function(a){var b,c;if(a.skip(22),this.fileNameLength=a.readInt(2),c=a.readInt(2),this.fileName=a.readString(this.fileNameLength),a.skip(c),-1==this.compressedSize||-1==this.uncompressedSize)throw new Error("Bug or corrupted zip : didn't get enough informations from the central directory (compressedSize == -1 || uncompressedSize == -1)");if(b=e.findCompression(this.compressionMethod),null===b)throw new Error("Corrupted zip : compression "+e.pretty(this.compressionMethod)+" unknown (inner file : "+this.fileName+")");if(this.decompressed=new f,this.decompressed.compressedSize=this.compressedSize,this.decompressed.uncompressedSize=this.uncompressedSize,this.decompressed.crc32=this.crc32,this.decompressed.compressionMethod=this.compressionMethod,this.decompressed.getCompressedContent=this.prepareCompressedContent(a,a.index,this.compressedSize,b),this.decompressed.getContent=this.prepareContent(a,a.index,this.compressedSize,b,this.uncompressedSize),this.loadOptions.checkCRC32&&(this.decompressed=e.transformTo("string",this.decompressed.getContent()),g.crc32(this.decompressed)!==this.crc32))throw new Error("Corrupted zip : CRC32 mismatch")},readCentralPart:function(a){if(this.versionMadeBy=a.readInt(2),this.versionNeeded=a.readInt(2),this.bitFlag=a.readInt(2),this.compressionMethod=a.readString(2),this.date=a.readDate(),this.crc32=a.readInt(4),this.compressedSize=a.readInt(4),this.uncompressedSize=a.readInt(4),this.fileNameLength=a.readInt(2),this.extraFieldsLength=a.readInt(2),this.fileCommentLength=a.readInt(2),this.diskNumberStart=a.readInt(2),this.internalFileAttributes=a.readInt(2),this.externalFileAttributes=a.readInt(4),this.localHeaderOffset=a.readInt(4),this.isEncrypted())throw new Error("Encrypted zip are not supported");this.fileName=a.readString(this.fileNameLength),this.readExtraFields(a),this.parseZIP64ExtraField(a),this.fileComment=a.readString(this.fileCommentLength)},processAttributes:function(){this.unixPermissions=null,this.dosPermissions=null;var a=this.versionMadeBy>>8;this.dir=16&this.externalFileAttributes?!0:!1,a===h&&(this.dosPermissions=63&this.externalFileAttributes),a===i&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileName.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var a=new d(this.extraFields[1].value);this.uncompressedSize===e.MAX_VALUE_32BITS&&(this.uncompressedSize=a.readInt(8)),this.compressedSize===e.MAX_VALUE_32BITS&&(this.compressedSize=a.readInt(8)),this.localHeaderOffset===e.MAX_VALUE_32BITS&&(this.localHeaderOffset=a.readInt(8)),this.diskNumberStart===e.MAX_VALUE_32BITS&&(this.diskNumberStart=a.readInt(4))}},readExtraFields:function(a){var b,c,d,e=a.index;for(this.extraFields=this.extraFields||{};a.index<e+this.extraFieldsLength;)b=a.readInt(2),c=a.readInt(2),d=a.readString(c),this.extraFields[b]={id:b,length:c,value:d}},handleUTF8:function(){if(this.useUTF8())this.fileName=g.utf8decode(this.fileName),this.fileComment=g.utf8decode(this.fileComment);else{var a=this.findExtraFieldUnicodePath();null!==a&&(this.fileName=a);var b=this.findExtraFieldUnicodeComment();null!==b&&(this.fileComment=b)}},findExtraFieldUnicodePath:function(){var a=this.extraFields[28789];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileName)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))
-}return null},findExtraFieldUnicodeComment:function(){var a=this.extraFields[25461];if(a){var b=new d(a.value);return 1!==b.readInt(1)?null:g.crc32(this.fileComment)!==b.readInt(4)?null:g.utf8decode(b.readString(a.length-5))}return null}},b.exports=c},{"./compressedObject":2,"./object":13,"./stringReader":15,"./utils":21}],24:[function(a,b){"use strict";var c=a("./lib/utils/common").assign,d=a("./lib/deflate"),e=a("./lib/inflate"),f=a("./lib/zlib/constants"),g={};c(g,d,e,f),b.exports=g},{"./lib/deflate":25,"./lib/inflate":26,"./lib/utils/common":27,"./lib/zlib/constants":30}],25:[function(a,b,c){"use strict";function d(a,b){var c=new s(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}function f(a,b){return b=b||{},b.gzip=!0,d(a,b)}var g=a("./zlib/deflate.js"),h=a("./utils/common"),i=a("./utils/strings"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=0,m=4,n=0,o=1,p=-1,q=0,r=8,s=function(a){this.options=h.assign({level:p,method:r,chunkSize:16384,windowBits:15,memLevel:8,strategy:q,to:""},a||{});var b=this.options;b.raw&&b.windowBits>0?b.windowBits=-b.windowBits:b.gzip&&b.windowBits>0&&b.windowBits<16&&(b.windowBits+=16),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=g.deflateInit2(this.strm,b.level,b.method,b.windowBits,b.memLevel,b.strategy);if(c!==n)throw new Error(j[c]);b.header&&g.deflateSetHeader(this.strm,b.header)};s.prototype.push=function(a,b){var c,d,e=this.strm,f=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?m:l,e.input="string"==typeof a?i.string2buf(a):a,e.next_in=0,e.avail_in=e.input.length;do{if(0===e.avail_out&&(e.output=new h.Buf8(f),e.next_out=0,e.avail_out=f),c=g.deflate(e,d),c!==o&&c!==n)return this.onEnd(c),this.ended=!0,!1;(0===e.avail_out||0===e.avail_in&&d===m)&&this.onData("string"===this.options.to?i.buf2binstring(h.shrinkBuf(e.output,e.next_out)):h.shrinkBuf(e.output,e.next_out))}while((e.avail_in>0||0===e.avail_out)&&c!==o);return d===m?(c=g.deflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===n):!0},s.prototype.onData=function(a){this.chunks.push(a)},s.prototype.onEnd=function(a){a===n&&(this.result="string"===this.options.to?this.chunks.join(""):h.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Deflate=s,c.deflate=d,c.deflateRaw=e,c.gzip=f},{"./utils/common":27,"./utils/strings":28,"./zlib/deflate.js":32,"./zlib/messages":37,"./zlib/zstream":39}],26:[function(a,b,c){"use strict";function d(a,b){var c=new m(b);if(c.push(a,!0),c.err)throw c.msg;return c.result}function e(a,b){return b=b||{},b.raw=!0,d(a,b)}var f=a("./zlib/inflate.js"),g=a("./utils/common"),h=a("./utils/strings"),i=a("./zlib/constants"),j=a("./zlib/messages"),k=a("./zlib/zstream"),l=a("./zlib/gzheader"),m=function(a){this.options=g.assign({chunkSize:16384,windowBits:0,to:""},a||{});var b=this.options;b.raw&&b.windowBits>=0&&b.windowBits<16&&(b.windowBits=-b.windowBits,0===b.windowBits&&(b.windowBits=-15)),!(b.windowBits>=0&&b.windowBits<16)||a&&a.windowBits||(b.windowBits+=32),b.windowBits>15&&b.windowBits<48&&0===(15&b.windowBits)&&(b.windowBits|=15),this.err=0,this.msg="",this.ended=!1,this.chunks=[],this.strm=new k,this.strm.avail_out=0;var c=f.inflateInit2(this.strm,b.windowBits);if(c!==i.Z_OK)throw new Error(j[c]);this.header=new l,f.inflateGetHeader(this.strm,this.header)};m.prototype.push=function(a,b){var c,d,e,j,k,l=this.strm,m=this.options.chunkSize;if(this.ended)return!1;d=b===~~b?b:b===!0?i.Z_FINISH:i.Z_NO_FLUSH,l.input="string"==typeof a?h.binstring2buf(a):a,l.next_in=0,l.avail_in=l.input.length;do{if(0===l.avail_out&&(l.output=new g.Buf8(m),l.next_out=0,l.avail_out=m),c=f.inflate(l,i.Z_NO_FLUSH),c!==i.Z_STREAM_END&&c!==i.Z_OK)return this.onEnd(c),this.ended=!0,!1;l.next_out&&(0===l.avail_out||c===i.Z_STREAM_END||0===l.avail_in&&d===i.Z_FINISH)&&("string"===this.options.to?(e=h.utf8border(l.output,l.next_out),j=l.next_out-e,k=h.buf2string(l.output,e),l.next_out=j,l.avail_out=m-j,j&&g.arraySet(l.output,l.output,e,j,0),this.onData(k)):this.onData(g.shrinkBuf(l.output,l.next_out)))}while(l.avail_in>0&&c!==i.Z_STREAM_END);return c===i.Z_STREAM_END&&(d=i.Z_FINISH),d===i.Z_FINISH?(c=f.inflateEnd(this.strm),this.onEnd(c),this.ended=!0,c===i.Z_OK):!0},m.prototype.onData=function(a){this.chunks.push(a)},m.prototype.onEnd=function(a){a===i.Z_OK&&(this.result="string"===this.options.to?this.chunks.join(""):g.flattenChunks(this.chunks)),this.chunks=[],this.err=a,this.msg=this.strm.msg},c.Inflate=m,c.inflate=d,c.inflateRaw=e,c.ungzip=d},{"./utils/common":27,"./utils/strings":28,"./zlib/constants":30,"./zlib/gzheader":33,"./zlib/inflate.js":35,"./zlib/messages":37,"./zlib/zstream":39}],27:[function(a,b,c){"use strict";var d="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Int32Array;c.assign=function(a){for(var b=Array.prototype.slice.call(arguments,1);b.length;){var c=b.shift();if(c){if("object"!=typeof c)throw new TypeError(c+"must be non-object");for(var d in c)c.hasOwnProperty(d)&&(a[d]=c[d])}}return a},c.shrinkBuf=function(a,b){return a.length===b?a:a.subarray?a.subarray(0,b):(a.length=b,a)};var e={arraySet:function(a,b,c,d,e){if(b.subarray&&a.subarray)return void a.set(b.subarray(c,c+d),e);for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){var b,c,d,e,f,g;for(d=0,b=0,c=a.length;c>b;b++)d+=a[b].length;for(g=new Uint8Array(d),e=0,b=0,c=a.length;c>b;b++)f=a[b],g.set(f,e),e+=f.length;return g}},f={arraySet:function(a,b,c,d,e){for(var f=0;d>f;f++)a[e+f]=b[c+f]},flattenChunks:function(a){return[].concat.apply([],a)}};c.setTyped=function(a){a?(c.Buf8=Uint8Array,c.Buf16=Uint16Array,c.Buf32=Int32Array,c.assign(c,e)):(c.Buf8=Array,c.Buf16=Array,c.Buf32=Array,c.assign(c,f))},c.setTyped(d)},{}],28:[function(a,b,c){"use strict";function d(a,b){if(65537>b&&(a.subarray&&g||!a.subarray&&f))return String.fromCharCode.apply(null,e.shrinkBuf(a,b));for(var c="",d=0;b>d;d++)c+=String.fromCharCode(a[d]);return c}var e=a("./common"),f=!0,g=!0;try{String.fromCharCode.apply(null,[0])}catch(h){f=!1}try{String.fromCharCode.apply(null,new Uint8Array(1))}catch(h){g=!1}for(var i=new e.Buf8(256),j=0;256>j;j++)i[j]=j>=252?6:j>=248?5:j>=240?4:j>=224?3:j>=192?2:1;i[254]=i[254]=1,c.string2buf=function(a){var b,c,d,f,g,h=a.length,i=0;for(f=0;h>f;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),i+=128>c?1:2048>c?2:65536>c?3:4;for(b=new e.Buf8(i),g=0,f=0;i>g;f++)c=a.charCodeAt(f),55296===(64512&c)&&h>f+1&&(d=a.charCodeAt(f+1),56320===(64512&d)&&(c=65536+(c-55296<<10)+(d-56320),f++)),128>c?b[g++]=c:2048>c?(b[g++]=192|c>>>6,b[g++]=128|63&c):65536>c?(b[g++]=224|c>>>12,b[g++]=128|c>>>6&63,b[g++]=128|63&c):(b[g++]=240|c>>>18,b[g++]=128|c>>>12&63,b[g++]=128|c>>>6&63,b[g++]=128|63&c);return b},c.buf2binstring=function(a){return d(a,a.length)},c.binstring2buf=function(a){for(var b=new e.Buf8(a.length),c=0,d=b.length;d>c;c++)b[c]=a.charCodeAt(c);return b},c.buf2string=function(a,b){var c,e,f,g,h=b||a.length,j=new Array(2*h);for(e=0,c=0;h>c;)if(f=a[c++],128>f)j[e++]=f;else if(g=i[f],g>4)j[e++]=65533,c+=g-1;else{for(f&=2===g?31:3===g?15:7;g>1&&h>c;)f=f<<6|63&a[c++],g--;g>1?j[e++]=65533:65536>f?j[e++]=f:(f-=65536,j[e++]=55296|f>>10&1023,j[e++]=56320|1023&f)}return d(j,e)},c.utf8border=function(a,b){var c;for(b=b||a.length,b>a.length&&(b=a.length),c=b-1;c>=0&&128===(192&a[c]);)c--;return 0>c?b:0===c?b:c+i[a[c]]>b?c:b}},{"./common":27}],29:[function(a,b){"use strict";function c(a,b,c,d){for(var e=65535&a|0,f=a>>>16&65535|0,g=0;0!==c;){g=c>2e3?2e3:c,c-=g;do e=e+b[d++]|0,f=f+e|0;while(--g);e%=65521,f%=65521}return e|f<<16|0}b.exports=c},{}],30:[function(a,b){b.exports={Z_NO_FLUSH:0,Z_PARTIAL_FLUSH:1,Z_SYNC_FLUSH:2,Z_FULL_FLUSH:3,Z_FINISH:4,Z_BLOCK:5,Z_TREES:6,Z_OK:0,Z_STREAM_END:1,Z_NEED_DICT:2,Z_ERRNO:-1,Z_STREAM_ERROR:-2,Z_DATA_ERROR:-3,Z_BUF_ERROR:-5,Z_NO_COMPRESSION:0,Z_BEST_SPEED:1,Z_BEST_COMPRESSION:9,Z_DEFAULT_COMPRESSION:-1,Z_FILTERED:1,Z_HUFFMAN_ONLY:2,Z_RLE:3,Z_FIXED:4,Z_DEFAULT_STRATEGY:0,Z_BINARY:0,Z_TEXT:1,Z_UNKNOWN:2,Z_DEFLATED:8}},{}],31:[function(a,b){"use strict";function c(){for(var a,b=[],c=0;256>c;c++){a=c;for(var d=0;8>d;d++)a=1&a?3988292384^a>>>1:a>>>1;b[c]=a}return b}function d(a,b,c,d){var f=e,g=d+c;a=-1^a;for(var h=d;g>h;h++)a=a>>>8^f[255&(a^b[h])];return-1^a}var e=c();b.exports=d},{}],32:[function(a,b,c){"use strict";function d(a,b){return a.msg=G[b],b}function e(a){return(a<<1)-(a>4?9:0)}function f(a){for(var b=a.length;--b>=0;)a[b]=0}function g(a){var b=a.state,c=b.pending;c>a.avail_out&&(c=a.avail_out),0!==c&&(C.arraySet(a.output,b.pending_buf,b.pending_out,c,a.next_out),a.next_out+=c,b.pending_out+=c,a.total_out+=c,a.avail_out-=c,b.pending-=c,0===b.pending&&(b.pending_out=0))}function h(a,b){D._tr_flush_block(a,a.block_start>=0?a.block_start:-1,a.strstart-a.block_start,b),a.block_start=a.strstart,g(a.strm)}function i(a,b){a.pending_buf[a.pending++]=b}function j(a,b){a.pending_buf[a.pending++]=b>>>8&255,a.pending_buf[a.pending++]=255&b}function k(a,b,c,d){var e=a.avail_in;return e>d&&(e=d),0===e?0:(a.avail_in-=e,C.arraySet(b,a.input,a.next_in,e,c),1===a.state.wrap?a.adler=E(a.adler,b,e,c):2===a.state.wrap&&(a.adler=F(a.adler,b,e,c)),a.next_in+=e,a.total_in+=e,e)}function l(a,b){var c,d,e=a.max_chain_length,f=a.strstart,g=a.prev_length,h=a.nice_match,i=a.strstart>a.w_size-jb?a.strstart-(a.w_size-jb):0,j=a.window,k=a.w_mask,l=a.prev,m=a.strstart+ib,n=j[f+g-1],o=j[f+g];a.prev_length>=a.good_match&&(e>>=2),h>a.lookahead&&(h=a.lookahead);do if(c=b,j[c+g]===o&&j[c+g-1]===n&&j[c]===j[f]&&j[++c]===j[f+1]){f+=2,c++;do;while(j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&j[++f]===j[++c]&&m>f);if(d=ib-(m-f),f=m-ib,d>g){if(a.match_start=b,g=d,d>=h)break;n=j[f+g-1],o=j[f+g]}}while((b=l[b&k])>i&&0!==--e);return g<=a.lookahead?g:a.lookahead}function m(a){var b,c,d,e,f,g=a.w_size;do{if(e=a.window_size-a.lookahead-a.strstart,a.strstart>=g+(g-jb)){C.arraySet(a.window,a.window,g,g,0),a.match_start-=g,a.strstart-=g,a.block_start-=g,c=a.hash_size,b=c;do d=a.head[--b],a.head[b]=d>=g?d-g:0;while(--c);c=g,b=c;do d=a.prev[--b],a.prev[b]=d>=g?d-g:0;while(--c);e+=g}if(0===a.strm.avail_in)break;if(c=k(a.strm,a.window,a.strstart+a.lookahead,e),a.lookahead+=c,a.lookahead+a.insert>=hb)for(f=a.strstart-a.insert,a.ins_h=a.window[f],a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+1])&a.hash_mask;a.insert&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[f+hb-1])&a.hash_mask,a.prev[f&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=f,f++,a.insert--,!(a.lookahead+a.insert<hb)););}while(a.lookahead<jb&&0!==a.strm.avail_in)}function n(a,b){var c=65535;for(c>a.pending_buf_size-5&&(c=a.pending_buf_size-5);;){if(a.lookahead<=1){if(m(a),0===a.lookahead&&b===H)return sb;if(0===a.lookahead)break}a.strstart+=a.lookahead,a.lookahead=0;var d=a.block_start+c;if((0===a.strstart||a.strstart>=d)&&(a.lookahead=a.strstart-d,a.strstart=d,h(a,!1),0===a.strm.avail_out))return sb;if(a.strstart-a.block_start>=a.w_size-jb&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.strstart>a.block_start&&(h(a,!1),0===a.strm.avail_out)?sb:sb}function o(a,b){for(var c,d;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),0!==c&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c)),a.match_length>=hb)if(d=D._tr_tally(a,a.strstart-a.match_start,a.match_length-hb),a.lookahead-=a.match_length,a.match_length<=a.max_lazy_match&&a.lookahead>=hb){a.match_length--;do a.strstart++,a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart;while(0!==--a.match_length);a.strstart++}else a.strstart+=a.match_length,a.match_length=0,a.ins_h=a.window[a.strstart],a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+1])&a.hash_mask;else d=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++;if(d&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function p(a,b){for(var c,d,e;;){if(a.lookahead<jb){if(m(a),a.lookahead<jb&&b===H)return sb;if(0===a.lookahead)break}if(c=0,a.lookahead>=hb&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart),a.prev_length=a.match_length,a.prev_match=a.match_start,a.match_length=hb-1,0!==c&&a.prev_length<a.max_lazy_match&&a.strstart-c<=a.w_size-jb&&(a.match_length=l(a,c),a.match_length<=5&&(a.strategy===S||a.match_length===hb&&a.strstart-a.match_start>4096)&&(a.match_length=hb-1)),a.prev_length>=hb&&a.match_length<=a.prev_length){e=a.strstart+a.lookahead-hb,d=D._tr_tally(a,a.strstart-1-a.prev_match,a.prev_length-hb),a.lookahead-=a.prev_length-1,a.prev_length-=2;do++a.strstart<=e&&(a.ins_h=(a.ins_h<<a.hash_shift^a.window[a.strstart+hb-1])&a.hash_mask,c=a.prev[a.strstart&a.w_mask]=a.head[a.ins_h],a.head[a.ins_h]=a.strstart);while(0!==--a.prev_length);if(a.match_available=0,a.match_length=hb-1,a.strstart++,d&&(h(a,!1),0===a.strm.avail_out))return sb}else if(a.match_available){if(d=D._tr_tally(a,0,a.window[a.strstart-1]),d&&h(a,!1),a.strstart++,a.lookahead--,0===a.strm.avail_out)return sb}else a.match_available=1,a.strstart++,a.lookahead--}return a.match_available&&(d=D._tr_tally(a,0,a.window[a.strstart-1]),a.match_available=0),a.insert=a.strstart<hb-1?a.strstart:hb-1,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function q(a,b){for(var c,d,e,f,g=a.window;;){if(a.lookahead<=ib){if(m(a),a.lookahead<=ib&&b===H)return sb;if(0===a.lookahead)break}if(a.match_length=0,a.lookahead>=hb&&a.strstart>0&&(e=a.strstart-1,d=g[e],d===g[++e]&&d===g[++e]&&d===g[++e])){f=a.strstart+ib;do;while(d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&d===g[++e]&&f>e);a.match_length=ib-(f-e),a.match_length>a.lookahead&&(a.match_length=a.lookahead)}if(a.match_length>=hb?(c=D._tr_tally(a,1,a.match_length-hb),a.lookahead-=a.match_length,a.strstart+=a.match_length,a.match_length=0):(c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++),c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function r(a,b){for(var c;;){if(0===a.lookahead&&(m(a),0===a.lookahead)){if(b===H)return sb;break}if(a.match_length=0,c=D._tr_tally(a,0,a.window[a.strstart]),a.lookahead--,a.strstart++,c&&(h(a,!1),0===a.strm.avail_out))return sb}return a.insert=0,b===K?(h(a,!0),0===a.strm.avail_out?ub:vb):a.last_lit&&(h(a,!1),0===a.strm.avail_out)?sb:tb}function s(a){a.window_size=2*a.w_size,f(a.head),a.max_lazy_match=B[a.level].max_lazy,a.good_match=B[a.level].good_length,a.nice_match=B[a.level].nice_length,a.max_chain_length=B[a.level].max_chain,a.strstart=0,a.block_start=0,a.lookahead=0,a.insert=0,a.match_length=a.prev_length=hb-1,a.match_available=0,a.ins_h=0}function t(){this.strm=null,this.status=0,this.pending_buf=null,this.pending_buf_size=0,this.pending_out=0,this.pending=0,this.wrap=0,this.gzhead=null,this.gzindex=0,this.method=Y,this.last_flush=-1,this.w_size=0,this.w_bits=0,this.w_mask=0,this.window=null,this.window_size=0,this.prev=null,this.head=null,this.ins_h=0,this.hash_size=0,this.hash_bits=0,this.hash_mask=0,this.hash_shift=0,this.block_start=0,this.match_length=0,this.prev_match=0,this.match_available=0,this.strstart=0,this.match_start=0,this.lookahead=0,this.prev_length=0,this.max_chain_length=0,this.max_lazy_match=0,this.level=0,this.strategy=0,this.good_match=0,this.nice_match=0,this.dyn_ltree=new C.Buf16(2*fb),this.dyn_dtree=new C.Buf16(2*(2*db+1)),this.bl_tree=new C.Buf16(2*(2*eb+1)),f(this.dyn_ltree),f(this.dyn_dtree),f(this.bl_tree),this.l_desc=null,this.d_desc=null,this.bl_desc=null,this.bl_count=new C.Buf16(gb+1),this.heap=new C.Buf16(2*cb+1),f(this.heap),this.heap_len=0,this.heap_max=0,this.depth=new C.Buf16(2*cb+1),f(this.depth),this.l_buf=0,this.lit_bufsize=0,this.last_lit=0,this.d_buf=0,this.opt_len=0,this.static_len=0,this.matches=0,this.insert=0,this.bi_buf=0,this.bi_valid=0}function u(a){var b;return a&&a.state?(a.total_in=a.total_out=0,a.data_type=X,b=a.state,b.pending=0,b.pending_out=0,b.wrap<0&&(b.wrap=-b.wrap),b.status=b.wrap?lb:qb,a.adler=2===b.wrap?0:1,b.last_flush=H,D._tr_init(b),M):d(a,O)}function v(a){var b=u(a);return b===M&&s(a.state),b}function w(a,b){return a&&a.state?2!==a.state.wrap?O:(a.state.gzhead=b,M):O}function x(a,b,c,e,f,g){if(!a)return O;var h=1;if(b===R&&(b=6),0>e?(h=0,e=-e):e>15&&(h=2,e-=16),1>f||f>Z||c!==Y||8>e||e>15||0>b||b>9||0>g||g>V)return d(a,O);8===e&&(e=9);var i=new t;return a.state=i,i.strm=a,i.wrap=h,i.gzhead=null,i.w_bits=e,i.w_size=1<<i.w_bits,i.w_mask=i.w_size-1,i.hash_bits=f+7,i.hash_size=1<<i.hash_bits,i.hash_mask=i.hash_size-1,i.hash_shift=~~((i.hash_bits+hb-1)/hb),i.window=new C.Buf8(2*i.w_size),i.head=new C.Buf16(i.hash_size),i.prev=new C.Buf16(i.w_size),i.lit_bufsize=1<<f+6,i.pending_buf_size=4*i.lit_bufsize,i.pending_buf=new C.Buf8(i.pending_buf_size),i.d_buf=i.lit_bufsize>>1,i.l_buf=3*i.lit_bufsize,i.level=b,i.strategy=g,i.method=c,v(a)}function y(a,b){return x(a,b,Y,$,_,W)}function z(a,b){var c,h,k,l;if(!a||!a.state||b>L||0>b)return a?d(a,O):O;if(h=a.state,!a.output||!a.input&&0!==a.avail_in||h.status===rb&&b!==K)return d(a,0===a.avail_out?Q:O);if(h.strm=a,c=h.last_flush,h.last_flush=b,h.status===lb)if(2===h.wrap)a.adler=0,i(h,31),i(h,139),i(h,8),h.gzhead?(i(h,(h.gzhead.text?1:0)+(h.gzhead.hcrc?2:0)+(h.gzhead.extra?4:0)+(h.gzhead.name?8:0)+(h.gzhead.comment?16:0)),i(h,255&h.gzhead.time),i(h,h.gzhead.time>>8&255),i(h,h.gzhead.time>>16&255),i(h,h.gzhead.time>>24&255),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,255&h.gzhead.os),h.gzhead.extra&&h.gzhead.extra.length&&(i(h,255&h.gzhead.extra.length),i(h,h.gzhead.extra.length>>8&255)),h.gzhead.hcrc&&(a.adler=F(a.adler,h.pending_buf,h.pending,0)),h.gzindex=0,h.status=mb):(i(h,0),i(h,0),i(h,0),i(h,0),i(h,0),i(h,9===h.level?2:h.strategy>=T||h.level<2?4:0),i(h,wb),h.status=qb);else{var m=Y+(h.w_bits-8<<4)<<8,n=-1;n=h.strategy>=T||h.level<2?0:h.level<6?1:6===h.level?2:3,m|=n<<6,0!==h.strstart&&(m|=kb),m+=31-m%31,h.status=qb,j(h,m),0!==h.strstart&&(j(h,a.adler>>>16),j(h,65535&a.adler)),a.adler=1}if(h.status===mb)if(h.gzhead.extra){for(k=h.pending;h.gzindex<(65535&h.gzhead.extra.length)&&(h.pending!==h.pending_buf_size||(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending!==h.pending_buf_size));)i(h,255&h.gzhead.extra[h.gzindex]),h.gzindex++;h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),h.gzindex===h.gzhead.extra.length&&(h.gzindex=0,h.status=nb)}else h.status=nb;if(h.status===nb)if(h.gzhead.name){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.name.length?255&h.gzhead.name.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.gzindex=0,h.status=ob)}else h.status=ob;if(h.status===ob)if(h.gzhead.comment){k=h.pending;do{if(h.pending===h.pending_buf_size&&(h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),g(a),k=h.pending,h.pending===h.pending_buf_size)){l=1;break}l=h.gzindex<h.gzhead.comment.length?255&h.gzhead.comment.charCodeAt(h.gzindex++):0,i(h,l)}while(0!==l);h.gzhead.hcrc&&h.pending>k&&(a.adler=F(a.adler,h.pending_buf,h.pending-k,k)),0===l&&(h.status=pb)}else h.status=pb;if(h.status===pb&&(h.gzhead.hcrc?(h.pending+2>h.pending_buf_size&&g(a),h.pending+2<=h.pending_buf_size&&(i(h,255&a.adler),i(h,a.adler>>8&255),a.adler=0,h.status=qb)):h.status=qb),0!==h.pending){if(g(a),0===a.avail_out)return h.last_flush=-1,M}else if(0===a.avail_in&&e(b)<=e(c)&&b!==K)return d(a,Q);if(h.status===rb&&0!==a.avail_in)return d(a,Q);if(0!==a.avail_in||0!==h.lookahead||b!==H&&h.status!==rb){var o=h.strategy===T?r(h,b):h.strategy===U?q(h,b):B[h.level].func(h,b);if((o===ub||o===vb)&&(h.status=rb),o===sb||o===ub)return 0===a.avail_out&&(h.last_flush=-1),M;if(o===tb&&(b===I?D._tr_align(h):b!==L&&(D._tr_stored_block(h,0,0,!1),b===J&&(f(h.head),0===h.lookahead&&(h.strstart=0,h.block_start=0,h.insert=0))),g(a),0===a.avail_out))return h.last_flush=-1,M}return b!==K?M:h.wrap<=0?N:(2===h.wrap?(i(h,255&a.adler),i(h,a.adler>>8&255),i(h,a.adler>>16&255),i(h,a.adler>>24&255),i(h,255&a.total_in),i(h,a.total_in>>8&255),i(h,a.total_in>>16&255),i(h,a.total_in>>24&255)):(j(h,a.adler>>>16),j(h,65535&a.adler)),g(a),h.wrap>0&&(h.wrap=-h.wrap),0!==h.pending?M:N)}function A(a){var b;return a&&a.state?(b=a.state.status,b!==lb&&b!==mb&&b!==nb&&b!==ob&&b!==pb&&b!==qb&&b!==rb?d(a,O):(a.state=null,b===qb?d(a,P):M)):O}var B,C=a("../utils/common"),D=a("./trees"),E=a("./adler32"),F=a("./crc32"),G=a("./messages"),H=0,I=1,J=3,K=4,L=5,M=0,N=1,O=-2,P=-3,Q=-5,R=-1,S=1,T=2,U=3,V=4,W=0,X=2,Y=8,Z=9,$=15,_=8,ab=29,bb=256,cb=bb+1+ab,db=30,eb=19,fb=2*cb+1,gb=15,hb=3,ib=258,jb=ib+hb+1,kb=32,lb=42,mb=69,nb=73,ob=91,pb=103,qb=113,rb=666,sb=1,tb=2,ub=3,vb=4,wb=3,xb=function(a,b,c,d,e){this.good_length=a,this.max_lazy=b,this.nice_length=c,this.max_chain=d,this.func=e};B=[new xb(0,0,0,0,n),new xb(4,4,8,4,o),new xb(4,5,16,8,o),new xb(4,6,32,32,o),new xb(4,4,16,16,p),new xb(8,16,32,32,p),new xb(8,16,128,128,p),new xb(8,32,128,256,p),new xb(32,128,258,1024,p),new xb(32,258,258,4096,p)],c.deflateInit=y,c.deflateInit2=x,c.deflateReset=v,c.deflateResetKeep=u,c.deflateSetHeader=w,c.deflate=z,c.deflateEnd=A,c.deflateInfo="pako deflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./messages":37,"./trees":38}],33:[function(a,b){"use strict";function c(){this.text=0,this.time=0,this.xflags=0,this.os=0,this.extra=null,this.extra_len=0,this.name="",this.comment="",this.hcrc=0,this.done=!1}b.exports=c},{}],34:[function(a,b){"use strict";var c=30,d=12;b.exports=function(a,b){var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C;e=a.state,f=a.next_in,B=a.input,g=f+(a.avail_in-5),h=a.next_out,C=a.output,i=h-(b-a.avail_out),j=h+(a.avail_out-257),k=e.dmax,l=e.wsize,m=e.whave,n=e.wnext,o=e.window,p=e.hold,q=e.bits,r=e.lencode,s=e.distcode,t=(1<<e.lenbits)-1,u=(1<<e.distbits)-1;a:do{15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=r[p&t];b:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,0===w)C[h++]=65535&v;else{if(!(16&w)){if(0===(64&w)){v=r[(65535&v)+(p&(1<<w)-1)];continue b}if(32&w){e.mode=d;break a}a.msg="invalid literal/length code",e.mode=c;break a}x=65535&v,w&=15,w&&(w>q&&(p+=B[f++]<<q,q+=8),x+=p&(1<<w)-1,p>>>=w,q-=w),15>q&&(p+=B[f++]<<q,q+=8,p+=B[f++]<<q,q+=8),v=s[p&u];c:for(;;){if(w=v>>>24,p>>>=w,q-=w,w=v>>>16&255,!(16&w)){if(0===(64&w)){v=s[(65535&v)+(p&(1<<w)-1)];continue c}a.msg="invalid distance code",e.mode=c;break a}if(y=65535&v,w&=15,w>q&&(p+=B[f++]<<q,q+=8,w>q&&(p+=B[f++]<<q,q+=8)),y+=p&(1<<w)-1,y>k){a.msg="invalid distance too far back",e.mode=c;break a}if(p>>>=w,q-=w,w=h-i,y>w){if(w=y-w,w>m&&e.sane){a.msg="invalid distance too far back",e.mode=c;break a}if(z=0,A=o,0===n){if(z+=l-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}else if(w>n){if(z+=l+n-w,w-=n,x>w){x-=w;do C[h++]=o[z++];while(--w);if(z=0,x>n){w=n,x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}}}else if(z+=n-w,x>w){x-=w;do C[h++]=o[z++];while(--w);z=h-y,A=C}for(;x>2;)C[h++]=A[z++],C[h++]=A[z++],C[h++]=A[z++],x-=3;x&&(C[h++]=A[z++],x>1&&(C[h++]=A[z++]))}else{z=h-y;do C[h++]=C[z++],C[h++]=C[z++],C[h++]=C[z++],x-=3;while(x>2);x&&(C[h++]=C[z++],x>1&&(C[h++]=C[z++]))}break}}break}}while(g>f&&j>h);x=q>>3,f-=x,q-=x<<3,p&=(1<<q)-1,a.next_in=f,a.next_out=h,a.avail_in=g>f?5+(g-f):5-(f-g),a.avail_out=j>h?257+(j-h):257-(h-j),e.hold=p,e.bits=q}},{}],35:[function(a,b,c){"use strict";function d(a){return(a>>>24&255)+(a>>>8&65280)+((65280&a)<<8)+((255&a)<<24)}function e(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new r.Buf16(320),this.work=new r.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function f(a){var b;return a&&a.state?(b=a.state,a.total_in=a.total_out=b.total=0,a.msg="",b.wrap&&(a.adler=1&b.wrap),b.mode=K,b.last=0,b.havedict=0,b.dmax=32768,b.head=null,b.hold=0,b.bits=0,b.lencode=b.lendyn=new r.Buf32(ob),b.distcode=b.distdyn=new r.Buf32(pb),b.sane=1,b.back=-1,C):F}function g(a){var b;return a&&a.state?(b=a.state,b.wsize=0,b.whave=0,b.wnext=0,f(a)):F}function h(a,b){var c,d;return a&&a.state?(d=a.state,0>b?(c=0,b=-b):(c=(b>>4)+1,48>b&&(b&=15)),b&&(8>b||b>15)?F:(null!==d.window&&d.wbits!==b&&(d.window=null),d.wrap=c,d.wbits=b,g(a))):F}function i(a,b){var c,d;return a?(d=new e,a.state=d,d.window=null,c=h(a,b),c!==C&&(a.state=null),c):F}function j(a){return i(a,rb)}function k(a){if(sb){var b;for(p=new r.Buf32(512),q=new r.Buf32(32),b=0;144>b;)a.lens[b++]=8;for(;256>b;)a.lens[b++]=9;for(;280>b;)a.lens[b++]=7;for(;288>b;)a.lens[b++]=8;for(v(x,a.lens,0,288,p,0,a.work,{bits:9}),b=0;32>b;)a.lens[b++]=5;v(y,a.lens,0,32,q,0,a.work,{bits:5}),sb=!1}a.lencode=p,a.lenbits=9,a.distcode=q,a.distbits=5}function l(a,b,c,d){var e,f=a.state;return null===f.window&&(f.wsize=1<<f.wbits,f.wnext=0,f.whave=0,f.window=new r.Buf8(f.wsize)),d>=f.wsize?(r.arraySet(f.window,b,c-f.wsize,f.wsize,0),f.wnext=0,f.whave=f.wsize):(e=f.wsize-f.wnext,e>d&&(e=d),r.arraySet(f.window,b,c-d,e,f.wnext),d-=e,d?(r.arraySet(f.window,b,c-d,d,0),f.wnext=d,f.whave=f.wsize):(f.wnext+=e,f.wnext===f.wsize&&(f.wnext=0),f.whave<f.wsize&&(f.whave+=e))),0}function m(a,b){var c,e,f,g,h,i,j,m,n,o,p,q,ob,pb,qb,rb,sb,tb,ub,vb,wb,xb,yb,zb,Ab=0,Bb=new r.Buf8(4),Cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15];if(!a||!a.state||!a.output||!a.input&&0!==a.avail_in)return F;c=a.state,c.mode===V&&(c.mode=W),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,o=i,p=j,xb=C;a:for(;;)switch(c.mode){case K:if(0===c.wrap){c.mode=W;break}for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(2&c.wrap&&35615===m){c.check=0,Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0),m=0,n=0,c.mode=L;break}if(c.flags=0,c.head&&(c.head.done=!1),!(1&c.wrap)||(((255&m)<<8)+(m>>8))%31){a.msg="incorrect header check",c.mode=lb;break}if((15&m)!==J){a.msg="unknown compression method",c.mode=lb;break}if(m>>>=4,n-=4,wb=(15&m)+8,0===c.wbits)c.wbits=wb;else if(wb>c.wbits){a.msg="invalid window size",c.mode=lb;break}c.dmax=1<<wb,a.adler=c.check=1,c.mode=512&m?T:V,m=0,n=0;break;case L:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.flags=m,(255&c.flags)!==J){a.msg="unknown compression method",c.mode=lb;break}if(57344&c.flags){a.msg="unknown header flags set",c.mode=lb;break}c.head&&(c.head.text=m>>8&1),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=M;case M:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.time=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,Bb[2]=m>>>16&255,Bb[3]=m>>>24&255,c.check=t(c.check,Bb,4,0)),m=0,n=0,c.mode=N;case N:for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.head&&(c.head.xflags=255&m,c.head.os=m>>8),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0,c.mode=O;case O:if(1024&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length=m,c.head&&(c.head.extra_len=m),512&c.flags&&(Bb[0]=255&m,Bb[1]=m>>>8&255,c.check=t(c.check,Bb,2,0)),m=0,n=0}else c.head&&(c.head.extra=null);c.mode=P;case P:if(1024&c.flags&&(q=c.length,q>i&&(q=i),q&&(c.head&&(wb=c.head.extra_len-c.length,c.head.extra||(c.head.extra=new Array(c.head.extra_len)),r.arraySet(c.head.extra,e,g,q,wb)),512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,c.length-=q),c.length))break a;c.length=0,c.mode=Q;case Q:if(2048&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.name+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.name=null);c.length=0,c.mode=R;case R:if(4096&c.flags){if(0===i)break a;q=0;do wb=e[g+q++],c.head&&wb&&c.length<65536&&(c.head.comment+=String.fromCharCode(wb));while(wb&&i>q);if(512&c.flags&&(c.check=t(c.check,e,q,g)),i-=q,g+=q,wb)break a}else c.head&&(c.head.comment=null);c.mode=S;case S:if(512&c.flags){for(;16>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(65535&c.check)){a.msg="header crc mismatch",c.mode=lb;break}m=0,n=0}c.head&&(c.head.hcrc=c.flags>>9&1,c.head.done=!0),a.adler=c.check=0,c.mode=V;break;case T:for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}a.adler=c.check=d(m),m=0,n=0,c.mode=U;case U:if(0===c.havedict)return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,E;a.adler=c.check=1,c.mode=V;case V:if(b===A||b===B)break a;case W:if(c.last){m>>>=7&n,n-=7&n,c.mode=ib;break}for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}switch(c.last=1&m,m>>>=1,n-=1,3&m){case 0:c.mode=X;break;case 1:if(k(c),c.mode=bb,b===B){m>>>=2,n-=2;break a}break;case 2:c.mode=$;break;case 3:a.msg="invalid block type",c.mode=lb}m>>>=2,n-=2;break;case X:for(m>>>=7&n,n-=7&n;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if((65535&m)!==(m>>>16^65535)){a.msg="invalid stored block lengths",c.mode=lb;break}if(c.length=65535&m,m=0,n=0,c.mode=Y,b===B)break a;case Y:c.mode=Z;case Z:if(q=c.length){if(q>i&&(q=i),q>j&&(q=j),0===q)break a;r.arraySet(f,e,g,q,h),i-=q,g+=q,j-=q,h+=q,c.length-=q;break}c.mode=V;break;case $:for(;14>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(c.nlen=(31&m)+257,m>>>=5,n-=5,c.ndist=(31&m)+1,m>>>=5,n-=5,c.ncode=(15&m)+4,m>>>=4,n-=4,c.nlen>286||c.ndist>30){a.msg="too many length or distance symbols",c.mode=lb;break}c.have=0,c.mode=_;case _:for(;c.have<c.ncode;){for(;3>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.lens[Cb[c.have++]]=7&m,m>>>=3,n-=3}for(;c.have<19;)c.lens[Cb[c.have++]]=0;if(c.lencode=c.lendyn,c.lenbits=7,yb={bits:c.lenbits},xb=v(w,c.lens,0,19,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid code lengths set",c.mode=lb;break}c.have=0,c.mode=ab;case ab:for(;c.have<c.nlen+c.ndist;){for(;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(16>sb)m>>>=qb,n-=qb,c.lens[c.have++]=sb;else{if(16===sb){for(zb=qb+2;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m>>>=qb,n-=qb,0===c.have){a.msg="invalid bit length repeat",c.mode=lb;break}wb=c.lens[c.have-1],q=3+(3&m),m>>>=2,n-=2}else if(17===sb){for(zb=qb+3;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=3+(7&m),m>>>=3,n-=3}else{for(zb=qb+7;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=qb,n-=qb,wb=0,q=11+(127&m),m>>>=7,n-=7}if(c.have+q>c.nlen+c.ndist){a.msg="invalid bit length repeat",c.mode=lb;break}for(;q--;)c.lens[c.have++]=wb}}if(c.mode===lb)break;if(0===c.lens[256]){a.msg="invalid code -- missing end-of-block",c.mode=lb;break}if(c.lenbits=9,yb={bits:c.lenbits},xb=v(x,c.lens,0,c.nlen,c.lencode,0,c.work,yb),c.lenbits=yb.bits,xb){a.msg="invalid literal/lengths set",c.mode=lb;break}if(c.distbits=6,c.distcode=c.distdyn,yb={bits:c.distbits},xb=v(y,c.lens,c.nlen,c.ndist,c.distcode,0,c.work,yb),c.distbits=yb.bits,xb){a.msg="invalid distances set",c.mode=lb;break}if(c.mode=bb,b===B)break a;case bb:c.mode=cb;case cb:if(i>=6&&j>=258){a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,u(a,p),h=a.next_out,f=a.output,j=a.avail_out,g=a.next_in,e=a.input,i=a.avail_in,m=c.hold,n=c.bits,c.mode===V&&(c.back=-1);
-break}for(c.back=0;Ab=c.lencode[m&(1<<c.lenbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(rb&&0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.lencode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,c.length=sb,0===rb){c.mode=hb;break}if(32&rb){c.back=-1,c.mode=V;break}if(64&rb){a.msg="invalid literal/length code",c.mode=lb;break}c.extra=15&rb,c.mode=db;case db:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.length+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}c.was=c.length,c.mode=eb;case eb:for(;Ab=c.distcode[m&(1<<c.distbits)-1],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(0===(240&rb)){for(tb=qb,ub=rb,vb=sb;Ab=c.distcode[vb+((m&(1<<tb+ub)-1)>>tb)],qb=Ab>>>24,rb=Ab>>>16&255,sb=65535&Ab,!(n>=tb+qb);){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}m>>>=tb,n-=tb,c.back+=tb}if(m>>>=qb,n-=qb,c.back+=qb,64&rb){a.msg="invalid distance code",c.mode=lb;break}c.offset=sb,c.extra=15&rb,c.mode=fb;case fb:if(c.extra){for(zb=c.extra;zb>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}c.offset+=m&(1<<c.extra)-1,m>>>=c.extra,n-=c.extra,c.back+=c.extra}if(c.offset>c.dmax){a.msg="invalid distance too far back",c.mode=lb;break}c.mode=gb;case gb:if(0===j)break a;if(q=p-j,c.offset>q){if(q=c.offset-q,q>c.whave&&c.sane){a.msg="invalid distance too far back",c.mode=lb;break}q>c.wnext?(q-=c.wnext,ob=c.wsize-q):ob=c.wnext-q,q>c.length&&(q=c.length),pb=c.window}else pb=f,ob=h-c.offset,q=c.length;q>j&&(q=j),j-=q,c.length-=q;do f[h++]=pb[ob++];while(--q);0===c.length&&(c.mode=cb);break;case hb:if(0===j)break a;f[h++]=c.length,j--,c.mode=cb;break;case ib:if(c.wrap){for(;32>n;){if(0===i)break a;i--,m|=e[g++]<<n,n+=8}if(p-=j,a.total_out+=p,c.total+=p,p&&(a.adler=c.check=c.flags?t(c.check,f,p,h-p):s(c.check,f,p,h-p)),p=j,(c.flags?m:d(m))!==c.check){a.msg="incorrect data check",c.mode=lb;break}m=0,n=0}c.mode=jb;case jb:if(c.wrap&&c.flags){for(;32>n;){if(0===i)break a;i--,m+=e[g++]<<n,n+=8}if(m!==(4294967295&c.total)){a.msg="incorrect length check",c.mode=lb;break}m=0,n=0}c.mode=kb;case kb:xb=D;break a;case lb:xb=G;break a;case mb:return H;case nb:default:return F}return a.next_out=h,a.avail_out=j,a.next_in=g,a.avail_in=i,c.hold=m,c.bits=n,(c.wsize||p!==a.avail_out&&c.mode<lb&&(c.mode<ib||b!==z))&&l(a,a.output,a.next_out,p-a.avail_out)?(c.mode=mb,H):(o-=a.avail_in,p-=a.avail_out,a.total_in+=o,a.total_out+=p,c.total+=p,c.wrap&&p&&(a.adler=c.check=c.flags?t(c.check,f,p,a.next_out-p):s(c.check,f,p,a.next_out-p)),a.data_type=c.bits+(c.last?64:0)+(c.mode===V?128:0)+(c.mode===bb||c.mode===Y?256:0),(0===o&&0===p||b===z)&&xb===C&&(xb=I),xb)}function n(a){if(!a||!a.state)return F;var b=a.state;return b.window&&(b.window=null),a.state=null,C}function o(a,b){var c;return a&&a.state?(c=a.state,0===(2&c.wrap)?F:(c.head=b,b.done=!1,C)):F}var p,q,r=a("../utils/common"),s=a("./adler32"),t=a("./crc32"),u=a("./inffast"),v=a("./inftrees"),w=0,x=1,y=2,z=4,A=5,B=6,C=0,D=1,E=2,F=-2,G=-3,H=-4,I=-5,J=8,K=1,L=2,M=3,N=4,O=5,P=6,Q=7,R=8,S=9,T=10,U=11,V=12,W=13,X=14,Y=15,Z=16,$=17,_=18,ab=19,bb=20,cb=21,db=22,eb=23,fb=24,gb=25,hb=26,ib=27,jb=28,kb=29,lb=30,mb=31,nb=32,ob=852,pb=592,qb=15,rb=qb,sb=!0;c.inflateReset=g,c.inflateReset2=h,c.inflateResetKeep=f,c.inflateInit=j,c.inflateInit2=i,c.inflate=m,c.inflateEnd=n,c.inflateGetHeader=o,c.inflateInfo="pako inflate (from Nodeca project)"},{"../utils/common":27,"./adler32":29,"./crc32":31,"./inffast":34,"./inftrees":36}],36:[function(a,b){"use strict";var c=a("../utils/common"),d=15,e=852,f=592,g=0,h=1,i=2,j=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],k=[16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,18,19,19,19,19,20,20,20,20,21,21,21,21,16,72,78],l=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0],m=[16,16,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,64,64];b.exports=function(a,b,n,o,p,q,r,s){var t,u,v,w,x,y,z,A,B,C=s.bits,D=0,E=0,F=0,G=0,H=0,I=0,J=0,K=0,L=0,M=0,N=null,O=0,P=new c.Buf16(d+1),Q=new c.Buf16(d+1),R=null,S=0;for(D=0;d>=D;D++)P[D]=0;for(E=0;o>E;E++)P[b[n+E]]++;for(H=C,G=d;G>=1&&0===P[G];G--);if(H>G&&(H=G),0===G)return p[q++]=20971520,p[q++]=20971520,s.bits=1,0;for(F=1;G>F&&0===P[F];F++);for(F>H&&(H=F),K=1,D=1;d>=D;D++)if(K<<=1,K-=P[D],0>K)return-1;if(K>0&&(a===g||1!==G))return-1;for(Q[1]=0,D=1;d>D;D++)Q[D+1]=Q[D]+P[D];for(E=0;o>E;E++)0!==b[n+E]&&(r[Q[b[n+E]]++]=E);if(a===g?(N=R=r,y=19):a===h?(N=j,O-=257,R=k,S-=257,y=256):(N=l,R=m,y=-1),M=0,E=0,D=F,x=q,I=H,J=0,v=-1,L=1<<H,w=L-1,a===h&&L>e||a===i&&L>f)return 1;for(var T=0;;){T++,z=D-J,r[E]<y?(A=0,B=r[E]):r[E]>y?(A=R[S+r[E]],B=N[O+r[E]]):(A=96,B=0),t=1<<D-J,u=1<<I,F=u;do u-=t,p[x+(M>>J)+u]=z<<24|A<<16|B|0;while(0!==u);for(t=1<<D-1;M&t;)t>>=1;if(0!==t?(M&=t-1,M+=t):M=0,E++,0===--P[D]){if(D===G)break;D=b[n+r[E]]}if(D>H&&(M&w)!==v){for(0===J&&(J=H),x+=F,I=D-J,K=1<<I;G>I+J&&(K-=P[I+J],!(0>=K));)I++,K<<=1;if(L+=1<<I,a===h&&L>e||a===i&&L>f)return 1;v=M&w,p[v]=H<<24|I<<16|x-q|0}}return 0!==M&&(p[x+M]=D-J<<24|64<<16|0),s.bits=H,0}},{"../utils/common":27}],37:[function(a,b){"use strict";b.exports={2:"need dictionary",1:"stream end",0:"","-1":"file error","-2":"stream error","-3":"data error","-4":"insufficient memory","-5":"buffer error","-6":"incompatible version"}},{}],38:[function(a,b,c){"use strict";function d(a){for(var b=a.length;--b>=0;)a[b]=0}function e(a){return 256>a?gb[a]:gb[256+(a>>>7)]}function f(a,b){a.pending_buf[a.pending++]=255&b,a.pending_buf[a.pending++]=b>>>8&255}function g(a,b,c){a.bi_valid>V-c?(a.bi_buf|=b<<a.bi_valid&65535,f(a,a.bi_buf),a.bi_buf=b>>V-a.bi_valid,a.bi_valid+=c-V):(a.bi_buf|=b<<a.bi_valid&65535,a.bi_valid+=c)}function h(a,b,c){g(a,c[2*b],c[2*b+1])}function i(a,b){var c=0;do c|=1&a,a>>>=1,c<<=1;while(--b>0);return c>>>1}function j(a){16===a.bi_valid?(f(a,a.bi_buf),a.bi_buf=0,a.bi_valid=0):a.bi_valid>=8&&(a.pending_buf[a.pending++]=255&a.bi_buf,a.bi_buf>>=8,a.bi_valid-=8)}function k(a,b){var c,d,e,f,g,h,i=b.dyn_tree,j=b.max_code,k=b.stat_desc.static_tree,l=b.stat_desc.has_stree,m=b.stat_desc.extra_bits,n=b.stat_desc.extra_base,o=b.stat_desc.max_length,p=0;for(f=0;U>=f;f++)a.bl_count[f]=0;for(i[2*a.heap[a.heap_max]+1]=0,c=a.heap_max+1;T>c;c++)d=a.heap[c],f=i[2*i[2*d+1]+1]+1,f>o&&(f=o,p++),i[2*d+1]=f,d>j||(a.bl_count[f]++,g=0,d>=n&&(g=m[d-n]),h=i[2*d],a.opt_len+=h*(f+g),l&&(a.static_len+=h*(k[2*d+1]+g)));if(0!==p){do{for(f=o-1;0===a.bl_count[f];)f--;a.bl_count[f]--,a.bl_count[f+1]+=2,a.bl_count[o]--,p-=2}while(p>0);for(f=o;0!==f;f--)for(d=a.bl_count[f];0!==d;)e=a.heap[--c],e>j||(i[2*e+1]!==f&&(a.opt_len+=(f-i[2*e+1])*i[2*e],i[2*e+1]=f),d--)}}function l(a,b,c){var d,e,f=new Array(U+1),g=0;for(d=1;U>=d;d++)f[d]=g=g+c[d-1]<<1;for(e=0;b>=e;e++){var h=a[2*e+1];0!==h&&(a[2*e]=i(f[h]++,h))}}function m(){var a,b,c,d,e,f=new Array(U+1);for(c=0,d=0;O-1>d;d++)for(ib[d]=c,a=0;a<1<<_[d];a++)hb[c++]=d;for(hb[c-1]=d,e=0,d=0;16>d;d++)for(jb[d]=e,a=0;a<1<<ab[d];a++)gb[e++]=d;for(e>>=7;R>d;d++)for(jb[d]=e<<7,a=0;a<1<<ab[d]-7;a++)gb[256+e++]=d;for(b=0;U>=b;b++)f[b]=0;for(a=0;143>=a;)eb[2*a+1]=8,a++,f[8]++;for(;255>=a;)eb[2*a+1]=9,a++,f[9]++;for(;279>=a;)eb[2*a+1]=7,a++,f[7]++;for(;287>=a;)eb[2*a+1]=8,a++,f[8]++;for(l(eb,Q+1,f),a=0;R>a;a++)fb[2*a+1]=5,fb[2*a]=i(a,5);kb=new nb(eb,_,P+1,Q,U),lb=new nb(fb,ab,0,R,U),mb=new nb(new Array(0),bb,0,S,W)}function n(a){var b;for(b=0;Q>b;b++)a.dyn_ltree[2*b]=0;for(b=0;R>b;b++)a.dyn_dtree[2*b]=0;for(b=0;S>b;b++)a.bl_tree[2*b]=0;a.dyn_ltree[2*X]=1,a.opt_len=a.static_len=0,a.last_lit=a.matches=0}function o(a){a.bi_valid>8?f(a,a.bi_buf):a.bi_valid>0&&(a.pending_buf[a.pending++]=a.bi_buf),a.bi_buf=0,a.bi_valid=0}function p(a,b,c,d){o(a),d&&(f(a,c),f(a,~c)),E.arraySet(a.pending_buf,a.window,b,c,a.pending),a.pending+=c}function q(a,b,c,d){var e=2*b,f=2*c;return a[e]<a[f]||a[e]===a[f]&&d[b]<=d[c]}function r(a,b,c){for(var d=a.heap[c],e=c<<1;e<=a.heap_len&&(e<a.heap_len&&q(b,a.heap[e+1],a.heap[e],a.depth)&&e++,!q(b,d,a.heap[e],a.depth));)a.heap[c]=a.heap[e],c=e,e<<=1;a.heap[c]=d}function s(a,b,c){var d,f,i,j,k=0;if(0!==a.last_lit)do d=a.pending_buf[a.d_buf+2*k]<<8|a.pending_buf[a.d_buf+2*k+1],f=a.pending_buf[a.l_buf+k],k++,0===d?h(a,f,b):(i=hb[f],h(a,i+P+1,b),j=_[i],0!==j&&(f-=ib[i],g(a,f,j)),d--,i=e(d),h(a,i,c),j=ab[i],0!==j&&(d-=jb[i],g(a,d,j)));while(k<a.last_lit);h(a,X,b)}function t(a,b){var c,d,e,f=b.dyn_tree,g=b.stat_desc.static_tree,h=b.stat_desc.has_stree,i=b.stat_desc.elems,j=-1;for(a.heap_len=0,a.heap_max=T,c=0;i>c;c++)0!==f[2*c]?(a.heap[++a.heap_len]=j=c,a.depth[c]=0):f[2*c+1]=0;for(;a.heap_len<2;)e=a.heap[++a.heap_len]=2>j?++j:0,f[2*e]=1,a.depth[e]=0,a.opt_len--,h&&(a.static_len-=g[2*e+1]);for(b.max_code=j,c=a.heap_len>>1;c>=1;c--)r(a,f,c);e=i;do c=a.heap[1],a.heap[1]=a.heap[a.heap_len--],r(a,f,1),d=a.heap[1],a.heap[--a.heap_max]=c,a.heap[--a.heap_max]=d,f[2*e]=f[2*c]+f[2*d],a.depth[e]=(a.depth[c]>=a.depth[d]?a.depth[c]:a.depth[d])+1,f[2*c+1]=f[2*d+1]=e,a.heap[1]=e++,r(a,f,1);while(a.heap_len>=2);a.heap[--a.heap_max]=a.heap[1],k(a,b),l(f,j,a.bl_count)}function u(a,b,c){var d,e,f=-1,g=b[1],h=0,i=7,j=4;for(0===g&&(i=138,j=3),b[2*(c+1)+1]=65535,d=0;c>=d;d++)e=g,g=b[2*(d+1)+1],++h<i&&e===g||(j>h?a.bl_tree[2*e]+=h:0!==e?(e!==f&&a.bl_tree[2*e]++,a.bl_tree[2*Y]++):10>=h?a.bl_tree[2*Z]++:a.bl_tree[2*$]++,h=0,f=e,0===g?(i=138,j=3):e===g?(i=6,j=3):(i=7,j=4))}function v(a,b,c){var d,e,f=-1,i=b[1],j=0,k=7,l=4;for(0===i&&(k=138,l=3),d=0;c>=d;d++)if(e=i,i=b[2*(d+1)+1],!(++j<k&&e===i)){if(l>j){do h(a,e,a.bl_tree);while(0!==--j)}else 0!==e?(e!==f&&(h(a,e,a.bl_tree),j--),h(a,Y,a.bl_tree),g(a,j-3,2)):10>=j?(h(a,Z,a.bl_tree),g(a,j-3,3)):(h(a,$,a.bl_tree),g(a,j-11,7));j=0,f=e,0===i?(k=138,l=3):e===i?(k=6,l=3):(k=7,l=4)}}function w(a){var b;for(u(a,a.dyn_ltree,a.l_desc.max_code),u(a,a.dyn_dtree,a.d_desc.max_code),t(a,a.bl_desc),b=S-1;b>=3&&0===a.bl_tree[2*cb[b]+1];b--);return a.opt_len+=3*(b+1)+5+5+4,b}function x(a,b,c,d){var e;for(g(a,b-257,5),g(a,c-1,5),g(a,d-4,4),e=0;d>e;e++)g(a,a.bl_tree[2*cb[e]+1],3);v(a,a.dyn_ltree,b-1),v(a,a.dyn_dtree,c-1)}function y(a){var b,c=4093624447;for(b=0;31>=b;b++,c>>>=1)if(1&c&&0!==a.dyn_ltree[2*b])return G;if(0!==a.dyn_ltree[18]||0!==a.dyn_ltree[20]||0!==a.dyn_ltree[26])return H;for(b=32;P>b;b++)if(0!==a.dyn_ltree[2*b])return H;return G}function z(a){pb||(m(),pb=!0),a.l_desc=new ob(a.dyn_ltree,kb),a.d_desc=new ob(a.dyn_dtree,lb),a.bl_desc=new ob(a.bl_tree,mb),a.bi_buf=0,a.bi_valid=0,n(a)}function A(a,b,c,d){g(a,(J<<1)+(d?1:0),3),p(a,b,c,!0)}function B(a){g(a,K<<1,3),h(a,X,eb),j(a)}function C(a,b,c,d){var e,f,h=0;a.level>0?(a.strm.data_type===I&&(a.strm.data_type=y(a)),t(a,a.l_desc),t(a,a.d_desc),h=w(a),e=a.opt_len+3+7>>>3,f=a.static_len+3+7>>>3,e>=f&&(e=f)):e=f=c+5,e>=c+4&&-1!==b?A(a,b,c,d):a.strategy===F||f===e?(g(a,(K<<1)+(d?1:0),3),s(a,eb,fb)):(g(a,(L<<1)+(d?1:0),3),x(a,a.l_desc.max_code+1,a.d_desc.max_code+1,h+1),s(a,a.dyn_ltree,a.dyn_dtree)),n(a),d&&o(a)}function D(a,b,c){return a.pending_buf[a.d_buf+2*a.last_lit]=b>>>8&255,a.pending_buf[a.d_buf+2*a.last_lit+1]=255&b,a.pending_buf[a.l_buf+a.last_lit]=255&c,a.last_lit++,0===b?a.dyn_ltree[2*c]++:(a.matches++,b--,a.dyn_ltree[2*(hb[c]+P+1)]++,a.dyn_dtree[2*e(b)]++),a.last_lit===a.lit_bufsize-1}var E=a("../utils/common"),F=4,G=0,H=1,I=2,J=0,K=1,L=2,M=3,N=258,O=29,P=256,Q=P+1+O,R=30,S=19,T=2*Q+1,U=15,V=16,W=7,X=256,Y=16,Z=17,$=18,_=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],ab=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],bb=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],cb=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],db=512,eb=new Array(2*(Q+2));d(eb);var fb=new Array(2*R);d(fb);var gb=new Array(db);d(gb);var hb=new Array(N-M+1);d(hb);var ib=new Array(O);d(ib);var jb=new Array(R);d(jb);var kb,lb,mb,nb=function(a,b,c,d,e){this.static_tree=a,this.extra_bits=b,this.extra_base=c,this.elems=d,this.max_length=e,this.has_stree=a&&a.length},ob=function(a,b){this.dyn_tree=a,this.max_code=0,this.stat_desc=b},pb=!1;c._tr_init=z,c._tr_stored_block=A,c._tr_flush_block=C,c._tr_tally=D,c._tr_align=B},{"../utils/common":27}],39:[function(a,b){"use strict";function c(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}b.exports=c},{}]},{},[9])(9)});
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
deleted file mode 100644
index 98a31fe8544..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/script.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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.
- */
-
-var packageSearchIndex;
-var typeSearchIndex;
-var memberSearchIndex;
-var tagSearchIndex;
-function loadScripts(doc, tag) {
-    createElem(doc, tag, 'jquery/jszip/dist/jszip.js');
-    createElem(doc, tag, 'jquery/jszip-utils/dist/jszip-utils.js');
-    if (window.navigator.userAgent.indexOf('MSIE ') > 0 || window.navigator.userAgent.indexOf('Trident/') > 0 ||
-            window.navigator.userAgent.indexOf('Edge/') > 0) {
-        createElem(doc, tag, 'jquery/jszip-utils/dist/jszip-utils-ie.js');
-    }
-    createElem(doc, tag, 'search.js');
-    
-    $.get(pathtoroot + "package-search-index.zip")
-            .done(function() {
-                JSZipUtils.getBinaryContent(pathtoroot + "package-search-index.zip", function(e, data) {
-                    var zip = new JSZip(data);
-                    zip.load(data);
-                    packageSearchIndex = JSON.parse(zip.file("package-search-index.json").asText());
-                });
-            });
-    $.get(pathtoroot + "type-search-index.zip")
-            .done(function() {
-                JSZipUtils.getBinaryContent(pathtoroot + "type-search-index.zip", function(e, data) {
-                    var zip = new JSZip(data);
-                    zip.load(data);
-                    typeSearchIndex = JSON.parse(zip.file("type-search-index.json").asText());
-                });
-            });
-    $.get(pathtoroot + "member-search-index.zip")
-            .done(function() {
-                JSZipUtils.getBinaryContent(pathtoroot + "member-search-index.zip", function(e, data) {
-                    var zip = new JSZip(data);
-                    zip.load(data);
-                    memberSearchIndex = JSON.parse(zip.file("member-search-index.json").asText());
-                });
-            });
-    $.get(pathtoroot + "tag-search-index.zip")
-            .done(function() {
-                JSZipUtils.getBinaryContent(pathtoroot + "tag-search-index.zip", function(e, data) {
-                    var zip = new JSZip(data);
-                    zip.load(data);
-                    tagSearchIndex = JSON.parse(zip.file("tag-search-index.json").asText());
-                });
-            });
-}
-
-function createElem(doc, tag, path) {
-    var script = doc.createElement(tag);
-    var scriptElement = doc.getElementsByTagName(tag)[0];
-    script.src = pathtoroot + path;
-    scriptElement.parentNode.insertBefore(script, scriptElement);
-}
-
-function show(type)
-{
-    count = 0;
-    for (var key in methods) {
-        var row = document.getElementById(key);
-        if ((methods[key] &  type) != 0) {
-            row.style.display = '';
-            row.className = (count++ % 2) ? rowColor : altColor;
-        }
-        else
-            row.style.display = 'none';
-    }
-    updateTabs(type);
-}
-
-function updateTabs(type)
-{
-    for (var value in tabs) {
-        var sNode = document.getElementById(tabs[value][0]);
-        var spanNode = sNode.firstChild;
-        if (value == type) {
-            sNode.className = activeTableTab;
-            spanNode.innerHTML = tabs[value][1];
-        }
-        else {
-            sNode.className = tableTab;
-            spanNode.innerHTML = "<a href=\"javascript:show("+ value + ");\">" + tabs[value][1] + "</a>";
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/search.js b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/search.js
deleted file mode 100644
index 51cd65a5ffc..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/search.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-
-var noResult = {l: "No results found"};
-var category = "category";
-var catPackages = "Packages";
-var catTypes = "Types";
-var catMembers = "Members";
-var catSearchTags = "SearchTags";
-function getName(name) {
-    var anchor = "";
-    var ch = '';
-    for (i = 0; i < name.length; i++) {
-        ch = name.charAt(i);
-        switch (ch) {
-            case '(':
-            case ')':
-            case '<':
-            case '>':
-            case ',':
-                anchor += "-";
-                break;
-            case ' ':
-            case '[':
-                break;
-            case ']':
-                anchor += ":A";
-                break;
-            case '$':
-                if (i == 0)
-                    anchor += "Z:Z";
-                anchor += ":D";
-                break;
-            case '_':
-                if (i == 0)
-                    anchor += "Z:Z";
-                anchor += ch;
-                break;
-            default:
-                anchor += ch;
-        }
-    }
-    return anchor;
-}
-var watermark = 'Search';
-$(function() {
-    $("#search").prop("disabled", false);
-    $("#reset").prop("disabled", false);
-    $("#search").val(watermark).addClass('watermark');
-    $("#search").blur(function(){
-        if ($(this).val().length == 0) {
-            $(this).val(watermark).addClass('watermark');
-        }
-    });
-    $("#search").keydown(function(){
-       if ($(this).val() == watermark) {
-            $(this).val('').removeClass('watermark');
-        }
-    });
-    $("#reset").click(function(){
-       $("#search").val('');
-       $("#search").focus();
-    });
-    $("#search").focus();
-    $("#search")[0].setSelectionRange(0,0);
-});
-$.widget("custom.catcomplete", $.ui.autocomplete, {
-    _create: function() {
-        this._super();
-        this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
-    },
-    _renderMenu: function(ul, items) {
-        var rMenu = this,
-                currentCategory = "";
-        $.each(items, function(index, item) {
-            var li;
-            if (item.l !== noResult.l && item.category !== currentCategory) {
-                ul.append("<li class=\"ui-autocomplete-category\">" + item.category + "</li>");
-                currentCategory = item.category;
-            }
-            li = rMenu._renderItemData(ul, item);
-            if (item.category) {
-                li.attr("aria-label", item.category + " : " + item.l);
-                li.attr("class", "resultItem");
-            } else {
-                li.attr("aria-label", item.l);
-                li.attr("class", "resultItem");
-            }
-        });
-    },
-    _renderItem: function(ul, item) {
-        var result = this.element.val();
-        var regexp = new RegExp($.ui.autocomplete.escapeRegex(result), "i");
-        highlight = "<span class=\"resultHighlight\">$&</span>";
-        var label = "";
-        if (item.category === catPackages) {
-            label = item.l.replace(regexp, highlight);
-        } else if (item.category === catTypes) {
-            label += (item.p + "." + item.l).replace(regexp, highlight);
-        } else if (item.category === catMembers) {
-            label += item.p + "." + (item.c + "." + item.l).replace(regexp, highlight);
-        } else if (item.category === catSearchTags) {
-            label = item.l.replace(regexp, highlight);
-        } else {
-            label = item.l;
-        }
-        $li = $("<li/>").appendTo(ul);
-        if (item.category === catSearchTags) {
-            if (item.d) {
-                $("<a/>").attr("href", "#")
-                        .html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span><br><span class=\"searchTagDescResult\">"
-                                + item.d + "</span><br>")
-                        .appendTo($li);
-            } else {
-                $("<a/>").attr("href", "#")
-                        .html(label + "<span class=\"searchTagHolderResult\"> (" + item.h + ")</span>")
-                        .appendTo($li);
-            }
-        } else {
-            $("<a/>").attr("href", "#")
-                    .html(label)
-                    .appendTo($li);
-        }
-        return $li;
-    }
-});
-$(function() {
-    $("#search").catcomplete({
-        minLength: 1,
-        delay: 100,
-        source: function(request, response) {
-            var result = new Array();
-            var tresult = new Array();
-            var mresult = new Array();
-            var tgresult = new Array();
-            var displayCount = 0;
-            var exactMatcher = new RegExp("^" + $.ui.autocomplete.escapeRegex(request.term) + "$", "i");
-            var secondaryMatcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
-            if (packageSearchIndex) {
-                var pCount = 0;
-                $.each(packageSearchIndex, function(index, item) {
-                    item[category] = catPackages;
-                    if (exactMatcher.test(item.l)) {
-                        result.unshift(item);
-                        pCount++;
-                    } else if (secondaryMatcher.test(item.l)) {
-                        result.push(item);
-                    }
-                });
-                displayCount = pCount;
-            }
-            if (typeSearchIndex) {
-                var tCount = 0;
-                $.each(typeSearchIndex, function(index, item) {
-                    item[category] = catTypes;
-                    if (exactMatcher.test(item.l)) {
-                        tresult.unshift(item);
-                        tCount++;
-                    } else if (secondaryMatcher.test(item.p + "." + item.l)) {
-                        tresult.push(item);
-                    }
-                });
-                result = result.concat(tresult);
-                displayCount = (tCount > displayCount) ? tCount : displayCount;
-            }
-            if (memberSearchIndex) {
-                var mCount = 0;
-                $.each(memberSearchIndex, function(index, item) {
-                    item[category] = catMembers;
-                    if (exactMatcher.test(item.l)) {
-                        mresult.unshift(item);
-                        mCount++;
-                    } else if (secondaryMatcher.test(item.c + "." + item.l)) {
-                        mresult.push(item);
-                    }
-                });
-                result = result.concat(mresult);
-                displayCount = (mCount > displayCount) ? mCount : displayCount;
-            }
-            if (tagSearchIndex) {
-                var tgCount = 0;
-                $.each(tagSearchIndex, function(index, item) {
-                    item[category] = catSearchTags;
-                    if (exactMatcher.test(item.l)) {
-                        tgresult.unshift(item);
-                        tgCount++;
-                    } else if (secondaryMatcher.test(item.l)) {
-                        tgresult.push(item);
-                    }
-                });
-                result = result.concat(tgresult);
-                displayCount = (tgCount > displayCount) ? tgCount : displayCount;
-            }
-            displayCount = (displayCount > 500) ? displayCount : 500;
-            var counter = function() {
-                var count = {Packages: 0, Types: 0, Members: 0, SearchTags: 0};
-                var f = function(item) {
-                    count[item.category] += 1;
-                    return (count[item.category] <= displayCount);
-                };
-                return f;
-            }();
-            response(result.filter(counter));
-        },
-        response: function(event, ui) {
-            if (!ui.content.length) {
-                ui.content.push(noResult);
-            } else {
-                $("#search").empty();
-            }
-        },
-        autoFocus: true,
-        position: {
-            collision: "flip"
-        },
-        select: function(event, ui) {
-            if (ui.item.l !== noResult.l) {
-                var url = "";
-                if (ui.item.category === catPackages) {
-                    url = ui.item.l.replace(/\./g, '/') + "/package-summary.html";
-                } else if (ui.item.category === catTypes) {
-                    if (ui.item.p === "<Unnamed>") {
-                        url = "/" + ui.item.l + ".html";
-                    } else {
-                        url = ui.item.p.replace(/\./g, '/') + "/" + ui.item.l + ".html";
-                    }
-                } else if (ui.item.category === catMembers) {
-                    if (ui.item.p === "<Unnamed>") {
-                        url = "/" + ui.item.c + ".html" + "#";
-                    } else {
-                        url = ui.item.p.replace(/\./g, '/') + "/" + ui.item.c + ".html" + "#";
-                    }
-                    if (ui.item.url) {
-                        url += ui.item.url;
-                    } else {
-                        url += getName(ui.item.l);
-                    }
-                } else if (ui.item.category === catSearchTags) {
-                    url += ui.item.u;
-                }
-                if (top !== window) {
-                    parent.classFrame.location = pathtoroot + url;
-                } else {
-                    window.location.href = pathtoroot + url;
-                }
-            }
-        }
-    });
-});
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
deleted file mode 100644
index 55b5109334f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
+++ /dev/null
@@ -1,753 +0,0 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
-    background-color:#ffffff;
-    color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
-    margin:0;
-    padding:0;
-    height:100%;
-    width:100%;
-}
-iframe {
-    margin:0;
-    padding:0;
-    height:100%;
-    width:100%;
-    overflow-y:scroll;
-    border:none;
-}
-a:link, a:visited {
-    text-decoration:none;
-    color:#4A6782;
-}
-a:hover, a:focus {
-    text-decoration:none;
-    color:#bb7a2a;
-}
-a:active {
-    text-decoration:none;
-    color:#4A6782;
-}
-a[name] {
-    color:#353833;
-}
-a[name]:hover {
-    text-decoration:none;
-    color:#353833;
-}
-a[name]:before, a[name]:target {
-    content:"";
-    display:block;
-    height:120px;
-    margin:-120px 0 0;
-}
-a[id]:before, a[id]:target {
-    padding-top:129px;
-    margin-top:-129px;
-    color:red;
-}
-pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-}
-h1 {
-    font-size:20px;
-}
-h2 {
-    font-size:18px;
-}
-h3 {
-    font-size:16px;
-    font-style:italic;
-}
-h4 {
-    font-size:13px;
-}
-h5 {
-    font-size:12px;
-}
-h6 {
-    font-size:11px;
-}
-ul {
-    list-style-type:disc;
-}
-code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-    margin-top:8px;
-    line-height:1.4em;
-}
-dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-}
-table tr td dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    vertical-align:top;
-    padding-top:4px;
-}
-sup {
-    font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
-    clear:both;
-    height:0px;
-    overflow:hidden;
-}
-.aboutLanguage {
-    float:right;
-    padding:0px 21px;
-    font-size:11px;
-    z-index:200;
-    margin-top:-9px;
-}
-.legalCopy {
-    margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
-    color:#FFFFFF;
-    text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
-    color:#bb7a2a;
-}
-.tab {
-    background-color:#0066FF;
-    color:#ffffff;
-    padding:8px;
-    width:5em;
-    font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    padding:.8em .5em .4em .8em;
-    height:auto;/*height:1.8em;*/
-    font-size:11px;
-    margin:0;
-}
-.navPadding {
-    padding-top: 100px;
-}
-.fixedNav {
-    position:fixed;
-    width:100%;
-    z-index:999;
-    background-color:#ffffff;
-}
-.topNav {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px; 
-}
-.bottomNav {
-    margin-top:10px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav {
-    background-color:#dee3e9;
-    float:left;
-    width:100%;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav div {
-    clear:left;
-    float:left;
-    padding:0 0 5px 6px;
-    text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
-    float:left;
-    margin:0 25px 0 0;
-    padding:0;
-}
-ul.navList li{
-    list-style:none;
-    float:left;
-    padding: 5px 6px;
-    text-transform:uppercase;
-}
-ul.navListSearch {
-    float:right;
-    margin:0 0 0 0;
-    padding:0;
-}
-ul.navListSearch li {
-    list-style:none;
-    float:right;
-    padding: 5px 6px;
-    text-transform:uppercase;
-}
-ul.navListSearch li span {
-    position:relative;
-    right:-16px;
-}
-ul.subNavList li {
-    list-style:none;
-    float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
-    color:#FFFFFF;
-    text-decoration:none;
-    text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
-    text-decoration:none;
-    color:#bb7a2a;
-    text-transform:uppercase;
-}
-.navBarCell1Rev {
-    background-color:#F8981D;
-    color:#253441;
-    margin: auto 5px;
-}
-.skipNav {
-    position:absolute;
-    top:auto;
-    left:-9999px;
-    overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
-    clear:both;
-    margin:0 20px;
-    padding:5px 0 0 0;
-}
-.indexNav {
-    margin:10px;
-    position:relative;
-}
-.indexNav ul {
-    padding:0;
-    margin:0;
-}
-.indexNav ul li {
-    display:inline;
-    list-style-type:none;
-    padding-right:10px;
-}
-.indexNav h1 {
-    font-size:13px;
-}
-.title {
-    color:#2c4557;
-    margin:10px 0;
-}
-.subTitle {
-    margin:5px 0 0 0;
-}
-.header ul {
-    margin:0 0 15px 0;
-    padding:0;
-}
-.footer ul {
-    margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
-    list-style:none;
-    font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
-    padding:0;
-    margin:15px 0;
-}
-ul.blockList li.blockList h2 {
-    padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
-    clear:both;
-    padding:10px 20px;
-    position:relative;
-}
-.indexContainer {
-    margin:10px;
-    position:relative;
-    font-size:12px;
-}
-.indexContainer h2 {
-    font-size:13px;
-    padding:0 0 3px 0;
-}
-.indexContainer ul {
-    margin:0;
-    padding:0;
-}
-.indexContainer ul li {
-    list-style:none;
-    padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
-    font-size:12px;
-    font-weight:bold;
-    margin:10px 0 0 0;
-    color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
-    margin:5px 0 10px 0px;
-    font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
-    margin-left:1px;
-    font-size:1.1em;
-    display:inline;
-    font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
-    margin:0 0 0 1px;
-    font-size:1.1em;
-    display:inline;
-}
-/*
-List styles
-*/
-li.circle {
-    list-style:circle;
-}
-ul.horizontal li {
-    display:inline;
-    font-size:0.9em;
-}
-ul.inheritance {
-    margin:0;
-    padding:0;
-}
-ul.inheritance li {
-    display:inline;
-    list-style:none;
-}
-ul.inheritance li ul.inheritance {
-    margin-left:15px;
-    padding-left:15px;
-    padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
-    margin:10px 0 10px 0;
-    padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
-    list-style:none;
-    margin-bottom:15px;
-    line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
-    padding:0px 20px 5px 10px;
-    border:1px solid #ededed; 
-    background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
-    padding:0 0 5px 8px;
-    background-color:#ffffff;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
-    margin-left:0;
-    padding-left:0;
-    padding-bottom:15px;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
-    list-style:none;
-    border-bottom:none;
-    padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
-    margin-top:0;
-    margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
-    width:100%;
-    border-spacing:0;
-    border-left:1px solid #EEE; 
-    border-right:1px solid #EEE; 
-    border-bottom:1px solid #EEE; 
-}
-.overviewSummary, .memberSummary  {
-    padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
-    position:relative;
-    text-align:left;
-    background-repeat:no-repeat;
-    color:#253441;
-    font-weight:bold;
-    clear:none;
-    overflow:hidden;
-    padding:0px;
-    padding-top:10px;
-    padding-left:1px;
-    margin:0px;
-    white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
-    color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    border: none;
-    height:16px;
-}
-.memberSummary caption span.activeTableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    height:16px;
-}
-.memberSummary caption span.tableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#4D7A97;
-    height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
-    padding-top:0px;
-    padding-left:0px;
-    padding-right:0px;
-    background-image:none;
-    float:none;
-    display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
-    display:none;
-    width:5px;
-    position:relative;
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative; 
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative;
-    background-color:#4D7A97;
-    float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
-    text-align:left;
-    padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
-    vertical-align:top;
-    padding-right:0px;
-    padding-top:8px;
-    padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
-    background:#dee3e9;
-    text-align:left;
-    padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
-    white-space:nowrap;
-    font-size:13px;
-}
-td.colLast, th.colLast {
-    font-size:13px;
-}
-td.colOne, th.colOne {
-    font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
-    width:25%;
-    vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
-    font-weight:bold;
-}
-.tableSubHeadingColor {
-    background-color:#EEEEFF;
-}
-.altColor {
-    background-color:#FFFFFF;
-}
-.rowColor {
-    background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
-    margin-top:0;
-}
-.deprecatedContent {
-    margin:0;
-    padding:10px 0;
-}
-.docSummary {
-    padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    font-style:normal;
-}
-
-div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
-    padding-top:0px;
-}
-
-
-td.colLast a {
-    padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
-    color:green;
-    padding:0 30px 0 0;
-}
-h1.hidden {
-    visibility:hidden;
-    overflow:hidden;
-    font-size:10px;
-}
-.block {
-    display:block;
-    margin:3px 10px 2px 0px;
-    color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .packageLabelInClass, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink, .searchTagLink {
-    font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
-    font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
-    font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2 {
-    padding-bottom:0px;
-}
-/*
-IFRAME specific styles
-*/
-.mainContainer {
-    margin:0 auto; 
-    padding:0; 
-    height:100%; 
-    width:100%; 
-    position:fixed; 
-    top:0; 
-    left:0;
-}
-.leftContainer {
-    height:100%;
-    position:fixed;
-    width:320px;
-}
-.leftTop {
-    position:relative;
-    float:left;
-    width:315px;
-    top:0;
-    left:0;
-    height:30%;
-    border-right:6px solid #ccc;
-    border-bottom:6px solid #ccc;
-}
-.leftBottom {
-    position:relative;
-    float:left;
-    width:315px;
-    bottom:0;
-    left:0;
-    height:70%;
-    border-right:6px solid #ccc;
-    border-top:1px solid #000;
-}
-.rightContainer {
-    position:absolute;
-    left:320px;
-    top:0;
-    bottom:0;
-    height:100%;
-    right:0;
-    border-left:1px solid #000;
-}
-.rightIframe {
-    margin:0;
-    padding:0;
-    height:100%;
-    right:30px;
-    width:100%;
-    overflow:visible;
-    margin-bottom:30px;
-}
-/*
-HTML5 specific styles
-*/
-main, nav, header, footer, section {
-    display:block;
-}
-.ui-autocomplete-category {
-    font-weight:bold;
-    font-size:15px;
-    padding:7px 0 7px 3px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-}
-.resultItem {
-    font-size:13px;
-}
-.ui-autocomplete {
-    max-height:85%;
-    max-width:65%;
-    overflow-y:scroll;
-    overflow-x:scroll;
-    white-space:nowrap;
-    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-}
-ul.ui-autocomplete {
-    position:fixed;
-    z-index:999999;
-}
-ul.ui-autocomplete  li {
-    float:left;
-    clear:both;
-    width:100%;
-}
-.resultHighlight {
-    font-weight:bold;
-}
-#search {
-    background-image:url('resources/glass.png');
-    background-size:13px;
-    background-repeat:no-repeat;
-    background-position:2px 3px;
-    padding-left:20px;
-    position:relative;
-    right:-18px;
-}
-#reset {
-    background-color: rgb(255,255,255);
-    border:0 none;
-    width:16px;
-    height:17px;
-    position:relative;
-    left:-2px;
-    background-image:url('resources/x.png');
-    background-repeat:no-repeat;
-    background-size:12px;
-    background-position:center;
-}
-.watermark {
-    color:#888;
-}
-.searchTagDescResult {
-    font-style:italic;
-    font-size:11px;
-}
-.searchTagHolderResult {
-    font-style:italic;
-    font-size:12px;
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/x.png b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/resources/x.png
deleted file mode 100644
index 30548a756e151be4e927e8d28c508cc5b3514bf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzEJ;K`RCwBAZ10)C00gB#Tm-~f6~+1M
z8SsFP-icvAY7!8)0M$-mc5(A40dl&5m<Nahj~qXF-Nwq|Iu6a@Kx!Ef^8&FKQ0;pr
zAfpyZ4I2<I2PzD~p?N6~Gb0ICfegq6;=f3OtmuZ|&<xU(#{wi40r7tzo{yw}1!@Q*
zkY>W6IT{!St5~1{i=i}zAy76p%_|w8rh@@c0Axr!ns=D-X+|*sY6!@wacG9%)Qn*O
zl0sa739kT-&_?#oVxXF6tOnqTD)cZ}2vi$`ZU8RLAlo8=_z#*P3xI~i!lEh+Pdu-L
zx{d*wgjtXbnGX_Yf@Tc7Q3YhLhPvc8noGJs2DA~1DySiA&<p{k-g=k|K>6V{5JzFt
ojAY1KXm~va;tU{v7C?Xj0BHw!K;2aXV*mgE07*qoM6N<$f;4TDA^-pY

diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
deleted file mode 100644
index 403f0721049..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * 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.doclets.internal.toolkit.taglets;
-
-/**
- * An abstract class for that implements the {@link Taglet} interface
- * for tags in <code>ExecutableMembers</code>.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public abstract class BaseExecutableMemberTaglet extends BaseTaglet {
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in field documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public boolean inField() {
-        return false;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in overview documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in overview documentation and false
-     * otherwise.
-     */
-    public boolean inOverview() {
-        return false;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in package documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public boolean inPackage() {
-        return false;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in type documentation (classes or interfaces).
-     * @return true if this <code>Taglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public boolean inType() {
-        return false;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
deleted file mode 100644
index e20b6761c11..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2001, 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
- * 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.doclets.internal.toolkit.taglets;
-
-/**
- * An abstract inline taglet that outputs HTML.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public abstract class BaseInlineTaglet extends BaseTaglet {
-
-    /**
-     * Will return true since this is an inline tag.
-     * @return true since this is an inline tag.
-     */
-    public boolean isInlineTag() {
-        return true;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
deleted file mode 100644
index 3a4fd36ec40..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * An abstract class that implements the {@link Taglet} interface and
- * serves as a base for JavaFX property getter and setter taglets.
- *
- *  <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>
- *
- */
-@Deprecated
-public abstract class BasePropertyTaglet extends BaseTaglet {
-
-    public BasePropertyTaglet() {
-    }
-
-    /**
-     * This method returns the text to be put in the resulting javadoc before
-     * the property name.
-     *
-     * @param tagletWriter the taglet writer for output
-     * @return the string to be put in the resulting javadoc.
-     */
-    abstract String getText(TagletWriter tagletWriter);
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation, which is output
-     * to the generated page.
-     * @param tag the <code>Tag</code> representation of this custom tag.
-     * @param tagletWriter the taglet writer for output.
-     * @return the TagletOutput representation of this <code>Tag</code>.
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter tagletWriter) {
-        return tagletWriter.propertyTagOutput(tag, getText(tagletWriter));
-    }
-
-    /**
-     * Will return false because this tag may
-     * only appear in Methods.
-     * @return false since this is not a method.
-     */
-    public boolean inConstructor() {
-        return false;
-    }
-
-    /**
-     * Will return false because this tag may
-     * only appear in Methods.
-     * @return false since this is not a method.
-     */
-    public boolean inOverview() {
-        return false;
-    }
-
-    /**
-     * Will return false because this tag may
-     * only appear in Methods.
-     * @return false since this is not a method.
-     */
-    public boolean inPackage() {
-        return false;
-    }
-
-    /**
-     * Will return false because this tag may
-     * only appear in Methods.
-     * @return false since this is not a method.
-     */
-    public boolean inType() {
-        return false;
-    }
-
-    /**
-     * Will return false because this tag is not inline.
-     * @return false since this is not an inline tag.
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
deleted file mode 100644
index b12a5e71220..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * An abstract class for that implements the {@link Taglet} interface.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public abstract class BaseTaglet implements Taglet {
-
-    protected String name = "Default";
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in constructor documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public boolean inConstructor() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in field documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public boolean inField() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in method documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public boolean inMethod() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in overview documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public boolean inOverview() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in package documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public boolean inPackage() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in type documentation (classes or interfaces).
-     * @return true if this <code>Taglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    /**
-     * Return the name of this custom tag.
-     * @return the name of this custom tag.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @throws IllegalArgumentException thrown when the method is not supported by the taglet.
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        throw new IllegalArgumentException("Method not supported in taglet " + getName() + ".");
-    }
-
-    /**
-     * {@inheritDoc}
-     * @throws IllegalArgumentException thrown when the method is not supported by the taglet.
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        throw new IllegalArgumentException("Method not supported in taglet " + getName() + ".");
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
deleted file mode 100644
index 5cd44bee7e8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import java.util.Map;
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * An inline Taglet used to denote literal code fragments.
- * The enclosed text is interpreted as not containing HTML markup or
- * nested javadoc tags, and is rendered in a font suitable for code.
- *
- * <p> The tag {@code {@code ...}} is equivalent to
- * {@code <code>{@literal ...}</code>}.
- * For example, the text:
- * <blockquote>  The type {@code {@code List<P>}}  </blockquote>
- * displays as:
- * <blockquote>  The type {@code List<P>}  </blockquote>
- *
- *  <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>
- *
- * @author Scott Seligman
- * @since 1.5
- */
-
-@Deprecated
-public class CodeTaglet extends BaseInlineTaglet {
-
-    private static final String NAME = "code";
-
-    public static void register(Map<String, Taglet> map) {
-        map.remove(NAME);
-        map.put(NAME, new CodeTaglet());
-    }
-
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        return writer.codeTagOutput(tag);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
deleted file mode 100644
index 23f557b9675..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * A taglet that represents the @deprecated tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-
-@Deprecated
-public class DeprecatedTaglet extends BaseTaglet{
-
-    public DeprecatedTaglet() {
-        name = "deprecated";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        return writer.deprecatedTagOutput(holder);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
deleted file mode 100644
index 7d26b3739b3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * An inline Taglet representing {&#064;docRoot}.  This taglet is
- * used to get the relative path to the document's root output
- * directory.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @author Doug Kramer
- * @since 1.4
- */
-
-@Deprecated
-public class DocRootTaglet extends BaseInlineTaglet {
-
-
-    /**
-     * Construct a new DocRootTaglet.
-     */
-    public DocRootTaglet() {
-        name = "docRoot";
-    }
-
-    /**
-     * Given a <code>Doc</code> object, check if it holds any tags of
-     * this type.  If it does, return the string representing the output.
-     * If it does not, return null.
-     * @param tag a tag representing the custom tag.
-     * @param writer a {@link TagletWriter} Taglet writer.
-     * @return the string representation of this <code>Tag</code>.
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        return writer.getDocRootOutput();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java
deleted file mode 100644
index 16a94defeb3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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.doclets.internal.toolkit.taglets;
-
-import java.util.Map;
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * An inline Taglet used to index word or a phrase.
- * The enclosed text is interpreted as not containing HTML markup or
- * nested javadoc tags.
- *
- * @author Bhavesh Patel
- */
-
-@Deprecated
-public class IndexTaglet extends BaseInlineTaglet {
-
-    private static final String NAME = "index";
-
-    public static void register(Map<String, Taglet> map) {
-        map.remove(NAME);
-        map.put(NAME, new IndexTaglet());
-    }
-
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        return writer.indexTagOutput(tag);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
deleted file mode 100644
index 05e17d93590..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * An inline Taglet representing the <b>inheritDoc</b> tag. This tag should only
- * be used with a method.  It is used to inherit documentation from overriden
- * and implemented methods.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public class InheritDocTaglet extends BaseInlineTaglet {
-
-    /**
-     * The inline tag that would appear in the documentation if
-     * the writer wanted documentation to be inherited.
-     */
-    public static final String INHERIT_DOC_INLINE_TAG = "{@inheritDoc}";
-
-    /**
-     * Construct a new InheritDocTaglet.
-     */
-    public InheritDocTaglet () {
-        name = "inheritDoc";
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * not appear in Fields.
-     * @return false
-     */
-    public boolean inField() {
-        return false;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * not appear in Constructors.
-     * @return false
-     */
-    public boolean inConstructor() {
-        return false;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * not appear in Overview.
-     * @return false
-     */
-    public boolean inOverview() {
-        return false;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * not appear in Packages.
-     * @return false
-     */
-    public boolean inPackage() {
-        return false;
-    }
-
-    /**
-     * Will return true because this inline tag may
-     * appear in Type (Class).
-     * @return true
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * Given a <code>MethodDoc</code> item, a <code>Tag</code> in the
-     * <code>MethodDoc</code> item and a String, replace all occurrences
-     * of @inheritDoc with documentation from it's superclass or superinterface.
-     *
-     * @param writer the writer that is writing the output.
-     * @param ped the {@link ProgramElementDoc} that we are documenting.
-     * @param holderTag the tag that holds the inheritDoc tag or null for type
-     * (class) docs.
-     * @param isFirstSentence true if we only want to inherit the first sentence.
-     */
-    private Content retrieveInheritedDocumentation(TagletWriter writer,
-            ProgramElementDoc ped, Tag holderTag, boolean isFirstSentence) {
-        Content replacement = writer.getOutputInstance();
-
-        Configuration configuration = writer.configuration();
-        Taglet inheritableTaglet = holderTag == null ?
-            null : configuration.tagletManager.getTaglet(holderTag.name());
-        if (inheritableTaglet != null &&
-            !(inheritableTaglet instanceof InheritableTaglet)) {
-                String message = ped.name() +
-                    ((ped instanceof ExecutableMemberDoc)
-                        ? ((ExecutableMemberDoc)ped).flatSignature()
-                        : "");
-                //This tag does not support inheritence.
-                configuration.message.warning(ped.position(),
-                "doclet.noInheritedDoc", message);
-         }
-        DocFinder.Output inheritedDoc =
-            DocFinder.search(configuration, new DocFinder.Input(ped,
-                (InheritableTaglet) inheritableTaglet, holderTag,
-                isFirstSentence, true));
-        if (inheritedDoc.isValidInheritDocTag) {
-            if (inheritedDoc.inlineTags.length > 0) {
-                replacement = writer.commentTagsToOutput(inheritedDoc.holderTag,
-                    inheritedDoc.holder, inheritedDoc.inlineTags, isFirstSentence);
-            }
-        } else {
-            String message = ped.name() +
-                    ((ped instanceof ExecutableMemberDoc)
-                        ? ((ExecutableMemberDoc)ped).flatSignature()
-                        : "");
-            configuration.message.warning(ped.position(),
-                "doclet.noInheritedDoc", message);
-        }
-        return replacement;
-    }
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation, which is output
-     * to the generated page.
-     * @param tag the <code>Tag</code> representation of this custom tag.
-     * @param tagletWriter the taglet writer for output.
-     * @return the Content representation of this <code>Tag</code>.
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter tagletWriter) {
-        if (! (tag.holder() instanceof ProgramElementDoc)) {
-            return tagletWriter.getOutputInstance();
-        }
-        return tag.name().equals("@inheritDoc") ?
-                retrieveInheritedDocumentation(tagletWriter, (ProgramElementDoc) tag.holder(), null, tagletWriter.isFirstSentence) :
-                retrieveInheritedDocumentation(tagletWriter, (ProgramElementDoc) tag.holder(), tag, tagletWriter.isFirstSentence);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
deleted file mode 100644
index c29a0490505..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit.taglets;
-
-import com.sun.tools.doclets.internal.toolkit.util.DocFinder;
-
-/**
- * A taglet should implement this interface if it supports the inheritDoc
- * tag or is automatically inherited if it is missing.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public interface InheritableTaglet extends Taglet {
-
-    /**
-     * Given an {@link com.sun.tools.doclets.internal.toolkit.util.DocFinder.Output}
-     * object, set its values with the appropriate information to inherit
-     * documentation.
-     *
-     * @param input  the input for documentation search.
-     * @param output the output for documentation search.
-     */
-    void inherit(DocFinder.Input input, DocFinder.Output output);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
deleted file mode 100644
index f9bd360f427..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.markup.RawHtml;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * This taglet acts as a wrapper to enable
- * {@link com.sun.tools.doclets.Taglet} type taglets to work
- * with the current version of Javadoc.
- * Note: this taglet only works with legacy taglets (those compatible with
- * Javadoc 1.4.x) that writes strings.
- * This taglet is able to wrap most most legacy taglets because
- * the standard doclet is the only known doclet to use legacy taglets.
- *
- *  <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>
- *
- * @since 1.5
- * @author Jamie Ho
- */
-
-@Deprecated
-public class LegacyTaglet implements Taglet {
-
-    private com.sun.tools.doclets.Taglet legacyTaglet;
-
-    public LegacyTaglet(com.sun.tools.doclets.Taglet t) {
-        legacyTaglet = t;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inField() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inField();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inConstructor() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inConstructor();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inMethod() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inMethod();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inOverview() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inOverview();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inPackage() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inPackage();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inType() {
-        return legacyTaglet.isInlineTag() || legacyTaglet.inType();
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public boolean isInlineTag() {
-        return legacyTaglet.isInlineTag();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getName() {
-        return legacyTaglet.getName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer)
-            throws IllegalArgumentException {
-        Content output = writer.getOutputInstance();
-        output.addContent(new RawHtml(legacyTaglet.toString(tag)));
-        return output;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer)
-            throws IllegalArgumentException {
-        Content output = writer.getOutputInstance();
-        Tag[] tags = holder.tags(getName());
-        if (tags.length > 0) {
-            String tagString = legacyTaglet.toString(tags);
-            if (tagString != null) {
-                output.addContent(new RawHtml(tagString));
-            }
-        }
-        return output;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
deleted file mode 100644
index b6898039701..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import java.util.Map;
-
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-
-/**
- * An inline Taglet used to denote literal text.
- * The enclosed text is interpreted as not containing HTML markup or
- * nested javadoc tags.
- * For example, the text:
- * <blockquote>  {@code {@literal a<B>c}}  </blockquote>
- * displays as:
- * <blockquote>  {@literal a<B>c}  </blockquote>
- *
- *  <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>
- *
- * @author Scott Seligman
- * @since 1.5
- */
-
-@Deprecated
-public class LiteralTaglet extends BaseInlineTaglet {
-
-    private static final String NAME = "literal";
-
-    public static void register(Map<String, Taglet> map) {
-        map.remove(NAME);
-        map.put(NAME, new LiteralTaglet());
-    }
-
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        return writer.literalTagOutput(tag);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
deleted file mode 100644
index 54ca871c3d1..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * A taglet that represents the @param tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
-
-    /**
-     * Construct a ParamTaglet.
-     */
-    public ParamTaglet() {
-        name = "param";
-    }
-
-    /**
-     * Given an array of <code>Parameter</code>s, return
-     * a name/rank number map.  If the array is null, then
-     * null is returned.
-     * @param params The array of parmeters (from type or executable member) to
-     *               check.
-     * @return a name-rank number map.
-     */
-    private static Map<String,String> getRankMap(Object[] params){
-        if (params == null) {
-            return null;
-        }
-        HashMap<String,String> result = new HashMap<>();
-        for (int i = 0; i < params.length; i++) {
-            String name = params[i] instanceof Parameter ?
-                ((Parameter) params[i]).name() :
-                ((TypeVariable) params[i]).typeName();
-            result.put(name, String.valueOf(i));
-        }
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void inherit(DocFinder.Input input, DocFinder.Output output) {
-        if (input.tagId == null) {
-            input.isTypeVariableParamTag = ((ParamTag) input.tag).isTypeParameter();
-            Object[] parameters = input.isTypeVariableParamTag ?
-                (Object[]) ((MethodDoc) input.tag.holder()).typeParameters() :
-                (Object[]) ((MethodDoc) input.tag.holder()).parameters();
-            String target = ((ParamTag) input.tag).parameterName();
-            int i;
-            for (i = 0; i < parameters.length; i++) {
-                String name = parameters[i] instanceof Parameter ?
-                    ((Parameter) parameters[i]).name() :
-                    ((TypeVariable) parameters[i]).typeName();
-                if (name.equals(target)) {
-                    input.tagId = String.valueOf(i);
-                    break;
-                }
-            }
-            if (i == parameters.length) {
-                //Someone used {@inheritDoc} on an invalid @param tag.
-                //We don't know where to inherit from.
-                //XXX: in the future when Configuration is available here,
-                //print a warning for this mistake.
-                return;
-            }
-        }
-        ParamTag[] tags = input.isTypeVariableParamTag ?
-            ((MethodDoc)input.element).typeParamTags() : ((MethodDoc)input.element).paramTags();
-        Map<String, String> rankMap = getRankMap(input.isTypeVariableParamTag ?
-            (Object[]) ((MethodDoc)input.element).typeParameters() :
-            (Object[]) ((MethodDoc)input.element).parameters());
-        for (ParamTag tag : tags) {
-            if (rankMap.containsKey(tag.parameterName()) &&
-                rankMap.get(tag.parameterName()).equals((input.tagId))) {
-                output.holder = input.element;
-                output.holderTag = tag;
-                output.inlineTags = input.isFirstSentence ?
-                                    tag.firstSentenceTags() : tag.inlineTags();
-                return;
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inField() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inMethod() {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inOverview() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inPackage() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    /**
-     * Given an array of <code>ParamTag</code>s,return its string representation.
-     * @param holder the member that holds the param tags.
-     * @param writer the TagletWriter that will write this tag.
-     * @return the TagletOutput representation of these <code>ParamTag</code>s.
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        if (holder instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc member = (ExecutableMemberDoc) holder;
-            Content output = getTagletOutput(false, member, writer,
-                member.typeParameters(), member.typeParamTags());
-            output.addContent(getTagletOutput(true, member, writer,
-                member.parameters(), member.paramTags()));
-            return output;
-        } else {
-            ClassDoc classDoc = (ClassDoc) holder;
-            return getTagletOutput(false, classDoc, writer,
-                classDoc.typeParameters(), classDoc.typeParamTags());
-        }
-    }
-
-    /**
-     * Given an array of <code>ParamTag</code>s,return its string representation.
-     * Try to inherit the param tags that are missing.
-     *
-     * @param holder            the doc that holds the param tags.
-     * @param writer            the TagletWriter that will write this tag.
-     * @param formalParameters  The array of parmeters (from type or executable
-     *                          member) to check.
-     *
-     * @return the TagletOutput representation of these <code>ParamTag</code>s.
-     */
-    private Content getTagletOutput(boolean isNonTypeParams, Doc holder,
-            TagletWriter writer, Object[] formalParameters, ParamTag[] paramTags) {
-        Content result = writer.getOutputInstance();
-        Set<String> alreadyDocumented = new HashSet<>();
-        if (paramTags.length > 0) {
-            result.addContent(
-                processParamTags(isNonTypeParams, paramTags,
-                getRankMap(formalParameters), writer, alreadyDocumented)
-            );
-        }
-        if (alreadyDocumented.size() != formalParameters.length) {
-            //Some parameters are missing corresponding @param tags.
-            //Try to inherit them.
-            result.addContent(getInheritedTagletOutput (isNonTypeParams, holder,
-                writer, formalParameters, alreadyDocumented));
-        }
-        return result;
-    }
-
-    /**
-     * Loop through each indivitual parameter.  It it does not have a
-     * corresponding param tag, try to inherit it.
-     */
-    private Content getInheritedTagletOutput(boolean isNonTypeParams, Doc holder,
-            TagletWriter writer, Object[] formalParameters,
-            Set<String> alreadyDocumented) {
-        Content result = writer.getOutputInstance();
-        if ((! alreadyDocumented.contains(null)) &&
-                holder instanceof MethodDoc) {
-            for (int i = 0; i < formalParameters.length; i++) {
-                if (alreadyDocumented.contains(String.valueOf(i))) {
-                    continue;
-                }
-                //This parameter does not have any @param documentation.
-                //Try to inherit it.
-                DocFinder.Output inheritedDoc =
-                    DocFinder.search(writer.configuration(), new DocFinder.Input((MethodDoc) holder, this,
-                        String.valueOf(i), ! isNonTypeParams));
-                if (inheritedDoc.inlineTags != null &&
-                        inheritedDoc.inlineTags.length > 0) {
-                    result.addContent(
-                        processParamTag(isNonTypeParams, writer,
-                            (ParamTag) inheritedDoc.holderTag,
-                            isNonTypeParams ?
-                                ((Parameter) formalParameters[i]).name():
-                                ((TypeVariable) formalParameters[i]).typeName(),
-                            alreadyDocumented.size() == 0));
-                }
-                alreadyDocumented.add(String.valueOf(i));
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Given an array of <code>Tag</code>s representing this custom
-     * tag, return its string representation.  Print a warning for param
-     * tags that do not map to parameters.  Print a warning for param
-     * tags that are duplicated.
-     *
-     * @param paramTags the array of <code>ParamTag</code>s to convert.
-     * @param writer the TagletWriter that will write this tag.
-     * @param alreadyDocumented the set of exceptions that have already
-     *        been documented.
-     * @param rankMap a {@link java.util.Map} which holds ordering
-     *                    information about the parameters.
-     * @param rankMap a {@link java.util.Map} which holds a mapping
-     *                of a rank of a parameter to its name.  This is
-     *                used to ensure that the right name is used
-     *                when parameter documentation is inherited.
-     * @return the Content representation of this <code>Tag</code>.
-     */
-    private Content processParamTags(boolean isNonTypeParams,
-            ParamTag[] paramTags, Map<String, String> rankMap, TagletWriter writer,
-            Set<String> alreadyDocumented) {
-        Content result = writer.getOutputInstance();
-        if (paramTags.length > 0) {
-            for (ParamTag pt : paramTags) {
-                String paramName = isNonTypeParams ?
-                                   pt.parameterName() : "<" + pt.parameterName() + ">";
-                if (!rankMap.containsKey(pt.parameterName())) {
-                    writer.getMsgRetriever().warning(pt.position(),
-                                                     isNonTypeParams ?
-                                                     "doclet.Parameters_warn" :
-                                                     "doclet.Type_Parameters_warn",
-                                                     paramName);
-                }
-                String rank = rankMap.get(pt.parameterName());
-                if (rank != null && alreadyDocumented.contains(rank)) {
-                    writer.getMsgRetriever().warning(pt.position(),
-                                                     isNonTypeParams ?
-                                                     "doclet.Parameters_dup_warn" :
-                                                     "doclet.Type_Parameters_dup_warn",
-                                                     paramName);
-                }
-                result.addContent(processParamTag(isNonTypeParams, writer, pt,
-                                                  pt.parameterName(), alreadyDocumented.size() == 0));
-                alreadyDocumented.add(rank);
-            }
-        }
-        return result;
-    }
-    /**
-     * Convert the individual ParamTag into Content.
-     *
-     * @param isNonTypeParams true if this is just a regular param tag.  False
-     *                        if this is a type param tag.
-     * @param writer          the taglet writer for output writing.
-     * @param paramTag        the tag whose inline tags will be printed.
-     * @param name            the name of the parameter.  We can't rely on
-     *                        the name in the param tag because we might be
-     *                        inheriting documentation.
-     * @param isFirstParam    true if this is the first param tag being printed.
-     *
-     */
-    private Content processParamTag(boolean isNonTypeParams,
-            TagletWriter writer, ParamTag paramTag, String name,
-            boolean isFirstParam) {
-        Content result = writer.getOutputInstance();
-        String header = writer.configuration().getText(
-            isNonTypeParams ? "doclet.Parameters" : "doclet.TypeParameters");
-        if (isFirstParam) {
-            result.addContent(writer.getParamHeader(header));
-        }
-        result.addContent(writer.paramTagOutput(paramTag,
-            name));
-        return result;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
deleted file mode 100644
index b52ace4846f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-/**
- * A taglet that adds the initial line of documentation to the JavaFX
- * property getters.
- *
- *  <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>
- */
-@Deprecated
-public class PropertyGetterTaglet extends BasePropertyTaglet {
-
-    /**
-     * Construct a new PropertyGetterTaglet.
-     */
-    public PropertyGetterTaglet () {
-        name = "propertyGetter";
-    }
-
-    @Override
-    String getText(TagletWriter tagletWriter) {
-        return tagletWriter.configuration().getText("doclet.PropertyGetter");
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
deleted file mode 100644
index bc6f31bc7f8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-/**
- * A taglet that adds the initial line of documentation to the JavaFX
- * property setters.
- *
- *  <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>
- */
-@Deprecated
-public class PropertySetterTaglet extends BasePropertyTaglet {
-
-    /**
-     * Construct a new PropertyGetterTaglet.
-     */
-    public PropertySetterTaglet () {
-        name = "propertySetter";
-    }
-
-    @Override
-    String getText(TagletWriter tagletWriter) {
-        return tagletWriter.configuration().getText("doclet.PropertySetter");
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
deleted file mode 100644
index 35d2f20ce9c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * A taglet that represents the @return tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public class ReturnTaglet extends BaseExecutableMemberTaglet
-        implements InheritableTaglet {
-
-    public ReturnTaglet() {
-        name = "return";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void inherit(DocFinder.Input input, DocFinder.Output output) {
-       Tag[] tags = input.element.tags("return");
-        if (tags.length > 0) {
-            output.holder = input.element;
-            output.holderTag = tags[0];
-            output.inlineTags = input.isFirstSentence ?
-                tags[0].firstSentenceTags() : tags[0].inlineTags();
-        }
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in constructor documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public boolean inConstructor() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        Type returnType = ((MethodDoc) holder).returnType();
-        Tag[] tags = holder.tags(name);
-
-        //Make sure we are not using @return tag on method with void return type.
-        if (returnType.isPrimitive() && returnType.typeName().equals("void")) {
-            if (tags.length > 0) {
-                writer.getMsgRetriever().warning(holder.position(),
-                    "doclet.Return_tag_on_void_method");
-            }
-            return null;
-        }
-        //Inherit @return tag if necessary.
-        if (tags.length == 0) {
-            DocFinder.Output inheritedDoc =
-                DocFinder.search(writer.configuration(), new DocFinder.Input((MethodDoc) holder, this));
-            tags = inheritedDoc.holderTag == null ? tags : new Tag[] {inheritedDoc.holderTag};
-        }
-        return tags.length > 0 ? writer.returnTagOutput(tags[0]) : null;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
deleted file mode 100644
index a7a13841b75..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * A taglet that represents the @see tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
-
-    public SeeTaglet() {
-        name = "see";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void inherit(DocFinder.Input input, DocFinder.Output output) {
-        Tag[] tags = input.element.seeTags();
-        if (tags.length > 0) {
-            output.holder = input.element;
-            output.holderTag = tags[0];
-            output.inlineTags = input.isFirstSentence ?
-                tags[0].firstSentenceTags() : tags[0].inlineTags();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        SeeTag[] tags = holder.seeTags();
-        if (tags.length == 0 && holder instanceof MethodDoc) {
-            DocFinder.Output inheritedDoc =
-                DocFinder.search(writer.configuration(), new DocFinder.Input((MethodDoc) holder, this));
-            if (inheritedDoc.holder != null) {
-                tags = inheritedDoc.holder.seeTags();
-            }
-        }
-        return writer.seeTagOutput(holder, tags);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
deleted file mode 100644
index 28f0d97bf06..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.DocFinder;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * A simple single argument custom tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- */
-
-@Deprecated
-public class SimpleTaglet extends BaseTaglet implements InheritableTaglet {
-
-    /**
-     * The marker in the location string for excluded tags.
-     */
-    public static final String EXCLUDED = "x";
-
-    /**
-     * The marker in the location string for packages.
-     */
-    public static final String PACKAGE = "p";
-
-    /**
-     * The marker in the location string for types.
-     */
-    public static final String TYPE = "t";
-
-    /**
-     * The marker in the location string for constructors.
-     */
-    public static final String CONSTRUCTOR = "c";
-
-    /**
-     * The marker in the location string for fields.
-     */
-    public static final String FIELD = "f";
-
-    /**
-     * The marker in the location string for methods.
-     */
-    public static final String METHOD = "m";
-
-    /**
-     * The marker in the location string for overview.
-     */
-    public static final String OVERVIEW = "o";
-
-    /**
-     * Use in location string when the tag is to
-     * appear in all locations.
-     */
-    public static final String ALL = "a";
-
-    /**
-     * The name of this tag.
-     */
-    protected String tagName;
-
-    /**
-     * The header to output.
-     */
-    protected String header;
-
-    /**
-     * The possible locations that this tag can appear in.
-     */
-    protected String locations;
-
-    /**
-     * Construct a <code>SimpleTaglet</code>.
-     * @param tagName the name of this tag
-     * @param header the header to output.
-     * @param locations the possible locations that this tag
-     * can appear in.  The <code>String</code> can contain 'p'
-     * for package, 't' for type, 'm' for method, 'c' for constructor
-     * and 'f' for field.
-     */
-    public SimpleTaglet(String tagName, String header, String locations) {
-        this.tagName = tagName;
-        this.header = header;
-        locations = StringUtils.toLowerCase(locations);
-        if (locations.contains(ALL) && !locations.contains(EXCLUDED)) {
-            this.locations = PACKAGE + TYPE + FIELD + METHOD + CONSTRUCTOR + OVERVIEW;
-        } else {
-            this.locations = locations;
-        }
-    }
-
-    /**
-     * Return the name of this <code>Taglet</code>.
-     */
-    public String getName() {
-        return tagName;
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in constructor documentation.
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public boolean inConstructor() {
-        return locations.contains(CONSTRUCTOR) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in field documentation.
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public boolean inField() {
-        return locations.contains(FIELD) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in method documentation.
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public boolean inMethod() {
-        return locations.contains(METHOD) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in overview documentation.
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in overview documentation and false
-     * otherwise.
-     */
-    public boolean inOverview() {
-        return locations.contains(OVERVIEW) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in package documentation.
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public boolean inPackage() {
-        return locations.contains(PACKAGE) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>SimpleTaglet</code>
-     * is used in type documentation (classes or interfaces).
-     * @return true if this <code>SimpleTaglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public boolean inType() {
-        return locations.contains(TYPE) && !locations.contains(EXCLUDED);
-    }
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    @Override
-    public void inherit(DocFinder.Input input, DocFinder.Output output) {
-        Tag[] tags = input.element.tags(tagName);
-        if (tags.length > 0) {
-            output.holder = input.element;
-            output.holderTag = tags[0];
-            output.inlineTags = input.isFirstSentence
-                    ? tags[0].firstSentenceTags() : tags[0].inlineTags();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        return header == null || tag == null ? null : writer.simpleTagOutput(tag, header);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        if (header == null || holder.tags(getName()).length == 0) {
-            return null;
-        }
-        return writer.simpleTagOutput(holder.tags(getName()), header);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
deleted file mode 100644
index 1a219971a05..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * The interface for a custom tag used by Doclets. A custom
- * tag must implement this interface.  To be loaded and used by
- * doclets at run-time, the taglet must have a static method called
- * <code>register</code> that accepts a {@link java.util.Map} as an
- * argument with the following signature:
- * <pre>
- *   public void register(Map map)
- * </pre>
- * This method should add an instance of the custom taglet to the map
- * with the name of the taglet as the key.  If overriding a taglet,
- * to avoid a name conflict, the overridden taglet must be deleted from
- * the map before an instance of the new taglet is added to the map.
- * <p>
- * It is recommended that the taglet throw an exception when it fails
- * to register itself.  The exception that it throws is up to the user.
- * <p>
- * Here are two sample taglets: <br>
- * <ul>
- *     <li><a href="{@docRoot}/ToDoTaglet.java">ToDoTaglet.java</a>
- *         - Standalone taglet</li>
- *     <li><a href="{@docRoot}/UnderlineTaglet.java">UnderlineTaglet.java</a>
- *         - Inline taglet</li>
- * </ul>
- * <p>
- * For more information on how to create your own Taglets, please see the
- * <a href="{@docRoot}/overview.html">Taglet Overview</a>.
- *
- * @since 1.4
- * @author Jamie Ho
- */
-
-@Deprecated
-public interface Taglet {
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in field documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in field documentation and false
-     * otherwise.
-     */
-    public abstract boolean inField();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in constructor documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in constructor documentation and false
-     * otherwise.
-     */
-    public abstract boolean inConstructor();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in method documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inMethod();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in overview documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in method documentation and false
-     * otherwise.
-     */
-    public abstract boolean inOverview();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in package documentation.
-     * @return true if this <code>Taglet</code>
-     * is used in package documentation and false
-     * otherwise.
-     */
-    public abstract boolean inPackage();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is used in type documentation (classes or
-     * interfaces).
-     * @return true if this <code>Taglet</code>
-     * is used in type documentation and false
-     * otherwise.
-     */
-    public abstract boolean inType();
-
-    /**
-     * Return true if this <code>Taglet</code>
-     * is an inline tag. Return false otherwise.
-     * @return true if this <code>Taglet</code>
-     * is an inline tag and false otherwise.
-     */
-    public abstract boolean isInlineTag();
-
-    /**
-     * Return the name of this custom tag.
-     * @return the name of this custom tag.
-     */
-    public abstract String getName();
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its Content representation, which is output
-     * to the generated page.
-     * @param tag the <code>Tag</code> representation of this custom tag.
-     * @param writer a {@link TagletWriter} Taglet writer.
-     * @throws IllegalArgumentException thrown when the method is not supported by the taglet.
-     * @return the Content representation of this <code>Tag</code>.
-     */
-    public abstract Content getTagletOutput(Tag tag, TagletWriter writer) throws IllegalArgumentException;
-
-    /**
-     * Given a <code>Doc</code> object, check if it holds any tags of
-     * this type.  If it does, return the string representing the output.
-     * If it does not, return null.
-     * @param holder a {@link Doc} object holding the custom tag.
-     * @param writer a {@link TagletWriter} Taglet writer.
-     * @throws IllegalArgumentException thrown when the method is not supported by the taglet.
-     * @return the TagletOutput representation of this <code>Tag</code>.
-     */
-    public abstract Content getTagletOutput(Doc holder, TagletWriter writer) throws IllegalArgumentException;
-
-    @Override
-    public abstract String toString();
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
deleted file mode 100644
index 030dc662ccc..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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.doclets.internal.toolkit.taglets;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import javax.tools.DocumentationTool;
-import javax.tools.JavaFileManager;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Manages the<code>Taglet</code>s used by doclets.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public class TagletManager {
-
-    /**
-     * The default separator for the simple tag option.
-     */
-    public static final char SIMPLE_TAGLET_OPT_SEPARATOR = ':';
-
-    /**
-     * The alternate separator for simple tag options.  Use this
-     * when you want the default separator to be in the name of the
-     * custom tag.
-     */
-    public static final String ALT_SIMPLE_TAGLET_OPT_SEPARATOR = "-";
-
-    /**
-     * The map of custom tags.
-     */
-    private LinkedHashMap<String,Taglet> customTags;
-
-    /**
-     * The array of custom tags that can appear in packages.
-     */
-    private Taglet[] packageTags;
-
-    /**
-     * The array of custom tags that can appear in classes or interfaces.
-     */
-    private Taglet[] typeTags;
-
-    /**
-     * The array of custom tags that can appear in fields.
-     */
-    private Taglet[] fieldTags;
-
-    /**
-     * The array of custom tags that can appear in constructors.
-     */
-    private Taglet[] constructorTags;
-
-    /**
-     * The array of custom tags that can appear in methods.
-     */
-    private Taglet[] methodTags;
-
-    /**
-     * The array of custom tags that can appear in the overview.
-     */
-    private Taglet[] overviewTags;
-
-    /**
-     * The array of custom tags that can appear in comments.
-     */
-    private Taglet[] inlineTags;
-
-    /**
-     * The array of custom tags that can appear in the serialized form.
-     */
-    private Taglet[] serializedFormTags;
-
-    /**
-     * The message retriever that will be used to print error messages.
-     */
-    private MessageRetriever message;
-
-    /**
-     * Keep track of standard tags.
-     */
-    private Set<String> standardTags;
-
-    /**
-     * Keep track of standard tags in lowercase to compare for better
-     * error messages when a tag like @docRoot is mistakenly spelled
-     * lowercase @docroot.
-     */
-    private Set<String> standardTagsLowercase;
-
-    /**
-     * Keep track of overriden standard tags.
-     */
-    private Set<String> overridenStandardTags;
-
-    /**
-     * Keep track of the tags that may conflict
-     * with standard tags in the future (any custom tag without
-     * a period in its name).
-     */
-    private Set<String> potentiallyConflictingTags;
-
-    /**
-     * The set of unseen custom tags.
-     */
-    private Set<String> unseenCustomTags;
-
-    /**
-     * True if we do not want to use @since tags.
-     */
-    private boolean nosince;
-
-    /**
-     * True if we want to use @version tags.
-     */
-    private boolean showversion;
-
-    /**
-     * True if we want to use @author tags.
-     */
-    private boolean showauthor;
-
-    /**
-     * True if we want to use JavaFX-related tags (@propertyGetter,
-     * @propertySetter, @propertyDescription, @defaultValue, @treatAsPrivate).
-     */
-    private boolean javafx;
-
-    private boolean exportInternalAPI;
-
-    /**
-     * Construct a new <code>TagletManager</code>.
-     * @param nosince true if we do not want to use @since tags.
-     * @param showversion true if we want to use @version tags.
-     * @param showauthor true if we want to use @author tags.
-     * @param message the message retriever to print warnings.
-     */
-    public TagletManager(boolean nosince, boolean showversion,
-                         boolean showauthor, boolean javafx,
-                         boolean exportInternalAPI,
-                         MessageRetriever message) {
-        overridenStandardTags = new HashSet<>();
-        potentiallyConflictingTags = new HashSet<>();
-        standardTags = new HashSet<>();
-        standardTagsLowercase = new HashSet<>();
-        unseenCustomTags = new HashSet<>();
-        customTags = new LinkedHashMap<>();
-        this.nosince = nosince;
-        this.showversion = showversion;
-        this.showauthor = showauthor;
-        this.javafx = javafx;
-        this.exportInternalAPI = exportInternalAPI;
-        this.message = message;
-        initStandardTaglets();
-        initStandardTagsLowercase();
-    }
-
-    /**
-     * Add a new <code>CustomTag</code>.  This is used to add a Taglet from within
-     * a Doclet.  No message is printed to indicate that the Taglet is properly
-     * registered because these Taglets are typically added for every execution of the
-     * Doclet.  We don't want to see this type of error message every time.
-     * @param customTag the new <code>CustomTag</code> to add.
-     */
-    public void addCustomTag(Taglet customTag) {
-        if (customTag != null) {
-            String name = customTag.getName();
-            if (customTags.containsKey(name)) {
-                customTags.remove(name);
-            }
-            customTags.put(name, customTag);
-            checkTagName(name);
-        }
-    }
-
-    public Set<String> getCustomTagNames() {
-        return customTags.keySet();
-    }
-
-    /**
-     * Add a new <code>Taglet</code>.  Print a message to indicate whether or not
-     * the Taglet was registered properly.
-     * @param classname  the name of the class representing the custom tag.
-     * @param tagletPath  the path to the class representing the custom tag.
-     */
-    public void addCustomTag(String classname, JavaFileManager fileManager, String tagletPath) {
-        try {
-            Class<?> customTagClass = null;
-            // construct class loader
-            String cpString = null;   // make sure env.class.path defaults to dot
-
-            ClassLoader tagClassLoader;
-            if (fileManager != null && fileManager.hasLocation(DocumentationTool.Location.TAGLET_PATH)) {
-                tagClassLoader = fileManager.getClassLoader(DocumentationTool.Location.TAGLET_PATH);
-            } else {
-                // do prepends to get correct ordering
-                cpString = appendPath(System.getProperty("env.class.path"), cpString);
-                cpString = appendPath(System.getProperty("java.class.path"), cpString);
-                cpString = appendPath(tagletPath, cpString);
-                tagClassLoader = new URLClassLoader(pathToURLs(cpString));
-            }
-
-            if (exportInternalAPI) {
-                exportInternalAPI(tagClassLoader);
-            }
-
-            customTagClass = tagClassLoader.loadClass(classname);
-
-            Method meth = customTagClass.getMethod("register",
-                                                   Map.class);
-            Object[] list = customTags.values().toArray();
-            Taglet lastTag = (list != null && list.length > 0)
-                ? (Taglet) list[list.length-1] : null;
-            meth.invoke(null, customTags);
-            list = customTags.values().toArray();
-            Object newLastTag = (list != null&& list.length > 0)
-                ? list[list.length-1] : null;
-            if (lastTag != newLastTag) {
-                //New taglets must always be added to the end of the LinkedHashMap.
-                //If the current and previous last taglet are not equal, that
-                //means a new Taglet has been added.
-                message.notice("doclet.Notice_taglet_registered", classname);
-                if (newLastTag != null) {
-                    checkTaglet(newLastTag);
-                }
-            }
-        } catch (Exception exc) {
-            exc.printStackTrace();
-            message.error("doclet.Error_taglet_not_registered", exc.getClass().getName(), classname);
-        }
-
-    }
-
-    /**
-     * Export javadoc internal API to the unnamed module for a classloader.
-     * This is to support continued use of existing non-standard doclets that
-     * use the internal toolkit API and related classes.
-     * @param cl the classloader
-     */
-    private void exportInternalAPI(ClassLoader cl) {
-        String[] packages = {
-            "com.sun.tools.doclets",
-            "com.sun.tools.doclets.standard",
-            "com.sun.tools.doclets.internal.toolkit",
-            "com.sun.tools.doclets.internal.toolkit.taglets",
-            "com.sun.tools.doclets.internal.toolkit.builders",
-            "com.sun.tools.doclets.internal.toolkit.util",
-            "com.sun.tools.doclets.internal.toolkit.util.links",
-            "com.sun.tools.doclets.formats.html",
-            "com.sun.tools.doclets.formats.html.markup"
-        };
-
-        try {
-            Method getModuleMethod = Class.class.getDeclaredMethod("getModule");
-            Object thisModule = getModuleMethod.invoke(getClass());
-
-            Class<?> moduleClass = Class.forName("java.lang.Module");
-            Method addExportsMethod = moduleClass.getDeclaredMethod("addExports", String.class, moduleClass);
-
-            Method getUnnamedModuleMethod = ClassLoader.class.getDeclaredMethod("getUnnamedModule");
-            Object target = getUnnamedModuleMethod.invoke(cl);
-
-            for (String pack : packages) {
-                addExportsMethod.invoke(thisModule, pack, target);
-            }
-        } catch (Exception e) {
-            // do nothing
-            e.printStackTrace();
-        }
-    }
-
-    private String appendPath(String path1, String path2) {
-        if (path1 == null || path1.length() == 0) {
-            return path2 == null ? "." : path2;
-        } else if (path2 == null || path2.length() == 0) {
-            return path1;
-        } else {
-            return path1  + File.pathSeparator + path2;
-        }
-    }
-
-    /**
-     * Utility method for converting a search path string to an array
-     * of directory and JAR file URLs.
-     *
-     * @param path the search path string
-     * @return the resulting array of directory and JAR file URLs
-     */
-    private URL[] pathToURLs(String path) {
-        Set<URL> urls = new LinkedHashSet<>();
-        for (String s: path.split(File.pathSeparator)) {
-            if (s.isEmpty()) continue;
-            try {
-                urls.add(new File(s).getAbsoluteFile().toURI().toURL());
-            } catch (MalformedURLException e) {
-                message.error("doclet.MalformedURL", s);
-            }
-        }
-        return urls.toArray(new URL[urls.size()]);
-    }
-
-
-    /**
-     * Add a new <code>SimpleTaglet</code>.  If this tag already exists
-     * and the header passed as an argument is null, move tag to the back of the
-     * list. If this tag already exists and the header passed as an argument is
-     * not null, overwrite previous tag with new one.  Otherwise, add new
-     * SimpleTaglet to list.
-     * @param tagName the name of this tag
-     * @param header the header to output.
-     * @param locations the possible locations that this tag
-     * can appear in.
-     */
-    public void addNewSimpleCustomTag(String tagName, String header, String locations) {
-        if (tagName == null || locations == null) {
-            return;
-        }
-        Taglet tag = customTags.get(tagName);
-        locations = StringUtils.toLowerCase(locations);
-        if (tag == null || header != null) {
-            customTags.remove(tagName);
-            customTags.put(tagName, new SimpleTaglet(tagName, header, locations));
-            if (locations != null && locations.indexOf('x') == -1) {
-                checkTagName(tagName);
-            }
-        } else {
-            //Move to back
-            customTags.remove(tagName);
-            customTags.put(tagName, tag);
-        }
-    }
-
-    /**
-     * Given a tag name, add it to the set of tags it belongs to.
-     */
-    private void checkTagName(String name) {
-        if (standardTags.contains(name)) {
-            overridenStandardTags.add(name);
-        } else {
-            if (name.indexOf('.') == -1) {
-                potentiallyConflictingTags.add(name);
-            }
-            unseenCustomTags.add(name);
-        }
-    }
-
-    /**
-     * Check the taglet to see if it is a legacy taglet.  Also
-     * check its name for errors.
-     */
-    private void checkTaglet(Object taglet) {
-        if (taglet instanceof Taglet) {
-            checkTagName(((Taglet) taglet).getName());
-        } else if (taglet instanceof com.sun.tools.doclets.Taglet) {
-            com.sun.tools.doclets.Taglet legacyTaglet = (com.sun.tools.doclets.Taglet) taglet;
-            customTags.remove(legacyTaglet.getName());
-            customTags.put(legacyTaglet.getName(), new LegacyTaglet(legacyTaglet));
-            checkTagName(legacyTaglet.getName());
-        } else {
-            throw new IllegalArgumentException("Given object is not a taglet.");
-        }
-    }
-
-    /**
-     * Given a name of a seen custom tag, remove it from the set of unseen
-     * custom tags.
-     * @param name the name of the seen custom tag.
-     */
-    public void seenCustomTag(String name) {
-        unseenCustomTags.remove(name);
-    }
-
-    /**
-     * Given an array of <code>Tag</code>s, check for spelling mistakes.
-     * @param doc the Doc object that holds the tags.
-     * @param tags the list of <code>Tag</code>s to check.
-     * @param areInlineTags true if the array of tags are inline and false otherwise.
-     */
-    public void checkTags(Doc doc, Tag[] tags, boolean areInlineTags) {
-        if (tags == null) {
-            return;
-        }
-        Taglet taglet;
-        for (Tag tag : tags) {
-            String name = tag.name();
-            if (name.length() > 0 && name.charAt(0) == '@') {
-                name = name.substring(1, name.length());
-            }
-            if (! (standardTags.contains(name) || customTags.containsKey(name))) {
-                if (standardTagsLowercase.contains(StringUtils.toLowerCase(name))) {
-                    message.warning(tag.position(), "doclet.UnknownTagLowercase", tag.name());
-                    continue;
-                } else {
-                    message.warning(tag.position(), "doclet.UnknownTag", tag.name());
-                    continue;
-                }
-            }
-            //Check if this tag is being used in the wrong location.
-            if ((taglet = customTags.get(name)) != null) {
-                if (areInlineTags && ! taglet.isInlineTag()) {
-                    printTagMisuseWarn(taglet, tag, "inline");
-                }
-                if ((doc instanceof RootDoc) && ! taglet.inOverview()) {
-                    printTagMisuseWarn(taglet, tag, "overview");
-                } else if ((doc instanceof PackageDoc) && ! taglet.inPackage()) {
-                    printTagMisuseWarn(taglet, tag, "package");
-                } else if ((doc instanceof ClassDoc) && ! taglet.inType()) {
-                    printTagMisuseWarn(taglet, tag, "class");
-                } else if ((doc instanceof ConstructorDoc) && ! taglet.inConstructor()) {
-                    printTagMisuseWarn(taglet, tag, "constructor");
-                } else if ((doc instanceof FieldDoc) && ! taglet.inField()) {
-                    printTagMisuseWarn(taglet, tag, "field");
-                } else if ((doc instanceof MethodDoc) && ! taglet.inMethod()) {
-                    printTagMisuseWarn(taglet, tag, "method");
-                }
-            }
-        }
-    }
-
-    /**
-     * Given the taglet, the tag and the type of documentation that the tag
-     * was found in, print a tag misuse warning.
-     * @param taglet the taglet representing the misused tag.
-     * @param tag the misused tag.
-     * @param holderType the type of documentation that the misused tag was found in.
-     */
-    private void printTagMisuseWarn(Taglet taglet, Tag tag, String holderType) {
-        Set<String> locationsSet = new LinkedHashSet<>();
-        if (taglet.inOverview()) {
-            locationsSet.add("overview");
-        }
-        if (taglet.inPackage()) {
-            locationsSet.add("package");
-        }
-        if (taglet.inType()) {
-            locationsSet.add("class/interface");
-        }
-        if (taglet.inConstructor())  {
-            locationsSet.add("constructor");
-        }
-        if (taglet.inField()) {
-            locationsSet.add("field");
-        }
-        if (taglet.inMethod()) {
-            locationsSet.add("method");
-        }
-        if (taglet.isInlineTag()) {
-            locationsSet.add("inline text");
-        }
-        String[] locations = locationsSet.toArray(new String[]{});
-        if (locations == null || locations.length == 0) {
-            //This known tag is excluded.
-            return;
-        }
-        StringBuilder combined_locations = new StringBuilder();
-        for (int i = 0; i < locations.length; i++) {
-            if (i > 0) {
-                combined_locations.append(", ");
-            }
-            combined_locations.append(locations[i]);
-        }
-        message.warning(tag.position(), "doclet.tag_misuse",
-            "@" + taglet.getName(), holderType, combined_locations.toString());
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in packages.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in packages.
-     */
-    public Taglet[] getPackageCustomTaglets() {
-        if (packageTags == null) {
-            initCustomTagletArrays();
-        }
-        return packageTags;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in classes or interfaces.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in classes or interfaces.
-     */
-    public Taglet[] getTypeCustomTaglets() {
-        if (typeTags == null) {
-            initCustomTagletArrays();
-        }
-        return typeTags;
-    }
-
-    /**
-     * Return the array of inline <code>Taglet</code>s that can
-     * appear in comments.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in comments.
-     */
-    public Taglet[] getInlineCustomTaglets() {
-        if (inlineTags == null) {
-            initCustomTagletArrays();
-        }
-        return inlineTags;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in fields.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in field.
-     */
-    public Taglet[] getFieldCustomTaglets() {
-        if (fieldTags == null) {
-            initCustomTagletArrays();
-        }
-        return fieldTags;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in the serialized form.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in the serialized form.
-     */
-    public Taglet[] getSerializedFormTaglets() {
-        if (serializedFormTags == null) {
-            initCustomTagletArrays();
-        }
-        return serializedFormTags;
-    }
-
-    /**
-     * @return the array of <code>Taglet</code>s that can
-     * appear in the given Doc.
-     */
-    public Taglet[] getCustomTaglets(Doc doc) {
-        if (doc instanceof ConstructorDoc) {
-            return getConstructorCustomTaglets();
-        } else if (doc instanceof MethodDoc) {
-            return getMethodCustomTaglets();
-        } else if (doc instanceof FieldDoc) {
-            return getFieldCustomTaglets();
-        } else if (doc instanceof ClassDoc) {
-            return getTypeCustomTaglets();
-        } else if (doc instanceof PackageDoc) {
-            return getPackageCustomTaglets();
-        } else if (doc instanceof RootDoc) {
-            return getOverviewCustomTaglets();
-        }
-        return null;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in constructors.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in constructors.
-     */
-    public Taglet[] getConstructorCustomTaglets() {
-        if (constructorTags == null) {
-            initCustomTagletArrays();
-        }
-        return constructorTags;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in methods.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in methods.
-     */
-    public Taglet[] getMethodCustomTaglets() {
-        if (methodTags == null) {
-            initCustomTagletArrays();
-        }
-        return methodTags;
-    }
-
-    /**
-     * Return the array of <code>Taglet</code>s that can
-     * appear in an overview.
-     * @return the array of <code>Taglet</code>s that can
-     * appear in overview.
-     */
-    public Taglet[] getOverviewCustomTaglets() {
-        if (overviewTags == null) {
-            initCustomTagletArrays();
-        }
-        return overviewTags;
-    }
-
-    /**
-     * Initialize the custom tag arrays.
-     */
-    private void initCustomTagletArrays() {
-        Iterator<Taglet> it = customTags.values().iterator();
-        ArrayList<Taglet> pTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> tTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> fTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> cTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> mTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> iTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> oTags = new ArrayList<>(customTags.size());
-        ArrayList<Taglet> sTags = new ArrayList<>();
-        Taglet current;
-        while (it.hasNext()) {
-            current = it.next();
-            if (current.inPackage() && !current.isInlineTag()) {
-                pTags.add(current);
-            }
-            if (current.inType() && !current.isInlineTag()) {
-                tTags.add(current);
-            }
-            if (current.inField() && !current.isInlineTag()) {
-                fTags.add(current);
-            }
-            if (current.inConstructor() && !current.isInlineTag()) {
-                cTags.add(current);
-            }
-            if (current.inMethod() && !current.isInlineTag()) {
-                mTags.add(current);
-            }
-            if (current.isInlineTag()) {
-                iTags.add(current);
-            }
-            if (current.inOverview() && !current.isInlineTag()) {
-                oTags.add(current);
-            }
-        }
-        packageTags = pTags.toArray(new Taglet[] {});
-        typeTags = tTags.toArray(new Taglet[] {});
-        fieldTags = fTags.toArray(new Taglet[] {});
-        constructorTags = cTags.toArray(new Taglet[] {});
-        methodTags = mTags.toArray(new Taglet[] {});
-        overviewTags = oTags.toArray(new Taglet[] {});
-        inlineTags = iTags.toArray(new Taglet[] {});
-
-        //Init the serialized form tags
-        sTags.add(customTags.get("serialData"));
-        sTags.add(customTags.get("throws"));
-        if (!nosince)
-            sTags.add(customTags.get("since"));
-        sTags.add(customTags.get("see"));
-        serializedFormTags = sTags.toArray(new Taglet[] {});
-    }
-
-    /**
-     * Initialize standard Javadoc tags for ordering purposes.
-     */
-    private void initStandardTaglets() {
-        if (javafx) {
-            initJavaFXTaglets();
-        }
-
-        Taglet temp;
-        addStandardTaglet(new ParamTaglet());
-        addStandardTaglet(new ReturnTaglet());
-        addStandardTaglet(new ThrowsTaglet());
-        addStandardTaglet(new SimpleTaglet("exception", null,
-                SimpleTaglet.METHOD + SimpleTaglet.CONSTRUCTOR));
-        addStandardTaglet(!nosince, new SimpleTaglet("since", message.getText("doclet.Since"),
-               SimpleTaglet.ALL));
-        addStandardTaglet(showversion, new SimpleTaglet("version", message.getText("doclet.Version"),
-                SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
-        addStandardTaglet(showauthor, new SimpleTaglet("author", message.getText("doclet.Author"),
-                SimpleTaglet.PACKAGE + SimpleTaglet.TYPE + SimpleTaglet.OVERVIEW));
-        addStandardTaglet(new SimpleTaglet("serialData", message.getText("doclet.SerialData"),
-            SimpleTaglet.EXCLUDED));
-        customTags.put((temp = new SimpleTaglet("factory", message.getText("doclet.Factory"),
-            SimpleTaglet.METHOD)).getName(), temp);
-        addStandardTaglet(new SeeTaglet());
-        //Standard inline tags
-        addStandardTaglet(new DocRootTaglet());
-        addStandardTaglet(new InheritDocTaglet());
-        addStandardTaglet(new ValueTaglet());
-        addStandardTaglet(new LiteralTaglet());
-        addStandardTaglet(new CodeTaglet());
-        addStandardTaglet(new IndexTaglet());
-
-        // Keep track of the names of standard tags for error
-        // checking purposes. The following are not handled above.
-        // See, for example, com.sun.tools.javadoc.Comment
-        standardTags.add("deprecated");
-        standardTags.add("link");
-        standardTags.add("linkplain");
-        standardTags.add("serial");
-        standardTags.add("serialField");
-        standardTags.add("Text");
-    }
-
-    /**
-     * Initialize JavaFX-related tags.
-     */
-    private void initJavaFXTaglets() {
-        addStandardTaglet(new PropertyGetterTaglet());
-        addStandardTaglet(new PropertySetterTaglet());
-        addStandardTaglet(new SimpleTaglet("propertyDescription",
-                message.getText("doclet.PropertyDescription"),
-                SimpleTaglet.FIELD + SimpleTaglet.METHOD));
-        addStandardTaglet(new SimpleTaglet("defaultValue", message.getText("doclet.DefaultValue"),
-            SimpleTaglet.FIELD + SimpleTaglet.METHOD));
-        addStandardTaglet(new SimpleTaglet("treatAsPrivate", null,
-                SimpleTaglet.FIELD + SimpleTaglet.METHOD + SimpleTaglet.TYPE));
-    }
-
-    void addStandardTaglet(Taglet taglet) {
-        String name = taglet.getName();
-        customTags.put(name, taglet);
-        standardTags.add(name);
-    }
-
-    void addStandardTaglet(boolean enable, Taglet taglet) {
-        String name = taglet.getName();
-        if (enable)
-            customTags.put(name, taglet);
-        standardTags.add(name);
-    }
-
-    /**
-     * Initialize lowercase version of standard Javadoc tags.
-     */
-    private void initStandardTagsLowercase() {
-        for (String standardTag : standardTags) {
-            standardTagsLowercase.add(StringUtils.toLowerCase(standardTag));
-        }
-    }
-
-    public boolean isKnownCustomTag(String tagName) {
-        return customTags.containsKey(tagName);
-    }
-
-    /**
-     * Print a list of {@link Taglet}s that might conflict with
-     * standard tags in the future and a list of standard tags
-     * that have been overriden.
-     */
-    public void printReport() {
-        printReportHelper("doclet.Notice_taglet_conflict_warn", potentiallyConflictingTags);
-        printReportHelper("doclet.Notice_taglet_overriden", overridenStandardTags);
-        printReportHelper("doclet.Notice_taglet_unseen", unseenCustomTags);
-    }
-
-    private void printReportHelper(String noticeKey, Set<String> names) {
-        if (names.size() > 0) {
-            String[] namesArray = names.toArray(new String[] {});
-            String result = " ";
-            for (int i = 0; i < namesArray.length; i++) {
-                result += "@" + namesArray[i];
-                if (i + 1 < namesArray.length) {
-                    result += ", ";
-                }
-            }
-            message.notice(noticeKey, result);
-        }
-    }
-
-    /**
-     * Given the name of a tag, return the corresponding taglet.
-     * Return null if the tag is unknown.
-     *
-     * @param name the name of the taglet to retrieve.
-     * @return return the corresponding taglet. Return null if the tag is
-     *         unknown.
-     */
-    public Taglet getTaglet(String name) {
-        if (name.indexOf("@") == 0) {
-            return customTags.get(name.substring(1));
-        } else {
-            return customTags.get(name);
-        }
-
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
deleted file mode 100644
index 1a8e1957810..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.taglets;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * The interface for the taglet writer.
- *
- *  <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>
- *
- * @since 1.5
- * @author Jamie Ho
- */
-
-@Deprecated
-public abstract class TagletWriter {
-
-    /**
-     * True if we only want to write the first sentence.
-     */
-    protected final boolean isFirstSentence;
-
-    protected TagletWriter(boolean isFirstSentence) {
-        this.isFirstSentence = isFirstSentence;
-    }
-
-    /**
-     * @return an instance of an output object.
-     */
-    public abstract Content getOutputInstance();
-
-    /**
-     * Return the output for a {@code {@code ...}} tag.
-     *
-     * @param tag the tag.
-     * @return the output of the taglet.
-     */
-    protected abstract Content codeTagOutput(Tag tag);
-
-    /**
-     * Return the output for a {@index...} tag.
-     *
-     * @param tag the tag.
-     * @return the output of the taglet.
-     */
-    protected abstract Content indexTagOutput(Tag tag);
-
-    /**
-     * Returns the output for the DocRoot inline tag.
-     * @return the output for the DocRoot inline tag.
-     */
-    protected abstract Content getDocRootOutput();
-
-    /**
-     * Return the deprecated tag output.
-     *
-     * @param doc the doc to write deprecated documentation for.
-     * @return the output of the deprecated tag.
-     */
-    protected abstract Content deprecatedTagOutput(Doc doc);
-
-    /**
-     * Return the output for a {@code {@literal ...}} tag.
-     *
-     * @param tag the tag.
-     * @return the output of the taglet.
-     */
-    protected abstract Content literalTagOutput(Tag tag);
-
-    /**
-     * Returns {@link MessageRetriever} for output purposes.
-     *
-     * @return {@link MessageRetriever} for output purposes.
-     */
-    protected abstract MessageRetriever getMsgRetriever();
-
-    /**
-     * Return the header for the param tags.
-     *
-     * @param header the header to display.
-     * @return the header for the param tags.
-     */
-    protected abstract Content getParamHeader(String header);
-
-    /**
-     * Return the output for param tags.
-     *
-     * @param paramTag the parameter to document.
-     * @param paramName the name of the parameter.
-     * @return the output of the param tag.
-     */
-    protected abstract Content paramTagOutput(ParamTag paramTag,
-        String paramName);
-
-    /**
-     * Return the output for property tags.
-     *
-     * @param propertyTag the parameter to document.
-     * @param prefix the text with which to prefix the property name.
-     * @return the output of the param tag.
-     */
-    protected abstract Content propertyTagOutput(Tag propertyTag, String prefix);
-
-    /**
-     * Return the return tag output.
-     *
-     * @param returnTag the return tag to output.
-     * @return the output of the return tag.
-     */
-    protected abstract Content returnTagOutput(Tag returnTag);
-
-    /**
-     * Return the see tag output.
-     *
-     * @param seeTags the array of See tags.
-     * @return the output of the see tags.
-     */
-    protected abstract Content seeTagOutput(Doc holder, SeeTag[] seeTags);
-
-    /**
-     * Return the output for a simple tag.
-     *
-     * @param simpleTags the array of simple tags.
-     * @return the output of the simple tags.
-     */
-    protected abstract Content simpleTagOutput(Tag[] simpleTags,
-        String header);
-
-    /**
-     * Return the output for a simple tag.
-     *
-     * @param simpleTag the simple tag.
-     * @return the output of the simple tag.
-     */
-    protected abstract Content simpleTagOutput(Tag simpleTag, String header);
-
-    /**
-     * Return the header for the throws tag.
-     *
-     * @return the header for the throws tag.
-     */
-    protected abstract Content getThrowsHeader();
-
-    /**
-     * Return the header for the throws tag.
-     *
-     * @param throwsTag the throws tag.
-     * @return the output of the throws tag.
-     */
-    protected abstract Content throwsTagOutput(ThrowsTag throwsTag);
-
-    /**
-     * Return the output for the throws tag.
-     *
-     * @param throwsType the throws type.
-     * @return the output of the throws type.
-     */
-    protected abstract Content throwsTagOutput(Type throwsType);
-
-    /**
-     * Return the output for the value tag.
-     *
-     * @param field       the constant field that holds the value tag.
-     * @param constantVal the constant value to document.
-     * @param includeLink true if we should link the constant text to the
-     *                    constant field itself.
-     * @return the output of the value tag.
-     */
-    protected abstract Content valueTagOutput(FieldDoc field,
-        String constantVal, boolean includeLink);
-
-    /**
-     * Given an output object, append to it the tag documentation for
-     * the given member.
-     *
-     * @param tagletManager the manager that manages the taglets.
-     * @param doc the Doc that we are print tags for.
-     * @param taglets the taglets to print.
-     * @param writer the writer that will generate the output strings.
-     * @param output the output buffer to store the output in.
-     */
-    public static void genTagOuput(TagletManager tagletManager, Doc doc,
-            Taglet[] taglets, TagletWriter writer, Content output) {
-        tagletManager.checkTags(doc, doc.tags(), false);
-        tagletManager.checkTags(doc, doc.inlineTags(), true);
-        Content currentOutput = null;
-        for (Taglet taglet : taglets) {
-            currentOutput = null;
-            if (doc instanceof ClassDoc && taglet instanceof ParamTaglet) {
-                //The type parameters are documented in a special section away
-                //from the tag info, so skip here.
-                continue;
-            }
-            if (taglet instanceof DeprecatedTaglet) {
-                //Deprecated information is documented "inline", not in tag info
-                //section.
-                continue;
-            }
-            try {
-                currentOutput = taglet.getTagletOutput(doc, writer);
-            } catch (IllegalArgumentException e) {
-                //The taglet does not take a member as an argument.  Let's try
-                //a single tag.
-                Tag[] tags = doc.tags(taglet.getName());
-                if (tags.length > 0) {
-                    currentOutput = taglet.getTagletOutput(tags[0], writer);
-                }
-            }
-            if (currentOutput != null) {
-                tagletManager.seenCustomTag(taglet.getName());
-                output.addContent(currentOutput);
-            }
-        }
-    }
-
-    /**
-     * Given an inline tag, return its output.
-     * @param tagletManager The taglet manager for the current doclet.
-     * @param holderTag The tag this holds this inline tag.  Null if there
-     * is no tag that holds it.
-     * @param inlineTag The inline tag to be documented.
-     * @param tagletWriter The taglet writer to write the output.
-     * @return The output of the inline tag.
-     */
-    public static Content getInlineTagOuput(TagletManager tagletManager,
-            Tag holderTag, Tag inlineTag, TagletWriter tagletWriter) {
-        Taglet[] definedTags = tagletManager.getInlineCustomTaglets();
-        //This is a custom inline tag.
-        for (Taglet definedTag : definedTags) {
-            if (("@" + definedTag.getName()).equals(inlineTag.name())) {
-                //Given a name of a seen custom tag, remove it from the
-                // set of unseen custom tags.
-                tagletManager.seenCustomTag(definedTag.getName());
-                Content output = definedTag.getTagletOutput(
-                        holderTag != null &&
-                        definedTag.getName().equals("inheritDoc") ?
-                        holderTag : inlineTag, tagletWriter);
-                return output;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Converts inline tags and text to TagOutput, expanding the
-     * inline tags along the way.  Called wherever text can contain
-     * an inline tag, such as in comments or in free-form text arguments
-     * to non-inline tags.
-     *
-     * @param holderTag the tag that holds the documentation.
-     * @param tags   array of text tags and inline tags (often alternating)
-     *               present in the text of interest for this doc.
-     * @return the {@link Content} representing the comments.
-     */
-    public abstract Content commentTagsToOutput(Tag holderTag, Tag[] tags);
-
-    /**
-     * Converts inline tags and text to TagOutput, expanding the
-     * inline tags along the way.  Called wherever text can contain
-     * an inline tag, such as in comments or in free-form text arguments
-     * to non-inline tags.
-     *
-     * @param holderDoc specific doc where comment resides.
-     * @param tags   array of text tags and inline tags (often alternating)
-     *               present in the text of interest for this doc.
-     * @return the {@link Content} representing the comments.
-     */
-    public abstract Content commentTagsToOutput(Doc holderDoc, Tag[] tags);
-
-    /**
-     * Converts inline tags and text to TagOutput, expanding the
-     * inline tags along the way.  Called wherever text can contain
-     * an inline tag, such as in comments or in free-form text arguments
-     * to non-inline tags.
-     *
-     * @param holderTag the tag that holds the documentation.
-     * @param holderDoc specific doc where comment resides.
-     * @param tags   array of text tags and inline tags (often alternating)
-     *               present in the text of interest for this doc.
-     * @param isFirstSentence true if this is the first sentence.
-     * @return the {@link Content} representing the comments.
-     */
-    public abstract Content commentTagsToOutput(Tag holderTag,
-        Doc holderDoc, Tag[] tags, boolean isFirstSentence);
-
-    /**
-     * @return an instance of the configuration used for this doclet.
-     */
-    public abstract Configuration configuration();
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
deleted file mode 100644
index 17ce4b9878f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * A taglet that represents the @throws tag.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public class ThrowsTaglet extends BaseExecutableMemberTaglet
-    implements InheritableTaglet {
-
-    public ThrowsTaglet() {
-        name = "throws";
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void inherit(DocFinder.Input input, DocFinder.Output output) {
-        ClassDoc exception;
-        if (input.tagId == null) {
-            ThrowsTag throwsTag = (ThrowsTag) input.tag;
-            exception = throwsTag.exception();
-            input.tagId = exception == null ?
-                throwsTag.exceptionName() :
-                throwsTag.exception().qualifiedName();
-        } else {
-            exception = input.element.containingClass().findClass(input.tagId);
-        }
-
-        for (ThrowsTag tag : ((MethodDoc)input.element).throwsTags()) {
-            if (input.tagId.equals(tag.exceptionName()) ||
-                (tag.exception() != null &&
-                 (input.tagId.equals(tag.exception().qualifiedName())))) {
-                output.holder = input.element;
-                output.holderTag = tag;
-                output.inlineTags = input.isFirstSentence ?
-                                    tag.firstSentenceTags() : tag.inlineTags();
-                output.tagList.add(tag);
-            } else if (exception != null && tag.exception() != null &&
-                     tag.exception().subclassOf(exception)) {
-                output.tagList.add(tag);
-            }
-        }
-    }
-
-    /**
-     * Add links for exceptions that are declared but not documented.
-     */
-    private Content linkToUndocumentedDeclaredExceptions(
-            Type[] declaredExceptionTypes, Set<String> alreadyDocumented,
-            TagletWriter writer) {
-        Content result = writer.getOutputInstance();
-        //Add links to the exceptions declared but not documented.
-        for (Type declaredExceptionType : declaredExceptionTypes) {
-            if (declaredExceptionType.asClassDoc() != null &&
-                !alreadyDocumented.contains(
-                        declaredExceptionType.asClassDoc().name()) &&
-                !alreadyDocumented.contains(
-                        declaredExceptionType.asClassDoc().qualifiedName())) {
-                if (alreadyDocumented.size() == 0) {
-                    result.addContent(writer.getThrowsHeader());
-                }
-                result.addContent(writer.throwsTagOutput(declaredExceptionType));
-                alreadyDocumented.add(declaredExceptionType.asClassDoc().name());
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Inherit throws documentation for exceptions that were declared but not
-     * documented.
-     */
-    private Content inheritThrowsDocumentation(Doc holder,
-            Type[] declaredExceptionTypes, Set<String> alreadyDocumented,
-            TagletWriter writer) {
-        Content result = writer.getOutputInstance();
-        if (holder instanceof MethodDoc) {
-            Set<Tag> declaredExceptionTags = new LinkedHashSet<>();
-            for (Type declaredExceptionType : declaredExceptionTypes) {
-                DocFinder.Output inheritedDoc =
-                        DocFinder.search(writer.configuration(), new DocFinder.Input((MethodDoc) holder, this,
-                                                             declaredExceptionType.typeName()));
-                if (inheritedDoc.tagList.size() == 0) {
-                    inheritedDoc = DocFinder.search(writer.configuration(), new DocFinder.Input(
-                            (MethodDoc) holder, this,
-                            declaredExceptionType.qualifiedTypeName()));
-                }
-                declaredExceptionTags.addAll(inheritedDoc.tagList);
-            }
-            result.addContent(throwsTagsOutput(
-                declaredExceptionTags.toArray(new ThrowsTag[] {}),
-                writer, alreadyDocumented, false));
-        }
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Doc holder, TagletWriter writer) {
-        ExecutableMemberDoc execHolder = (ExecutableMemberDoc) holder;
-        ThrowsTag[] tags = execHolder.throwsTags();
-        Content result = writer.getOutputInstance();
-        HashSet<String> alreadyDocumented = new HashSet<>();
-        if (tags.length > 0) {
-            result.addContent(throwsTagsOutput(
-                execHolder.throwsTags(), writer, alreadyDocumented, true));
-        }
-        result.addContent(inheritThrowsDocumentation(holder,
-            execHolder.thrownExceptionTypes(), alreadyDocumented, writer));
-        result.addContent(linkToUndocumentedDeclaredExceptions(
-            execHolder.thrownExceptionTypes(), alreadyDocumented, writer));
-        return result;
-    }
-
-
-    /**
-     * Given an array of <code>Tag</code>s representing this custom
-     * tag, return its string representation.
-     * @param throwTags the array of <code>ThrowsTag</code>s to convert.
-     * @param writer the TagletWriter that will write this tag.
-     * @param alreadyDocumented the set of exceptions that have already
-     *        been documented.
-     * @param allowDups True if we allow duplicate throws tags to be documented.
-     * @return the Content representation of this <code>Tag</code>.
-     */
-    protected Content throwsTagsOutput(ThrowsTag[] throwTags,
-        TagletWriter writer, Set<String> alreadyDocumented, boolean allowDups) {
-        Content result = writer.getOutputInstance();
-        if (throwTags.length > 0) {
-            for (ThrowsTag tt : throwTags) {
-                ClassDoc cd = tt.exception();
-                if ((!allowDups) && (alreadyDocumented.contains(tt.exceptionName()) ||
-                                     (cd != null && alreadyDocumented.contains(cd.qualifiedName())))) {
-                    continue;
-                }
-                if (alreadyDocumented.size() == 0) {
-                    result.addContent(writer.getThrowsHeader());
-                }
-                result.addContent(writer.throwsTagOutput(tt));
-                alreadyDocumented.add(cd != null ?
-                                      cd.qualifiedName() : tt.exceptionName());
-            }
-        }
-        return result;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
deleted file mode 100644
index 4d70742bad1..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, 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.doclets.internal.toolkit.taglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-import com.sun.tools.doclets.internal.toolkit.Content;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * An inline Taglet representing the value tag. This tag should only be used with
- * constant fields that have a value.  It is used to access the value of constant
- * fields.  This inline tag has an optional field name parameter.  If the name is
- * specified, the constant value is retrieved from the specified field.  A link
- * is also created to the specified field.  If a name is not specified, the value
- * is retrieved for the field that the inline tag appears on.  The name is specifed
- * in the following format:  [fully qualified class name]#[constant field name].
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-@Deprecated
-public class ValueTaglet extends BaseInlineTaglet {
-
-    /**
-     * Construct a new ValueTaglet.
-     */
-    public ValueTaglet() {
-        name = "value";
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * only appear in Fields.
-     * @return false since this is not a method.
-     */
-    public boolean inMethod() {
-        return true;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * only appear in Fields.
-     * @return false since this is not a method.
-     */
-    public boolean inConstructor() {
-        return true;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * only appear in Fields.
-     * @return false since this is not a method.
-     */
-    public boolean inOverview() {
-        return true;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * only appear in Fields.
-     * @return false since this is not a method.
-     */
-    public boolean inPackage() {
-        return true;
-    }
-
-    /**
-     * Will return false because this inline tag may
-     * only appear in Fields.
-     * @return false since this is not a method.
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * Given the name of the field, return the corresponding FieldDoc. Return null
-     * due to invalid use of value tag if the name is null or empty string and if
-     * the value tag is not used on a field.
-     *
-     * @param config the current configuration of the doclet.
-     * @param tag the value tag.
-     * @param name the name of the field to search for.  The name should be in
-     * {@code <qualified class name>#<field name>} format. If the class name is omitted,
-     * it is assumed that the field is in the current class.
-     *
-     * @return the corresponding FieldDoc. If the name is null or empty string,
-     * return field that the value tag was used in. Return null if the name is null
-     * or empty string and if the value tag is not used on a field.
-     */
-    private FieldDoc getFieldDoc(Configuration config, Tag tag, String name) {
-        if (name == null || name.length() == 0) {
-            //Base case: no label.
-            if (tag.holder() instanceof FieldDoc) {
-                return (FieldDoc) tag.holder();
-            } else {
-                // If the value tag does not specify a parameter which is a valid field and
-                // it is not used within the comments of a valid field, return null.
-                 return null;
-            }
-        }
-        StringTokenizer st = new StringTokenizer(name, "#");
-        String memberName = null;
-        ClassDoc cd = null;
-        if (st.countTokens() == 1) {
-            //Case 2:  @value in same class.
-            Doc holder = tag.holder();
-            if (holder instanceof MemberDoc) {
-                cd = ((MemberDoc) holder).containingClass();
-            } else if (holder instanceof ClassDoc) {
-                cd = (ClassDoc) holder;
-            }
-            memberName = st.nextToken();
-        } else {
-            //Case 3: @value in different class.
-            cd = config.root.classNamed(st.nextToken());
-            memberName = st.nextToken();
-        }
-        if (cd == null) {
-            return null;
-        }
-        for (FieldDoc field : cd.fields()) {
-            if (field.name().equals(memberName)) {
-                return field;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        FieldDoc field = getFieldDoc(
-            writer.configuration(), tag, tag.text());
-        if (field == null) {
-            if (tag.text().isEmpty()) {
-                //Invalid use of @value
-                writer.getMsgRetriever().warning(tag.holder().position(),
-                        "doclet.value_tag_invalid_use");
-            } else {
-                //Reference is unknown.
-                writer.getMsgRetriever().warning(tag.holder().position(),
-                        "doclet.value_tag_invalid_reference", tag.text());
-            }
-        } else if (field.constantValue() != null) {
-            return writer.valueTagOutput(field,
-                field.constantValueExpression(),
-                ! field.equals(tag.holder()));
-        } else {
-            //Referenced field is not a constant.
-            writer.getMsgRetriever().warning(tag.holder().position(),
-                "doclet.value_tag_invalid_constant", field.name());
-        }
-        return writer.getOutputInstance();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
deleted file mode 100644
index cad2426bf1f..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package-info.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
-    This package has classes used to generate Javadoc tag documentation.
-    Doclets no longer have to implement its own version of standard tags
-    such as &#64;param and &#64;throws.  This is the single, doclet
-    implementation of each standard tag that is shared by all
-    doclets.  Each doclet must have a taglet writer that takes a taglet
-    as input and writes doclet-dependent output. The taglet itself will
-    do the tag processing. For example, suppose we are outputing
-    &#64;throws tags. The taglet would:
-    <ul>
-        <li> Retrieve the list of throws tags to be documented.
-        <li> Replace {&#64;inheritDoc} with the appropriate documentation.
-        <li> Add throws documentation for exceptions that are declared in
-             the signature of the method but
-             not documented with the throws tags.
-    </ul>
-    After doing the steps above, the taglet would pass the information to
-    the taglet writer for writing. The taglets are essentially builders for
-    tags.
-
-    <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>
-*/
-
-package com.sun.tools.doclets.internal.toolkit.taglets;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
deleted file mode 100644
index 301efdbc704..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * This class acts as an artificial PackageDoc for classes specified
- * on the command line when running Javadoc.  For example, if you
- * specify several classes from package java.lang, this class will catalog
- * those classes so that we can retrieve all of the classes from a particular
- * package later.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-@Deprecated
-public class ClassDocCatalog {
-
-    /**
-     * Stores the set of packages that the classes specified on the command line
-     * belong to.  Note that the default package is "".
-     */
-    private Set<String> packageSet;
-
-
-    /**
-     * Stores all classes for each package
-     */
-    private Map<String,Set<ClassDoc>> allClasses;
-
-    /**
-     * Stores ordinary classes (excluding Exceptions and Errors) for each
-     * package
-     */
-    private Map<String,Set<ClassDoc>> ordinaryClasses;
-
-    /**
-     * Stores exceptions for each package
-     */
-    private Map<String,Set<ClassDoc>> exceptions;
-
-    /**
-     * Stores enums for each package.
-     */
-    private Map<String,Set<ClassDoc>> enums;
-
-    /**
-     * Stores annotation types for each package.
-     */
-    private Map<String,Set<ClassDoc>> annotationTypes;
-
-    /**
-     * Stores errors for each package
-     */
-    private Map<String,Set<ClassDoc>> errors;
-
-    /**
-     * Stores interfaces for each package
-     */
-    private Map<String,Set<ClassDoc>> interfaces;
-
-    private Configuration configuration;
-    private Utils utils;
-
-    /**
-     * Construct a new ClassDocCatalog.
-     *
-     * @param classdocs the array of ClassDocs to catalog
-     */
-    public ClassDocCatalog (ClassDoc[] classdocs, Configuration config) {
-        init();
-        this.configuration = config;
-        this.utils = config.utils;
-        for (ClassDoc classdoc : classdocs) {
-            addClassDoc(classdoc);
-        }
-    }
-
-    /**
-     * Construct a new ClassDocCatalog.
-     *
-     */
-    public ClassDocCatalog () {
-        init();
-    }
-
-    private void init() {
-        allClasses = new HashMap<>();
-        ordinaryClasses = new HashMap<>();
-        exceptions = new HashMap<>();
-        enums = new HashMap<>();
-        annotationTypes = new HashMap<>();
-        errors = new HashMap<>();
-        interfaces = new HashMap<>();
-        packageSet = new HashSet<>();
-    }
-
-    /**
-     * Add the given class to the catalog.
-     * @param classdoc the ClassDoc to add to the catelog.
-     */
-    public void addClassDoc(ClassDoc classdoc) {
-        if (classdoc == null) {
-            return;
-        }
-        addClass(classdoc, allClasses);
-        if (classdoc.isOrdinaryClass()) {
-            addClass(classdoc, ordinaryClasses);
-        } else if (classdoc.isException()) {
-            addClass(classdoc, exceptions);
-        } else if (classdoc.isEnum()) {
-            addClass(classdoc, enums);
-        } else if (classdoc.isAnnotationType()) {
-            addClass(classdoc, annotationTypes);
-        } else if (classdoc.isError()) {
-            addClass(classdoc, errors);
-        } else if (classdoc.isInterface()) {
-            addClass(classdoc, interfaces);
-        }
-    }
-
-    /**
-     * Add the given class to the given map.
-     * @param classdoc the ClassDoc to add to the catelog.
-     * @param map the Map to add the ClassDoc to.
-     */
-    private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
-
-        PackageDoc pkg = classdoc.containingPackage();
-        if (pkg.isIncluded() || (configuration.nodeprecated && utils.isDeprecated(pkg))) {
-            //No need to catalog this class if it's package is
-            //included on the command line or if -nodeprecated option is set
-            // and the containing package is marked as deprecated.
-            return;
-        }
-        String key = utils.getPackageName(pkg);
-        Set<ClassDoc> s = map.get(key);
-        if (s == null) {
-            packageSet.add(key);
-            s = new HashSet<>();
-        }
-        s.add(classdoc);
-        map.put(key, s);
-
-    }
-
-    private ClassDoc[] getArray(Map<String,Set<ClassDoc>> m, String key) {
-        Set<ClassDoc> s = m.get(key);
-        if (s == null) {
-            return new ClassDoc[] {};
-        } else {
-            return s.toArray(new ClassDoc[] {});
-        }
-    }
-
-    /**
-     * Return all of the classes specified on the command-line that
-     * belong to the given package.
-     * @param pkgDoc the package to return the classes for.
-     */
-    public ClassDoc[] allClasses(PackageDoc pkgDoc) {
-        return pkgDoc.isIncluded() ?
-              pkgDoc.allClasses() :
-              getArray(allClasses, utils.getPackageName(pkgDoc));
-    }
-
-    /**
-     * Return all of the classes specified on the command-line that
-     * belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] allClasses(String packageName) {
-        return getArray(allClasses, packageName);
-    }
-
-    /**
-     * Return the array of package names that this catalog stores
-     * ClassDocs for.
-     */
-    public String[] packageNames() {
-        return packageSet.toArray(new String[] {});
-    }
-
-    /**
-     * Return true if the given package is known to this catalog.
-     * @param packageName the name to check.
-     * @return true if this catalog has any information about
-     * classes in the given package.
-     */
-    public boolean isKnownPackage(String packageName) {
-        return packageSet.contains(packageName);
-    }
-
-
-    /**
-     * Return all of the errors specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] errors(String packageName) {
-        return getArray(errors, packageName);
-    }
-
-    /**
-     * Return all of the exceptions specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] exceptions(String packageName) {
-        return getArray(exceptions, packageName);
-    }
-
-    /**
-     * Return all of the enums specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] enums(String packageName) {
-        return getArray(enums, packageName);
-    }
-
-    /**
-     * Return all of the annotation types specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] annotationTypes(String packageName) {
-        return getArray(annotationTypes, packageName);
-    }
-
-    /**
-     * Return all of the interfaces specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] interfaces(String packageName) {
-        return getArray(interfaces, packageName);
-    }
-
-    /**
-     * Return all of the ordinary classes specified on the command-line
-     * that belong to the given package.
-     * @param packageName the name of the package specified on the
-     * command-line.
-     */
-    public ClassDoc[] ordinaryClasses(String packageName) {
-        return getArray(ordinaryClasses, packageName);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
deleted file mode 100644
index 3d23d0494a0..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Build Class Hierarchy for all the Classes. This class builds the Class
- * Tree and the Interface Tree separately.
- *
- *  <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>
- *
- * @see java.util.HashMap
- * @see java.util.List
- * @see com.sun.javadoc.Type
- * @see com.sun.javadoc.ClassDoc
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class ClassTree {
-
-    /**
-     * List of baseclasses. Contains only java.lang.Object. Can be used to get
-     * the mapped listing of sub-classes.
-     */
-    final private SortedSet<ClassDoc> baseclasses;
-
-    /**
-    * Mapping for each Class with their SubClasses
-    */
-    final private Map<ClassDoc, SortedSet<ClassDoc>> subclasses = new HashMap<>();
-
-    /**
-     * List of base-interfaces. Contains list of all the interfaces who do not
-     * have super-interfaces. Can be used to get the mapped listing of
-     * sub-interfaces.
-     */
-    final private SortedSet<ClassDoc> baseinterfaces;
-
-    /**
-    * Mapping for each Interface with their SubInterfaces
-    */
-    final private Map<ClassDoc, SortedSet<ClassDoc>> subinterfaces = new HashMap<>();
-
-    final private SortedSet<ClassDoc> baseEnums;
-    final private Map<ClassDoc, SortedSet<ClassDoc>> subEnums = new HashMap<>();
-
-    final private SortedSet<ClassDoc> baseAnnotationTypes;
-    final private Map<ClassDoc, SortedSet<ClassDoc>> subAnnotationTypes = new HashMap<>();
-
-    /**
-    * Mapping for each Interface with classes who implement it.
-    */
-    final private Map<ClassDoc, SortedSet<ClassDoc>> implementingclasses = new HashMap<>();
-
-    private final Configuration configuration;
-    private final Utils utils;
-    private final Comparator<Doc> comparator;
-    /**
-     * Constructor. Build the Tree using the Root of this Javadoc run.
-     *
-     * @param configuration the configuration of the doclet.
-     * @param noDeprecated Don't add deprecated classes in the class tree, if
-     * true.
-     */
-    public ClassTree(Configuration configuration, boolean noDeprecated) {
-        configuration.message.notice("doclet.Building_Tree");
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        comparator = utils.makeGeneralPurposeComparator();
-        baseAnnotationTypes = new TreeSet<>(comparator);
-        baseEnums = new TreeSet<>(comparator);
-        baseclasses = new TreeSet<>(comparator);
-        baseinterfaces = new TreeSet<>(comparator);
-        buildTree(configuration.root.classes());
-
-    }
-
-    /**
-     * Constructor. Build the Tree using the Root of this Javadoc run.
-     *
-     * @param root Root of the Document.
-     * @param configuration The current configuration of the doclet.
-     */
-    public ClassTree(RootDoc root, Configuration configuration) {
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        comparator = utils.makeGeneralPurposeComparator();
-        baseAnnotationTypes = new TreeSet<>(comparator);
-        baseEnums = new TreeSet<>(comparator);
-        baseclasses = new TreeSet<>(comparator);
-        baseinterfaces = new TreeSet<>(comparator);
-        buildTree(root.classes());
-    }
-
-    /**
-     * Constructor. Build the tree for the given array of classes.
-     *
-     * @param classes Array of classes.
-     * @param configuration The current configuration of the doclet.
-     */
-    public ClassTree(ClassDoc[] classes, Configuration configuration) {
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        comparator = utils.makeGeneralPurposeComparator();
-        baseAnnotationTypes = new TreeSet<>(comparator);
-        baseEnums = new TreeSet<>(comparator);
-        baseclasses = new TreeSet<>(comparator);
-        baseinterfaces = new TreeSet<>(comparator);
-        buildTree(classes);
-    }
-
-    /**
-     * Generate mapping for the sub-classes for every class in this run.
-     * Return the sub-class list for java.lang.Object which will be having
-     * sub-class listing for itself and also for each sub-class itself will
-     * have their own sub-class lists.
-     *
-     * @param classes all the classes in this run.
-     * @param configuration the current configuration of the doclet.
-     */
-    private void buildTree(ClassDoc[] classes) {
-        for (ClassDoc aClass : classes) {
-            // In the tree page (e.g overview-tree.html) do not include
-            // information of classes which are deprecated or are a part of a
-            // deprecated package.
-            if (configuration.nodeprecated &&
-                    (utils.isDeprecated(aClass) ||
-                    utils.isDeprecated(aClass.containingPackage()))) {
-                continue;
-            }
-
-            if (configuration.javafx
-                    && aClass.tags("treatAsPrivate").length > 0) {
-                continue;
-            }
-
-            if (aClass.isEnum()) {
-                processType(aClass, configuration, baseEnums, subEnums);
-            } else if (aClass.isClass()) {
-                processType(aClass, configuration, baseclasses, subclasses);
-            } else if (aClass.isInterface()) {
-                processInterface(aClass);
-            } else if (aClass.isAnnotationType()) {
-                processType(aClass, configuration, baseAnnotationTypes,
-                    subAnnotationTypes);
-            }
-        }
-    }
-
-    /**
-     * For the class passed map it to it's own sub-class listing.
-     * For the Class passed, get the super class,
-     * if superclass is non null, (it is not "java.lang.Object")
-     *    get the "value" from the hashmap for this key Class
-     *    if entry not found create one and get that.
-     *    add this Class as a sub class in the list
-     *    Recurse till hits java.lang.Object Null SuperClass.
-     *
-     * @param cd class for which sub-class mapping to be generated.
-     * @param configuration the current configurtation of the doclet.
-     */
-    private void processType(ClassDoc cd, Configuration configuration,
-            Collection<ClassDoc> bases, Map<ClassDoc, SortedSet<ClassDoc>> subs) {
-        ClassDoc superclass = utils.getFirstVisibleSuperClassCD(cd, configuration);
-        if (superclass != null) {
-            if (!add(subs, superclass, cd)) {
-                return;
-            } else {
-                processType(superclass, configuration, bases, subs);
-            }
-        } else {     // cd is java.lang.Object, add it once to the list
-            if (!bases.contains(cd)) {
-                bases.add(cd);
-            }
-        }
-        List<Type> intfacs = utils.getAllInterfaces(cd, configuration);
-        for (Type intfac : intfacs) {
-            add(implementingclasses, intfac.asClassDoc(), cd);
-        }
-    }
-
-    /**
-     * For the interface passed get the interfaces which it extends, and then
-     * put this interface in the sub-interface list of those interfaces. Do it
-     * recursively. If a interface doesn't have super-interface just attach
-     * that interface in the list of all the baseinterfaces.
-     *
-     * @param cd Interface under consideration.
-     */
-    private void processInterface(ClassDoc cd) {
-        ClassDoc[] intfacs = cd.interfaces();
-        if (intfacs.length > 0) {
-            for (ClassDoc intfac : intfacs) {
-                if (!add(subinterfaces, intfac, cd)) {
-                    return;
-                } else {
-                    processInterface(intfac);   // Recurse
-                }
-            }
-        } else {
-            // we need to add all the interfaces who do not have
-            // super-interfaces to baseinterfaces list to traverse them
-            if (!baseinterfaces.contains(cd)) {
-                baseinterfaces.add(cd);
-            }
-        }
-    }
-
-    /**
-     * Adjust the Class Tree. Add the class interface  in to it's super-class'
-     * or super-interface's sub-interface list.
-     *
-     * @param map the entire map.
-     * @param superclass java.lang.Object or the super-interface.
-     * @param cd sub-interface to be mapped.
-     * @returns boolean true if class added, false if class already processed.
-     */
-    private boolean add(Map<ClassDoc, SortedSet<ClassDoc>> map, ClassDoc superclass, ClassDoc cd) {
-        SortedSet<ClassDoc> list = map.get(superclass);
-        if (list == null) {
-            list = new TreeSet<>(comparator);
-            map.put(superclass, list);
-        }
-        if (list.contains(cd)) {
-            return false;
-        } else {
-            list.add(cd);
-        }
-        return true;
-    }
-
-    /**
-     * From the map return the list of sub-classes or sub-interfaces. If list
-     * is null create a new one and return it.
-     *
-     * @param map The entire map.
-     * @param cd class for which the sub-class list is requested.
-     * @returns List Sub-Class list for the class passed.
-     */
-    private SortedSet<ClassDoc> get(Map<ClassDoc, SortedSet<ClassDoc>> map, ClassDoc cd) {
-        SortedSet<ClassDoc> aset = map.get(cd);
-        if (aset == null) {
-            return new TreeSet<>(comparator);
-        }
-        return aset;
-    }
-
-    /**
-     *  Return the sub-class list for the class passed.
-     *
-     * @param cd class whose sub-class list is required.
-     */
-    public SortedSet<ClassDoc> subclasses(ClassDoc cd) {
-        return get(subclasses, cd);
-    }
-
-    /**
-     *  Return the sub-interface list for the interface passed.
-     *
-     * @param cd interface whose sub-interface list is required.
-     */
-    public SortedSet<ClassDoc> subinterfaces(ClassDoc cd) {
-        return get(subinterfaces, cd);
-    }
-
-    /**
-     *  Return the list of classes which implement the interface passed.
-     *
-     * @param cd interface whose implementing-classes list is required.
-     */
-    public SortedSet<ClassDoc> implementingclasses(ClassDoc cd) {
-        SortedSet<ClassDoc> result = get(implementingclasses, cd);
-        SortedSet<ClassDoc> intfcs = allSubs(cd, false);
-
-        //If class x implements a subinterface of cd, then it follows
-        //that class x implements cd.
-        Iterator<ClassDoc> subInterfacesIter = intfcs.iterator();
-        while (subInterfacesIter.hasNext()) {
-            Iterator<ClassDoc> implementingClassesIter
-                    = implementingclasses(subInterfacesIter.next()).iterator();
-            while (implementingClassesIter.hasNext()) {
-                ClassDoc c = implementingClassesIter.next();
-                if (!result.contains(c)) {
-                    result.add(c);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     *  Return the sub-class/interface list for the class/interface passed.
-     *
-     * @param cd class/interface whose sub-class/interface list is required.
-     * @param isEnum true if the subclasses should be forced to come from the
-     * enum tree.
-     */
-    public SortedSet<ClassDoc> subs(ClassDoc cd, boolean isEnum) {
-        if (isEnum) {
-            return get(subEnums, cd);
-        } else if (cd.isAnnotationType()) {
-            return get(subAnnotationTypes, cd);
-        } else if (cd.isInterface()) {
-            return get(subinterfaces, cd);
-        } else if (cd.isClass()) {
-            return get(subclasses, cd);
-        } else {
-            return null;
-        }
-
-    }
-
-    /**
-     * Return a list of all direct or indirect, sub-classes and subinterfaces
-     * of the ClassDoc argument.
-     *
-     * @param cd ClassDoc whose sub-classes or sub-interfaces are requested.
-     * @param isEnum true if the subclasses should be forced to come from the
-     * enum tree.
-     */
-    public SortedSet<ClassDoc> allSubs(ClassDoc cd, boolean isEnum) {
-        // new entries added to the list are searched as well
-        List<ClassDoc> list = new ArrayList<>(subs(cd, isEnum));
-        for (int i = 0; i < list.size(); i++) {
-            cd = list.get(i);
-            SortedSet<ClassDoc> tlist = subs(cd, isEnum);
-            for (ClassDoc tcd : tlist) {
-                if (!list.contains(tcd)) {
-                    list.add(tcd);
-                }
-            }
-        }
-        SortedSet<ClassDoc> oset = new TreeSet<>(comparator);
-        oset.addAll(list);
-        return oset;
-    }
-
-    /**
-     *  Return the base-classes list. This will have only one element namely
-     *  thw classdoc for java.lang.Object, since this is the base class for all
-     *  classes.
-     */
-    public SortedSet<ClassDoc> baseclasses() {
-        return baseclasses;
-    }
-
-    /**
-     *  Return the list of base interfaces. This is the list of interfaces
-     *  which do not have super-interface.
-     */
-    public SortedSet<ClassDoc> baseinterfaces() {
-        return baseinterfaces;
-    }
-
-    /**
-     *  Return the list of base enums. This is the list of enums
-     *  which do not have super-enums.
-     */
-    public SortedSet<ClassDoc> baseEnums() {
-        return baseEnums;
-    }
-
-    /**
-     *  Return the list of base annotation types. This is the list of
-     *  annotation types which do not have super-annotation types.
-     */
-    public SortedSet<ClassDoc> baseAnnotationTypes() {
-        return baseAnnotationTypes;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
deleted file mode 100644
index 206bc69ae77..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.ConfigurationImpl;
-
-/**
- * Map all class uses for a given class.
- *
- *  <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>
- *
- * @since 1.2
- * @author Robert G. Field
- */
-@Deprecated
-public class ClassUseMapper {
-
-    private final ClassTree classtree;
-
-    /**
-     * Mapping of ClassDocs to set of PackageDoc used by that class.
-     * Entries may be null.
-     */
-    public Map<String,Set<PackageDoc>> classToPackage = new HashMap<>();
-
-    /**
-     * Mapping of Annotations to set of PackageDoc that use the annotation.
-     */
-    public Map<String,List<PackageDoc>> classToPackageAnnotations = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to set of ClassDoc used by that class.
-     * Entries may be null.
-     */
-    public Map<String,Set<ClassDoc>> classToClass = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of ClassDoc which are direct or
-     * indirect subclasses of that class.
-     * Entries may be null.
-     */
-    public Map<String,List<ClassDoc>> classToSubclass = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of ClassDoc which are direct or
-     * indirect subinterfaces of that interface.
-     * Entries may be null.
-     */
-    public Map<String,List<ClassDoc>> classToSubinterface = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of ClassDoc which implement
-     * this interface.
-     * Entries may be null.
-     */
-    public Map<String,List<ClassDoc>> classToImplementingClass = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of FieldDoc declared as that class.
-     * Entries may be null.
-     */
-    public Map<String,List<FieldDoc>> classToField = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of MethodDoc returning that class.
-     * Entries may be null.
-     */
-    public Map<String,List<MethodDoc>> classToMethodReturn = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of MethodDoc having that class
-     * as an arg.
-     * Entries may be null.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToMethodArgs = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of MethodDoc which throws that class.
-     * Entries may be null.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToMethodThrows = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of ConstructorDoc having that class
-     * as an arg.
-     * Entries may be null.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToConstructorArgs = new HashMap<>();
-
-    /**
-     * Mapping of ClassDocs to list of ConstructorDoc which throws that class.
-     * Entries may be null.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToConstructorThrows = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to constructors that use them.
-     */
-    public Map<String,List<ConstructorDoc>> classToConstructorAnnotations = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to Constructor parameters that use them.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToConstructorParamAnnotation = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to Constructor arguments that use them as type parameters.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToConstructorDocArgTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to ClassDocs that use them as type parameters.
-     */
-    public Map<String,List<ClassDoc>> classToClassTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to ClassDocs that use them.
-     */
-    public Map<String,List<ClassDoc>> classToClassAnnotations = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to ExecutableMemberDocs that use them as type parameters.
-     */
-    public Map<String,List<MethodDoc>> classToExecMemberDocTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to ExecutableMemberDocs arguments that use them as type parameters.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToExecMemberDocArgTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to ExecutableMemberDocs that use them.
-     */
-    public Map<String,List<MethodDoc>> classToExecMemberDocAnnotations = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to ExecutableMemberDocs that have return type
-     * with type parameters of that class.
-     */
-    public Map<String,List<MethodDoc>> classToExecMemberDocReturnTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to MethodDoc parameters that use them.
-     */
-    public Map<String,List<ExecutableMemberDoc>> classToExecMemberDocParamAnnotation = new HashMap<>();
-
-    /**
-     * The mapping of ClassDocs to FieldDocs that use them as type parameters.
-     */
-    public Map<String,List<FieldDoc>> classToFieldDocTypeParam = new HashMap<>();
-
-    /**
-     * The mapping of AnnotationTypeDocs to FieldDocs that use them.
-     */
-    public Map<String,List<FieldDoc>> annotationToFieldDoc = new HashMap<>();
-
-    private final Utils utils;
-    public ClassUseMapper(ConfigurationImpl configuration, ClassTree classtree) {
-        RootDoc root = configuration.root;
-        this.classtree = classtree;
-        utils = configuration.utils;
-        // Map subclassing, subinterfacing implementing, ...
-        for (ClassDoc doc : classtree.baseclasses()) {
-            subclasses(doc);
-        }
-        for (ClassDoc doc : classtree.baseinterfaces()) {
-            // does subinterfacing as side-effect
-            implementingClasses(doc);
-        }
-        // Map methods, fields, constructors using a class.
-        ClassDoc[] classes = root.classes();
-        for (ClassDoc aClass : classes) {
-            PackageDoc pkg = aClass.containingPackage();
-            mapAnnotations(classToPackageAnnotations, pkg, pkg);
-            ClassDoc cd = aClass;
-            mapTypeParameters(classToClassTypeParam, cd, cd);
-            mapAnnotations(classToClassAnnotations, cd, cd);
-            FieldDoc[] fields = cd.fields();
-            for (FieldDoc fd : fields) {
-                mapTypeParameters(classToFieldDocTypeParam, fd, fd);
-                mapAnnotations(annotationToFieldDoc, fd, fd);
-                if (!fd.type().isPrimitive()) {
-                    add(classToField, fd.type().asClassDoc(), fd);
-                }
-            }
-            ConstructorDoc[] cons = cd.constructors();
-            for (ConstructorDoc con : cons) {
-                mapAnnotations(classToConstructorAnnotations, con, con);
-                mapExecutable(con);
-            }
-            MethodDoc[] meths = cd.methods();
-            for (MethodDoc md : meths) {
-                mapExecutable(md);
-                mapTypeParameters(classToExecMemberDocTypeParam, md, md);
-                mapAnnotations(classToExecMemberDocAnnotations, md, md);
-                if (!(md.returnType().isPrimitive() || md.returnType() instanceof TypeVariable)) {
-                    mapTypeParameters(classToExecMemberDocReturnTypeParam,
-                                      md.returnType(), md);
-                    add(classToMethodReturn, md.returnType().asClassDoc(), md);
-                }
-            }
-        }
-    }
-
-    /**
-     * Return all subclasses of a class AND fill-in classToSubclass map.
-     */
-    private Collection<ClassDoc> subclasses(ClassDoc cd) {
-        Collection<ClassDoc> ret = classToSubclass.get(cd.qualifiedName());
-        if (ret == null) {
-            ret = new TreeSet<>(utils.makeComparatorForClassUse());
-            SortedSet<ClassDoc> subs = classtree.subclasses(cd);
-            if (subs != null) {
-                ret.addAll(subs);
-                for (ClassDoc sub : subs) {
-                    ret.addAll(subclasses(sub));
-                }
-            }
-            addAll(classToSubclass, cd, ret);
-        }
-        return ret;
-    }
-
-    /**
-     * Return all subinterfaces of an interface AND fill-in classToSubinterface map.
-     */
-    private Collection<ClassDoc> subinterfaces(ClassDoc cd) {
-        Collection<ClassDoc> ret = classToSubinterface.get(cd.qualifiedName());
-        if (ret == null) {
-            ret = new TreeSet<>(utils.makeComparatorForClassUse());
-            SortedSet<ClassDoc> subs = classtree.subinterfaces(cd);
-            if (subs != null) {
-                ret.addAll(subs);
-                for (ClassDoc sub : subs) {
-                    ret.addAll(subinterfaces(sub));
-                }
-            }
-            addAll(classToSubinterface, cd, ret);
-        }
-        return ret;
-    }
-
-    /**
-     * Return all implementing classes of an interface (including
-     * all subclasses of implementing classes and all classes
-     * implementing subinterfaces) AND fill-in both classToImplementingClass
-     * and classToSubinterface maps.
-     */
-    private Collection<ClassDoc> implementingClasses(ClassDoc cd) {
-        Collection<ClassDoc> ret = classToImplementingClass.get(cd.qualifiedName());
-        if (ret == null) {
-            ret = new TreeSet<>(utils.makeComparatorForClassUse());
-            SortedSet<ClassDoc> impl = classtree.implementingclasses(cd);
-            if (impl != null) {
-                ret.addAll(impl);
-                for (ClassDoc anImpl : impl) {
-                    ret.addAll(subclasses(anImpl));
-                }
-            }
-            for (ClassDoc doc : subinterfaces(cd)) {
-                ret.addAll(implementingClasses(doc));
-            }
-            addAll(classToImplementingClass, cd, ret);
-        }
-        return ret;
-    }
-
-    /**
-     * Determine classes used by a method or constructor, so they can be
-     * inverse mapped.
-     */
-    private void mapExecutable(ExecutableMemberDoc em) {
-        boolean isConstructor = em.isConstructor();
-        Set<Type> classArgs = new TreeSet<>(utils.makeTypeComparator());
-        for (Parameter param : em.parameters()) {
-            Type pcd = param.type();
-            // ignore primitives and typevars, typevars are handled elsewhere
-            if ((!param.type().isPrimitive()) && !(pcd instanceof TypeVariable)) {
-                 // avoid dups
-                if (classArgs.add(pcd)) {
-                    add(isConstructor ? classToConstructorArgs : classToMethodArgs,
-                            pcd.asClassDoc(), em);
-                    mapTypeParameters(isConstructor
-                                ? classToConstructorDocArgTypeParam
-                                : classToExecMemberDocArgTypeParam,
-                            pcd, em);
-                }
-            }
-            mapAnnotations(isConstructor
-                        ? classToConstructorParamAnnotation
-                        : classToExecMemberDocParamAnnotation,
-                    param, em);
-
-        }
-        for (ClassDoc anException : em.thrownExceptions()) {
-            add(isConstructor ? classToConstructorThrows : classToMethodThrows,
-                anException, em);
-        }
-    }
-
-    private <T> List<T> refList(Map<String,List<T>> map, ClassDoc cd) {
-        List<T> list = map.get(cd.qualifiedName());
-        if (list == null) {
-            list = new ArrayList<>();
-            map.put(cd.qualifiedName(), list);
-        }
-        return list;
-    }
-
-    private Set<PackageDoc> packageSet(ClassDoc cd) {
-        Set<PackageDoc> pkgSet = classToPackage.get(cd.qualifiedName());
-        if (pkgSet == null) {
-            pkgSet = new TreeSet<>();
-            classToPackage.put(cd.qualifiedName(), pkgSet);
-        }
-        return pkgSet;
-    }
-
-    private Set<ClassDoc> classSet(ClassDoc cd) {
-        Set<ClassDoc> clsSet = classToClass.get(cd.qualifiedName());
-        if (clsSet == null) {
-            clsSet = new TreeSet<>();
-            classToClass.put(cd.qualifiedName(), clsSet);
-        }
-        return clsSet;
-    }
-
-    private <T extends ProgramElementDoc> void add(Map<String,List<T>> map, ClassDoc cd, T ref) {
-        // add to specified map
-        refList(map, cd).add(ref);
-
-        // add ref's package to package map and class map
-        packageSet(cd).add(ref.containingPackage());
-
-        classSet(cd).add(ref instanceof MemberDoc?
-                ((MemberDoc)ref).containingClass() :
-                    (ClassDoc)ref);
-    }
-
-    private void addAll(Map<String,List<ClassDoc>> map, ClassDoc cd, Collection<ClassDoc> refs) {
-        if (refs == null) {
-            return;
-        }
-        // add to specified map
-        refList(map, cd).addAll(refs);
-
-        Set<PackageDoc> pkgSet = packageSet(cd);
-        Set<ClassDoc> clsSet = classSet(cd);
-        // add ref's package to package map and class map
-        for (ClassDoc cls : refs) {
-            pkgSet.add(cls.containingPackage());
-            clsSet.add(cls);
-
-        }
-    }
-
-    /**
-     * Map the ClassDocs to the ProgramElementDocs that use them as
-     * type parameters.
-     *
-     * @param map the map the insert the information into.
-     * @param doc the doc whose type parameters are being checked.
-     * @param holder the holder that owns the type parameters.
-     */
-    private <T extends ProgramElementDoc> void mapTypeParameters(Map<String,List<T>> map, Object doc,
-            T holder) {
-        TypeVariable[] typeVariables;
-        if (doc instanceof ClassDoc) {
-            typeVariables = ((ClassDoc) doc).typeParameters();
-        } else if (doc instanceof WildcardType) {
-            for (Type extendsBound : ((WildcardType) doc).extendsBounds()) {
-                addTypeParameterToMap(map, extendsBound, holder);
-            }
-            for (Type superBound : ((WildcardType) doc).superBounds()) {
-                addTypeParameterToMap(map, superBound, holder);
-            }
-            return;
-        } else if (doc instanceof ParameterizedType) {
-            for (Type typeArgument : ((ParameterizedType) doc).typeArguments()) {
-                addTypeParameterToMap(map, typeArgument, holder);
-            }
-            return;
-        } else if (doc instanceof ExecutableMemberDoc) {
-            typeVariables = ((ExecutableMemberDoc) doc).typeParameters();
-        } else if (doc instanceof FieldDoc) {
-            Type fieldType = ((FieldDoc) doc).type();
-            mapTypeParameters(map, fieldType, holder);
-            return;
-        } else {
-            return;
-        }
-        for (TypeVariable typeVariable : typeVariables) {
-            for (Type bound : typeVariable.bounds()) {
-                addTypeParameterToMap(map, bound, holder);
-            }
-        }
-    }
-
-    /**
-     * Map the AnnotationType to the ProgramElementDocs that use them as
-     * type parameters.
-     *
-     * @param map the map the insert the information into.
-     * @param doc the doc whose type parameters are being checked.
-     * @param holder the holder that owns the type parameters.
-     */
-    private <T extends ProgramElementDoc> void mapAnnotations(Map<String,List<T>> map, Object doc,
-            T holder) {
-        AnnotationDesc[] annotations;
-        boolean isPackage = false;
-        if (doc instanceof ProgramElementDoc) {
-            annotations = ((ProgramElementDoc) doc).annotations();
-        } else if (doc instanceof PackageDoc) {
-            annotations = ((PackageDoc) doc).annotations();
-            isPackage = true;
-        } else if (doc instanceof Parameter) {
-            annotations = ((Parameter) doc).annotations();
-        } else {
-            throw new DocletAbortException("should not happen");
-        }
-        for (AnnotationDesc annotation : annotations) {
-            AnnotationTypeDoc annotationDoc = annotation.annotationType();
-            if (isPackage)
-                refList(map, annotationDoc).add(holder);
-            else
-                add(map, annotationDoc, holder);
-        }
-    }
-
-
-    /**
-     * Map the AnnotationType to the ProgramElementDocs that use them as
-     * type parameters.
-     *
-     * @param map the map the insert the information into.
-     * @param doc the doc whose type parameters are being checked.
-     * @param holder the holder that owns the type parameters.
-     */
-    private <T extends PackageDoc> void mapAnnotations(Map<String,List<T>> map, PackageDoc doc,
-            T holder) {
-        for (AnnotationDesc annotation : doc.annotations()) {
-            AnnotationTypeDoc annotationDoc = annotation.annotationType();
-            refList(map, annotationDoc).add(holder);
-        }
-    }
-
-    private <T extends ProgramElementDoc> void addTypeParameterToMap(Map<String,List<T>> map, Type type,
-            T holder) {
-        if (type instanceof ClassDoc) {
-            add(map, (ClassDoc) type, holder);
-        } else if (type instanceof ParameterizedType) {
-            add(map, ((ParameterizedType) type).asClassDoc(), holder);
-        }
-        mapTypeParameters(map, type, holder);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
deleted file mode 100644
index e4f43fd7500..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * Build list of all the deprecated packages, classes, constructors, fields and methods.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class DeprecatedAPIListBuilder {
-
-    public static final int NUM_TYPES = 12;
-
-    public static final int PACKAGE = 0;
-    public static final int INTERFACE = 1;
-    public static final int CLASS = 2;
-    public static final int ENUM = 3;
-    public static final int EXCEPTION = 4;
-    public static final int ERROR = 5;
-    public static final int ANNOTATION_TYPE = 6;
-    public static final int FIELD = 7;
-    public static final int METHOD = 8;
-    public static final int CONSTRUCTOR = 9;
-    public static final int ENUM_CONSTANT = 10;
-    public static final int ANNOTATION_TYPE_MEMBER = 11;
-
-    /**
-     * List of deprecated type Lists.
-     */
-    private List<List<Doc>> deprecatedLists;
-    private final Configuration configuration;
-    private final Utils utils;
-
-    /**
-     * Constructor.
-     *
-     * @param configuration the current configuration of the doclet
-     */
-    public DeprecatedAPIListBuilder(Configuration configuration) {
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        deprecatedLists = new ArrayList<>();
-        for (int i = 0; i < NUM_TYPES; i++) {
-            deprecatedLists.add(i, new ArrayList<Doc>());
-        }
-        buildDeprecatedAPIInfo();
-    }
-
-    /**
-     * Build the sorted list of all the deprecated APIs in this run.
-     * Build separate lists for deprecated packages, classes, constructors,
-     * methods and fields.
-     *
-     * @param configuration the current configuration of the doclet.
-     */
-    private void buildDeprecatedAPIInfo() {
-        Set<PackageDoc> packages = configuration.packages;
-        for (PackageDoc pkg : packages) {
-            if (utils.isDeprecated(pkg)) {
-                getList(PACKAGE).add(pkg);
-            }
-        }
-        for (ClassDoc cd : configuration.root.classes()) {
-            if (utils.isDeprecated(cd)) {
-                if (cd.isOrdinaryClass()) {
-                    getList(CLASS).add(cd);
-                } else if (cd.isInterface()) {
-                    getList(INTERFACE).add(cd);
-                } else if (cd.isException()) {
-                    getList(EXCEPTION).add(cd);
-                } else if (cd.isEnum()) {
-                    getList(ENUM).add(cd);
-                } else if (cd.isError()) {
-                    getList(ERROR).add(cd);
-                } else if (cd.isAnnotationType()) {
-                    getList(ANNOTATION_TYPE).add(cd);
-                }
-            }
-            composeDeprecatedList(getList(FIELD), cd.fields());
-            composeDeprecatedList(getList(METHOD), cd.methods());
-            composeDeprecatedList(getList(CONSTRUCTOR), cd.constructors());
-            if (cd.isEnum()) {
-                composeDeprecatedList(getList(ENUM_CONSTANT), cd.enumConstants());
-            }
-            if (cd.isAnnotationType()) {
-                composeDeprecatedList(getList(ANNOTATION_TYPE_MEMBER),
-                                      ((AnnotationTypeDoc) cd).elements());
-            }
-        }
-        sortDeprecatedLists();
-    }
-
-    /**
-     * Add the members into a single list of deprecated members.
-     *
-     * @param list List of all the particular deprecated members, e.g. methods.
-     * @param members members to be added in the list.
-     */
-    private void composeDeprecatedList(List<Doc> list, MemberDoc[] members) {
-        for (MemberDoc member : members) {
-            if (utils.isDeprecated(member)) {
-                list.add(member);
-            }
-        }
-    }
-
-    /**
-     * Sort the deprecated lists for class kinds, fields, methods and
-     * constructors.
-     */
-    private void sortDeprecatedLists() {
-        for (int i = 0; i < NUM_TYPES; i++) {
-            Collections.sort(getList(i));
-        }
-    }
-
-    /**
-     * Return the list of deprecated Doc objects of a given type.
-     *
-     * @param type the constant representing the type of list being returned.
-     */
-    public List<Doc> getList(int type) {
-        return deprecatedLists.get(type);
-    }
-
-    /**
-     * Return true if the list of a given type has size greater than 0.
-     *
-     * @param type the type of list being checked.
-     */
-    public boolean hasDocumentation(int type) {
-        return (deprecatedLists.get(type)).size() > 0;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
deleted file mode 100644
index 16b438e09e7..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 1998, 2013, 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.doclets.internal.toolkit.util;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-import javax.tools.JavaFileManager.Location;
-import javax.tools.StandardLocation;
-
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * Abstraction for handling files, which may be specified directly
- * (e.g. via a path on the command line) or relative to a Location.
- *
- *  <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>
- *
- * @since 8
- */
-@Deprecated
-public abstract class DocFile {
-
-    /** Create a DocFile for a directory. */
-    public static DocFile createFileForDirectory(Configuration configuration, String file) {
-        return DocFileFactory.getFactory(configuration).createFileForDirectory(file);
-    }
-
-    /** Create a DocFile for a file that will be opened for reading. */
-    public static DocFile createFileForInput(Configuration configuration, String file) {
-        return DocFileFactory.getFactory(configuration).createFileForInput(file);
-    }
-
-    /** Create a DocFile for a file that will be opened for writing. */
-    public static DocFile createFileForOutput(Configuration configuration, DocPath path) {
-        return DocFileFactory.getFactory(configuration).createFileForOutput(path);
-    }
-
-    private final Configuration configuration;
-
-    /**
-     * The location for this file. Maybe null if the file was created without
-     * a location or path.
-     */
-    protected final Location location;
-
-    /**
-     * The path relative to the (output) location. Maybe null if the file was
-     * created without a location or path.
-     */
-    protected final DocPath path;
-
-    /**
-     * List the directories and files found in subdirectories along the
-     * elements of the given location.
-     * @param configuration the doclet configuration
-     * @param location currently, only {@link StandardLocation#SOURCE_PATH} is supported.
-     * @param path the subdirectory of the directories of the location for which to
-     *  list files
-     */
-    public static Iterable<DocFile> list(Configuration configuration, Location location, DocPath path) {
-        return DocFileFactory.getFactory(configuration).list(location, path);
-    }
-
-    /** Create a DocFile without a location or path */
-    protected DocFile(Configuration configuration) {
-        this.configuration = configuration;
-        this.location = null;
-        this.path = null;
-    }
-
-    /** Create a DocFile for a given location and relative path. */
-    protected DocFile(Configuration configuration, Location location, DocPath path) {
-        this.configuration = configuration;
-        this.location = location;
-        this.path = path;
-    }
-
-    /** Open an input stream for the file. */
-    public abstract InputStream openInputStream() throws IOException;
-
-    /**
-     * Open an output stream for the file.
-     * The file must have been created with a location of
-     * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT}
-     * and a corresponding relative path.
-     */
-    public abstract OutputStream openOutputStream() throws IOException, UnsupportedEncodingException;
-
-    /**
-     * Open an writer for the file, using the encoding (if any) given in the
-     * doclet configuration.
-     * The file must have been created with a location of
-     * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path.
-     */
-    public abstract Writer openWriter() throws IOException, UnsupportedEncodingException;
-
-    /**
-     * Copy the contents of another file directly to this file.
-     */
-    public void copyFile(DocFile fromFile) throws IOException {
-        try (OutputStream output = openOutputStream();
-             InputStream input = fromFile.openInputStream()) {
-            byte[] bytearr = new byte[1024];
-            int len;
-            while ((len = input.read(bytearr)) != -1) {
-                output.write(bytearr, 0, len);
-            }
-        }
-        catch (FileNotFoundException | SecurityException exc) {
-        }
-    }
-
-    /**
-     * Copy the contents of a resource file to this file.
-     * @param resource the path of the resource, relative to the package of this class
-     * @param overwrite whether or not to overwrite the file if it already exists
-     * @param replaceNewLine if false, the file is copied as a binary file;
-     *     if true, the file is written line by line, using the platform line
-     *     separator
-     */
-    public void copyResource(DocPath resource, boolean overwrite, boolean replaceNewLine) {
-        if (exists() && !overwrite)
-            return;
-
-        try {
-            InputStream in = Configuration.class.getResourceAsStream(resource.getPath());
-            if (in == null)
-                return;
-
-            try (OutputStream out = openOutputStream()) {
-                if (!replaceNewLine) {
-                    byte[] buf = new byte[2048];
-                    int n;
-                    while ((n = in.read(buf)) > 0)
-                        out.write(buf, 0, n);
-                } else {
-                    try (BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-                         BufferedWriter writer = new BufferedWriter(configuration.docencoding == null
-                                                                    ? new OutputStreamWriter(out)
-                                                                    : new OutputStreamWriter(out, configuration.docencoding))) {
-                        String line;
-                        while ((line = reader.readLine()) != null) {
-                            writer.write(line);
-                            writer.write(DocletConstants.NL);
-                        }
-                    }
-                }
-            } finally {
-                in.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace(System.err);
-            throw new DocletAbortException(e);
-        }
-    }
-
-    /** Return true if the file can be read. */
-    public abstract boolean canRead();
-
-    /** Return true if the file can be written. */
-    public abstract boolean canWrite();
-
-    /** Return true if the file exists. */
-    public abstract boolean exists();
-
-    /** Return the base name (last component) of the file name. */
-    public abstract String getName();
-
-    /** Return the file system path for this file. */
-    public abstract String getPath();
-
-    /** Return true if file has an absolute path name. */
-    public abstract boolean isAbsolute();
-
-    /** Return true if file identifies a directory. */
-    public abstract boolean isDirectory();
-
-    /** Return true if file identifies a file. */
-    public abstract boolean isFile();
-
-    /** Return true if this file is the same as another. */
-    public abstract boolean isSameFile(DocFile other);
-
-    /** If the file is a directory, list its contents. */
-    public abstract Iterable<DocFile> list() throws IOException;
-
-    /** Create the file as a directory, including any parent directories. */
-    public abstract boolean mkdirs();
-
-    /**
-     * Derive a new file by resolving a relative path against this file.
-     * The new file will inherit the configuration and location of this file
-     * If this file has a path set, the new file will have a corresponding
-     * new path.
-     */
-    public abstract DocFile resolve(DocPath p);
-
-    /**
-     * Derive a new file by resolving a relative path against this file.
-     * The new file will inherit the configuration and location of this file
-     * If this file has a path set, the new file will have a corresponding
-     * new path.
-     */
-    public abstract DocFile resolve(String p);
-
-    /**
-     * Resolve a relative file against the given output location.
-     * @param locn Currently, only
-     * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} is supported.
-     */
-    public abstract DocFile resolveAgainst(Location locn);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
deleted file mode 100644
index b3437ab8bfc..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.internal.toolkit.util;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileManager.Location;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * Factory for DocFile objects.
- *
- *  <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>
- *
- * @since 1.8
- */
-@Deprecated
-abstract class DocFileFactory {
-    private static final Map<Configuration, DocFileFactory> factories = new WeakHashMap<>();
-
-    /**
-     * Get the appropriate factory, based on the file manager given in the
-     * configuration.
-     */
-    static synchronized DocFileFactory getFactory(Configuration configuration) {
-        DocFileFactory f = factories.get(configuration);
-        if (f == null) {
-            JavaFileManager fm = configuration.getFileManager();
-            if (fm instanceof StandardJavaFileManager) {
-                f = new StandardDocFileFactory(configuration);
-            } else {
-                throw new IllegalStateException();
-            }
-            factories.put(configuration, f);
-        }
-        return f;
-    }
-
-    protected Configuration configuration;
-
-    protected DocFileFactory(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /** Create a DocFile for a directory. */
-    abstract DocFile createFileForDirectory(String file);
-
-    /** Create a DocFile for a file that will be opened for reading. */
-    abstract DocFile createFileForInput(String file);
-
-    /** Create a DocFile for a file that will be opened for writing. */
-    abstract DocFile createFileForOutput(DocPath path);
-
-    /**
-     * List the directories and files found in subdirectories along the
-     * elements of the given location.
-     * @param location currently, only {@link StandardLocation#SOURCE_PATH} is supported.
-     * @param path the subdirectory of the directories of the location for which to
-     *  list files
-     */
-    abstract Iterable<DocFile> list(Location location, DocPath path);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
deleted file mode 100644
index 8f9df7a5b26..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-
-/**
- * Search for the requested documentation.  Inherit documentation if necessary.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class DocFinder {
-
-    /**
-     * The class that encapsulates the input.
-     */
-    public static class Input {
-        /**
-         * The element to search documentation from.
-         */
-        public ProgramElementDoc element;
-        /**
-         * The taglet to search for documentation on behalf of. Null if we want
-         * to search for overall documentation.
-         */
-        public InheritableTaglet taglet = null;
-
-        /**
-         * The id of the tag to retrieve documentation for.
-         */
-        public String tagId = null;
-
-        /**
-         * The tag to retrieve documentation for.  This is only used for the
-         * inheritDoc tag.
-         */
-        public Tag tag = null;
-
-        /**
-         * True if we only want to search for the first sentence.
-         */
-        public boolean isFirstSentence = false;
-
-        /**
-         * True if we are looking for documentation to replace the inheritDocTag.
-         */
-        public boolean isInheritDocTag = false;
-
-        /**
-         * Used to distinguish between type variable param tags and regular
-         * param tags.
-         */
-        public boolean isTypeVariableParamTag = false;
-
-        public Input(ProgramElementDoc element, InheritableTaglet taglet, Tag tag,
-                boolean isFirstSentence, boolean isInheritDocTag) {
-            this(element);
-            this.taglet = taglet;
-            this.tag = tag;
-            this.isFirstSentence = isFirstSentence;
-            this.isInheritDocTag = isInheritDocTag;
-        }
-
-        public Input(ProgramElementDoc element, InheritableTaglet taglet, String tagId) {
-            this(element);
-            this.taglet = taglet;
-            this.tagId = tagId;
-        }
-
-        public Input(ProgramElementDoc element, InheritableTaglet taglet, String tagId,
-            boolean isTypeVariableParamTag) {
-            this(element);
-            this.taglet = taglet;
-            this.tagId = tagId;
-            this.isTypeVariableParamTag = isTypeVariableParamTag;
-        }
-
-        public Input(ProgramElementDoc element, InheritableTaglet taglet) {
-            this(element);
-            this.taglet = taglet;
-        }
-
-        public Input(ProgramElementDoc element) {
-            if (element == null)
-                throw new NullPointerException();
-            this.element = element;
-        }
-
-        public Input(ProgramElementDoc element, boolean isFirstSentence) {
-            this(element);
-            this.isFirstSentence = isFirstSentence;
-        }
-
-        public Input copy() {
-            Input clone = new Input(this.element);
-            clone.taglet = this.taglet;
-            clone.tagId = this.tagId;
-            clone.tag = this.tag;
-            clone.isFirstSentence = this.isFirstSentence;
-            clone.isInheritDocTag = this.isInheritDocTag;
-            clone.isTypeVariableParamTag = this.isTypeVariableParamTag;
-            if (clone.element == null)
-                throw new NullPointerException();
-            return clone;
-
-        }
-    }
-
-    /**
-     * The class that encapsulates the output.
-     */
-    public static class Output {
-        /**
-         * The tag that holds the documentation.  Null if documentation
-         * is not held by a tag.
-         */
-        public Tag holderTag;
-
-        /**
-         * The Doc object that holds the documentation.
-         */
-        public Doc holder;
-
-        /**
-         * The inherited documentation.
-         */
-        public Tag[] inlineTags = new Tag[] {};
-
-        /**
-         * False if documentation could not be inherited.
-         */
-        public boolean isValidInheritDocTag = true;
-
-        /**
-         * When automatically inheriting throws tags, you sometime must inherit
-         * more than one tag.  For example if the element declares that it throws
-         * IOException and the overridden element has throws tags for IOException and
-         * ZipException, both tags would be inherited because ZipException is a
-         * subclass of IOException.  This subclass of DocFinder.Output allows
-         * multiple tag inheritence.
-         */
-        public List<Tag> tagList  = new ArrayList<>();
-    }
-
-    /**
-     * Search for the requested comments in the given element.  If it does not
-     * have comments, return documentation from the overriden element if possible.
-     * If the overriden element does not exist or does not have documentation to
-     * inherit, search for documentation to inherit from implemented methods.
-     *
-     * @param input the input object used to perform the search.
-     *
-     * @return an Output object representing the documentation that was found.
-     */
-    public static Output search(Configuration configuration, Input input) {
-        Output output = new Output();
-        if (input.isInheritDocTag) {
-            //Do nothing because "element" does not have any documentation.
-            //All it has it {@inheritDoc}.
-        } else if (input.taglet == null) {
-            //We want overall documentation.
-            output.inlineTags = input.isFirstSentence ?
-                input.element.firstSentenceTags() :
-                input.element.inlineTags();
-            output.holder = input.element;
-        } else {
-            input.taglet.inherit(input, output);
-        }
-
-        if (output.inlineTags != null && output.inlineTags.length > 0) {
-            return output;
-        }
-        output.isValidInheritDocTag = false;
-        Input inheritedSearchInput = input.copy();
-        inheritedSearchInput.isInheritDocTag = false;
-        if (input.element instanceof MethodDoc) {
-            MethodDoc overriddenMethod = ((MethodDoc) input.element).overriddenMethod();
-            if (overriddenMethod != null) {
-                inheritedSearchInput.element = overriddenMethod;
-                output = search(configuration, inheritedSearchInput);
-                output.isValidInheritDocTag = true;
-                if (output.inlineTags.length > 0) {
-                    return output;
-                }
-            }
-            //NOTE:  When we fix the bug where ClassDoc.interfaceTypes() does
-            //       not pass all implemented interfaces, we will use the
-            //       appropriate element here.
-            MethodDoc[] implementedMethods =
-                (new ImplementedMethods((MethodDoc) input.element, configuration)).build(false);
-            for (MethodDoc implementedMethod : implementedMethods) {
-                inheritedSearchInput.element = implementedMethod;
-                output = search(configuration, inheritedSearchInput);
-                output.isValidInheritDocTag = true;
-                if (output.inlineTags.length > 0) {
-                    return output;
-                }
-            }
-        } else if (input.element instanceof ClassDoc) {
-            ProgramElementDoc superclass = ((ClassDoc) input.element).superclass();
-            if (superclass != null) {
-                inheritedSearchInput.element = superclass;
-                output = search(configuration, inheritedSearchInput);
-                output.isValidInheritDocTag = true;
-                if (output.inlineTags.length > 0) {
-                    return output;
-                }
-            }
-        }
-        return output;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
deleted file mode 100644
index 4bfc31104c6..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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
- * 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.doclets.internal.toolkit.util;
-
-/**
- * Abstraction for simple relative URIs, consisting of a path,
- * an optional query, and an optional fragment. DocLink objects can
- * be created by the constructors below or from a DocPath using the
- * convenience methods, {@link DocPath#fragment fragment} and
- * {@link DocPath#query 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>
- *
- */
-@Deprecated
-public class DocLink {
-    final String path;
-    final String query;
-    final String fragment;
-
-    /** Create a DocLink representing the URI {@code #fragment}. */
-    public static DocLink fragment(String fragment) {
-        return new DocLink((String) null, (String) null, fragment);
-    }
-
-    /** Create a DocLink representing the URI {@code path}. */
-    public DocLink(DocPath path) {
-        this(path.getPath(), null, null);
-    }
-
-    /**
-     * Create a DocLink representing the URI {@code path?query#fragment}.
-     * query and fragment may be null.
-     */
-    public DocLink(DocPath path, String query, String fragment) {
-        this(path.getPath(), query, fragment);
-    }
-
-    /**
-     * Create a DocLink representing the URI {@code path?query#fragment}.
-     * Any of the component parts may be null.
-     */
-    public DocLink(String path, String query, String fragment) {
-        this.path = path;
-        this.query = query;
-        this.fragment = fragment;
-    }
-
-    /**
-     * Return the link in the form "path?query#fragment", omitting any empty
-     * components.
-     */
-    @Override
-    public String toString() {
-        // common fast path
-        if (path != null && isEmpty(query) && isEmpty(fragment))
-            return path;
-
-        StringBuilder sb = new StringBuilder();
-        if (path != null)
-            sb.append(path);
-        if (!isEmpty(query))
-            sb.append("?").append(query);
-        if (!isEmpty(fragment))
-            sb.append("#").append(fragment);
-        return sb.toString();
-    }
-
-    private static boolean isEmpty(String s) {
-        return (s == null) || s.isEmpty();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
deleted file mode 100644
index 4651eba7bee..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1998, 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
- * 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.doclets.internal.toolkit.util;
-
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.PackageDoc;
-
-/**
- * Abstraction for immutable relative paths.
- * Paths always use '/' as a separator, and never begin or end with '/'.
- *
- *  <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>
- */
-@Deprecated
-public class DocPath {
-    private final String path;
-
-    /** The empty path. */
-    public static final DocPath empty = new DocPath("");
-
-    /** The empty path. */
-    public static final DocPath parent = new DocPath("..");
-
-    /**
-     * Create a path from a string.
-     */
-    public static DocPath create(String p) {
-        return (p == null) || p.isEmpty() ? empty : new DocPath(p);
-    }
-
-    /**
-     * Return the path for a class.
-     * For example, if the class is java.lang.Object,
-     * the path is java/lang/Object.html.
-     */
-    public static DocPath forClass(ClassDoc cd) {
-        return (cd == null) ? empty :
-                forPackage(cd.containingPackage()).resolve(forName(cd));
-    }
-
-    /**
-     * Return the path for the simple name of the class.
-     * For example, if the class is java.lang.Object,
-     * the path is Object.html.
-     */
-    public static DocPath forName(ClassDoc cd) {
-        return (cd == null) ? empty : new DocPath(cd.name() + ".html");
-    }
-
-    /**
-     * Return the path for the package of a class.
-     * For example, if the class is java.lang.Object,
-     * the path is java/lang.
-     */
-    public static DocPath forPackage(ClassDoc cd) {
-        return (cd == null) ? empty : forPackage(cd.containingPackage());
-    }
-
-    /**
-     * Return the path for a package.
-     * For example, if the package is java.lang,
-     * the path is java/lang.
-     */
-    public static DocPath forPackage(PackageDoc pd) {
-        return (pd == null) ? empty : DocPath.create(pd.name().replace('.', '/'));
-    }
-
-    /**
-     * Return the inverse path for a package.
-     * For example, if the package is java.lang,
-     * the inverse path is ../...
-     */
-    public static DocPath forRoot(PackageDoc pd) {
-        String name = (pd == null) ? "" : pd.name();
-        if (name.isEmpty())
-            return empty;
-        return new DocPath(name.replace('.', '/').replaceAll("[^/]+", ".."));
-    }
-
-    /**
-     * Return the relative path from one package to another.
-     */
-    public static DocPath relativePath(PackageDoc from, PackageDoc to) {
-        return forRoot(from).resolve(forPackage(to));
-    }
-
-    protected DocPath(String p) {
-        path = (p.endsWith("/") ? p.substring(0, p.length() - 1) : p);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equals(Object other) {
-        return (other instanceof DocPath) && path.equals(((DocPath)other).path);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public int hashCode() {
-        return path.hashCode();
-    }
-
-    public DocPath basename() {
-        int sep = path.lastIndexOf("/");
-        return (sep == -1) ? this : new DocPath(path.substring(sep + 1));
-    }
-
-    public DocPath parent() {
-        int sep = path.lastIndexOf("/");
-        return (sep == -1) ? empty : new DocPath(path.substring(0, sep));
-    }
-
-    /**
-     * Return the path formed by appending the specified string to the current path.
-     */
-    public DocPath resolve(String p) {
-        if (p == null || p.isEmpty())
-            return this;
-        if (path.isEmpty())
-            return new DocPath(p);
-        return new DocPath(path + "/" + p);
-    }
-
-    /**
-     * Return the path by appending the specified path to the current path.
-     */
-    public DocPath resolve(DocPath p) {
-        if (p == null || p.isEmpty())
-            return this;
-        if (path.isEmpty())
-            return p;
-        return new DocPath(path + "/" + p.getPath());
-    }
-
-    /**
-     * Return the inverse path for this path.
-     * For example, if the path is a/b/c, the inverse path is ../../..
-     */
-    public DocPath invert() {
-        return new DocPath(path.replaceAll("[^/]+", ".."));
-    }
-
-    /**
-     * Return true if this path is empty.
-     */
-    public boolean isEmpty() {
-        return path.isEmpty();
-    }
-
-    public DocLink fragment(String fragment) {
-        return new DocLink(path, null, fragment);
-    }
-
-    public DocLink query(String query) {
-        return new DocLink(path, query, null);
-    }
-
-    /**
-     * Return this path as a string.
-     */
-    // This is provided instead of using toString() to help catch
-    // unintended use of toString() in string concatenation sequences.
-    public String getPath() {
-        return path;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
deleted file mode 100644
index 452fa52ac7e..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.internal.toolkit.util;
-
-/**
- * Standard DocPath objects.
- *
- *  <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>
- *
- * @since 8
- */
-@Deprecated
-public class DocPaths {
-
-    /** The name of the file for all classes, using frames. */
-    public static final DocPath ALLCLASSES_FRAME = DocPath.create("allclasses-frame.html");
-
-    /** The name of the file for all classes, without using frames. */
-    public static final DocPath ALLCLASSES_NOFRAME = DocPath.create("allclasses-noframe.html");
-
-    /** The name of the sub-directory for storing class usage info. */
-    public static final DocPath CLASS_USE = DocPath.create("class-use");
-
-    /** The name of the file for constant values. */
-    public static final DocPath CONSTANT_VALUES = DocPath.create("constant-values.html");
-
-    /** The name of the fie for deprecated elements. */
-    public static final DocPath DEPRECATED_LIST = DocPath.create("deprecated-list.html");
-
-    /** The name of the subdirectory for user-provided additional documentation files. */
-    public static final DocPath DOC_FILES = DocPath.create("doc-files");
-
-    /** The name of the image file showing a magnifying glass on the search box. */
-    public static final DocPath GLASS_IMG = DocPath.create("glass.png");
-
-    /** The name of the file for help info. */
-    public static final DocPath HELP_DOC = DocPath.create("help-doc.html");
-
-    /** The name of the main index file. */
-    public static final DocPath INDEX = DocPath.create("index.html");
-
-    /** The name of the single index file for all classes. */
-    public static final DocPath INDEX_ALL = DocPath.create("index-all.html");
-
-    /** The name of the directory for the split index files. */
-    public static final DocPath INDEX_FILES = DocPath.create("index-files");
-
-    /** Generate the name of one of the files in the split index. */
-    public static DocPath indexN(int n) {
-        return DocPath.create("index-" + n + ".html");
-    }
-
-    /** The name of the default javascript file. */
-    public static final DocPath JAVASCRIPT = DocPath.create("script.js");
-
-    /** The name of the directory for the jQuery. */
-    public static final DocPath JQUERY_FILES = DocPath.create("jquery");
-
-    /** The name of the default jQuery stylesheet file. */
-    public static final DocPath JQUERY_STYLESHEET_FILE = DocPath.create("jquery-ui.css");
-
-    /** The name of the default jQuery javascript file. */
-    public static final DocPath JQUERY_JS_1_10 = DocPath.create("jquery-1.10.2.js");
-
-    /** The name of the default jQuery javascript file. */
-    public static final DocPath JQUERY_JS = DocPath.create("jquery-ui.js");
-
-    /** The name of the default jszip javascript file. */
-    public static final DocPath JSZIP = DocPath.create("jszip/dist/jszip.js");
-
-    /** The name of the default jszip javascript file. */
-    public static final DocPath JSZIP_MIN = DocPath.create("jszip/dist/jszip.min.js");
-
-    /** The name of the default jszip-utils javascript file. */
-    public static final DocPath JSZIPUTILS = DocPath.create("jszip-utils/dist/jszip-utils.js");
-
-    /** The name of the default jszip-utils javascript file. */
-    public static final DocPath JSZIPUTILS_MIN = DocPath.create("jszip-utils/dist/jszip-utils.min.js");
-
-    /** The name of the default jszip-utils javascript file. */
-    public static final DocPath JSZIPUTILS_IE = DocPath.create("jszip-utils/dist/jszip-utils-ie.js");
-
-    /** The name of the default jszip-utils javascript file. */
-    public static final DocPath JSZIPUTILS_IE_MIN = DocPath.create("jszip-utils/dist/jszip-utils-ie.min.js");
-
-    /** The name of the member search index file. */
-    public static final DocPath MEMBER_SEARCH_INDEX_JSON = DocPath.create("member-search-index.json");
-
-    /** The name of the member search index zip file. */
-    public static final DocPath MEMBER_SEARCH_INDEX_ZIP = DocPath.create("member-search-index.zip");
-
-    /** The name of the file for the overview frame. */
-    public static final DocPath OVERVIEW_FRAME = DocPath.create("overview-frame.html");
-
-    /** The name of the file for the overview summary. */
-    public static final DocPath OVERVIEW_SUMMARY = DocPath.create("overview-summary.html");
-
-    /** The name of the file for the overview tree. */
-    public static final DocPath OVERVIEW_TREE = DocPath.create("overview-tree.html");
-
-    /** The name of the file for the package frame. */
-    public static final DocPath PACKAGE_FRAME = DocPath.create("package-frame.html");
-
-    /** The name of the file for the package list. */
-    public static final DocPath PACKAGE_LIST = DocPath.create("package-list");
-
-    /** The name of the package search index file. */
-    public static final DocPath PACKAGE_SEARCH_INDEX_JSON = DocPath.create("package-search-index.json");
-
-    /** The name of the package search index zipfile. */
-    public static final DocPath PACKAGE_SEARCH_INDEX_ZIP = DocPath.create("package-search-index.zip");
-
-    /** The name of the file for the package summary. */
-    public static final DocPath PACKAGE_SUMMARY = DocPath.create("package-summary.html");
-
-    /** The name of the file for the package tree. */
-    public static final DocPath PACKAGE_TREE = DocPath.create("package-tree.html");
-
-    /** The name of the file for the package usage info. */
-    public static final DocPath PACKAGE_USE = DocPath.create("package-use.html");
-
-    /** The name of the file for the overview frame. */
-    public static final DocPath PROFILE_OVERVIEW_FRAME = DocPath.create("profile-overview-frame.html");
-
-    /** The name of the sub-package from which resources are read. */
-    public static final DocPath RESOURCES = DocPath.create("resources");
-
-    /** The name of the search javascript file. */
-    public static final DocPath SEARCH_JS = DocPath.create("search.js");
-
-    /** The name of the file for the serialized form info. */
-    public static final DocPath SERIALIZED_FORM = DocPath.create("serialized-form.html");
-
-    /** The name of the directory in which HTML versions of the source code
-     *  are generated.
-     */
-    public static final DocPath SOURCE_OUTPUT = DocPath.create("src-html");
-
-    /** The name of the default stylesheet. */
-    public static final DocPath STYLESHEET = DocPath.create("stylesheet.css");
-
-    /** The name of the tag search index file. */
-    public static final DocPath TAG_SEARCH_INDEX_JSON = DocPath.create("tag-search-index.json");
-
-    /** The name of the tag search index zip file. */
-    public static final DocPath TAG_SEARCH_INDEX_ZIP = DocPath.create("tag-search-index.zip");
-
-    /** The name of the type search index file. */
-    public static final DocPath TYPE_SEARCH_INDEX_JSON = DocPath.create("type-search-index.json");
-
-    /** The name of the type search index zip file. */
-    public static final DocPath TYPE_SEARCH_INDEX_ZIP = DocPath.create("type-search-index.zip");
-
-    /** The name of the image file for undo button on the search box. */
-    public static final DocPath X_IMG = DocPath.create("x.png");
-
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
deleted file mode 100644
index 573948dc99a..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, 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.doclets.internal.toolkit.util;
-
-/**
- *  <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>
- */
-@Deprecated
-public class DocletAbortException extends RuntimeException {
-    private static final long serialVersionUID = -9131058909576418984L;
-
-    public DocletAbortException(String message) {
-        super(message);
-    }
-
-    public DocletAbortException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
deleted file mode 100644
index b2970386fdb..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.util;
-
-/**
- * Stores all constants for a Doclet.  Extend this class if you have doclet
- * specific constants to add.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class DocletConstants {
-
-    /**
-     * The default amount of space between tab stops.
-     */
-    public static final int DEFAULT_TAB_STOP_LENGTH = 8;
-
-    /**
-     * The line separator for the current operating system.
-     */
-    public static final String NL = System.getProperty("line.separator");
-
-    /**
-     * The default package name.
-     */
-    public static final String DEFAULT_PACKAGE_NAME = "<Unnamed>";
-
-    /**
-     * The default package file name.
-     */
-    public static final String DEFAULT_PACKAGE_FILE_NAME = "default";
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
deleted file mode 100644
index ef75a3ecedb..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.internal.toolkit.util;
-
-import java.io.*;
-import java.net.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.tools.DocumentationTool;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Process and manage "-link" and "-linkoffline" to external packages. The
- * options "-link" and "-linkoffline" both depend on the fact that Javadoc now
- * generates "package-list"(lists all the packages which are getting
- * documented) file in the current or the destination directory, while
- * generating the documentation.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Robert Field
- */
-@Deprecated
-public class Extern {
-
-    /**
-     * Map package names onto Extern Item objects.
-     * Lazily initialized.
-     */
-    private Map<String,Item> packageToItemMap;
-
-    /**
-     * The global configuration information for this run.
-     */
-    private final Configuration configuration;
-
-    /**
-     * True if we are using -linkoffline and false if -link is used instead.
-     */
-    private boolean linkoffline = false;
-
-    /**
-     * Stores the info for one external doc set
-     */
-    private class Item {
-
-        /**
-         * Package name, found in the "package-list" file in the {@link path}.
-         */
-        final String packageName;
-
-        /**
-         * The URL or the directory path at which the package documentation will be
-         * available.
-         */
-        final String path;
-
-        /**
-         * If given path is directory path then true else if it is a URL then false.
-         */
-        final boolean relative;
-
-        /**
-         * Constructor to build a Extern Item object and map it with the package name.
-         * If the same package name is found in the map, then the first mapped
-         * Item object or offline location will be retained.
-         *
-         * @param packageName Package name found in the "package-list" file.
-         * @param path        URL or Directory path from where the "package-list"
-         * file is picked.
-         * @param relative    True if path is URL, false if directory path.
-         */
-        Item(String packageName, String path, boolean relative) {
-            this.packageName = packageName;
-            this.path = path;
-            this.relative = relative;
-            if (packageToItemMap == null) {
-                packageToItemMap = new HashMap<>();
-            }
-            if (!packageToItemMap.containsKey(packageName)) { // save the previous
-                packageToItemMap.put(packageName, this);        // mapped location
-            }
-        }
-
-        /**
-         * String representation of "this" with packagename and the path.
-         */
-        public String toString() {
-            return packageName + (relative? " -> " : " => ") + path;
-        }
-    }
-
-    public Extern(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * Determine if a doc item is externally documented.
-     *
-     * @param doc A ProgramElementDoc.
-     */
-    public boolean isExternal(ProgramElementDoc doc) {
-        if (packageToItemMap == null) {
-            return false;
-        }
-        return packageToItemMap.get(doc.containingPackage().name()) != null;
-    }
-
-    /**
-     * Convert a link to be an external link if appropriate.
-     *
-     * @param pkgName The package name.
-     * @param relativepath    The relative path.
-     * @param filename    The link to convert.
-     * @return if external return converted link else return null
-     */
-    public DocLink getExternalLink(String pkgName,
-                                  DocPath relativepath, String filename) {
-        return getExternalLink(pkgName, relativepath, filename, null);
-    }
-
-    public DocLink getExternalLink(String pkgName,
-                                  DocPath relativepath, String filename, String memberName) {
-        Item fnd = findPackageItem(pkgName);
-        if (fnd == null)
-            return null;
-
-        DocPath p = fnd.relative ?
-                relativepath.resolve(fnd.path).resolve(filename) :
-                DocPath.create(fnd.path).resolve(filename);
-
-        return new DocLink(p, "is-external=true", memberName);
-    }
-
-    /**
-     * Build the extern package list from given URL or the directory path.
-     * Flag error if the "-link" or "-linkoffline" option is already used.
-     *
-     * @param url        URL or Directory path.
-     * @param pkglisturl This can be another URL for "package-list" or ordinary
-     *                   file.
-     * @param reporter   The <code>DocErrorReporter</code> used to report errors.
-     * @param linkoffline True if -linkoffline is used and false if -link is used.
-     */
-    public boolean link(String url, String pkglisturl,
-                              DocErrorReporter reporter, boolean linkoffline) {
-        this.linkoffline = linkoffline;
-        try {
-            url = adjustEndFileSeparator(url);
-            if (isUrl(pkglisturl)) {
-                readPackageListFromURL(url, toURL(adjustEndFileSeparator(pkglisturl)));
-            } else {
-                readPackageListFromFile(url, DocFile.createFileForInput(configuration, pkglisturl));
-            }
-            return true;
-        } catch (Fault f) {
-            reporter.printWarning(f.getMessage());
-            return false;
-        }
-    }
-
-    private URL toURL(String url) throws Fault {
-        try {
-            return new URL(url);
-        } catch (MalformedURLException e) {
-            throw new Fault(configuration.getText("doclet.MalformedURL", url), e);
-        }
-    }
-
-    private class Fault extends Exception {
-        private static final long serialVersionUID = 0;
-
-        Fault(String msg, Exception cause) {
-            super(msg, cause);
-        }
-    }
-
-    /**
-     * Get the Extern Item object associated with this package name.
-     *
-     * @param pkgName Package name.
-     */
-    private Item findPackageItem(String pkgName) {
-        if (packageToItemMap == null) {
-            return null;
-        }
-        return packageToItemMap.get(pkgName);
-    }
-
-    /**
-     * If the URL or Directory path is missing end file separator, add that.
-     */
-    private String adjustEndFileSeparator(String url) {
-        return url.endsWith("/") ? url : url + '/';
-    }
-
-    /**
-     * Fetch the URL and read the "package-list" file.
-     *
-     * @param urlpath        Path to the packages.
-     * @param pkglisturlpath URL or the path to the "package-list" file.
-     */
-    private void readPackageListFromURL(String urlpath, URL pkglisturlpath)
-            throws Fault {
-        try {
-            URL link = pkglisturlpath.toURI().resolve(DocPaths.PACKAGE_LIST.getPath()).toURL();
-            readPackageList(link.openStream(), urlpath, false);
-        } catch (URISyntaxException | MalformedURLException exc) {
-            throw new Fault(configuration.getText("doclet.MalformedURL", pkglisturlpath.toString()), exc);
-        }
-        catch (IOException exc) {
-            throw new Fault(configuration.getText("doclet.URL_error", pkglisturlpath.toString()), exc);
-        }
-    }
-
-    /**
-     * Read the "package-list" file which is available locally.
-     *
-     * @param path URL or directory path to the packages.
-     * @param pkgListPath Path to the local "package-list" file.
-     */
-    private void readPackageListFromFile(String path, DocFile pkgListPath)
-            throws Fault {
-        DocFile file = pkgListPath.resolve(DocPaths.PACKAGE_LIST);
-        if (! (file.isAbsolute() || linkoffline)){
-            file = file.resolveAgainst(DocumentationTool.Location.DOCUMENTATION_OUTPUT);
-        }
-        try {
-            if (file.exists() && file.canRead()) {
-                boolean pathIsRelative =
-                        !isUrl(path)
-                        && !DocFile.createFileForInput(configuration, path).isAbsolute();
-                readPackageList(file.openInputStream(), path, pathIsRelative);
-            } else {
-                throw new Fault(configuration.getText("doclet.File_error", file.getPath()), null);
-            }
-        } catch (IOException exc) {
-           throw new Fault(configuration.getText("doclet.File_error", file.getPath()), exc);
-        }
-    }
-
-    /**
-     * Read the file "package-list" and for each package name found, create
-     * Extern object and associate it with the package name in the map.
-     *
-     * @param input    InputStream from the "package-list" file.
-     * @param path     URL or the directory path to the packages.
-     * @param relative Is path relative?
-     */
-    private void readPackageList(InputStream input, String path,
-                                boolean relative)
-                         throws IOException {
-        BufferedReader in = new BufferedReader(new InputStreamReader(input));
-        StringBuilder strbuf = new StringBuilder();
-        try {
-            int c;
-            while ((c = in.read()) >= 0) {
-                char ch = (char)c;
-                if (ch == '\n' || ch == '\r') {
-                    if (strbuf.length() > 0) {
-                        String packname = strbuf.toString();
-                        String packpath = path +
-                                      packname.replace('.', '/') + '/';
-                        new Item(packname, packpath, relative);
-                        strbuf.setLength(0);
-                    }
-                } else {
-                    strbuf.append(ch);
-                }
-            }
-        } finally {
-            input.close();
-        }
-    }
-
-    public boolean isUrl (String urlCandidate) {
-        try {
-            new URL(urlCandidate);
-            //No exception was thrown, so this must really be a URL.
-            return true;
-        } catch (MalformedURLException e) {
-            //Since exception is thrown, this must be a directory path.
-            return false;
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java
deleted file mode 100644
index 71248cb01b3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/FatalError.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2016, 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.doclets.internal.toolkit.util;
-
-/**
- *  <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>
- */
-@Deprecated
-public class FatalError extends Error {
-    private static final long serialVersionUID = -9131058909576418984L;
-
-    public FatalError() { }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
deleted file mode 100644
index 87e0c3fa169..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Process and manage grouping of packages, as specified by "-group" option on
- * the command line.
- * <p>
- * For example, if user has used -group option as
- * -group "Core Packages" "java.*" -group "CORBA Packages" "org.omg.*", then
- * the packages specified on the command line will be grouped according to their
- * names starting with either "java." or "org.omg.". All the other packages
- * which do not fall in the user given groups, are grouped in default group,
- * named as either "Other Packages" or "Packages" depending upon if "-group"
- * option used or not at all used respectively.
- * </p>
- * <p>
- * Also the packages are grouped according to the longest possible match of
- * their names with the grouping information provided. For example, if there
- * are two groups, like -group "Lang" "java.lang" and -group "Core" "java.*",
- * will put the package java.lang in the group "Lang" and not in group "Core".
- * </p>
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class Group {
-
-    /**
-     * Map of regular expressions with the corresponding group name.
-     */
-    private Map<String,String> regExpGroupMap = new HashMap<>();
-
-    /**
-     * List of regular expressions sorted according to the length. Regular
-     * expression with longest length will be first in the sorted order.
-     */
-    private List<String> sortedRegExpList = new ArrayList<>();
-
-    /**
-     * List of group names in the same order as given on the command line.
-     */
-    private List<String> groupList = new ArrayList<>();
-
-    /**
-     * Map of non-regular expressions(possible package names) with the
-     * corresponding group name.
-     */
-    private Map<String,String> pkgNameGroupMap = new HashMap<>();
-
-    /**
-     * The global configuration information for this run.
-     */
-    private final Configuration configuration;
-
-    /**
-     * Since we need to sort the keys in the reverse order(longest key first),
-     * the compare method in the implementing class is doing the reverse
-     * comparison.
-     */
-    private static class MapKeyComparator implements Comparator<String> {
-        public int compare(String key1, String key2) {
-            return key2.length() - key1.length();
-        }
-    }
-
-    public Group(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * Depending upon the format of the package name provided in the "-group"
-     * option, generate two separate maps. There will be a map for mapping
-     * regular expression(only meta character allowed is '*' and that is at the
-     * end of the regular expression) on to the group name. And another map
-     * for mapping (possible) package names(if the name format doesen't contain
-     * meta character '*', then it is assumed to be a package name) on to the
-     * group name. This will also sort all the regular expressions found in the
-     * reverse order of their lengths, i.e. longest regular expression will be
-     * first in the sorted list.
-     *
-     * @param groupname       The name of the group from -group option.
-     * @param pkgNameFormList List of the package name formats.
-     */
-    public boolean checkPackageGroups(String groupname,
-            String pkgNameFormList) {
-        StringTokenizer strtok = new StringTokenizer(pkgNameFormList, ":");
-        if (groupList.contains(groupname)) {
-            configuration.message.warning("doclet.Groupname_already_used", groupname);
-            return false;
-        }
-        groupList.add(groupname);
-        while (strtok.hasMoreTokens()) {
-            String id = strtok.nextToken();
-            if (id.length() == 0) {
-                configuration.message.warning("doclet.Error_in_packagelist", groupname, pkgNameFormList);
-                return false;
-            }
-            if (id.endsWith("*")) {
-                id = id.substring(0, id.length() - 1);
-                if (foundGroupFormat(regExpGroupMap, id)) {
-                    return false;
-                }
-                regExpGroupMap.put(id, groupname);
-                sortedRegExpList.add(id);
-            } else {
-                if (foundGroupFormat(pkgNameGroupMap, id)) {
-                    return false;
-                }
-                pkgNameGroupMap.put(id, groupname);
-            }
-        }
-        Collections.sort(sortedRegExpList, new MapKeyComparator());
-        return true;
-    }
-
-    /**
-     * Search if the given map has given the package format.
-     *
-     * @param map Map to be searched.
-     * @param pkgFormat The pacakge format to search.
-     *
-     * @return true if package name format found in the map, else false.
-     */
-    boolean foundGroupFormat(Map<String,?> map, String pkgFormat) {
-        if (map.containsKey(pkgFormat)) {
-            configuration.message.error("doclet.Same_package_name_used", pkgFormat);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Group the packages according the grouping information provided on the
-     * command line. Given a list of packages, search each package name in
-     * regular expression map as well as package name map to get the
-     * corresponding group name. Create another map with mapping of group name
-     * to the package list, which will fall under the specified group. If any
-     * package doesen't belong to any specified group on the comamnd line, then
-     * a new group named "Other Packages" will be created for it. If there are
-     * no groups found, in other words if "-group" option is not at all used,
-     * then all the packages will be grouped under group "Packages".
-     *
-     * @param packages Packages specified on the command line.
-     */
-    public Map<String, List<PackageDoc>> groupPackages(Set<PackageDoc> packages) {
-        Map<String,List<PackageDoc>> groupPackageMap = new HashMap<>();
-        String defaultGroupName =
-            (pkgNameGroupMap.isEmpty() && regExpGroupMap.isEmpty())?
-                configuration.message.getText("doclet.Packages") :
-                configuration.message.getText("doclet.Other_Packages");
-        // if the user has not used the default group name, add it
-        if (!groupList.contains(defaultGroupName)) {
-            groupList.add(defaultGroupName);
-        }
-        for (PackageDoc pkg : packages) {
-            String pkgName = pkg.name();
-            String groupName = pkgNameGroupMap.get(pkgName);
-            // if this package is not explicitly assigned to a group,
-            // try matching it to group specified by regular expression
-            if (groupName == null) {
-                groupName = regExpGroupName(pkgName);
-            }
-            // if it is in neither group map, put it in the default
-            // group
-            if (groupName == null) {
-                groupName = defaultGroupName;
-            }
-            getPkgList(groupPackageMap, groupName).add(pkg);
-        }
-        return groupPackageMap;
-    }
-
-    /**
-     * Search for package name in the sorted regular expression
-     * list, if found return the group name.  If not, return null.
-     *
-     * @param pkgName Name of package to be found in the regular
-     * expression list.
-     */
-    String regExpGroupName(String pkgName) {
-        for (String regexp : sortedRegExpList) {
-            if (pkgName.startsWith(regexp)) {
-                return regExpGroupMap.get(regexp);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * For the given group name, return the package list, on which it is mapped.
-     * Create a new list, if not found.
-     *
-     * @param map Map to be searched for gorup name.
-     * @param groupname Group name to search.
-     */
-    List<PackageDoc> getPkgList(Map<String,List<PackageDoc>> map, String groupname) {
-        List<PackageDoc> list = map.get(groupname);
-        if (list == null) {
-            list = new ArrayList<>();
-            map.put(groupname, list);
-        }
-        return list;
-    }
-
-    /**
-     * Return the list of groups, in the same order as specified
-     * on the command line.
-     */
-    public List<String> getGroupList() {
-        return groupList;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
deleted file mode 100644
index 041d45a6eaf..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * For a given class method, build an array of interface methods which it
- * implements.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class ImplementedMethods {
-
-    private final Map<MethodDoc,Type> interfaces = new HashMap<>();
-    private final List<MethodDoc> methlist = new ArrayList<>();
-    private final Configuration configuration;
-    private final Utils utils;
-    private final ClassDoc classdoc;
-    private final MethodDoc method;
-
-    public ImplementedMethods(MethodDoc method, Configuration configuration) {
-        this.method = method;
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        classdoc = method.containingClass();
-    }
-
-    /**
-     * Return the array of interface methods which the method passed in the
-     * constructor is implementing. The search/build order is as follows:
-     * <pre>
-     * 1. Search in all the immediate interfaces which this method's class is
-     *    implementing. Do it recursively for the superinterfaces as well.
-     * 2. Traverse all the superclasses and search recursively in the
-     *    interfaces which those superclasses implement.
-     *</pre>
-     *
-     * @return MethodDoc[] Array of implemented methods.
-     */
-    public MethodDoc[] build(boolean sort) {
-        buildImplementedMethodList(sort);
-        return methlist.toArray(new MethodDoc[methlist.size()]);
-    }
-
-    public MethodDoc[] build() {
-        return build(true);
-    }
-
-    public Type getMethodHolder(MethodDoc methodDoc) {
-        return interfaces.get(methodDoc);
-    }
-
-    /**
-     * Search for the method in the array of interfaces. If found check if it is
-     * overridden by any other subinterface method which this class
-     * implements. If it is not overidden, add it in the method list.
-     * Do this recursively for all the extended interfaces for each interface
-     * from the array passed.
-     */
-    private void buildImplementedMethodList(boolean sort) {
-        List<Type> intfacs = utils.getAllInterfaces(classdoc, configuration, sort);
-        for (Type interfaceType : intfacs) {
-            MethodDoc found = utils.findMethod(interfaceType.asClassDoc(), method);
-            if (found != null) {
-                removeOverriddenMethod(found);
-                if (!overridingMethodFound(found)) {
-                    methlist.add(found);
-                    interfaces.put(found, interfaceType);
-                }
-            }
-        }
-    }
-
-    /**
-     * Search in the method list and check if it contains a method which
-     * is overridden by the method as parameter.  If found, remove the
-     * overridden method from the method list.
-     *
-     * @param method Is this method overriding a method in the method list.
-     */
-    private void removeOverriddenMethod(MethodDoc method) {
-        ClassDoc overriddenClass = method.overriddenClass();
-        if (overriddenClass != null) {
-            for (int i = 0; i < methlist.size(); i++) {
-                ClassDoc cd = methlist.get(i).containingClass();
-                if (cd == overriddenClass || overriddenClass.subclassOf(cd)) {
-                    methlist.remove(i);  // remove overridden method
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Search in the already found methods' list and check if it contains
-     * a method which is overriding the method parameter or is the method
-     * parameter itself.
-     *
-     * @param method MethodDoc Method to be searched in the Method List for
-     * an overriding method.
-     */
-    private boolean overridingMethodFound(MethodDoc method) {
-        ClassDoc containingClass = method.containingClass();
-        for (MethodDoc listmethod : methlist) {
-            if (containingClass == listmethod.containingClass()) {
-                // it's the same method.
-                return true;
-            }
-            ClassDoc cd = listmethod.overriddenClass();
-            if (cd == null) {
-                continue;
-            }
-            if (cd == containingClass || cd.subclassOf(containingClass)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
deleted file mode 100644
index d9185a37b67..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Build the mapping of each Unicode character with it's member lists
- * containing members names starting with it. Also build a list for all the
- * Unicode characters which start a member name. Member name is
- * classkind or field or method or constructor name.
- *
- *  <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>
- *
- * @since 1.2
- * @see java.lang.Character
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class IndexBuilder {
-
-    /**
-     * Mapping of each Unicode Character with the member list containing
-     * members with names starting with it.
-     */
-    private Map<Character,List<Doc>> indexmap = new HashMap<>();
-
-    /**
-     * Don't generate deprecated information if true.
-     */
-    private boolean noDeprecated;
-
-    /**
-     * Build this Index only for classes?
-     */
-    private boolean classesOnly;
-
-    /**
-     * Indicates javafx mode.
-     */
-    private boolean javafx;
-
-    // make ProgramElementDoc[] when new toArray is available
-    protected final Object[] elements;
-
-    private final Configuration configuration;
-    /**
-     * Constructor. Build the index map.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @param noDeprecated  true if -nodeprecated option is used,
-     *                      false otherwise.
-     */
-    public IndexBuilder(Configuration configuration, boolean noDeprecated) {
-        this(configuration, noDeprecated, false);
-    }
-
-    /**
-     * Constructor. Build the index map.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @param noDeprecated  true if -nodeprecated option is used,
-     *                      false otherwise.
-     * @param classesOnly   Include only classes in index.
-     */
-    public IndexBuilder(Configuration configuration, boolean noDeprecated,
-                        boolean classesOnly) {
-        this.configuration  = configuration;
-        if (classesOnly) {
-            configuration.message.notice("doclet.Building_Index_For_All_Classes");
-        } else {
-            configuration.message.notice("doclet.Building_Index");
-        }
-        this.noDeprecated = noDeprecated;
-        this.classesOnly = classesOnly;
-        this.javafx = configuration.javafx;
-        buildIndexMap(configuration.root);
-        Set<Character> set = indexmap.keySet();
-        elements =  set.toArray();
-        Arrays.sort(elements);
-    }
-
-    /**
-     * Sort the index map. Traverse the index map for all it's elements and
-     * sort each element which is a list.
-     */
-    protected void sortIndexMap() {
-        for (List<Doc> docs : indexmap.values()) {
-            Collections.sort(docs, configuration.utils.makeComparatorForIndexUse());
-        }
-    }
-
-    /**
-     * Get all the members in all the Packages and all the Classes
-     * given on the command line. Form separate list of those members depending
-     * upon their names.
-     *
-     * @param root Root of the documemt.
-     */
-    protected void buildIndexMap(RootDoc root)  {
-        PackageDoc[] packages = root.specifiedPackages();
-        ClassDoc[] classes = root.classes();
-        if (!classesOnly) {
-            if (packages.length == 0) {
-                Set<PackageDoc> set = new HashSet<>();
-                for (ClassDoc aClass : classes) {
-                    PackageDoc pd = aClass.containingPackage();
-                    if (pd != null && pd.name().length() > 0) {
-                        set.add(pd);
-                    }
-                }
-                adjustIndexMap(set.toArray(packages));
-            } else {
-                adjustIndexMap(packages);
-            }
-        }
-        adjustIndexMap(classes);
-        if (!classesOnly) {
-            for (ClassDoc aClass : classes) {
-                if (shouldAddToIndexMap(aClass)) {
-                    putMembersInIndexMap(aClass);
-                }
-            }
-        }
-        sortIndexMap();
-    }
-
-    /**
-     * Put all the members(fields, methods and constructors) in the classdoc
-     * to the indexmap.
-     *
-     * @param classdoc ClassDoc whose members will be added to the indexmap.
-     */
-    protected void putMembersInIndexMap(ClassDoc classdoc) {
-        adjustIndexMap(classdoc.fields());
-        adjustIndexMap(classdoc.methods());
-        adjustIndexMap(classdoc.constructors());
-    }
-
-
-    /**
-     * Adjust list of members according to their names. Check the first
-     * character in a member name, and then add the member to a list of members
-     * for that particular unicode character.
-     *
-     * @param elements Array of members.
-     */
-    protected void adjustIndexMap(Doc[] elements) {
-        for (Doc element : elements) {
-            if (shouldAddToIndexMap(element)) {
-                String name = element.name();
-                char ch = (name.length() == 0) ?
-                          '*' :
-                          Character.toUpperCase(name.charAt(0));
-                Character unicode = ch;
-                List<Doc> list = indexmap.get(unicode);
-                if (list == null) {
-                    list = new ArrayList<>();
-                    indexmap.put(unicode, list);
-                }
-                list.add(element);
-            }
-        }
-    }
-
-    /**
-     * Should this doc element be added to the index map?
-     */
-    protected boolean shouldAddToIndexMap(Doc element) {
-        if (javafx) {
-            if (element.tags("treatAsPrivate").length > 0) {
-                return false;
-            }
-        }
-
-        if (element instanceof PackageDoc)
-            // Do not add to index map if -nodeprecated option is set and the
-            // package is marked as deprecated.
-            return !(noDeprecated && configuration.utils.isDeprecated(element));
-        else
-            // Do not add to index map if -nodeprecated option is set and if the
-            // Doc is marked as deprecated or the containing package is marked as
-            // deprecated.
-            return !(noDeprecated &&
-                    (configuration.utils.isDeprecated(element) ||
-                    configuration.utils.isDeprecated(((ProgramElementDoc)element).containingPackage())));
-    }
-
-    /**
-     * Return a map of all the individual member lists with Unicode character.
-     *
-     * @return Map index map.
-     */
-    public Map<Character,List<Doc>> getIndexMap() {
-        return indexmap;
-    }
-
-    /**
-     * Return the sorted list of members, for passed Unicode Character.
-     *
-     * @param index index Unicode character.
-     * @return List member list for specific Unicode character.
-     */
-    public List<Doc> getMemberList(Character index) {
-        return indexmap.get(index);
-    }
-
-    /**
-     * Array of IndexMap keys, Unicode characters.
-     */
-    public Object[] elements() {
-        return elements;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
deleted file mode 100644
index ed7776e7638..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 1998, 2013, 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.doclets.internal.toolkit.util;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-
-
-/**
- * Retrieve and format messages stored in a resource.
- *
- *  <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>
- *
- * @since 1.2
- * @author Atul M Dambalkar
- * @author Robert Field
- */
-@Deprecated
-public class MessageRetriever {
-    /**
-     * The global configuration information for this run.
-     */
-    private final Configuration configuration;
-
-    /**
-     * The location from which to lazily fetch the resource..
-     */
-    private final String resourcelocation;
-
-    /**
-     * The lazily fetched resource..
-     */
-    private ResourceBundle messageRB;
-
-    /**
-     * Initialize the ResourceBundle with the given resource.
-     *
-     * @param rb the resource bundle to read.
-     */
-    public MessageRetriever(ResourceBundle rb) {
-        this.configuration = null;
-        this.messageRB = rb;
-        this.resourcelocation = null;
-    }
-
-    /**
-     * Initialize the ResourceBundle with the given resource.
-     *
-     * @param configuration the configuration
-     * @param resourcelocation Resource.
-     */
-    public MessageRetriever(Configuration configuration,
-                            String resourcelocation) {
-        this.configuration = configuration;
-        this.resourcelocation = resourcelocation;
-    }
-
-    private ResourceBundle initRB() {
-        ResourceBundle bundle = messageRB;
-        if (bundle == null) {
-            try {
-                messageRB = bundle =
-                        ResourceBundle.getBundle(resourcelocation, configuration.getLocale());
-            } catch (MissingResourceException e) {
-                throw new Error("Fatal: Resource (" + resourcelocation
-                        + ") for javadoc doclets is missing.");
-            }
-        }
-        return bundle;
-    }
-
-    /**
-     * Determines whether the given <code>key</code> can be retrieved
-     * from this <code>MessageRetriever</code>
-     *
-     * @param key
-     *        the resource <code>key</code>
-     * @return <code>true</code> if the given <code>key</code> is
-     *        contained in the underlying <code>ResourceBundle</code>.
-     */
-    public boolean containsKey(String key) {
-        ResourceBundle bundle = initRB();
-        return bundle.containsKey(key);
-    }
-
-    /**
-     * Get and format message string from resource
-     *
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     * @throws MissingResourceException when the key does not
-     * exist in the properties file.
-     */
-    public String getText(String key, Object... args) throws MissingResourceException {
-        ResourceBundle bundle = initRB();
-        String message = bundle.getString(key);
-        return MessageFormat.format(message, args);
-    }
-
-    /**
-     * Print error message, increment error count.
-     *
-     * @param pos the position of the source
-     * @param msg message to print
-     */
-    private void printError(SourcePosition pos, String msg) {
-        configuration.root.printError(pos, msg);
-    }
-
-    /**
-     * Print error message, increment error count.
-     *
-     * @param msg message to print
-     */
-    private void printError(String msg) {
-        configuration.root.printError(msg);
-    }
-
-    /**
-     * Print warning message, increment warning count.
-     *
-     * @param pos the position of the source
-     * @param msg message to print
-     */
-    private void printWarning(SourcePosition pos, String msg) {
-        configuration.root.printWarning(pos, msg);
-    }
-
-    /**
-     * Print warning message, increment warning count.
-     *
-     * @param msg message to print
-     */
-    private void printWarning(String msg) {
-        configuration.root.printWarning(msg);
-    }
-
-    /**
-     * Print a message.
-     *
-     * @param pos the position of the source
-     * @param msg message to print
-     */
-    private void printNotice(SourcePosition pos, String msg) {
-        configuration.root.printNotice(pos, msg);
-    }
-
-    /**
-     * Print a message.
-     *
-     * @param msg message to print
-     */
-    private void printNotice(String msg) {
-        configuration.root.printNotice(msg);
-    }
-
-    /**
-     * Print error message, increment error count.
-     *
-     * @param pos the position of the source
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void error(SourcePosition pos, String key, Object... args) {
-        printError(pos, getText(key, args));
-    }
-
-    /**
-     * Print error message, increment error count.
-     *
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void error(String key, Object... args) {
-        printError(getText(key, args));
-    }
-
-    /**
-     * Print warning message, increment warning count.
-     *
-     * @param pos the position of the source
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void warning(SourcePosition pos, String key, Object... args) {
-        if (configuration.showMessage(pos, key))
-            printWarning(pos, getText(key, args));
-    }
-
-    /**
-     * Print warning message, increment warning count.
-     *
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void warning(String key, Object... args) {
-        printWarning(getText(key, args));
-    }
-
-    /**
-     * Print a message.
-     *
-     * @param pos the position of the source
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void notice(SourcePosition pos, String key, Object... args) {
-        printNotice(pos, getText(key, args));
-    }
-
-    /**
-     * Print a message.
-     *
-     * @param key selects message from resource
-     * @param args arguments to be replaced in the message.
-     */
-    public void notice(String key, Object... args) {
-        printNotice(getText(key, args));
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
deleted file mode 100644
index a3960fc93e3..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2002, 2016, 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.doclets.internal.toolkit.util;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Provides methods for creating an array of class, method and
- * field names to be included as meta keywords in the HTML header
- * of class pages.  These keywords improve search results
- * on browsers that look for keywords.
- *
- *  <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>
- *
- * @author Doug Kramer
- */
-@Deprecated
-public class MetaKeywords {
-
-    /**
-     * The global configuration information for this run.
-     */
-    private final Configuration configuration;
-    private final Utils utils;
-
-    /**
-     * Constructor
-     */
-    public MetaKeywords(Configuration configuration) {
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-    }
-
-    /**
-     * Returns an array of strings where each element
-     * is a class, method or field name.  This array is
-     * used to create one meta keyword tag for each element.
-     * Method parameter lists are converted to "()" and
-     * overloads are combined.
-     *
-     * Constructors are not included because they have the same
-     * name as the class, which is already included.
-     * Nested class members are not included because their
-     * definitions are on separate pages.
-     */
-    public String[] getMetaKeywords(ClassDoc classdoc) {
-        ArrayList<String> results = new ArrayList<>();
-
-        // Add field and method keywords only if -keywords option is used
-        if( configuration.keywords ) {
-            results.addAll(getClassKeyword(classdoc));
-            results.addAll(getMemberKeywords(classdoc.fields()));
-            results.addAll(getMemberKeywords(classdoc.methods()));
-        }
-        return results.toArray(new String[]{});
-    }
-
-    /**
-     * Get the current class for a meta tag keyword, as the first
-     * and only element of an array list.
-     */
-    protected ArrayList<String> getClassKeyword(ClassDoc classdoc) {
-        String cltypelower = classdoc.isInterface() ? "interface" : "class";
-        ArrayList<String> metakeywords = new ArrayList<>(1);
-        metakeywords.add(classdoc.qualifiedName() + " " + cltypelower);
-        return metakeywords;
-    }
-
-    /**
-     * Get the package keywords.
-     */
-    public String[] getMetaKeywords(PackageDoc packageDoc) {
-        if( configuration.keywords ) {
-            String pkgName = utils.getPackageName(packageDoc);
-            return new String[] { pkgName + " " + "package" };
-        } else {
-            return new String[] {};
-        }
-    }
-
-    /**
-     * Get the overview keywords.
-     */
-    public String[] getOverviewMetaKeywords(String title, String docTitle) {
-        if( configuration.keywords ) {
-            String windowOverview = configuration.getText(title);
-            String[] metakeywords = { windowOverview };
-            if (docTitle.length() > 0 ) {
-                metakeywords[0] += ", " + docTitle;
-            }
-            return metakeywords;
-        } else {
-            return new String[] {};
-        }
-    }
-
-    /**
-     * Get members for meta tag keywords as an array,
-     * where each member name is a string element of the array.
-     * The parameter lists are not included in the keywords;
-     * therefore all overloaded methods are combined.<br>
-     * Example: getValue(Object) is returned in array as getValue()
-     *
-     * @param memberdocs  array of MemberDoc objects to be added to keywords
-     */
-    protected ArrayList<String> getMemberKeywords(MemberDoc[] memberdocs) {
-        ArrayList<String> results = new ArrayList<>();
-        String membername;
-        for (MemberDoc memberdoc : memberdocs) {
-            membername = memberdoc.name() + (memberdoc.isMethod() ? "()" : "");
-            if (!results.contains(membername)) {
-                results.add(membername);
-            }
-        }
-        return results;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
deleted file mode 100644
index d387bde21c0..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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.doclets.internal.toolkit.util;
-
-/**
- * Enum representing method types.
- *
- * @author Bhavesh Patel
- */
-@Deprecated
-public enum MethodTypes {
-    ALL(0xffff, "doclet.All_Methods", "t0", true),
-    STATIC(0x1, "doclet.Static_Methods", "t1", false),
-    INSTANCE(0x2, "doclet.Instance_Methods", "t2", false),
-    ABSTRACT(0x4, "doclet.Abstract_Methods", "t3", false),
-    CONCRETE(0x8, "doclet.Concrete_Methods", "t4", false),
-    DEFAULT(0x10, "doclet.Default_Methods", "t5", false),
-    DEPRECATED(0x20, "doclet.Deprecated_Methods", "t6", false);
-
-    private final int value;
-    private final String resourceKey;
-    private final String tabId;
-    private final boolean isDefaultTab;
-
-    MethodTypes(int v, String k, String id, boolean dt) {
-        this.value = v;
-        this.resourceKey = k;
-        this.tabId = id;
-        this.isDefaultTab = dt;
-    }
-
-    public int value() {
-        return value;
-    }
-
-    public String resourceKey() {
-        return resourceKey;
-    }
-
-    public String tabId() {
-        return tabId;
-    }
-
-    public boolean isDefaultTab() {
-        return isDefaultTab;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
deleted file mode 100644
index 10022992ca9..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.doclets.internal.toolkit.util;
-
-import java.io.*;
-import java.util.*;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * Write out the package index.
- *
- *  <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>
- *
- * @see com.sun.javadoc.PackageDoc
- * @author Atul M Dambalkar
- */
-@Deprecated
-public class PackageListWriter extends PrintWriter {
-
-    private final Configuration configuration;
-    private final Utils utils;
-
-    /**
-     * Constructor.
-     *
-     * @param configuration the current configuration of the doclet.
-     */
-    public PackageListWriter(Configuration configuration) throws IOException {
-        super(DocFile.createFileForOutput(configuration, DocPaths.PACKAGE_LIST).openWriter());
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-    }
-
-    /**
-     * Generate the package index.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @throws DocletAbortException
-     */
-    public static void generate(Configuration configuration) {
-        PackageListWriter packgen;
-        try {
-            packgen = new PackageListWriter(configuration);
-            packgen.generatePackageListFile(configuration.root);
-            packgen.close();
-        } catch (IOException exc) {
-            configuration.message.error("doclet.exception_encountered",
-                exc.toString(), DocPaths.PACKAGE_LIST);
-            throw new DocletAbortException(exc);
-        }
-    }
-
-    protected void generatePackageListFile(RootDoc root) {
-        ArrayList<String> names = new ArrayList<>();
-        for (PackageDoc pkg : configuration.packages) {
-            // if the -nodeprecated option is set and the package is marked as
-            // deprecated, do not include it in the packages list.
-            if (!(configuration.nodeprecated && utils.isDeprecated(pkg)))
-                names.add(pkg.name());
-        }
-        Collections.sort(names);
-        for (String name : names) {
-            println(name);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
deleted file mode 100644
index d018bf9fede..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 1998, 2016, 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.doclets.internal.toolkit.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.tools.DocumentationTool;
-import javax.tools.FileObject;
-import javax.tools.JavaFileManager.Location;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-import com.sun.tools.javac.util.Assert;
-
-/**
- * Implementation of DocFileFactory using a {@link StandardJavaFileManager}.
- *
- *  <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>
- *
- * @since 1.8
- */
-@Deprecated
-class StandardDocFileFactory extends DocFileFactory {
-    private final StandardJavaFileManager fileManager;
-    private Path destDir;
-
-    public StandardDocFileFactory(Configuration configuration) {
-        super(configuration);
-        fileManager = (StandardJavaFileManager) configuration.getFileManager();
-    }
-
-    private Path getDestDir() {
-        if (destDir == null) {
-            if (!configuration.destDirName.isEmpty()
-                    || !fileManager.hasLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT)) {
-                try {
-                    String dirName = configuration.destDirName.isEmpty() ? "." : configuration.destDirName;
-                    Path dir = Paths.get(dirName);
-                    fileManager.setLocationFromPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir));
-                } catch (IOException e) {
-                    throw new DocletAbortException(e);
-                }
-            }
-
-            destDir = fileManager.getLocationAsPaths(DocumentationTool.Location.DOCUMENTATION_OUTPUT).iterator().next();
-        }
-        return destDir;
-    }
-
-    public DocFile createFileForDirectory(String file) {
-        return new StandardDocFile(Paths.get(file));
-    }
-
-    public DocFile createFileForInput(String file) {
-        return new StandardDocFile(Paths.get(file));
-    }
-
-    public DocFile createFileForOutput(DocPath path) {
-        return new StandardDocFile(DocumentationTool.Location.DOCUMENTATION_OUTPUT, path);
-    }
-
-    @Override
-    Iterable<DocFile> list(Location location, DocPath path) {
-        Location l = ((location == StandardLocation.SOURCE_PATH)
-                && !fileManager.hasLocation(StandardLocation.SOURCE_PATH))
-                ? StandardLocation.CLASS_PATH
-                : location;
-
-        Set<DocFile> files = new LinkedHashSet<>();
-        for (Path f: fileManager.getLocationAsPaths(l)) {
-            if (Files.isDirectory(f)) {
-                f = f.resolve(path.getPath());
-                if (Files.exists(f))
-                    files.add(new StandardDocFile(f));
-            }
-        }
-        return files;
-    }
-
-    private static Path newFile(Path dir, String path) {
-        return (dir == null) ? Paths.get(path) : dir.resolve(path);
-    }
-
-    class StandardDocFile extends DocFile {
-        private Path file;
-
-        /** Create a StandardDocFile for a given file. */
-        private StandardDocFile(Path file) {
-            super(configuration);
-            this.file = file;
-        }
-
-        /** Create a StandardDocFile for a given location and relative path. */
-        private StandardDocFile(Location location, DocPath path) {
-            super(configuration, location, path);
-            Assert.check(location == DocumentationTool.Location.DOCUMENTATION_OUTPUT);
-            this.file = newFile(getDestDir(), path.getPath());
-        }
-
-        /** Open an input stream for the file. */
-        public InputStream openInputStream() throws IOException {
-            JavaFileObject fo = getJavaFileObjectForInput(file);
-            return new BufferedInputStream(fo.openInputStream());
-        }
-
-        /**
-         * Open an output stream for the file.
-         * The file must have been created with a location of
-         * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path.
-         */
-        public OutputStream openOutputStream() throws IOException, UnsupportedEncodingException {
-            if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
-                throw new IllegalStateException();
-
-            OutputStream out = getFileObjectForOutput(path).openOutputStream();
-            return new BufferedOutputStream(out);
-        }
-
-        /**
-         * Open an writer for the file, using the encoding (if any) given in the
-         * doclet configuration.
-         * The file must have been created with a location of
-         * {@link DocumentationTool.Location#DOCUMENTATION_OUTPUT} and a corresponding relative path.
-         */
-        public Writer openWriter() throws IOException, UnsupportedEncodingException {
-            if (location != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
-                throw new IllegalStateException();
-
-            OutputStream out = getFileObjectForOutput(path).openOutputStream();
-            if (configuration.docencoding == null) {
-                return new BufferedWriter(new OutputStreamWriter(out));
-            } else {
-                return new BufferedWriter(new OutputStreamWriter(out, configuration.docencoding));
-            }
-        }
-
-        /** Return true if the file can be read. */
-        public boolean canRead() {
-            return Files.isReadable(file);
-        }
-
-        /** Return true if the file can be written. */
-        public boolean canWrite() {
-            return Files.isWritable(file);
-        }
-
-        /** Return true if the file exists. */
-        public boolean exists() {
-            return Files.exists(file);
-        }
-
-        /** Return the base name (last component) of the file name. */
-        public String getName() {
-            return file.getFileName().toString();
-        }
-
-        /** Return the file system path for this file. */
-        public String getPath() {
-            return file.toString();
-        }
-
-        /** Return true is file has an absolute path name. */
-        public boolean isAbsolute() {
-            return file.isAbsolute();
-        }
-
-        /** Return true is file identifies a directory. */
-        public boolean isDirectory() {
-            return Files.isDirectory(file);
-        }
-
-        /** Return true is file identifies a file. */
-        public boolean isFile() {
-            return Files.isRegularFile(file);
-        }
-
-        /** Return true if this file is the same as another. */
-        public boolean isSameFile(DocFile other) {
-            if (!(other instanceof StandardDocFile))
-                return false;
-
-            try {
-                return Files.isSameFile(file, ((StandardDocFile) other).file);
-            } catch (IOException e) {
-                return false;
-            }
-        }
-
-        /** If the file is a directory, list its contents. */
-        public Iterable<DocFile> list() throws IOException {
-            List<DocFile> files = new ArrayList<DocFile>();
-            try (DirectoryStream<Path> ds = Files.newDirectoryStream(file)) {
-                for (Path f: ds) {
-                    files.add(new StandardDocFile(f));
-                }
-            }
-            return files;
-        }
-
-        /** Create the file as a directory, including any parent directories. */
-        public boolean mkdirs() {
-            try {
-                Files.createDirectories(file);
-                return true;
-            } catch (IOException e) {
-                return false;
-            }
-        }
-
-        /**
-         * Derive a new file by resolving a relative path against this file.
-         * The new file will inherit the configuration and location of this file
-         * If this file has a path set, the new file will have a corresponding
-         * new path.
-         */
-        public DocFile resolve(DocPath p) {
-            return resolve(p.getPath());
-        }
-
-        /**
-         * Derive a new file by resolving a relative path against this file.
-         * The new file will inherit the configuration and location of this file
-         * If this file has a path set, the new file will have a corresponding
-         * new path.
-         */
-        public DocFile resolve(String p) {
-            if (location == null && path == null) {
-                return new StandardDocFile(file.resolve(p));
-            } else {
-                return new StandardDocFile(location, path.resolve(p));
-            }
-        }
-
-        /**
-         * Resolve a relative file against the given output location.
-         * @param locn Currently, only
-         * {@link DocumentationTool.Location.DOCUMENTATION_OUTPUT} is supported.
-         */
-        public DocFile resolveAgainst(Location locn) {
-            if (locn != DocumentationTool.Location.DOCUMENTATION_OUTPUT)
-                throw new IllegalArgumentException();
-            return new StandardDocFile(getDestDir().resolve(file));
-        }
-
-        /** Return a string to identify the contents of this object,
-         * for debugging purposes.
-         */
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder();
-            sb.append("PathDocFile[");
-            if (location != null)
-                sb.append("locn:").append(location).append(",");
-            if (path != null)
-                sb.append("path:").append(path.getPath()).append(",");
-            sb.append("file:").append(file);
-            sb.append("]");
-            return sb.toString();
-        }
-
-        private JavaFileObject getJavaFileObjectForInput(Path file) {
-            return fileManager.getJavaFileObjects(file).iterator().next();
-        }
-
-        private FileObject getFileObjectForOutput(DocPath path) throws IOException {
-            // break the path into a package-part and the rest, by finding
-            // the position of the last '/' before an invalid character for a
-            // package name, such as the "." before an extension or the "-"
-            // in filenames like package-summary.html, doc-files or src-html.
-            String p = path.getPath();
-            int lastSep = -1;
-            for (int i = 0; i < p.length(); i++) {
-                char ch = p.charAt(i);
-                if (ch == '/') {
-                    lastSep = i;
-                } else if (i == lastSep + 1 && !Character.isJavaIdentifierStart(ch)
-                        || !Character.isJavaIdentifierPart(ch)) {
-                    break;
-                }
-            }
-            String pkg = (lastSep == -1) ? "" : p.substring(0, lastSep);
-            String rest = p.substring(lastSep + 1);
-            return fileManager.getFileForOutput(location, pkg, rest, null);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
deleted file mode 100644
index 881c92460a0..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2003, 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
- * 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.doclets.internal.toolkit.util;
-import com.sun.javadoc.*;
-
-
-/**
- * A tag that holds nothing but plain text.  This is useful for passing
- * text to methods that only accept inline tags as a parameter.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public class TextTag implements Tag {
-    protected final String text;
-    protected final String name = "Text";
-    protected final Doc holder;
-
-    /**
-     *  Constructor
-     */
-    public TextTag(Doc holder, String text) {
-        super();
-        this.holder = holder;
-        this.text = text;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String name() {
-        return name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Doc holder() {
-        return holder;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String kind() {
-        return name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String text() {
-        return text;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String toString() {
-        return name + ":" + text;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Tag[] inlineTags() {
-        return new Tag[] {this};
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Tag[] firstSentenceTags() {
-        return new Tag[] {this};
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public SourcePosition position() {
-        return holder.position();
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
deleted file mode 100644
index 0b75c7bc2c5..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/Utils.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*
- * Copyright (c) 1999, 2015, 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.doclets.internal.toolkit.util;
-
-import java.io.*;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.text.Collator;
-import java.util.*;
-
-import javax.tools.JavaFileManager.Location;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.javac.util.StringUtils;
-
-/**
- * Utilities Class for Doclets.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Jamie Ho
- */
-@Deprecated
-public class Utils {
-    /**
-     * Return array of class members whose documentation is to be generated.
-     * If the member is deprecated do not include such a member in the
-     * returned array.
-     *
-     * @param  members             Array of members to choose from.
-     * @return ProgramElementDoc[] Array of eligible members for whom
-     *                             documentation is getting generated.
-     */
-    public ProgramElementDoc[] excludeDeprecatedMembers(
-        ProgramElementDoc[] members) {
-        return
-            toProgramElementDocArray(excludeDeprecatedMembersAsList(members));
-    }
-
-    /**
-     * Return array of class members whose documentation is to be generated.
-     * If the member is deprecated do not include such a member in the
-     * returned array.
-     *
-     * @param  members    Array of members to choose from.
-     * @return List       List of eligible members for whom
-     *                    documentation is getting generated.
-     */
-    public List<ProgramElementDoc> excludeDeprecatedMembersAsList(
-        ProgramElementDoc[] members) {
-        List<ProgramElementDoc> list = new ArrayList<>();
-        for (ProgramElementDoc member : members) {
-            if (member.tags("deprecated").length == 0) {
-                list.add(member);
-            }
-        }
-        Collections.sort(list);
-        return list;
-    }
-
-    /**
-     * Return the list of ProgramElementDoc objects as Array.
-     */
-    public ProgramElementDoc[] toProgramElementDocArray(List<ProgramElementDoc> list) {
-        ProgramElementDoc[] pgmarr = new ProgramElementDoc[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            pgmarr[i] = list.get(i);
-        }
-        return pgmarr;
-    }
-
-    /**
-     * Return true if a non-public member found in the given array.
-     *
-     * @param  members Array of members to look into.
-     * @return boolean True if non-public member found, false otherwise.
-     */
-    public boolean nonPublicMemberFound(ProgramElementDoc[] members) {
-        for (ProgramElementDoc member : members) {
-            if (!member.isPublic()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Search for the given method in the given class.
-     *
-     * @param  cd        Class to search into.
-     * @param  method    Method to be searched.
-     * @return MethodDoc Method found, null otherwise.
-     */
-    public MethodDoc findMethod(ClassDoc cd, MethodDoc method) {
-        MethodDoc[] methods = cd.methods();
-        for (MethodDoc m : methods) {
-            if (executableMembersEqual(method, m)) {
-                return m;
-
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param member1 the first method to compare.
-     * @param member2 the second method to compare.
-     * @return true if member1 overrides/hides or is overriden/hidden by member2.
-     */
-    public boolean executableMembersEqual(ExecutableMemberDoc member1,
-            ExecutableMemberDoc member2) {
-        if (! (member1 instanceof MethodDoc && member2 instanceof MethodDoc))
-            return false;
-
-        MethodDoc method1 = (MethodDoc) member1;
-        MethodDoc method2 = (MethodDoc) member2;
-        if (method1.isStatic() && method2.isStatic()) {
-            Parameter[] targetParams = method1.parameters();
-            Parameter[] currentParams;
-            if (method1.name().equals(method2.name()) &&
-                   (currentParams = method2.parameters()).length ==
-                targetParams.length) {
-                int j;
-                for (j = 0; j < targetParams.length; j++) {
-                    if (! (targetParams[j].typeName().equals(
-                              currentParams[j].typeName()) ||
-                                   currentParams[j].type() instanceof TypeVariable ||
-                                   targetParams[j].type() instanceof TypeVariable)) {
-                        break;
-                    }
-                }
-                if (j == targetParams.length) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-                return method1.overrides(method2) ||
-                method2.overrides(method1) ||
-                                member1 == member2;
-        }
-    }
-
-    /**
-     * According to
-     * <cite>The Java&trade; Language Specification</cite>,
-     * all the outer classes and static inner classes are core classes.
-     */
-    public boolean isCoreClass(ClassDoc cd) {
-        return cd.containingClass() == null || cd.isStatic();
-    }
-
-    public boolean matches(ProgramElementDoc doc1,
-            ProgramElementDoc doc2) {
-        if (doc1 instanceof ExecutableMemberDoc &&
-            doc2 instanceof ExecutableMemberDoc) {
-            ExecutableMemberDoc ed1 = (ExecutableMemberDoc)doc1;
-            ExecutableMemberDoc ed2 = (ExecutableMemberDoc)doc2;
-            return executableMembersEqual(ed1, ed2);
-        } else {
-            return doc1.name().equals(doc2.name());
-        }
-    }
-
-    /**
-     * Copy the given directory contents from the source package directory
-     * to the generated documentation directory. For example for a package
-     * java.lang this method find out the source location of the package using
-     * {@link SourcePath} and if given directory is found in the source
-     * directory structure, copy the entire directory, to the generated
-     * documentation hierarchy.
-     *
-     * @param configuration The configuration of the current doclet.
-     * @param path The relative path to the directory to be copied.
-     * @param dir The original directory name to copy from.
-     * @param overwrite Overwrite files if true.
-     */
-    public void copyDocFiles(Configuration configuration, PackageDoc pd) {
-        Location locn = configuration.getLocationForPackage(pd);
-        copyDocFiles(configuration, locn, DocPath.forPackage(pd).resolve(DocPaths.DOC_FILES));
-    }
-
-    public void copyDocFiles(Configuration configuration, Location locn, DocPath dir) {
-        try {
-            boolean first = true;
-            for (DocFile f : DocFile.list(configuration, locn, dir)) {
-                if (!f.isDirectory()) {
-                    continue;
-                }
-                DocFile srcdir = f;
-                DocFile destdir = DocFile.createFileForOutput(configuration, dir);
-                if (srcdir.isSameFile(destdir)) {
-                    continue;
-                }
-
-                for (DocFile srcfile: srcdir.list()) {
-                    DocFile destfile = destdir.resolve(srcfile.getName());
-                    if (srcfile.isFile()) {
-                        if (destfile.exists() && !first) {
-                            configuration.message.warning((SourcePosition) null,
-                                    "doclet.Copy_Overwrite_warning",
-                                    srcfile.getPath(), destdir.getPath());
-                        } else {
-                            configuration.message.notice(
-                                    "doclet.Copying_File_0_To_Dir_1",
-                                    srcfile.getPath(), destdir.getPath());
-                            destfile.copyFile(srcfile);
-                        }
-                    } else if (srcfile.isDirectory()) {
-                        if (configuration.copydocfilesubdirs
-                                && !configuration.shouldExcludeDocFileDir(srcfile.getName())) {
-                            copyDocFiles(configuration, locn, dir.resolve(srcfile.getName()));
-                        }
-                    }
-                }
-
-                first = false;
-            }
-        } catch (SecurityException | IOException exc) {
-            throw new DocletAbortException(exc);
-        }
-    }
-    /**
-     * Returns a TypeComparator object suitable for sorting Types.
-     * @return a TypeComparator objectt
-     */
-    public Comparator<Type> makeTypeComparator() {
-        return new TypeComparator();
-    }
-    /**
-     * We want the list of types in alphabetical order.  However, types are not
-     * comparable.  We need a comparator for now.
-     */
-    private static class TypeComparator implements Comparator<Type> {
-        public int compare(Type type1, Type type2) {
-            return compareStrings(type1.qualifiedTypeName(), type2.qualifiedTypeName());
-        }
-    }
-
-    /**
-     * For the class return all implemented interfaces including the
-     * superinterfaces of the implementing interfaces, also iterate over for
-     * all the superclasses. For interface return all the extended interfaces
-     * as well as superinterfaces for those extended interfaces.
-     *
-     * @param  type       type whose implemented or
-     *                    super interfaces are sought.
-     * @param  configuration the current configuration of the doclet.
-     * @param  sort if true, return list of interfaces sorted alphabetically.
-     * @return List of all the required interfaces.
-     */
-    public List<Type> getAllInterfaces(Type type,
-            Configuration configuration, boolean sort) {
-        Map<ClassDoc,Type> results = sort ?
-                new TreeMap<ClassDoc,Type>() :
-                new LinkedHashMap<ClassDoc,Type>();
-        Type[] interfaceTypes = null;
-        Type superType = null;
-        if (type instanceof ParameterizedType) {
-            interfaceTypes = ((ParameterizedType) type).interfaceTypes();
-            superType = ((ParameterizedType) type).superclassType();
-        } else if (type instanceof ClassDoc) {
-            interfaceTypes = ((ClassDoc) type).interfaceTypes();
-            superType = ((ClassDoc) type).superclassType();
-        } else {
-            interfaceTypes = type.asClassDoc().interfaceTypes();
-            superType = type.asClassDoc().superclassType();
-        }
-
-        for (Type interfaceType : interfaceTypes) {
-            ClassDoc interfaceClassDoc = interfaceType.asClassDoc();
-            if (!(interfaceClassDoc.isPublic() ||
-                  (configuration == null ||
-                   isLinkable(interfaceClassDoc, configuration)))) {
-                continue;
-            }
-            results.put(interfaceClassDoc, interfaceType);
-            for (Type t : getAllInterfaces(interfaceType, configuration, sort)) {
-                results.put(t.asClassDoc(), t);
-            }
-        }
-        if (superType == null)
-            return new ArrayList<>(results.values());
-        //Try walking the tree.
-        addAllInterfaceTypes(results,
-            superType,
-            interfaceTypesOf(superType),
-            false, configuration);
-        List<Type> resultsList = new ArrayList<>(results.values());
-        if (sort) {
-                Collections.sort(resultsList, new TypeComparator());
-        }
-        return resultsList;
-    }
-
-    private Type[] interfaceTypesOf(Type type) {
-        if (type instanceof AnnotatedType)
-            type = ((AnnotatedType)type).underlyingType();
-        return type instanceof ClassDoc ?
-                ((ClassDoc)type).interfaceTypes() :
-                ((ParameterizedType)type).interfaceTypes();
-    }
-
-    public List<Type> getAllInterfaces(Type type, Configuration configuration) {
-        return getAllInterfaces(type, configuration, true);
-    }
-
-    private void findAllInterfaceTypes(Map<ClassDoc,Type> results, ClassDoc c, boolean raw,
-            Configuration configuration) {
-        Type superType = c.superclassType();
-        if (superType == null)
-            return;
-        addAllInterfaceTypes(results, superType,
-                interfaceTypesOf(superType),
-                raw, configuration);
-    }
-
-    private void findAllInterfaceTypes(Map<ClassDoc,Type> results, ParameterizedType p,
-            Configuration configuration) {
-        Type superType = p.superclassType();
-        if (superType == null)
-            return;
-        addAllInterfaceTypes(results, superType,
-                interfaceTypesOf(superType),
-                false, configuration);
-    }
-
-    private void addAllInterfaceTypes(Map<ClassDoc,Type> results, Type type,
-            Type[] interfaceTypes, boolean raw,
-            Configuration configuration) {
-        for (Type interfaceType : interfaceTypes) {
-            ClassDoc interfaceClassDoc = interfaceType.asClassDoc();
-            if (!(interfaceClassDoc.isPublic() ||
-                  (configuration != null &&
-                   isLinkable(interfaceClassDoc, configuration)))) {
-                continue;
-            }
-            if (raw)
-                interfaceType = interfaceType.asClassDoc();
-            results.put(interfaceClassDoc, interfaceType);
-            List<Type> superInterfaces = getAllInterfaces(interfaceType, configuration);
-            for (Type superInterface : superInterfaces) {
-                results.put(superInterface.asClassDoc(), superInterface);
-            }
-        }
-        if (type instanceof AnnotatedType)
-            type = ((AnnotatedType)type).underlyingType();
-
-        if (type instanceof ParameterizedType)
-            findAllInterfaceTypes(results, (ParameterizedType) type, configuration);
-        else if (((ClassDoc) type).typeParameters().length == 0)
-            findAllInterfaceTypes(results, (ClassDoc) type, raw, configuration);
-        else
-            findAllInterfaceTypes(results, (ClassDoc) type, true, configuration);
-    }
-
-    /**
-     * Enclose in quotes, used for paths and filenames that contains spaces
-     */
-    public String quote(String filepath) {
-        return ("\"" + filepath + "\"");
-    }
-
-    /**
-     * Given a package, return its name.
-     * @param packageDoc the package to check.
-     * @return the name of the given package.
-     */
-    public String getPackageName(PackageDoc packageDoc) {
-        return packageDoc == null || packageDoc.name().length() == 0 ?
-            DocletConstants.DEFAULT_PACKAGE_NAME : packageDoc.name();
-    }
-
-    /**
-     * Given a package, return its file name without the extension.
-     * @param packageDoc the package to check.
-     * @return the file name of the given package.
-     */
-    public String getPackageFileHeadName(PackageDoc packageDoc) {
-        return packageDoc == null || packageDoc.name().length() == 0 ?
-            DocletConstants.DEFAULT_PACKAGE_FILE_NAME : packageDoc.name();
-    }
-
-    /**
-     * Given a string, replace all occurrences of 'newStr' with 'oldStr'.
-     * @param originalStr the string to modify.
-     * @param oldStr the string to replace.
-     * @param newStr the string to insert in place of the old string.
-     */
-    public String replaceText(String originalStr, String oldStr,
-            String newStr) {
-        if (oldStr == null || newStr == null || oldStr.equals(newStr)) {
-            return originalStr;
-        }
-        return originalStr.replace(oldStr, newStr);
-    }
-
-    /**
-     * Given an annotation, return true if it should be documented and false
-     * otherwise.
-     *
-     * @param annotationDoc the annotation to check.
-     *
-     * @return true return true if it should be documented and false otherwise.
-     */
-    public boolean isDocumentedAnnotation(AnnotationTypeDoc annotationDoc) {
-        for (AnnotationDesc anno : annotationDoc.annotations()) {
-            if (anno.annotationType().qualifiedName().equals(
-                    Documented.class.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean isDeclarationTarget(AnnotationDesc targetAnno) {
-        // The error recovery steps here are analogous to TypeAnnotations
-        AnnotationDesc.ElementValuePair[] elems = targetAnno.elementValues();
-        if (elems == null
-            || elems.length != 1
-            || !"value".equals(elems[0].element().name())
-            || !(elems[0].value().value() instanceof AnnotationValue[]))
-            return true;    // error recovery
-
-        for (AnnotationValue aValue : (AnnotationValue[])elems[0].value().value()) {
-            Object value = aValue.value();
-            if (!(value instanceof FieldDoc))
-                return true; // error recovery
-
-            FieldDoc eValue = (FieldDoc) value;
-            if (isJava5DeclarationElementType(eValue)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the {@code annotationDoc} is to be treated
-     * as a declaration annotation, when targeting the
-     * {@code elemType} element type.
-     *
-     * @param annotationDoc the annotationDoc to check
-     * @param elemType  the targeted elemType
-     * @return true if annotationDoc is a declaration annotation
-     */
-    public boolean isDeclarationAnnotation(AnnotationTypeDoc annotationDoc,
-            boolean isJava5DeclarationLocation) {
-        if (!isJava5DeclarationLocation)
-            return false;
-        AnnotationDesc[] annotationDescList = annotationDoc.annotations();
-        // Annotations with no target are treated as declaration as well
-        if (annotationDescList.length==0)
-            return true;
-        for (AnnotationDesc anno : annotationDescList) {
-            if (anno.annotationType().qualifiedName().equals(
-                    Target.class.getName())) {
-                if (isDeclarationTarget(anno))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return true if this class is linkable and false if we can't link to the
-     * desired class.
-     * <br>
-     * <b>NOTE:</b>  You can only link to external classes if they are public or
-     * protected.
-     *
-     * @param classDoc the class to check.
-     * @param configuration the current configuration of the doclet.
-     *
-     * @return true if this class is linkable and false if we can't link to the
-     * desired class.
-     */
-    public boolean isLinkable(ClassDoc classDoc,
-            Configuration configuration) {
-        return
-            ((classDoc.isIncluded() && configuration.isGeneratedDoc(classDoc))) ||
-            (configuration.extern.isExternal(classDoc) &&
-                (classDoc.isPublic() || classDoc.isProtected()));
-    }
-
-    /**
-     * Given a class, return the closest visible super class.
-     *
-     * @param classDoc the class we are searching the parent for.
-     * @param configuration the current configuration of the doclet.
-     * @return the closest visible super class.  Return null if it cannot
-     *         be found (i.e. classDoc is java.lang.Object).
-     */
-    public Type getFirstVisibleSuperClass(ClassDoc classDoc,
-            Configuration configuration) {
-        if (classDoc == null) {
-            return null;
-        }
-        Type sup = classDoc.superclassType();
-        ClassDoc supClassDoc = classDoc.superclass();
-        while (sup != null &&
-                  (! (supClassDoc.isPublic() ||
-                              isLinkable(supClassDoc, configuration))) ) {
-            if (supClassDoc.superclass().qualifiedName().equals(supClassDoc.qualifiedName()))
-                break;
-            sup = supClassDoc.superclassType();
-            supClassDoc = supClassDoc.superclass();
-        }
-        if (classDoc.equals(supClassDoc)) {
-            return null;
-        }
-        return sup;
-    }
-
-    /**
-     * Given a class, return the closest visible super class.
-     *
-     * @param classDoc the class we are searching the parent for.
-     * @param configuration the current configuration of the doclet.
-     * @return the closest visible super class.  Return null if it cannot
-     *         be found (i.e. classDoc is java.lang.Object).
-     */
-    public ClassDoc getFirstVisibleSuperClassCD(ClassDoc classDoc,
-            Configuration configuration) {
-        if (classDoc == null) {
-            return null;
-        }
-        ClassDoc supClassDoc = classDoc.superclass();
-        while (supClassDoc != null &&
-                  (! (supClassDoc.isPublic() ||
-                              isLinkable(supClassDoc, configuration))) ) {
-            supClassDoc = supClassDoc.superclass();
-        }
-        if (classDoc.equals(supClassDoc)) {
-            return null;
-        }
-        return supClassDoc;
-    }
-
-    /**
-     * Given a ClassDoc, return the name of its type (Class, Interface, etc.).
-     *
-     * @param cd the ClassDoc to check.
-     * @param lowerCaseOnly true if you want the name returned in lower case.
-     *                      If false, the first letter of the name is capitalized.
-     * @return
-     */
-    public String getTypeName(Configuration config,
-        ClassDoc cd, boolean lowerCaseOnly) {
-        String typeName = "";
-        if (cd.isOrdinaryClass()) {
-            typeName = "doclet.Class";
-        } else if (cd.isInterface()) {
-            typeName = "doclet.Interface";
-        } else if (cd.isException()) {
-            typeName = "doclet.Exception";
-        } else if (cd.isError()) {
-            typeName = "doclet.Error";
-        } else if (cd.isAnnotationType()) {
-            typeName = "doclet.AnnotationType";
-        } else if (cd.isEnum()) {
-            typeName = "doclet.Enum";
-        }
-        return config.getText(
-            lowerCaseOnly ? StringUtils.toLowerCase(typeName) : typeName);
-    }
-
-    /**
-     * Replace all tabs in a string with the appropriate number of spaces.
-     * The string may be a multi-line string.
-     * @param configuration the doclet configuration defining the setting for the
-     *                      tab length.
-     * @param text the text for which the tabs should be expanded
-     * @return the text with all tabs expanded
-     */
-    public String replaceTabs(Configuration configuration, String text) {
-        if (!text.contains("\t"))
-            return text;
-
-        final int tabLength = configuration.sourcetab;
-        final String whitespace = configuration.tabSpaces;
-        final int textLength = text.length();
-        StringBuilder result = new StringBuilder(textLength);
-        int pos = 0;
-        int lineLength = 0;
-        for (int i = 0; i < textLength; i++) {
-            char ch = text.charAt(i);
-            switch (ch) {
-                case '\n': case '\r':
-                    lineLength = 0;
-                    break;
-                case '\t':
-                    result.append(text, pos, i);
-                    int spaceCount = tabLength - lineLength % tabLength;
-                    result.append(whitespace, 0, spaceCount);
-                    lineLength += spaceCount;
-                    pos = i + 1;
-                    break;
-                default:
-                    lineLength++;
-            }
-        }
-        result.append(text, pos, textLength);
-        return result.toString();
-    }
-
-    public String normalizeNewlines(String text) {
-        StringBuilder sb = new StringBuilder();
-        final int textLength = text.length();
-        final String NL = DocletConstants.NL;
-        int pos = 0;
-        for (int i = 0; i < textLength; i++) {
-            char ch = text.charAt(i);
-            switch (ch) {
-                case '\n':
-                    sb.append(text, pos, i);
-                    sb.append(NL);
-                    pos = i + 1;
-                    break;
-                case '\r':
-                    sb.append(text, pos, i);
-                    sb.append(NL);
-                    if (i + 1 < textLength && text.charAt(i + 1) == '\n')
-                        i++;
-                    pos = i + 1;
-                    break;
-            }
-        }
-        sb.append(text, pos, textLength);
-        return sb.toString();
-    }
-
-    /**
-     * The documentation for values() and valueOf() in Enums are set by the
-     * doclet.
-     */
-    public void setEnumDocumentation(Configuration configuration,
-            ClassDoc classDoc) {
-        for (MethodDoc currentMethod : classDoc.methods()) {
-            if (currentMethod.name().equals("values") &&
-                currentMethod.parameters().length == 0) {
-                StringBuilder sb = new StringBuilder();
-                sb.append(configuration.getText("doclet.enum_values_doc.main", classDoc.name()));
-                sb.append("\n@return ");
-                sb.append(configuration.getText("doclet.enum_values_doc.return"));
-                currentMethod.setRawCommentText(sb.toString());
-            } else if (currentMethod.name().equals("valueOf") &&
-                     currentMethod.parameters().length == 1) {
-                Type paramType = currentMethod.parameters()[0].type();
-                if (paramType != null &&
-                    paramType.qualifiedTypeName().equals(String.class.getName())) {
-                    StringBuilder sb = new StringBuilder();
-                    sb.append(configuration.getText("doclet.enum_valueof_doc.main", classDoc.name()));
-                    sb.append("\n@param name ");
-                    sb.append(configuration.getText("doclet.enum_valueof_doc.param_name"));
-                    sb.append("\n@return ");
-                    sb.append(configuration.getText("doclet.enum_valueof_doc.return"));
-                    sb.append("\n@throws IllegalArgumentException ");
-                    sb.append(configuration.getText("doclet.enum_valueof_doc.throws_ila"));
-                    sb.append("\n@throws NullPointerException ");
-                    sb.append(configuration.getText("doclet.enum_valueof_doc.throws_npe"));
-                    currentMethod.setRawCommentText(sb.toString());
-                }
-            }
-        }
-    }
-
-    /**
-     *  Return true if the given Doc is deprecated.
-     *
-     * @param doc the Doc to check.
-     * @return true if the given Doc is deprecated.
-     */
-    public boolean isDeprecated(Doc doc) {
-        if (doc.tags("deprecated").length > 0) {
-            return true;
-        }
-        AnnotationDesc[] annotationDescList;
-        if (doc instanceof PackageDoc)
-            annotationDescList = ((PackageDoc)doc).annotations();
-        else
-            annotationDescList = ((ProgramElementDoc)doc).annotations();
-        for (AnnotationDesc anno : annotationDescList) {
-            if (anno.annotationType().qualifiedName().equals(
-                    Deprecated.class.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * A convenience method to get property name from the name of the
-     * getter or setter method.
-     * @param name name of the getter or setter method.
-     * @return the name of the property of the given setter of getter.
-     */
-    public String propertyNameFromMethodName(Configuration configuration, String name) {
-        String propertyName = null;
-        if (name.startsWith("get") || name.startsWith("set")) {
-            propertyName = name.substring(3);
-        } else if (name.startsWith("is")) {
-            propertyName = name.substring(2);
-        }
-        if ((propertyName == null) || propertyName.isEmpty()){
-            return "";
-        }
-        return propertyName.substring(0, 1).toLowerCase(configuration.getLocale())
-                + propertyName.substring(1);
-    }
-
-    /**
-     * In case of JavaFX mode on, filters out classes that are private,
-     * package private or having the @treatAsPrivate annotation. Those are not
-     * documented in JavaFX mode.
-     *
-     * @param classes array of classes to be filtered.
-     * @param javafx set to true if in JavaFX mode.
-     * @return list of filtered classes.
-     */
-    public ClassDoc[] filterOutPrivateClasses(final ClassDoc[] classes,
-                                                     boolean javafx) {
-        if (!javafx) {
-            return classes;
-        }
-        final List<ClassDoc> filteredOutClasses = new ArrayList<>(classes.length);
-        for (ClassDoc classDoc : classes) {
-            if (classDoc.isPrivate() || classDoc.isPackagePrivate()) {
-                continue;
-            }
-            Tag[] aspTags = classDoc.tags("treatAsPrivate");
-            if (aspTags != null && aspTags.length > 0) {
-                continue;
-            }
-            filteredOutClasses.add(classDoc);
-        }
-
-        return filteredOutClasses.toArray(new ClassDoc[0]);
-    }
-
-    /**
-     * Test whether the given FieldDoc is one of the declaration annotation ElementTypes
-     * defined in Java 5.
-     * Instead of testing for one of the new enum constants added in Java 8, test for
-     * the old constants. This prevents bootstrapping problems.
-     *
-     * @param elt The FieldDoc to test
-     * @return true, iff the given ElementType is one of the constants defined in Java 5
-     * @since 1.8
-     */
-    public boolean isJava5DeclarationElementType(FieldDoc elt) {
-        return elt.name().contentEquals(ElementType.ANNOTATION_TYPE.name()) ||
-                elt.name().contentEquals(ElementType.CONSTRUCTOR.name()) ||
-                elt.name().contentEquals(ElementType.FIELD.name()) ||
-                elt.name().contentEquals(ElementType.LOCAL_VARIABLE.name()) ||
-                elt.name().contentEquals(ElementType.METHOD.name()) ||
-                elt.name().contentEquals(ElementType.PACKAGE.name()) ||
-                elt.name().contentEquals(ElementType.PARAMETER.name()) ||
-                elt.name().contentEquals(ElementType.TYPE.name());
-    }
-
-    /**
-     * A general purpose case insensitive String comparator, which compares two Strings using a Collator
-     * strength of "TERTIARY".
-     *
-     * @param s1 first String to compare.
-     * @param s2 second String to compare.
-     * @return a negative integer, zero, or a positive integer as the first
-     *         argument is less than, equal to, or greater than the second.
-     */
-    public static int compareStrings(String s1, String s2) {
-        return compareStrings(true, s1, s2);
-    }
-    /**
-     * A general purpose case sensitive String comparator, which compares two Strings using a Collator
-     * strength of "SECONDARY".
-     *
-     * @param s1 first String to compare.
-     * @param s2 second String to compare.
-     * @return a negative integer, zero, or a positive integer as the first
-     *         argument is less than, equal to, or greater than the second.
-     */
-    public static int compareCaseCompare(String s1, String s2) {
-        return compareStrings(false, s1, s2);
-    }
-    private static int compareStrings(boolean caseSensitive, String s1, String s2) {
-        Collator collator = Collator.getInstance();
-        collator.setStrength(caseSensitive ? Collator.TERTIARY : Collator.SECONDARY);
-        return collator.compare(s1, s2);
-    }
-    /**
-     * A simple comparator which compares simple names, then the fully qualified names
-     * and finally the kinds, ClassUse comparator works well for this purpose.
-     *
-     * @return a simple general purpose doc comparator
-     */
-    public Comparator<Doc> makeGeneralPurposeComparator() {
-        return makeComparatorForClassUse();
-    }
-    /**
-     * A comparator for index file presentations, and are sorted as follows:
-     *  1. sort on simple names of entities
-     *  2. if equal, then compare the DocKind ex: Package, Interface etc.
-     *  3a. if equal and if the type is of ExecutableMemberDoc(Constructor, Methods),
-     *      a case insensitive comparison of parameter the type signatures
-     *  3b. if equal, case sensitive comparison of the type signatures
-     *  4. finally, if equal, compare the FQNs of the entities
-     * @return a comparator for index file use
-     */
-    public Comparator<Doc> makeComparatorForIndexUse() {
-        return new Utils.DocComparator<Doc>() {
-            /**
-             * Compare two given Doc entities, first sort on names, then on the kinds,
-             * then on the parameters only if the type is an instance of ExecutableMemberDocs,
-             * the parameters are compared and finally the fully qualified names.
-             *
-             * @param d1 - a Doc element.
-             * @param d2 - a Doc element.
-             * @return a negative integer, zero, or a positive integer as the first
-             *         argument is less than, equal to, or greater than the second.
-             */
-            public int compare(Doc d1, Doc d2) {
-                int result = compareNames(d1, d2);
-                if (result != 0) {
-                    return result;
-                }
-                result = compareDocKinds(d1, d2);
-                if (result != 0) {
-                    return result;
-                }
-                if (hasParameters(d1)) {
-                    Parameter[] param1 = ((ExecutableMemberDoc) d1).parameters();
-                    Parameter[] param2 = ((ExecutableMemberDoc) d2).parameters();
-                    result = compareParameters(false, param1, param2);
-                    if (result != 0) {
-                        return result;
-                    }
-                    result = compareParameters(true, param1, param2);
-                    if (result != 0) {
-                        return result;
-                    }
-                }
-                return compareFullyQualifiedNames(d1, d2);
-            }
-        };
-    }
-    /**
-     * Comparator for ClassUse presentations, and sorted as follows,
-     * 1. compares simple names of entities
-     * 2. if equal, the fully qualified names of the entities
-     * 3. if equal and if applicable, the string representation of parameter types
-     * 3a. first by using case insensitive comparison
-     * 3b. second by using a case sensitive comparison
-     * 4. finally the Doc kinds ie. package, class, interface etc.
-     * @return a comparator to sort classes and members for class use
-     */
-    public Comparator<Doc> makeComparatorForClassUse() {
-        return new Utils.DocComparator<Doc>() {
-            /**
-             * Compares two given Doc entities, first sort on name, and if
-             * applicable on the fully qualified name, and if applicable
-             * on the parameter types, and finally the DocKind.
-             * @param d1 - a Doc element.
-             * @param d2 - a Doc element.
-             * @return a negative integer, zero, or a positive integer as the first
-             *         argument is less than, equal to, or greater than the second.
-             */
-            public int compare(Doc d1, Doc d2) {
-                int result = compareNames(d1, d2);
-                if (result != 0) {
-                    return result;
-                }
-                result = compareFullyQualifiedNames(d1, d2);
-                if (result != 0) {
-                    return result;
-                }
-                if (hasParameters(d1) && hasParameters(d2)) {
-                    Parameter[] param1 = ((ExecutableMemberDoc) d1).parameters();
-                    Parameter[] param2 = ((ExecutableMemberDoc) d2).parameters();
-                    result = compareParameters(false, param1, param2);
-                    if (result != 0) {
-                        return result;
-                    }
-                    return compareParameters(true, param1, param2);
-                }
-                return compareDocKinds(d1, d2);
-            }
-        };
-    }
-    /**
-     * A general purpose comparator to sort Doc entities, basically provides the building blocks
-     * for creating specific comparators for an use-case.
-     * @param <T> a Doc entity
-     */
-    static abstract class DocComparator<T extends Doc> implements Comparator<Doc> {
-        static enum DocKind {
-           PACKAGE,
-           CLASS,
-           ENUM,
-           INTERFACE,
-           ANNOTATION,
-           FIELD,
-           CONSTRUCTOR,
-           METHOD
-        };
-        boolean hasParameters(Doc d) {
-            return d instanceof ExecutableMemberDoc;
-        }
-        DocKind getDocKind(Doc d) {
-            if (d.isAnnotationType() || d.isAnnotationTypeElement()) {
-                return DocKind.ANNOTATION;
-            } else if (d.isEnum() || d.isEnumConstant()) {
-                return DocKind.ENUM;
-            } else if (d.isField()) {
-                return DocKind.FIELD;
-            } else if (d.isInterface()) {
-                return DocKind.INTERFACE;
-            } else if (d.isClass()) {
-                return DocKind.CLASS;
-            } else if (d.isConstructor()) {
-                return DocKind.CONSTRUCTOR;
-            } else if (d.isMethod()) {
-                return DocKind.METHOD;
-            } else {
-                return DocKind.PACKAGE;
-            }
-        }
-        /**
-         * Compares two Doc entities' kinds, and these are ordered as defined in
-         * the DocKind enumeration.
-         * @param d1 the first Doc object
-         * @param d2 the second Doc object
-         * @return a negative integer, zero, or a positive integer as the first
-         *         argument is less than, equal to, or greater than the second.
-         */
-        protected int compareDocKinds(Doc d1, Doc d2) {
-            return getDocKind(d1).compareTo(getDocKind(d2));
-        }
-        /**
-         * Compares arrays of parameters as a string representation of their types.
-         *
-         * @param ignoreCase specifies case sensitive or insensitive comparison.
-         * @param params1 the first parameter array.
-         * @param params2 the first parameter array.
-         * @return a negative integer, zero, or a positive integer as the first argument is less
-         * than, equal to, or greater than the second.
-         */
-        protected int compareParameters(boolean caseSensitive,
-                                        Parameter[] params1,
-                                        Parameter[] params2) {
-            String s1 = getParametersAsString(params1);
-            String s2 = getParametersAsString(params2);
-            return compareStrings(caseSensitive, s1, s2);
-        }
-        /*
-         * This method returns a string representation solely for comparison purposes.
-         */
-        protected String getParametersAsString(Parameter[] params) {
-            StringBuilder sb = new StringBuilder();
-            for (Parameter param : params) {
-                Type t = param.type();
-                // add parameter type to arrays, as TypeMirror does.
-                String tname = (t.asParameterizedType() != null && t.getElementType() != null)
-                        ? t.getElementType() + t.dimension()
-                        : t.toString();
-                // prefix P for primitive and R for reference types, thus items will
-                // be ordered naturally.
-                sb.append(t.isPrimitive() ? "P" : "R").append("-").append(tname).append("-");
-            }
-            return sb.toString();
-        }
-
-        /**
-         * Compares two Doc entities typically the simple name of a method,
-         * field, constructor etc.
-         * @param d1 the first Doc.
-         * @param d2 the second Doc.
-         * @return a negative integer, zero, or a positive integer as the first
-         *         argument is less than, equal to, or greater than the second.
-         */
-        protected int compareNames(Doc d1, Doc d2) {
-            return compareStrings(d1.name(), d2.name());
-        }
-
-        /**
-         * Compares the fully qualified names of the entities
-         * @param d1 the first entity
-         * @param d2 the second entity
-         * @return a negative integer, zero, or a positive integer as the first
-         *         argument is less than, equal to, or greater than the second.
-         */
-        protected int compareFullyQualifiedNames(Doc d1, Doc d2) {
-            String name1 = (d1 instanceof ProgramElementDoc)
-                    ? ((ProgramElementDoc)d1).qualifiedName()
-                    : d1.name();
-            String name2 = (d2 instanceof ProgramElementDoc)
-                    ? ((ProgramElementDoc)d2).qualifiedName()
-                    : d2.name();
-            return compareStrings(name1, name2);
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
deleted file mode 100644
index 9c71003eec4..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * Copyright (c) 1999, 2016, 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.doclets.internal.toolkit.util;
-
-import java.util.*;
-import java.util.regex.Pattern;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.*;
-
-/**
- * A data structure that encapsulates the visible members of a particular
- * type for a given class tree.  To use this data structor, you must specify
- * the type of member you are interested in (nested class, field, constructor
- * or method) and the leaf of the class tree.  The data structure will map
- * all visible members in the leaf and classes above the leaf in the tree.
- *
- *  <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>
- *
- * @author Atul M Dambalkar
- * @author Jamie Ho (rewrite)
- */
-@Deprecated
-public class VisibleMemberMap {
-
-    private boolean noVisibleMembers = true;
-
-    public static final int INNERCLASSES    = 0;
-    public static final int ENUM_CONSTANTS  = 1;
-    public static final int FIELDS          = 2;
-    public static final int CONSTRUCTORS    = 3;
-    public static final int METHODS         = 4;
-    public static final int ANNOTATION_TYPE_FIELDS = 5;
-    public static final int ANNOTATION_TYPE_MEMBER_OPTIONAL = 6;
-    public static final int ANNOTATION_TYPE_MEMBER_REQUIRED = 7;
-    public static final int PROPERTIES      = 8;
-
-    /**
-     * The total number of member types is {@value}.
-     */
-    public static final int NUM_MEMBER_TYPES = 9;
-
-    public static final String STARTLEVEL = "start";
-
-    /**
-     * List of ClassDoc objects for which ClassMembers objects are built.
-     */
-    private final List<ClassDoc> visibleClasses = new ArrayList<>();
-
-    /**
-     * Map for each member name on to a map which contains members with same
-     * name-signature. The mapped map will contain mapping for each MemberDoc
-     * onto it's respecive level string.
-     */
-    private final Map<Object,Map<ProgramElementDoc,String>> memberNameMap = new HashMap<>();
-
-    /**
-     * Map of class and it's ClassMembers object.
-     */
-    private final Map<ClassDoc,ClassMembers> classMap = new HashMap<>();
-
-    /**
-     * Type whose visible members are requested.  This is the leaf of
-     * the class tree being mapped.
-     */
-    private final ClassDoc classdoc;
-
-    /**
-     * Member kind: InnerClasses/Fields/Methods?
-     */
-    private final int kind;
-
-    /**
-     * The configuration this VisibleMemberMap was created with.
-     */
-    private final Configuration configuration;
-    private final Utils utils;
-
-    private static final Map<ClassDoc, ProgramElementDoc[]> propertiesCache = new HashMap<>();
-    private static final Map<ProgramElementDoc, ProgramElementDoc> classPropertiesMap = new HashMap<>();
-    private static final Map<ProgramElementDoc, GetterSetter> getterSetterMap = new HashMap<>();
-
-    /**
-     * Construct a VisibleMemberMap of the given type for the given
-     * class.
-     *
-     * @param classdoc the class whose members are being mapped.
-     * @param kind the kind of member that is being mapped.
-     * @param configuration the configuration to use to construct this
-     * VisibleMemberMap. If the field configuration.nodeprecated is true the
-     * deprecated members are excluded from the map. If the field
-     * configuration.javafx is true the JavaFX features are used.
-     */
-    public VisibleMemberMap(ClassDoc classdoc,
-                            int kind,
-                            Configuration configuration) {
-        this.classdoc = classdoc;
-        this.kind = kind;
-        this.configuration = configuration;
-        this.utils = configuration.utils;
-        new ClassMembers(classdoc, STARTLEVEL).build();
-    }
-
-    /**
-     * Return the list of visible classes in this map.
-     *
-     * @return the list of visible classes in this map.
-     */
-    public List<ClassDoc> getVisibleClassesList() {
-        sort(visibleClasses);
-        return visibleClasses;
-    }
-
-    /**
-     * Returns the property field documentation belonging to the given member.
-     * @param ped the member for which the property documentation is needed.
-     * @return the property field documentation, null if there is none.
-     */
-    public ProgramElementDoc getPropertyMemberDoc(ProgramElementDoc ped) {
-        return classPropertiesMap.get(ped);
-    }
-
-    /**
-     * Returns the getter documentation belonging to the given property method.
-     * @param propertyMethod the method for which the getter is needed.
-     * @return the getter documentation, null if there is none.
-     */
-    public ProgramElementDoc getGetterForProperty(ProgramElementDoc propertyMethod) {
-        return getterSetterMap.get(propertyMethod).getGetter();
-    }
-
-    /**
-     * Returns the setter documentation belonging to the given property method.
-     * @param propertyMethod the method for which the setter is needed.
-     * @return the setter documentation, null if there is none.
-     */
-    public ProgramElementDoc getSetterForProperty(ProgramElementDoc propertyMethod) {
-        return getterSetterMap.get(propertyMethod).getSetter();
-    }
-
-    /**
-     * Return the package private members inherited by the class.  Only return
-     * if parent is package private and not documented.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @return the package private members inherited by the class.
-     */
-    private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
-        List<ProgramElementDoc> results = new ArrayList<>();
-        for (ClassDoc currentClass : visibleClasses) {
-            if (currentClass != classdoc &&
-                currentClass.isPackagePrivate() &&
-                !utils.isLinkable(currentClass, configuration)) {
-                // Document these members in the child class because
-                // the parent is inaccessible.
-                results.addAll(getMembersFor(currentClass));
-            }
-        }
-        return results;
-    }
-
-    /**
-     * Return the visible members of the class being mapped.  Also append at the
-     * end of the list members that are inherited by inaccessible parents. We
-     * document these members in the child because the parent is not documented.
-     *
-     * @param configuration the current configuration of the doclet.
-     */
-    public List<ProgramElementDoc> getLeafClassMembers(Configuration configuration) {
-        List<ProgramElementDoc> result = getMembersFor(classdoc);
-        result.addAll(getInheritedPackagePrivateMethods(configuration));
-        return result;
-    }
-
-    /**
-     * Retrn the list of members for the given class.
-     *
-     * @param cd the class to retrieve the list of visible members for.
-     *
-     * @return the list of members for the given class.
-     */
-    public List<ProgramElementDoc> getMembersFor(ClassDoc cd) {
-        ClassMembers clmembers = classMap.get(cd);
-        if (clmembers == null) {
-            return new ArrayList<>();
-        }
-        return clmembers.getMembers();
-    }
-
-    /**
-     * Sort the given mixed list of classes and interfaces to a list of
-     * classes followed by interfaces traversed. Don't sort alphabetically.
-     */
-    private void sort(List<ClassDoc> list) {
-        List<ClassDoc> classes = new ArrayList<>();
-        List<ClassDoc> interfaces = new ArrayList<>();
-        for (ClassDoc cd : list) {
-            if (cd.isClass()) {
-                classes.add(cd);
-            }
-            else {
-                interfaces.add(cd);
-            }
-        }
-        list.clear();
-        list.addAll(classes);
-        list.addAll(interfaces);
-    }
-
-    private void fillMemberLevelMap(List<ProgramElementDoc> list, String level) {
-        for (ProgramElementDoc element : list) {
-            Object key = getMemberKey(element);
-            Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
-            if (memberLevelMap == null) {
-                memberLevelMap = new HashMap<>();
-                memberNameMap.put(key, memberLevelMap);
-            }
-            memberLevelMap.put(element, level);
-        }
-    }
-
-    private void purgeMemberLevelMap(List<ProgramElementDoc> list, String level) {
-        for (ProgramElementDoc element : list) {
-            Object key = getMemberKey(element);
-            Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
-            if (memberLevelMap != null && level.equals(memberLevelMap.get(element)))
-                memberLevelMap.remove(element);
-        }
-    }
-
-    /**
-     * Represents a class member.  We should be able to just use a
-     * ProgramElementDoc instead of this class, but that doesn't take
-     * type variables in consideration when comparing.
-     */
-    private class ClassMember {
-        private Set<ProgramElementDoc> members;
-
-        public ClassMember(ProgramElementDoc programElementDoc) {
-            members = new HashSet<>();
-            members.add(programElementDoc);
-        }
-
-        public void addMember(ProgramElementDoc programElementDoc) {
-            members.add(programElementDoc);
-        }
-
-        public boolean isEqual(MethodDoc member) {
-            for (ProgramElementDoc element : members) {
-                if (utils.executableMembersEqual(member, (MethodDoc) element)) {
-                    members.add(member);
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * A data structure that represents the class members for
-     * a visible class.
-     */
-    private class ClassMembers {
-
-        /**
-         * The mapping class, whose inherited members are put in the
-         * {@link #members} list.
-         */
-        private ClassDoc mappingClass;
-
-        /**
-         * List of inherited members from the mapping class.
-         */
-        private List<ProgramElementDoc> members = new ArrayList<>();
-
-        /**
-         * Level/Depth of inheritance.
-         */
-        private String level;
-
-        /**
-         * Return list of inherited members from mapping class.
-         *
-         * @return List Inherited members.
-         */
-        public List<ProgramElementDoc> getMembers() {
-            return members;
-        }
-
-        private ClassMembers(ClassDoc mappingClass, String level) {
-            this.mappingClass = mappingClass;
-            this.level = level;
-            if (classMap.containsKey(mappingClass) &&
-                        level.startsWith(classMap.get(mappingClass).level)) {
-                //Remove lower level class so that it can be replaced with
-                //same class found at higher level.
-                purgeMemberLevelMap(getClassMembers(mappingClass, false),
-                    classMap.get(mappingClass).level);
-                classMap.remove(mappingClass);
-                visibleClasses.remove(mappingClass);
-            }
-            if (!classMap.containsKey(mappingClass)) {
-                classMap.put(mappingClass, this);
-                visibleClasses.add(mappingClass);
-            }
-
-        }
-
-        private void build() {
-            if (kind == CONSTRUCTORS) {
-                addMembers(mappingClass);
-            } else {
-                mapClass();
-            }
-        }
-
-        private void mapClass() {
-            addMembers(mappingClass);
-            ClassDoc[] interfaces = mappingClass.interfaces();
-            for (ClassDoc anInterface : interfaces) {
-                String locallevel = level + 1;
-                ClassMembers cm = new ClassMembers(anInterface, locallevel);
-                cm.mapClass();
-            }
-            if (mappingClass.isClass()) {
-                ClassDoc superclass = mappingClass.superclass();
-                if (!(superclass == null || mappingClass.equals(superclass))) {
-                    ClassMembers cm = new ClassMembers(superclass,
-                                                       level + "c");
-                    cm.mapClass();
-                }
-            }
-        }
-
-        /**
-         * Get all the valid members from the mapping class. Get the list of
-         * members for the class to be included into(ctii), also get the level
-         * string for ctii. If mapping class member is not already in the
-         * inherited member list and if it is visible in the ctii and not
-         * overridden, put such a member in the inherited member list.
-         * Adjust member-level-map, class-map.
-         */
-        private void addMembers(ClassDoc fromClass) {
-            List<ProgramElementDoc> cdmembers = getClassMembers(fromClass, true);
-            List<ProgramElementDoc> incllist = new ArrayList<>();
-            for (ProgramElementDoc pgmelem : cdmembers) {
-                if (!found(members, pgmelem) &&
-                    memberIsVisible(pgmelem) &&
-                    !isOverridden(pgmelem, level) &&
-                    !isTreatedAsPrivate(pgmelem)) {
-                    incllist.add(pgmelem);
-                }
-            }
-            if (incllist.size() > 0) {
-                noVisibleMembers = false;
-            }
-            members.addAll(incllist);
-            fillMemberLevelMap(getClassMembers(fromClass, false), level);
-        }
-
-        private boolean isTreatedAsPrivate(ProgramElementDoc pgmelem) {
-            if (!configuration.javafx) {
-                return false;
-            }
-
-            Tag[] aspTags = pgmelem.tags("@treatAsPrivate");
-            boolean result = (aspTags != null) && (aspTags.length > 0);
-            return result;
-        }
-
-        /**
-         * Is given doc item visible in given classdoc in terms fo inheritance?
-         * The given doc item is visible in the given classdoc if it is public
-         * or protected and if it is package-private if it's containing class
-         * is in the same package as the given classdoc.
-         */
-        private boolean memberIsVisible(ProgramElementDoc pgmdoc) {
-            if (pgmdoc.containingClass().equals(classdoc)) {
-                //Member is in class that we are finding visible members for.
-                //Of course it is visible.
-                return true;
-            } else if (pgmdoc.isPrivate()) {
-                //Member is in super class or implemented interface.
-                //Private, so not inherited.
-                return false;
-            } else if (pgmdoc.isPackagePrivate()) {
-                //Member is package private.  Only return true if its class is in
-                //same package.
-                return pgmdoc.containingClass().containingPackage().equals(
-                    classdoc.containingPackage());
-            } else {
-                //Public members are always inherited.
-                return true;
-            }
-        }
-
-        /**
-         * Return all available class members.
-         */
-        private List<ProgramElementDoc> getClassMembers(ClassDoc cd, boolean filter) {
-            if (cd.isEnum() && kind == CONSTRUCTORS) {
-                //If any of these rules are hit, return empty array because
-                //we don't document these members ever.
-                return Arrays.asList(new ProgramElementDoc[] {});
-            }
-            ProgramElementDoc[] members = null;
-            switch (kind) {
-                case ANNOTATION_TYPE_FIELDS:
-                    members = cd.fields(filter);
-                    break;
-                case ANNOTATION_TYPE_MEMBER_OPTIONAL:
-                    members = cd.isAnnotationType() ?
-                        filter((AnnotationTypeDoc) cd, false) :
-                        new AnnotationTypeElementDoc[] {};
-                    break;
-                case ANNOTATION_TYPE_MEMBER_REQUIRED:
-                    members = cd.isAnnotationType() ?
-                        filter((AnnotationTypeDoc) cd, true) :
-                        new AnnotationTypeElementDoc[] {};
-                    break;
-                case INNERCLASSES:
-                    members = cd.innerClasses(filter);
-                    break;
-                case ENUM_CONSTANTS:
-                    members = cd.enumConstants();
-                    break;
-                case FIELDS:
-                    members = cd.fields(filter);
-                    break;
-                case CONSTRUCTORS:
-                    members = cd.constructors();
-                    break;
-                case METHODS:
-                    members = cd.methods(filter);
-                    checkOnPropertiesTags((MethodDoc[])members);
-                    break;
-                case PROPERTIES:
-                    members = properties(cd, filter);
-                    break;
-                default:
-                    members = new ProgramElementDoc[0];
-            }
-            // Deprected members should be excluded or not?
-            if (configuration.nodeprecated) {
-                return utils.excludeDeprecatedMembersAsList(members);
-            }
-            return Arrays.asList(members);
-        }
-
-        /**
-         * Filter the annotation type members and return either the required
-         * members or the optional members, depending on the value of the
-         * required parameter.
-         *
-         * @param doc The annotation type to process.
-         * @param required
-         * @return the annotation type members and return either the required
-         * members or the optional members, depending on the value of the
-         * required parameter.
-         */
-        private AnnotationTypeElementDoc[] filter(AnnotationTypeDoc doc,
-            boolean required) {
-            AnnotationTypeElementDoc[] members = doc.elements();
-            List<AnnotationTypeElementDoc> targetMembers = new ArrayList<>();
-            for (AnnotationTypeElementDoc member : members) {
-                if ((required && member.defaultValue() == null) ||
-                    ((!required) && member.defaultValue() != null)) {
-                    targetMembers.add(member);
-                }
-            }
-            return targetMembers.toArray(new AnnotationTypeElementDoc[]{});
-        }
-
-        private boolean found(List<ProgramElementDoc> list, ProgramElementDoc elem) {
-            for (ProgramElementDoc pgmelem : list) {
-                if (utils.matches(pgmelem, elem)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-
-        /**
-         * Is member overridden? The member is overridden if it is found in the
-         * same level hierarchy e.g. member at level "11" overrides member at
-         * level "111".
-         */
-        private boolean isOverridden(ProgramElementDoc pgmdoc, String level) {
-            Map<?,String> memberLevelMap = (Map<?,String>) memberNameMap.get(getMemberKey(pgmdoc));
-            if (memberLevelMap == null)
-                return false;
-            for (String mappedlevel : memberLevelMap.values()) {
-                if (mappedlevel.equals(STARTLEVEL) ||
-                    (level.startsWith(mappedlevel) &&
-                     !level.equals(mappedlevel))) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private ProgramElementDoc[] properties(final ClassDoc cd, final boolean filter) {
-            final MethodDoc[] allMethods = cd.methods(filter);
-            final FieldDoc[] allFields = cd.fields(false);
-
-            if (propertiesCache.containsKey(cd)) {
-                return propertiesCache.get(cd);
-            }
-
-            final List<MethodDoc> result = new ArrayList<>();
-
-            for (final MethodDoc propertyMethod : allMethods) {
-
-                if (!isPropertyMethod(propertyMethod)) {
-                    continue;
-                }
-
-                final MethodDoc getter = getterForField(allMethods, propertyMethod);
-                final MethodDoc setter = setterForField(allMethods, propertyMethod);
-                final FieldDoc field = fieldForProperty(allFields, propertyMethod);
-
-                addToPropertiesMap(setter, getter, propertyMethod, field);
-                getterSetterMap.put(propertyMethod, new GetterSetter(getter, setter));
-                result.add(propertyMethod);
-            }
-            final ProgramElementDoc[] resultAray =
-                    result.toArray(new ProgramElementDoc[result.size()]);
-            propertiesCache.put(cd, resultAray);
-            return resultAray;
-        }
-
-        private void addToPropertiesMap(MethodDoc setter,
-                                        MethodDoc getter,
-                                        MethodDoc propertyMethod,
-                                        FieldDoc field) {
-            if ((field == null)
-                    || (field.getRawCommentText() == null)
-                    || field.getRawCommentText().length() == 0) {
-                addToPropertiesMap(setter, propertyMethod);
-                addToPropertiesMap(getter, propertyMethod);
-                addToPropertiesMap(propertyMethod, propertyMethod);
-            } else {
-                addToPropertiesMap(getter, field);
-                addToPropertiesMap(setter, field);
-                addToPropertiesMap(propertyMethod, field);
-            }
-        }
-
-        private void addToPropertiesMap(ProgramElementDoc propertyMethod,
-                                        ProgramElementDoc commentSource) {
-            if (null == propertyMethod || null == commentSource) {
-                return;
-            }
-            final String methodRawCommentText = propertyMethod.getRawCommentText();
-
-            /* The second condition is required for the property buckets. In
-             * this case the comment is at the property method (not at the field)
-             * and it needs to be listed in the map.
-             */
-            if ((null == methodRawCommentText || 0 == methodRawCommentText.length())
-                    || propertyMethod.equals(commentSource)) {
-                classPropertiesMap.put(propertyMethod, commentSource);
-            }
-        }
-
-        private MethodDoc getterForField(MethodDoc[] methods,
-                                         MethodDoc propertyMethod) {
-            final String propertyMethodName = propertyMethod.name();
-            final String fieldName =
-                    propertyMethodName.substring(0,
-                            propertyMethodName.lastIndexOf("Property"));
-            final String fieldNameUppercased =
-                    "" + Character.toUpperCase(fieldName.charAt(0))
-                                            + fieldName.substring(1);
-            final String getterNamePattern;
-            final String fieldTypeName = propertyMethod.returnType().toString();
-            if ("boolean".equals(fieldTypeName)
-                    || fieldTypeName.endsWith("BooleanProperty")) {
-                getterNamePattern = "(is|get)" + fieldNameUppercased;
-            } else {
-                getterNamePattern = "get" + fieldNameUppercased;
-            }
-
-            for (MethodDoc methodDoc : methods) {
-                if (Pattern.matches(getterNamePattern, methodDoc.name())) {
-                    if (0 == methodDoc.parameters().length
-                            && (methodDoc.isPublic() || methodDoc.isProtected())) {
-                        return methodDoc;
-                    }
-                }
-            }
-            return null;
-        }
-
-        private MethodDoc setterForField(MethodDoc[] methods,
-                                         MethodDoc propertyMethod) {
-            final String propertyMethodName = propertyMethod.name();
-            final String fieldName =
-                    propertyMethodName.substring(0,
-                            propertyMethodName.lastIndexOf("Property"));
-            final String fieldNameUppercased =
-                    "" + Character.toUpperCase(fieldName.charAt(0))
-                                             + fieldName.substring(1);
-            final String setter = "set" + fieldNameUppercased;
-
-            for (MethodDoc methodDoc : methods) {
-                if (setter.equals(methodDoc.name())) {
-                    if (1 == methodDoc.parameters().length
-                            && "void".equals(methodDoc.returnType().simpleTypeName())
-                            && (methodDoc.isPublic() || methodDoc.isProtected())) {
-                        return methodDoc;
-                    }
-                }
-            }
-            return null;
-        }
-
-        private FieldDoc fieldForProperty(FieldDoc[] fields, MethodDoc property) {
-
-            for (FieldDoc field : fields) {
-                final String fieldName = field.name();
-                final String propertyName = fieldName + "Property";
-                if (propertyName.equals(property.name())) {
-                    return field;
-                }
-            }
-            return null;
-        }
-
-        // properties aren't named setA* or getA*
-        private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
-        private boolean isPropertyMethod(MethodDoc method) {
-            if (!configuration.javafx) {
-               return false;
-            }
-            if (!method.name().endsWith("Property")) {
-                return false;
-            }
-
-            if (! memberIsVisible(method)) {
-                return false;
-            }
-
-            if (pattern.matcher(method.name()).matches()) {
-                return false;
-            }
-            if (method.typeParameters().length > 0) {
-                return false;
-            }
-            return 0 == method.parameters().length
-                    && !"void".equals(method.returnType().simpleTypeName());
-        }
-
-        private void checkOnPropertiesTags(MethodDoc[] members) {
-            for (MethodDoc methodDoc: members) {
-                if (methodDoc.isIncluded()) {
-                    for (Tag tag: methodDoc.tags()) {
-                        String tagName = tag.name();
-                        if (tagName.equals("@propertySetter")
-                                || tagName.equals("@propertyGetter")
-                                || tagName.equals("@propertyDescription")) {
-                            if (!isPropertyGetterOrSetter(members, methodDoc)) {
-                                configuration.message.warning(tag.position(),
-                                        "doclet.javafx_tag_misuse");
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        private boolean isPropertyGetterOrSetter(MethodDoc[] members,
-                                                 MethodDoc methodDoc) {
-            boolean found = false;
-            String propertyName = utils.propertyNameFromMethodName(configuration, methodDoc.name());
-            if (!propertyName.isEmpty()) {
-                String propertyMethodName = propertyName + "Property";
-                for (MethodDoc member: members) {
-                    if (member.name().equals(propertyMethodName)) {
-                        found = true;
-                        break;
-                    }
-                }
-            }
-            return found;
-        }
-    }
-
-    private class GetterSetter {
-        private final ProgramElementDoc getter;
-        private final ProgramElementDoc setter;
-
-        public GetterSetter(ProgramElementDoc getter, ProgramElementDoc setter) {
-            this.getter = getter;
-            this.setter = setter;
-        }
-
-        public ProgramElementDoc getGetter() {
-            return getter;
-        }
-
-        public ProgramElementDoc getSetter() {
-            return setter;
-        }
-    }
-
-    /**
-     * Return true if this map has no visible members.
-     *
-     * @return true if this map has no visible members.
-     */
-    public boolean noVisibleMembers() {
-        return noVisibleMembers;
-    }
-
-    private ClassMember getClassMember(MethodDoc member) {
-        for (Object key : memberNameMap.keySet()) {
-            if (key instanceof String) {
-                continue;
-            } else if (((ClassMember) key).isEqual(member)) {
-                return (ClassMember) key;
-            }
-        }
-        return new ClassMember(member);
-    }
-
-    /**
-     * Return the key to the member map for the given member.
-     */
-    private Object getMemberKey(ProgramElementDoc doc) {
-        if (doc.isConstructor()) {
-            return doc.name() + ((ExecutableMemberDoc)doc).signature();
-        } else if (doc.isMethod()) {
-            return getClassMember((MethodDoc) doc);
-        } else if (doc.isField() || doc.isEnumConstant() || doc.isAnnotationTypeElement()) {
-            return doc.name();
-        } else { // it's a class or interface
-            String classOrIntName = doc.name();
-            //Strip off the containing class name because we only want the member name.
-            classOrIntName = classOrIntName.indexOf('.') != 0 ? classOrIntName.substring(classOrIntName.lastIndexOf('.'), classOrIntName.length()) : classOrIntName;
-            return "clint" + classOrIntName;
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
deleted file mode 100644
index 409e6d6746c..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.util.links;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * A factory that constructs links from given link information.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public abstract class LinkFactory {
-
-    /**
-     * Return an empty instance of a content object.
-     *
-     * @return an empty instance of a content object.
-     */
-    protected abstract Content newContent();
-
-    /**
-     * Constructs a link from the given link information.
-     *
-     * @param linkInfo the information about the link.
-     * @return the output of the link.
-     */
-    public Content getLink(LinkInfo linkInfo) {
-        if (linkInfo.type != null) {
-            Type type = linkInfo.type;
-            Content link = newContent();
-            if (type.isPrimitive()) {
-                //Just a primitive.
-                link.addContent(type.typeName());
-            } else if (type.asAnnotatedType() != null && type.dimension().length() == 0) {
-                link.addContent(getTypeAnnotationLinks(linkInfo));
-                linkInfo.type = type.asAnnotatedType().underlyingType();
-                link.addContent(getLink(linkInfo));
-                return link;
-            } else if (type.asWildcardType() != null) {
-                //Wildcard type.
-                linkInfo.isTypeBound = true;
-                link.addContent("?");
-                WildcardType wildcardType = type.asWildcardType();
-                Type[] extendsBounds = wildcardType.extendsBounds();
-                for (int i = 0; i < extendsBounds.length; i++) {
-                    link.addContent(i > 0 ? ", " : " extends ");
-                    setBoundsLinkInfo(linkInfo, extendsBounds[i]);
-                    link.addContent(getLink(linkInfo));
-                }
-                Type[] superBounds = wildcardType.superBounds();
-                for (int i = 0; i < superBounds.length; i++) {
-                    link.addContent(i > 0 ? ", " : " super ");
-                    setBoundsLinkInfo(linkInfo, superBounds[i]);
-                    link.addContent(getLink(linkInfo));
-                }
-            } else if (type.asTypeVariable()!= null) {
-                link.addContent(getTypeAnnotationLinks(linkInfo));
-                linkInfo.isTypeBound = true;
-                //A type variable.
-                Doc owner = type.asTypeVariable().owner();
-                if ((! linkInfo.excludeTypeParameterLinks) &&
-                        owner instanceof ClassDoc) {
-                    linkInfo.classDoc = (ClassDoc) owner;
-                    Content label = newContent();
-                    label.addContent(type.typeName());
-                    linkInfo.label = label;
-                    link.addContent(getClassLink(linkInfo));
-                } else {
-                    //No need to link method type parameters.
-                    link.addContent(type.typeName());
-                }
-
-                Type[] bounds = type.asTypeVariable().bounds();
-                if (! linkInfo.excludeTypeBounds) {
-                    linkInfo.excludeTypeBounds = true;
-                    for (int i = 0; i < bounds.length; i++) {
-                        link.addContent(i > 0 ? " & " : " extends ");
-                        setBoundsLinkInfo(linkInfo, bounds[i]);
-                        link.addContent(getLink(linkInfo));
-                    }
-                }
-            } else if (type.asClassDoc() != null) {
-                //A class type.
-                if (linkInfo.isTypeBound &&
-                        linkInfo.excludeTypeBoundsLinks) {
-                    //Since we are excluding type parameter links, we should not
-                    //be linking to the type bound.
-                    link.addContent(type.typeName());
-                    link.addContent(getTypeParameterLinks(linkInfo));
-                    return link;
-                } else {
-                    linkInfo.classDoc = type.asClassDoc();
-                    link = newContent();
-                    link.addContent(getClassLink(linkInfo));
-                    if (linkInfo.includeTypeAsSepLink) {
-                        link.addContent(getTypeParameterLinks(linkInfo, false));
-                    }
-                }
-            }
-
-            if (linkInfo.isVarArg) {
-                if (type.dimension().length() > 2) {
-                    //Javadoc returns var args as array.
-                    //Strip out the first [] from the var arg.
-                    link.addContent(type.dimension().substring(2));
-                }
-                link.addContent("...");
-            } else {
-                while (type != null && type.dimension().length() > 0) {
-                    if (type.asAnnotatedType() != null) {
-                        linkInfo.type = type;
-                        link.addContent(" ");
-                        link.addContent(getTypeAnnotationLinks(linkInfo));
-                        link.addContent("[]");
-                        type = type.asAnnotatedType().underlyingType().getElementType();
-                    } else {
-                        link.addContent("[]");
-                        type = type.getElementType();
-                    }
-                }
-                linkInfo.type = type;
-                Content newLink = newContent();
-                newLink.addContent(getTypeAnnotationLinks(linkInfo));
-                newLink.addContent(link);
-                link = newLink;
-            }
-            return link;
-        } else if (linkInfo.classDoc != null) {
-            //Just a class link
-            Content link = newContent();
-            link.addContent(getClassLink(linkInfo));
-            if (linkInfo.includeTypeAsSepLink) {
-                link.addContent(getTypeParameterLinks(linkInfo, false));
-            }
-            return link;
-        } else {
-            return null;
-        }
-    }
-
-    private void setBoundsLinkInfo(LinkInfo linkInfo, Type bound) {
-        linkInfo.classDoc = null;
-        linkInfo.label = null;
-        linkInfo.type = bound;
-    }
-
-    /**
-     * Return the link to the given class.
-     *
-     * @param linkInfo the information about the link to construct.
-     *
-     * @return the link for the given class.
-     */
-    protected abstract Content getClassLink(LinkInfo linkInfo);
-
-    /**
-     * Return the link to the given type parameter.
-     *
-     * @param linkInfo     the information about the link to construct.
-     * @param typeParam the type parameter to link to.
-     */
-    protected abstract Content getTypeParameterLink(LinkInfo linkInfo,
-        Type typeParam);
-
-    protected abstract Content getTypeAnnotationLink(LinkInfo linkInfo,
-            AnnotationDesc annotation);
-
-    /**
-     * Return the links to the type parameters.
-     *
-     * @param linkInfo     the information about the link to construct.
-     * @return the links to the type parameters.
-     */
-    public Content getTypeParameterLinks(LinkInfo linkInfo) {
-        return getTypeParameterLinks(linkInfo, true);
-    }
-
-    /**
-     * Return the links to the type parameters.
-     *
-     * @param linkInfo     the information about the link to construct.
-     * @param isClassLabel true if this is a class label.  False if it is
-     *                     the type parameters portion of the link.
-     * @return the links to the type parameters.
-     */
-    public Content getTypeParameterLinks(LinkInfo linkInfo, boolean isClassLabel) {
-        Content links = newContent();
-        Type[] vars;
-        if (linkInfo.executableMemberDoc != null) {
-            vars = linkInfo.executableMemberDoc.typeParameters();
-        } else if (linkInfo.type != null &&
-                linkInfo.type.asParameterizedType() != null){
-            vars =  linkInfo.type.asParameterizedType().typeArguments();
-        } else if (linkInfo.classDoc != null){
-            vars = linkInfo.classDoc.typeParameters();
-        } else {
-            //Nothing to document.
-            return links;
-        }
-        if (((linkInfo.includeTypeInClassLinkLabel && isClassLabel) ||
-             (linkInfo.includeTypeAsSepLink && ! isClassLabel)
-              )
-            && vars.length > 0) {
-            links.addContent("<");
-            for (int i = 0; i < vars.length; i++) {
-                if (i > 0) {
-                    links.addContent(",");
-                }
-                links.addContent(getTypeParameterLink(linkInfo, vars[i]));
-            }
-            links.addContent(">");
-        }
-        return links;
-    }
-
-    public Content getTypeAnnotationLinks(LinkInfo linkInfo) {
-        Content links = newContent();
-        if (linkInfo.type.asAnnotatedType() == null)
-            return links;
-        AnnotationDesc[] annotations = linkInfo.type.asAnnotatedType().annotations();
-        for (int i = 0; i < annotations.length; i++) {
-            if (i > 0) {
-                links.addContent(" ");
-            }
-            links.addContent(getTypeAnnotationLink(linkInfo, annotations[i]));
-        }
-
-        links.addContent(" ");
-        return links;
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
deleted file mode 100644
index 78b18f01de7..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.util.links;
-
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.Configuration;
-import com.sun.tools.doclets.internal.toolkit.Content;
-
-/**
- * Encapsulates information about a link.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public abstract class LinkInfo {
-
-    /**
-     * The ClassDoc we want to link to.  Null if we are not linking
-     * to a ClassDoc.
-     */
-    public ClassDoc classDoc;
-
-    /**
-     * The executable member doc we want to link to.  Null if we are not linking
-     * to an executable member.
-     */
-    public ExecutableMemberDoc executableMemberDoc;
-
-    /**
-     * The Type we want to link to.  Null if we are not linking to a type.
-     */
-    public Type type;
-
-    /**
-     * True if this is a link to a VarArg.
-     */
-    public boolean isVarArg = false;
-
-    /**
-     * Set this to true to indicate that you are linking to a type parameter.
-     */
-    public boolean isTypeBound = false;
-
-    /**
-     * Whether the document element is in a Java 5 declaration
-     * location or not.
-     */
-    public boolean isJava5DeclarationLocation = true;
-
-    /**
-     * The label for the link.
-     */
-    public Content label;
-
-    /**
-     * True if the link should be strong.
-     */
-    public boolean isStrong = false;
-
-    /**
-     * True if we should include the type in the link label.  False otherwise.
-     */
-    public boolean includeTypeInClassLinkLabel = true;
-
-    /**
-     * True if we should include the type as separate link.  False otherwise.
-     */
-    public boolean includeTypeAsSepLink = false;
-
-    /**
-     * True if we should exclude the type bounds for the type parameter.
-     */
-    public boolean excludeTypeBounds = false;
-
-    /**
-     * True if we should print the type parameters, but not link them.
-     */
-    public boolean excludeTypeParameterLinks = false;
-
-    /**
-     * True if we should print the type bounds, but not link them.
-     */
-    public boolean excludeTypeBoundsLinks = false;
-
-    /**
-     * By default, the link can be to the page it's already on.  However,
-     * there are cases where we don't want this (e.g. heading of class page).
-     */
-    public boolean linkToSelf = true;
-
-    /**
-     * Return an empty instance of a content object.
-     *
-     * @return an empty instance of a content object.
-     */
-    protected abstract Content newContent();
-
-    /**
-     * Return true if this link is linkable and false if we can't link to the
-     * desired place.
-     *
-     * @return true if this link is linkable and false if we can't link to the
-     * desired place.
-     */
-    public abstract boolean isLinkable();
-
-    /**
-     * Return the label for this class link.
-     *
-     * @param configuration the current configuration of the doclet.
-     * @return the label for this class link.
-     */
-    public Content getClassLinkLabel(Configuration configuration) {
-        if (label != null && !label.isEmpty()) {
-            return label;
-        } else if (isLinkable()) {
-            Content label = newContent();
-            label.addContent(classDoc.name());
-            return label;
-        } else {
-            Content label = newContent();
-            label.addContent(configuration.getClassName(classDoc));
-            return label;
-        }
-    }
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
deleted file mode 100644
index bc84ab398e8..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.doclets.internal.toolkit.util.links;
-
-/**
- * Stores output of a link.
- *
- *  <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>
- *
- * @author Jamie Ho
- * @since 1.5
- */
-@Deprecated
-public interface LinkOutput {
-
-    /**
-     * Append the given object to the output.
-     *
-     * @param o the object to append.
-     */
-    public void append(Object o);
-
-    /**
-     * Insert the given object into the output sequence.
-     *
-     * @param offset the offset.
-     * @param o the object to be inserted.
-     */
-    public void insert(int offset, Object o);
-}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
deleted file mode 100644
index da4d9455716..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package-info.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-/**
-    Provides a factory for constructing links.
-
-    <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>
-*/
-
-package com.sun.tools.doclets.internal.toolkit.util.links;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
deleted file mode 100644
index ef49b0ab1e2..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/package-info.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
-    This package has utility classes that perform common services required
-    for API documentation generation.
-
-    <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>
-*/
-
-package com.sun.tools.doclets.internal.toolkit.util;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java
deleted file mode 100644
index c8912b29074..00000000000
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/package-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2003, 2017, 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.
- */
-
-/**
-<p style="font-style: italic; font-size:larger">
-<b>Note:</b> The declarations in this package have been superseded by those
-in the new package {@link jdk.javadoc.doclet}.
-</p>
-*/
-
-package com.sun.tools.doclets;
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
index fbff58b81c5..5e3cef07c0f 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,32 +25,26 @@
 
 package com.sun.tools.doclets.standard;
 
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.formats.html.*;
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.DocErrorReporter;
+import com.sun.javadoc.PackageDoc;
+import com.sun.javadoc.RootDoc;
 
 /**
- * This doclet generates HTML-formatted documentation for the specified packages and types.
+ * This is not the doclet you are looking for.
  * @deprecated The doclet has been superseded by its replacement,
  * {@link jdk.javadoc.doclet.StandardDoclet}.
  */
 @Deprecated(forRemoval=true, since="9")
+@SuppressWarnings("deprecation")
 public class Standard {
 
-    public static int optionLength(String option) {
-        return HtmlDoclet.optionLength(option);
-    }
-
     public static boolean start(RootDoc root) {
-        return HtmlDoclet.start(root);
+        root.printNotice("Notice: " + "This is not the Standard Doclet");
+        return true;
     }
 
-    public static boolean validOptions(String[][] options,
-                                   DocErrorReporter reporter) {
-        return HtmlDoclet.validOptions(options, reporter);
+    public static int optionLength(String option) {
+        return 0;  // all options are unsupported
     }
-
-    public static LanguageVersion languageVersion() {
-        return HtmlDoclet.languageVersion();
-    }
-
 }
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java
index 4b93a8cbd8b..860dd11c2c3 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java
@@ -25,7 +25,7 @@
 
 /**
 <p style="font-style: italic; font-size:larger">
-<b>Note:</b> The declarations in this package have been superseded by those
+<b>Note:</b> The declarations in this package have been replaced by those
 in the new package {@link jdk.javadoc.doclet}.
 </p>
 */
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java
index c8c85c01299..71498382695 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -36,8 +36,6 @@ import javax.tools.FileObject;
 
 import com.sun.javadoc.*;
 import com.sun.source.util.TreePath;
-import com.sun.tools.doclets.internal.toolkit.util.DocletAbortException;
-import com.sun.tools.doclets.internal.toolkit.util.FatalError;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.util.Position;
@@ -135,7 +133,7 @@ public abstract class DocImpl implements Doc, Comparable<Object> {
                     @Override
                     public void report() {
                         env.error(DocImpl.this, "javadoc.JavaScript_in_comment");
-                        throw new FatalError();
+                        throw new Error();
                     }
                 });
             }
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
index 7fb5130b3b0..309c4b9416b 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
@@ -88,9 +88,6 @@ import static jdk.javadoc.internal.tool.Main.Result.*;
  */
 public class Start extends ToolOption.Helper {
 
-    private static final String OldStdDocletName =
-        "com.sun.tools.doclets.standard.Standard";
-
     private static final Class<?> StdDoclet =
             jdk.javadoc.doclet.StandardDoclet.class;
     /** Context for this invocation. */
@@ -301,43 +298,23 @@ public class Start extends ToolOption.Helper {
 
     /**
      * Main program - external wrapper. In order to maintain backward
-     * CLI  compatibility, we dispatch to the old tool or the old doclet's
-     * Start mechanism, based on the options present on the command line
-     * with the following precedence:
-     *   1. presence of -Xold, dispatch to old tool
-     *   2. doclet variant, if old, dispatch to old Start
-     *   3. taglet variant, if old, dispatch to old Start
+     * CLI compatibility, the execution is dispatched to the appropriate
+     * Start mechanism, depending on the doclet variant.
      *
-     * Thus the presence of -Xold switches the tool, soon after command files
-     * if any, are expanded, this is performed here, noting that the messager
-     * is available at this point in time.
-     * The doclet/taglet tests are performed in the begin method, further on,
+     * The doclet tests are performed in the begin method, further on,
      * this is to minimize argument processing and most importantly the impact
-     * of class loader creation, needed to detect the doclet/taglet class variants.
+     * of class loader creation, needed to detect the doclet class variants.
      */
     @SuppressWarnings("deprecation")
     Result begin(String... argv) {
         // Preprocess @file arguments
         try {
             argv = CommandLine.parse(argv);
+            return begin(Arrays.asList(argv), Collections.emptySet());
         } catch (IOException e) {
             error("main.cant.read", e.getMessage());
             return ERROR;
         }
-
-        if (argv.length > 0 && "-Xold".equals(argv[0])) {
-            warn("main.legacy_api");
-            String[] nargv = Arrays.copyOfRange(argv, 1, argv.length);
-            int rc = com.sun.tools.javadoc.Main.execute(
-                    messager.programName,
-                    messager.getWriter(WriterKind.ERROR),
-                    messager.getWriter(WriterKind.WARNING),
-                    messager.getWriter(WriterKind.NOTICE),
-                    OldStdDocletName,
-                    nargv);
-            return (rc == 0) ? OK : ERROR;
-        }
-        return begin(Arrays.asList(argv), Collections.emptySet());
     }
 
     // Called by 199 API.
@@ -413,7 +390,7 @@ public class Start extends ToolOption.Helper {
                     messager.getWriter(WriterKind.ERROR),
                     messager.getWriter(WriterKind.WARNING),
                     messager.getWriter(WriterKind.NOTICE),
-                    "com.sun.tools.doclets.standard.Standard",
+                    docletClass.getName(),
                     array);
             return (rc == 0) ? OK : ERROR;
         }
@@ -749,8 +726,7 @@ public class Start extends ToolOption.Helper {
                 }
             }
             try {
-                Class<?> klass = cl.loadClass(userDocletName);
-                return klass;
+                return cl.loadClass(userDocletName);
             } catch (ClassNotFoundException cnfe) {
                 if (apiMode) {
                     throw new IllegalArgumentException("Cannot find doclet class " + userDocletName,
@@ -766,12 +742,6 @@ public class Start extends ToolOption.Helper {
             return loadDocletClass(docletName);
         }
 
-        // Step 5: we don't have a doclet specified, do we have taglets ?
-        if (!userTagletNames.isEmpty() && hasOldTaglet(userTagletNames, userTagletPath)) {
-            // found a bogey, return the old doclet
-            return loadDocletClass(OldStdDocletName);
-        }
-
         // finally
         return StdDoclet;
     }
@@ -788,41 +758,6 @@ public class Start extends ToolOption.Helper {
         }
     }
 
-    /*
-     * This method returns true iff it finds a legacy taglet, but for
-     * all other conditions including errors it returns false, allowing
-     * nature to take its own course.
-     */
-    @SuppressWarnings("deprecation")
-    private boolean hasOldTaglet(List<String> tagletNames, List<File> tagletPaths) throws ToolException {
-        if (!fileManager.hasLocation(TAGLET_PATH)) {
-            try {
-                ((StandardJavaFileManager) fileManager).setLocation(TAGLET_PATH, tagletPaths);
-            } catch (IOException ioe) {
-                String text = messager.getText("main.doclet_could_not_set_location", tagletPaths);
-                throw new ToolException(CMDERR, text, ioe);
-            }
-        }
-        ClassLoader cl = fileManager.getClassLoader(TAGLET_PATH);
-        if (cl == null) {
-            // no classloader found!
-            String text = messager.getText("main.doclet_no_classloader_found", tagletNames.get(0));
-            throw new ToolException(CMDERR, text);
-        }
-        for (String tagletName : tagletNames) {
-            try {
-                Class<?> klass = cl.loadClass(tagletName);
-                if (com.sun.tools.doclets.Taglet.class.isAssignableFrom(klass)) {
-                    return true;
-                }
-            } catch (ClassNotFoundException cnfe) {
-                String text = messager.getText("main.doclet_class_not_found", tagletName);
-                throw new ToolException(CMDERR, text, cnfe);
-            }
-        }
-        return false;
-    }
-
     private void parseArgs(List<String> args, List<String> javaNames) throws ToolException,
             OptionException, com.sun.tools.javac.main.Option.InvalidValueException {
         for (int i = 0 ; i < args.size() ; i++) {
diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
index 5b338f4d8ec..46e5b09f514 100644
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
@@ -359,15 +359,6 @@ public enum ToolOption {
         public void process(Helper helper) {
             throw new AssertionError("the -J flag should be caught by the launcher.");
         }
-    },
-
-    // This option exists only for the purpose of documenting itself.
-    // It's actually implemented ahead of the normal option decoding loop.
-    Xold("-Xold", EXTENDED) {
-        @Override
-        public void process(Helper helper) {
-            throw new AssertionError("the -Xold flag should be handled earlier.");
-        }
     };
 
     public final String primaryName;
diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/langtools/src/jdk.javadoc/share/classes/module-info.java
index 5499c7127d1..8a442f2212a 100644
--- a/langtools/src/jdk.javadoc/share/classes/module-info.java
+++ b/langtools/src/jdk.javadoc/share/classes/module-info.java
@@ -39,8 +39,6 @@ module jdk.javadoc {
     requires java.xml;
 
     exports com.sun.javadoc;
-    exports com.sun.tools.doclets;
-    exports com.sun.tools.doclets.standard;
     exports com.sun.tools.javadoc;
 
     exports jdk.javadoc.doclet;
diff --git a/langtools/test/com/sun/javadoc/5093723/DocumentedClass.java b/langtools/test/com/sun/javadoc/5093723/DocumentedClass.java
deleted file mode 100644
index 659cbb77f40..00000000000
--- a/langtools/test/com/sun/javadoc/5093723/DocumentedClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2009 Google, Inc.  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.
- */
-
-/** A documented class. */
-public class DocumentedClass extends UndocumentedClass {
-  /** {@link #method} */
-  public void m1() {}
-  /** {@link #publicMethod} */
-  public void m2() {}
-  /** {@link #protectedMethod} */
-  public void m3() {}
-  /** {@link #privateMethod} */
-  public void m4() {}
-}
diff --git a/langtools/test/com/sun/javadoc/5093723/T5093723.java b/langtools/test/com/sun/javadoc/5093723/T5093723.java
deleted file mode 100644
index 1dba9fd617c..00000000000
--- a/langtools/test/com/sun/javadoc/5093723/T5093723.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2009 Google, Inc.  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      5093723
- * @summary  REGRESSION: ClassCastException in SingleIndexWriter
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main T5093723
- */
-
-public class T5093723 extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        T5093723 tester = new T5093723();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-Xdoclint:none",
-                testSrc("DocumentedClass.java"),
-                testSrc("UndocumentedClass.java"));
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/5093723/UndocumentedClass.java b/langtools/test/com/sun/javadoc/5093723/UndocumentedClass.java
deleted file mode 100644
index b31dea6aa51..00000000000
--- a/langtools/test/com/sun/javadoc/5093723/UndocumentedClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2009 Google, Inc.  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.
- */
-
-class UndocumentedClass {
-    void method() {}
-    public void publicMethod() {}
-    protected void protectedMethod() {}
-    private void privateMethod() {}
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java
deleted file mode 100644
index 7e944520745..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4706779 4956908
- * @summary  Add text equivalent of class tree ASCII art for accessibility
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main AccessAsciiArt
- */
-
-public class AccessAsciiArt extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        AccessAsciiArt tester = new AccessAsciiArt();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "p1", "p1.subpkg");
-        checkExit(Exit.OK);
-
-        checkOutput("p1/subpkg/SSC.html", true,
-                // Test the top line of the class tree
-                "<li><a href=\"../../p1/C.html\" title=\"class in p1\">p1.C</a></li>",
-                // Test the second line of the class tree
-                "<li><a href=\"../../p1/SC.html\" title=\"class in p1\">p1.SC</a></li>",
-                // Test the third line of the class tree
-                "<li>p1.subpkg.SSC</li>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/C.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/C.java
deleted file mode 100644
index e1e1b8c4504..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/C.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C implements SI {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/I.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/I.java
deleted file mode 100644
index b406858ef51..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/I.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public interface I {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java
deleted file mode 100644
index 0fab6aa424a..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class SC extends C {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java
deleted file mode 100644
index 76feb446167..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public interface SI extends I {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java b/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java
deleted file mode 100644
index 6b25f66cbd9..00000000000
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1.subpkg;
-
-public class SSC extends p1.SC {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java b/langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java
deleted file mode 100644
index cc262bd6af8..00000000000
--- a/langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4636655
- * @summary  Add title attribute to <FRAME> tags for accessibility
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main AccessFrameTitle
- */
-
-public class AccessFrameTitle extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        AccessFrameTitle tester = new AccessFrameTitle();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Testing only for the presence of the title attributes.
-        // To make this test more robust, only
-        // the initial part of each title string is tested for,
-        // in case the ending part of the string later changes
-        checkOutput("index.html", true,
-                "title=\"All classes and interfaces (except non-static nested types)\"",
-                "title=\"All Packages\"",
-                "title=\"Package, class and interface descriptions\"");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java b/langtools/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java
deleted file mode 100644
index e72eeab81a0..00000000000
--- a/langtools/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java b/langtools/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java b/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java
deleted file mode 100644
index 78a3ac5d665..00000000000
--- a/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4636667 7052425 8016549
- * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main AccessH1
- */
-
-
-public class AccessH1 extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        AccessH1 tester = new AccessH1();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-doctitle", "Document Title",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Test the style sheet
-        checkOutput("stylesheet.css", true,
-                "h1 {\n"
-                + "    font-size:20px;\n"
-                + "}");
-
-        // Test the doc title in the overview page
-        checkOutput("overview-summary.html", true,
-                "<h1 class=\"title\">Document Title</h1>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AccessH1/p1/C.java b/langtools/test/com/sun/javadoc/AccessH1/p1/C.java
deleted file mode 100644
index 4a5f6dc179d..00000000000
--- a/langtools/test/com/sun/javadoc/AccessH1/p1/C.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessH1/p2/C2.java b/langtools/test/com/sun/javadoc/AccessH1/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/AccessH1/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java b/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
deleted file mode 100644
index ce17788098f..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4638136 7198273 8025633 8081854
- * @summary  Add ability to skip over nav bar for accessibility
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main AccessSkipNav
- */
-
-public class AccessSkipNav extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        AccessSkipNav tester = new AccessSkipNav();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Testing only for the presence of the <a href> and <a name>
-        checkOutput("p1/C1.html", true,
-                // Top navbar <a href>
-                "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
-                // Top navbar <a name>
-                "<a name=\"skip.navbar.top\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                // Bottom navbar <a href>
-                "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
-                // Bottom navbar <a name>
-                "<a name=\"skip.navbar.bottom\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSkipNav/p1/C1.java b/langtools/test/com/sun/javadoc/AccessSkipNav/p1/C1.java
deleted file mode 100644
index e72eeab81a0..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/p1/C1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSkipNav/p2/C2.java b/langtools/test/com/sun/javadoc/AccessSkipNav/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java b/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
deleted file mode 100644
index 9eb88476966..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      4637604 4775148
- * @summary  Test the tables for summary attribute
- * @author   dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main AccessSummary
- */
-
-public class AccessSummary extends JavadocTester {
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        AccessSummary tester = new AccessSummary();
-        tester.runTests();
-    }
-
-    @Test
-    void testAccessSummary() {
-        javadoc("-d", "out", "-sourcepath", testSrc, "p1", "p2");
-        checkExit(Exit.OK);
-        checkOutput("overview-summary.html", true,
-                 "summary=\"Packages table, listing packages, and an explanation\"");
-
-        // Test that the summary attribute appears
-        checkOutput("p1/C1.html", true,
-                 "summary=\"Constructor Summary table, listing constructors, and an explanation\"");
-
-        // Test that the summary attribute appears
-        checkOutput("constant-values.html", true,
-                 "summary=\"Constant Field Values table, listing constant fields, and values\"");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSummary/p1/C1.java b/langtools/test/com/sun/javadoc/AccessSummary/p1/C1.java
deleted file mode 100644
index a213805c576..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSummary/p1/C1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C1 {
-
-    public static final String STATICFINALFIELD = "test";
-
-}
diff --git a/langtools/test/com/sun/javadoc/AccessSummary/p2/C2.java b/langtools/test/com/sun/javadoc/AccessSummary/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/AccessSummary/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java b/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java
deleted file mode 100644
index b57604baa9e..00000000000
--- a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4651598 8026567
- * @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main AuthorDD
- */
-
-/**
- * Runs javadoc and runs regression tests on the resulting HTML.
- */
-public class AuthorDD extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        AuthorDD tester = new AuthorDD();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        // Test for all cases except the split index page
-        javadoc("-d", "out",
-                "-author",
-                "-version",
-                "-sourcepath", testSrc,
-                "p1");
-        checkExit(Exit.OK);
-
-        checkOutput("p1/C1.html", true,
-                // Test single @since tag:
-                "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>JDK 1.0</dd>",
-                // Test multiple @author tags:
-                "<dt><span class=\"simpleTagLabel\">Author:</span></dt>\n"
-                + "<dd>Doug Kramer, Jamie, Neal</dd>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/AuthorDD/p1/C1.java b/langtools/test/com/sun/javadoc/AuthorDD/p1/C1.java
deleted file mode 100644
index a47ca792fdc..00000000000
--- a/langtools/test/com/sun/javadoc/AuthorDD/p1/C1.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-/**
- * This is the class documentation.
- * Testing multiple @since and @version tags only to see if all
- * instances of SimpleTaglet have the same bug
- *
- * @author Doug Kramer
- * @author Jamie
- * @author Neal
- *
- * @since  JDK 1.0
- *
- * @version 1.1
- * @version 1.2
- * @version 1.3
- */
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java b/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java
deleted file mode 100644
index b228790dc02..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4524350 4662945 4633447
- * @summary stddoclet: {@docRoot} inserts an extra trailing "/"
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main DocRootSlash
- */
-
-import java.util.regex.*;
-
-/**
- * Runs javadoc and runs regression tests on the resulting HTML.
- * It reads each file, complete with newlines, into a string to easily
- * find strings that contain newlines.
- */
-public class DocRootSlash extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        DocRootSlash tester = new DocRootSlash();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        // Directory that contains source files that javadoc runs on
-        String srcdir = System.getProperty("test.src", ".");
-
-        javadoc("-d", "out",
-                "-Xdoclint:none",
-                "-overview", (srcdir + "/overview.html"),
-                "-header", "<A HREF=\"{@docroot}/package-list\">{&#064;docroot}</A> <A HREF=\"{@docRoot}/help-doc\">{&#064;docRoot}</A>",
-                "-sourcepath", srcdir,
-                "p1", "p2");
-
-        checkFiles(
-                "p1/C1.html" ,
-                "p1/package-summary.html",
-                "overview-summary.html");
-
-        // Bug 4633447: Special test for overview-frame.html
-        // Find two strings in file "overview-frame.html"
-        checkOutput("overview-frame.html", true,
-                "<A HREF=\"./package-list\">",
-                "<A HREF=\"./help-doc\">");
-    }
-
-    void checkFiles(String... filenameArray) {
-        int count = 0;
-
-        for (String f : filenameArray) {
-            // Read contents of file into a string
-            String fileString = readFile(f);
-            System.out.println("\nSub-tests for file: " + f + " --------------");
-            // Loop over all tests in a single file
-            for ( int j = 0; j < 11; j++ ) {
-
-                // Compare actual to expected string for a single subtest
-                compareActualToExpected(++count, fileString);
-            }
-        }
-    }
-
-    /**
-     * Regular expression pattern matching code
-     *
-     * Prefix Pattern:
-     * flag   (?i)            (case insensitive, so "a href" == "A HREF" and all combinations)
-     * group1 (
-     *          <a or <A
-     *          \\s+          (one or more whitespace characters)
-     *          href or HREF
-     *          \"            (double quote)
-     *        )
-     * group2 ([^\"]*)        (link reference -- characters that don't include a quote)
-     * group3 (\".*?>)        (" target="frameName">)
-     * group4 (.*?)           (label - zero or more characters)
-     * group5 (</a>)          (end tag)
-     */
-    private static final String prefix = "(?i)(<a\\s+href=";    // <a href=     (start group1)
-    private static final String ref1   = "\")([^\"]*)(\".*?>)"; // doublequotes (end group1, group2, group3)
-    private static final String ref2   = ")(\\S+?)([^<>]*>)";   // no quotes    (end group1, group2, group3)
-    private static final String label  = "(.*?)";               // text label   (group4)
-    private static final String end    = "(</a>)";              // </a>         (group5)
-
-    /**
-     * Compares the actual string to the expected string in the specified string
-     * @param str   String to search through
-     */
-    void compareActualToExpected(int count, String str) {
-        checking("comparison for " + str);
-
-        // Pattern must be compiled each run because numTestsRun is incremented
-        Pattern actualLinkPattern1 =
-            Pattern.compile("Sub-test " + count + " Actual: " + prefix + ref1, Pattern.DOTALL);
-        Pattern expectLinkPattern1 =
-            Pattern.compile("Sub-test " + count + " Expect: " + prefix + ref1, Pattern.DOTALL);
-        // Pattern linkPattern2 = Pattern.compile(prefix + ref2 + label + end, Pattern.DOTALL);
-
-        Matcher actualLinkMatcher1 = actualLinkPattern1.matcher(str);
-        Matcher expectLinkMatcher1 = expectLinkPattern1.matcher(str);
-        if (expectLinkMatcher1.find() && actualLinkMatcher1.find()) {
-            String expectRef = expectLinkMatcher1.group(2);
-            String actualRef = actualLinkMatcher1.group(2);
-            if (actualRef.equals(expectRef)) {
-                passed(expectRef);
-                // System.out.println("pattern:   " + actualLinkPattern1.pattern());
-                // System.out.println("actualRef: " + actualRef);
-                // System.out.println("group0:    " + actualLinkMatcher1.group());
-                // System.out.println("group1:    " + actualLinkMatcher1.group(1));
-                // System.out.println("group2:    " + actualLinkMatcher1.group(2));
-                // System.out.println("group3:    " + actualLinkMatcher1.group(3));
-                // System.exit(0);
-            } else {
-                failed("\n"
-                        + "Actual: \"" + actualRef + "\"\n"
-                        + "Expect: \"" + expectRef + "\"");
-            }
-        } else {
-            failed("Didn't find <A HREF> that fits the pattern: "
-                    + expectLinkPattern1.pattern());
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/overview.html b/langtools/test/com/sun/javadoc/DocRootSlash/overview.html
deleted file mode 100644
index 56ccb05b517..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/overview.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<BODY>
-
-Dummy first sentence to suppress BreakIterator warning.
-<p>
-
-Case 0 Actual: <A HREF=".">.</A> &nbsp; Current directory
-<p>
-Sub-test 23 Actual: <A HREF="{@docroot}">{&#064;docroot}</A> Bare tag - ALL LOWERCASE <br>
-Sub-test 23 Expect: <A HREF=""></A> <br>
-(Expect empty string because lowercase docroot is illegal) 
-<p>
-
-Sub-test 24 Actual: <A HREF="{@docRoot}">{&#064;docRoot}</A> Bare tag - "R" UPPERCASE <br>
-Sub-test 24 Expect: <A HREF=".">.</A>
-<p>
-
-Sub-test 25 Actual: <A HREF="{@docRoot}/package-list">{&#064;docRoot}/package-list</A>  <br>
-Sub-test 25 Expect: <A HREF="./package-list">./package-list</A>
-<p>
-
-Sub-test 26 Actual: <A HREF="{@docRoot}/p2/C2.html">{&#064;docRoot}/p2/C2.html</A>  <br>
-Sub-test 26 Expect: <A HREF="./p2/C2.html">./p2/C2.html</A>
-<p>
-
-Sub-test 27 Actual: <A HREF="{@docRoot}/../docs1/p2/C2.html">{&#064;docRoot}/../docs1/p2/C2.html</A> <br>
-Sub-test 27 Expect: <A HREF="./../docs1/p2/C2.html">./../docs1/p2/C2.html</A>
-<p>
-
-Sub-test 28 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A>  <br>
-Sub-test 28 Expect: <A HREF="./p2/package-summary.html#package_description">./p2/package-summary.html#package_description</A>
-<p>
-
-Sub-test 29 Actual: <A HREF="{@docRoot}/../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
-Sub-test 29 Expect: <A HREF="./../docs1/p2/package-summary.html#package_description">./../docs1/p2/package-summary.html#package_description</A>
-<p>
-
-<!-- ============================================================== -->
-
-Allow docRoot to work without a trailing slash for those who had to change their comments
-to work with the 1.4.0 bug:
-<p>
-
-Sub-test 30 Actual: <A HREF="{@docRoot}p2/C2.html">{&#064;docRoot}p2/C2.html</A>  <br>
-Sub-test 30 Expect: <A HREF=".p2/C2.html">./p2/C2.html</A>
-<p>
-
-Sub-test 31 Actual: <A HREF="{@docRoot}../docs1/p2/C2.html">{&#064;docRoot}../docs1/p2/C2.html</A> <br>
-Sub-test 31 Expect: <A HREF=".../docs1/p2/C2.html">./../docs1/p2/C2.html</A>
-<p>
-
-Sub-test 32 Actual: <A HREF="{@docRoot}p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A>  <br>
-Sub-test 32 Expect: <A HREF=".p2/package-summary.html#package_description">./p2/package-summary.html#package_description</A>
-
-<p>
-Sub-test 33 Actual: <A HREF="{@docRoot}../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
-Sub-test 33 Expect: <A HREF=".../docs1/p2/package-summary.html#package_description">./../docs1/p2/package-summary.html#package_description</A>
-
-</BODY>
-</HTML>
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/p1/C1.java b/langtools/test/com/sun/javadoc/DocRootSlash/p1/C1.java
deleted file mode 100644
index 69f8df4dc4c..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/p1/C1.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-/**
- * Dummy first sentence to suppress breakiterator warning.
- * <p>
- *
- * Case 0 Actual: <A HREF=".">.</A> &nbsp; Current directory
- * <p>
- *
- * Sub-test 1 Actual: <A HREF="{@docroot}">{&#064;docroot}</A> Bare tag - ALL LOWERCASE <br>
- * Sub-test 1 Expect: <A HREF=""></A> <br>
- * (Expect empty string because lowercase docroot is illegal)
- * <p>
- *
- * Sub-test 2 Actual: <A HREF="{@docRoot}">{&#064;docRoot}</A> Bare tag - "R" UPPERCASE <br>
- * Sub-test 2 Expect: <A HREF="..">..</A>
- * <p>
- *
- * Sub-test 3 Actual: <A HREF="{@docRoot}/package-list">{&#064;docRoot}/package-list</A> <br>
- * Sub-test 3 Expect: <A HREF="../package-list">../package-list</A>
- * <p>
- *
- * Sub-test 4 Actual: <A HREF="{@docRoot}/p2/C2.html">{&#064;docRoot}/p2/C2.html</A> <br>
- * Sub-test 4 Expect: <A HREF="../p2/C2.html">../p2/C2.html</A>
- * <p>
- *
- * Sub-test 5 Actual: <A HREF="{@docRoot}/../docs1/p2/C2.html">{&#064;docRoot}/../docs1/p2/C2.html</A> <br>
- * Sub-test 5 Expect: <A HREF="../../docs1/p2/C2.html">../../docs1/p2/C2.html</A>
- * <p>
- *
- * Sub-test 6 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A> <br>
- * Sub-test 6 Expect: <A HREF="../p2/package-summary.html#package_description">../p2/package-summary.html#package_description</A>
- * <p>
- *
- * Sub-test 7 Actual: <A HREF="{@docRoot}/../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
- * Sub-test 7 Expect: <A HREF="../../docs1/p2/package-summary.html#package_description">../../docs1/p2/package-summary.html#package_description</A>
- * <p>
- *
- * <!-- =================================================================== -->
- *
- * Allow docRoot to work without a trailing slash for those who had to change their comments
- * to work with the 1.4.0 bug:
- * <p>
- *
- * Sub-test 8 Actual: <A HREF="{@docRoot}p2/C2.html">{&#064;docRoot}p2/C2.html</A> <br>
- * Sub-test 8 Expect: <A HREF="..p2/C2.html">../p2/C2.html</A>
- * <p>
- *
- * Sub-test 9 Actual: <A HREF="{@docRoot}../docs1/p2/C2.html">{&#064;docRoot}../docs1/p2/C2.html</A> <br>
- * Sub-test 9 Expect: <A HREF="..../docs1/p2/C2.html">../../docs1/p2/C2.html</A>
- * <p>
- *
- * Sub-test 10 Actual: <A HREF="{@docRoot}p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A> <br>
- * Sub-test 10 Expect: <A HREF="..p2/package-summary.html#package_description">../p2/package-summary.html#package_description#package_description</A>
- * <p>
- *
- * Sub-test 11 Actual: <A HREF="{@docRoot}../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
- * Sub-test 11 Expect: <A HREF="..../docs1/p2/package-summary.html#package_description">../../docs1/p2/package-summary.html#package_description</A>
- *
- */
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/p1/package.html b/langtools/test/com/sun/javadoc/DocRootSlash/p1/package.html
deleted file mode 100644
index abda92fd0c7..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/p1/package.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<BODY>
-
-Dummy first sentence to suppress breakiterator warning.
-<p>
-
-Case 0 Actual: <A HREF=".">.</A> &nbsp; Current directory
-<p>
-
-Sub-test 12 Actual: <A HREF="{@docroot}">{&#064;docroot}</A> Bare tag - ALL LOWERCASE <br>
-Sub-test 12 Expect: <A HREF=""></A> <br>
-(Expect empty string because lowercase docroot is illegal)
-<p>
-
-Sub-test 13 Actual: <A HREF="{@docRoot}">{&#064;docRoot}</A> Bare tag - "R" UPPERCASE <br>
-Sub-test 13 Expect: <A HREF="..">..</A>
-<p>
-
-Sub-test 14 Actual: <A HREF="{@docRoot}/package-list">{&#064;docRoot}/package-list</A> <br>
-Sub-test 14 Expect: <A HREF="../package-list">../package-list</A>
-<p>
-
-Sub-test 15 Actual: <A HREF="{@docRoot}/p2/C2.html">{&#064;docRoot}/p2/C2.html</A> <br>
-Sub-test 15 Expect: <A HREF="../p2/C2.html">../p2/C2.html</A>
-<p>
-
-Sub-test 16 Actual: <A HREF="{@docRoot}/../docs1/p2/C2.html">{&#064;docRoot}/../docs1/p2/C2.html</A> <br>
-Sub-test 16 Expect: <A HREF="../../docs1/p2/C2.html">../../docs1/p2/C2.html</A>
-<p>
-
-Sub-test 17 Actual: <A HREF="{@docRoot}/p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A> <br>
-Sub-test 17 Expect: <A HREF="../p2/package-summary.html#package_description">../p2/package-summary.html#package_description</A>
-<p>
-
-Sub-test 18 Actual: <A HREF="{@docRoot}/../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
-Sub-test 18 Expect: <A HREF="../../docs1/p2/package-summary.html#package_description">../../docs1/p2/package-summary.html#package_description</A>
-<p>
-
-<!-- ================================================================== -->
-
-Allow docRoot to work without a trailing slash for those who had to change their comments
-to work with the 1.4.0 bug:
-<p>
-
-Sub-test 19 Actual: <A HREF="{@docRoot}p2/C2.html">{&#064;docRoot}p2/C2.html</A> <br>
-Sub-test 19 Expect: <A HREF="..p2/C2.html">../p2/C2.html</A>
-<p>
-
-Sub-test 20 Actual: <A HREF="{@docRoot}../docs1/p2/C2.html">{&#064;docRoot}../docs1/p2/C2.html</A> <br>
-Sub-test 20 Expect: <A HREF="..../docs1/p2/C2.html">../../docs1/p2/C2.html</A>
-<p>
-
-Sub-test 21 Actual: <A HREF="{@docRoot}p2/package-summary.html#package_description">{&#064;docRoot}/p2/package-summary.html#package_description</A><br>
-Sub-test 21 Expect: <A HREF="..p2/package-summary.html#package_description">../p2/package-summary.html#package_description</A>
-<p>
-
-Sub-test 22 Actual: <A HREF="{@docRoot}../docs1/p2/package-summary.html#package_description">{&#064;docRoot}/../docs1/p2/package-summary.html#package_description</A> <br>
-Sub-test 22 Expect: <A HREF="..../docs1/p2/package-summary.html#package_description">../../docs1/p2/package-summary.html#package_description</A>
-
-</BODY>
-</HTML>
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/p2/C2.java b/langtools/test/com/sun/javadoc/DocRootSlash/p2/C2.java
deleted file mode 100644
index 06445ed0729..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/p2/C2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-/**
- * Source file for C2
- */
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/DocRootSlash/p2/package.html b/langtools/test/com/sun/javadoc/DocRootSlash/p2/package.html
deleted file mode 100644
index 70860484534..00000000000
--- a/langtools/test/com/sun/javadoc/DocRootSlash/p2/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<BODY>
-This is the description of package p2.
-
-</BODY>
-</HTML>
diff --git a/langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java b/langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java
deleted file mode 100644
index c37ed93b740..00000000000
--- a/langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8008768
- * @summary Using {@inheritDoc} in simple tag defined via -tag fails
- * @author Mike Duigou
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main DocTest
- */
-
-/**
- * DocTest documentation.
- *
- * @apiNote DocTest API note.
- * @implSpec DocTest implementation spec.
- * @implNote DocTest implementation note.
- */
-public class DocTest extends JavadocTester {
-    public static void main(String... args) throws Exception {
-        DocTest tester = new DocTest();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-verbose",
-                "-d", "DocTest",
-                "-tag", "apiNote:optcm:<em>API Note</em>",
-                "-tag", "implSpec:optcm:<em>Implementation Requirements</em>:",
-                "-tag", "implNote:optcm:<em>Implementation Note</em>:",
-                "-package",
-                testSrc("DocTest.java")
-        );
-        checkExit(Exit.OK);
-
-        // javadoc does not report an exit code for an internal exception (!)
-        // so monitor stderr for stack dumps.
-        checkOutput(Output.STDERR, false, "at com.sun");
-    }
-
-    /**
-     * DocTest() documentation.
-     *
-     * @apiNote DocTest() API note.
-     * @implSpec DocTest() implementation spec.
-     * @implNote DocTest() implementation note.
-     */
-    public DocTest() {
-    }
-
-    /**
-     * DocTest.testMethod() documentation.
-     *
-     * @apiNote DocTest.testMethod() API note.
-     * @implSpec DocTest.testMethod() implementation spec.
-     * @implNote DocTest.testMethod() implementation note.
-     */
-    public void testMethod() {
-    }
-}
-
-/**
- * DocTestWithTags documentation.
- *
- * @apiNote DocTestWithTags API note.
- * <pre>
- *    DocTestWithTags API note code sample.
- * </pre>
- * @implSpec DocTestWithTags implementation spec.
- * <pre>
- *    DocTestWithTags implementation spec code sample.
- * </pre>
- * @implNote DocTestWithTags implementation note.
- * <pre>
- *    DocTestWithTags implementation note code sample.
- * </pre>
- */
-class DocTestWithTags {
-
-    /**
-     * DocTestWithTags() documentation.
-     *
-     * @apiNote DocTestWithTags() API note.
-     * <pre>
-     *    DocTestWithTags() API note code sample.
-     * </pre>
-     * @implSpec DocTestWithTags() implementation spec.
-     * <pre>
-     *    DocTestWithTags() implementation spec code sample.
-     * </pre>
-     * @implNote DocTest() implementation note.
-     * <pre>
-     *    DocTest() implementation note code sample.
-     * </pre>
-     */
-    public DocTestWithTags() {
-    }
-
-    /**
-     * DocTest.testMethod() documentation.
-     *
-     * @apiNote DocTestWithTags.testMethod() API note.
-     * <pre>
-     *    DocTestWithTags.testMethod() API note code sample.
-     * </pre>
-     * @implSpec DocTestWithTags.testMethod() implementation spec.
-     * <pre>
-     *    DocTestWithTags.testMethod() API implementation spec code sample.
-     * </pre>
-     * @implNote DocTest.testMethod() implementation note.
-     * <pre>
-     *    DocTest.testMethod() API implementation code sample.
-     * </pre>
-     */
-    public void testMethod() {
-    }
-}
-
-class MinimallyExtendsDocTest extends DocTest {
-}
-
-/**
- * SimpleExtendsDocTest documentation.
- */
-class SimpleExtendsDocTest extends DocTest {
-
-    /**
-     * SimpleExtendsDocTest() documentation.
-     */
-    public SimpleExtendsDocTest() {
-
-    }
-
-    /**
-     * SimpleExtendsDocTest.testMethod() documenation.
-     */
-    @java.lang.Override
-    public void testMethod() {
-    }
-}
-
-/**
- * {@inheritDoc}
- */
-class SimpleInheritDocDocTest extends DocTest {
-
-    /**
-     * {@inheritDoc}
-     */
-    public SimpleInheritDocDocTest() {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @java.lang.Override
-    public void testMethod() {
-    }
-}
-
-/**
- * {@inheritDoc}
- *
- * @apiNote {@inheritDoc}
- * @implSpec {@inheritDoc}
- * @implNote {@inheritDoc}
- */
-class FullInheritDocDocTest extends DocTest {
-
-    /**
-     * {@inheritDoc}
-     *
-     * @apiNote {@inheritDoc}
-     * @implSpec {@inheritDoc}
-     * @implNote {@inheritDoc}
-     */
-    public FullInheritDocDocTest() {
-
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @apiNote {@inheritDoc}
-     * @implSpec {@inheritDoc}
-     * @implNote {@inheritDoc}
-     */
-    @java.lang.Override
-    public void testMethod() {
-    }
-}
-
-/**
- * {@inheritDoc} and FullInheritDocPlusDocTest documentation.
- *
- * @implSpec {@inheritDoc} and FullInheritDocPlusDocTest API note.
- * @implNote {@inheritDoc} and FullInheritDocPlusDocTest implementation specification.
- * @apiNote {@inheritDoc} and FullInheritDocPlusDocTest implementation note.
- */
-class FullInheritDocPlusDocTest extends DocTest {
-
-    /**
-     * {@inheritDoc} and FullInheritDocPlusDocTest() documentation.
-     *
-     * @implSpec {@inheritDoc} and FullInheritDocPlusDocTest() API note.
-     * @implNote {@inheritDoc} and FullInheritDocPlusDocTest() implementation specification.
-     * @apiNote {@inheritDoc} and FullInheritDocPlusDocTest() implementation note.
-     */
-    public FullInheritDocPlusDocTest() {
-
-    }
-
-    /**
-     * {@inheritDoc} and FullInheritDocPlusDocTest.testMethod() documentation.
-     *
-     * @implSpec {@inheritDoc} and FullInheritDocPlusDocTest.testMethod() API note.
-     * @implNote {@inheritDoc} and FullInheritDocPlusDocTest.testMethod() implementation specification.
-     * @apiNote {@inheritDoc} and FullInheritDocPlusDocTest.testMethod() implementation note.
-     */
-    @java.lang.Override
-    public void testMethod() {
-    }
-}
-
diff --git a/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java b/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
deleted file mode 100644
index 4ce8d370d37..00000000000
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4645058 4747738 4855054 8024756 8141492
- * @summary  Javascript IE load error when linked by -linkoffline
- *           Window title shouldn't change when loading left frames (javascript)
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main JavascriptWinTitle
- */
-
-public class JavascriptWinTitle extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        JavascriptWinTitle tester = new JavascriptWinTitle();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-doctitle", "Document Title",
-                "-windowtitle", "Window Title",
-                "-overview", testSrc("overview.html"),
-                "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api", testSrc,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-        checkOutput("overview-summary.html", true,
-                "<script type=\"text/javascript\">",
-                "<body>");
-
-        // Test that "onload" is not present in BODY tag:
-        checkOutput("p1/package-summary.html", true, "<body>");
-        checkOutput("overview-frame.html", true, "<body>");
-        checkOutput("allclasses-frame.html", true, "<body>");
-        checkOutput("p1/package-frame.html", true, "<body>");
-
-        // Test that win title javascript is followed by NOSCRIPT code.
-        checkOutput("p1/C.html", true,
-                "<script type=\"text/javascript\"><!--\n"
-                + "    try {\n"
-                + "        if (location.href.indexOf('is-external=true') == -1) {\n"
-                + "            parent.document.title=\"C (Window Title)\";\n"
-                + "        }\n"
-                + "    }\n"
-                + "    catch(err) {\n"
-                + "    }\n"
-                + "//-->\n");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/JavascriptWinTitle/overview.html b/langtools/test/com/sun/javadoc/JavascriptWinTitle/overview.html
deleted file mode 100644
index 732aaabbaf1..00000000000
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/overview.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-This document is generated from sample source code and HTML files 
-with examples of a wide variety of Java language constructs: packages, 
-subclasses, subinterfaces, nested classes, nested interfaces,
-inheriting from other packages, constructors, fields,
-methods, and so forth.
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java b/langtools/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java
deleted file mode 100644
index 4a5f6dc179d..00000000000
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C {
-}
diff --git a/langtools/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java b/langtools/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/JavascriptWinTitle/package-list b/langtools/test/com/sun/javadoc/JavascriptWinTitle/package-list
deleted file mode 100644
index fecd4d4ffb3..00000000000
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/package-list
+++ /dev/null
@@ -1,135 +0,0 @@
-java.applet
-java.awt
-java.awt.color
-java.awt.datatransfer
-java.awt.dnd
-java.awt.event
-java.awt.font
-java.awt.geom
-java.awt.im
-java.awt.im.spi
-java.awt.image
-java.awt.image.renderable
-java.awt.print
-java.beans
-java.beans.beancontext
-java.io
-java.lang
-java.lang.ref
-java.lang.reflect
-java.math
-java.net
-java.nio
-java.nio.channels
-java.nio.channels.spi
-java.nio.charset
-java.nio.charset.spi
-java.rmi
-java.rmi.activation
-java.rmi.dgc
-java.rmi.registry
-java.rmi.server
-java.security
-java.security.acl
-java.security.cert
-java.security.interfaces
-java.security.spec
-java.sql
-java.text
-java.util
-java.util.jar
-java.util.logging
-java.util.prefs
-java.util.regex
-java.util.zip
-javax.accessibility
-javax.crypto
-javax.crypto.interfaces
-javax.crypto.spec
-javax.imageio
-javax.imageio.event
-javax.imageio.metadata
-javax.imageio.plugins.jpeg
-javax.imageio.spi
-javax.imageio.stream
-javax.naming
-javax.naming.directory
-javax.naming.event
-javax.naming.ldap
-javax.naming.spi
-javax.net
-javax.net.ssl
-javax.print
-javax.print.attribute
-javax.print.attribute.standard
-javax.print.event
-javax.rmi
-javax.rmi.CORBA
-javax.security.auth
-javax.security.auth.callback
-javax.security.auth.kerberos
-javax.security.auth.login
-javax.security.auth.spi
-javax.security.auth.x500
-javax.security.cert
-javax.sound.midi
-javax.sound.midi.spi
-javax.sound.sampled
-javax.sound.sampled.spi
-javax.sql
-javax.swing
-javax.swing.border
-javax.swing.colorchooser
-javax.swing.event
-javax.swing.filechooser
-javax.swing.plaf
-javax.swing.plaf.basic
-javax.swing.plaf.metal
-javax.swing.plaf.multi
-javax.swing.table
-javax.swing.text
-javax.swing.text.html
-javax.swing.text.html.parser
-javax.swing.text.rtf
-javax.swing.tree
-javax.swing.undo
-javax.transaction
-javax.transaction.xa
-javax.xml.parsers
-javax.xml.transform
-javax.xml.transform.dom
-javax.xml.transform.sax
-javax.xml.transform.stream
-org.ietf.jgss
-org.omg.CORBA
-org.omg.CORBA.DynAnyPackage
-org.omg.CORBA.ORBPackage
-org.omg.CORBA.TypeCodePackage
-org.omg.CORBA.portable
-org.omg.CORBA_2_3
-org.omg.CORBA_2_3.portable
-org.omg.CosNaming
-org.omg.CosNaming.NamingContextExtPackage
-org.omg.CosNaming.NamingContextPackage
-org.omg.Dynamic
-org.omg.DynamicAny
-org.omg.DynamicAny.DynAnyFactoryPackage
-org.omg.DynamicAny.DynAnyPackage
-org.omg.IOP
-org.omg.IOP.CodecFactoryPackage
-org.omg.IOP.CodecPackage
-org.omg.Messaging
-org.omg.PortableInterceptor
-org.omg.PortableInterceptor.ORBInitInfoPackage
-org.omg.PortableServer
-org.omg.PortableServer.CurrentPackage
-org.omg.PortableServer.POAManagerPackage
-org.omg.PortableServer.POAPackage
-org.omg.PortableServer.ServantLocatorPackage
-org.omg.PortableServer.portable
-org.omg.SendingContext
-org.omg.stub.java.rmi
-org.w3c.dom
-org.xml.sax
-org.xml.sax.ext
-org.xml.sax.helpers
diff --git a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java b/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
deleted file mode 100644
index 3cd3a53c141..00000000000
--- a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      4034096 4764726 6235799
- * @summary  Add support for HTML keywords via META tag for
- *           class and member names to improve API search
- * @author   dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main MetaTag
- */
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class MetaTag extends JavadocTester {
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        MetaTag tester = new MetaTag();
-        tester.runTests();
-    }
-
-    @Test
-    void testStandard() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "-keywords",
-                "-doctitle", "Sample Packages",
-                "p1", "p2");
-
-        checkExit(Exit.OK);
-
-        checkOutput("p1/C1.html", true,
-                "<meta name=\"keywords\" content=\"p1.C1 class\">",
-                "<meta name=\"keywords\" content=\"field1\">",
-                "<meta name=\"keywords\" content=\"field2\">",
-                "<meta name=\"keywords\" content=\"method1()\">",
-                "<meta name=\"keywords\" content=\"method2()\">");
-
-        checkOutput("p1/package-summary.html", true,
-                "<meta name=\"keywords\" content=\"p1 package\">");
-
-        checkOutput("overview-summary.html", true,
-                "<meta name=\"keywords\" content=\"Overview, Sample Packages\">");
-
-        // NOTE: Hopefully, this regression test is not run at midnight.  If the output
-        // was generated yesterday and this test is run today, the test will fail.
-        checkOutput("overview-summary.html", true,
-                "<meta name=\"date\" content=\"" + date() + "\">");
-    }
-
-    @Test
-    void testNoTimestamp() {
-        javadoc("-d", "out-2",
-                "-sourcepath", testSrc,
-                "-notimestamp",
-                "-doctitle", "Sample Packages",
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // No keywords when -keywords is not used.
-        checkOutput("p1/C1.html", false,
-                "<META NAME=\"keywords\" CONTENT=\"p1.C1 class\">",
-                "<META NAME=\"keywords\" CONTENT=\"field1\">",
-                "<META NAME=\"keywords\" CONTENT=\"field2\">",
-                "<META NAME=\"keywords\" CONTENT=\"method1()\">",
-                "<META NAME=\"keywords\" CONTENT=\"method2()\">");
-
-        checkOutput("p1/package-summary.html", false,
-                "<META NAME=\"keywords\" CONTENT=\"p1 package\">");
-
-        checkOutput("overview-summary.html", false,
-                "<META NAME=\"keywords\" CONTENT=\"Overview Summary, Sample Packages\">");
-
-        // The date metatag should not show up when -notimestamp is used.
-        // NOTE: Hopefully, this regression test is not run at midnight.  If the output
-        // was generated yesterday and this test is run today, the test will fail.
-        checkOutput("overview-summary.html", false,
-                "<META NAME=\"date\" CONTENT=\"" + date() + "\">");
-    }
-
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-
-    String date() {
-        return dateFormat.format(new Date());
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/MetaTag/p1/C1.java b/langtools/test/com/sun/javadoc/MetaTag/p1/C1.java
deleted file mode 100644
index 54e43e3053a..00000000000
--- a/langtools/test/com/sun/javadoc/MetaTag/p1/C1.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C1 {
-
-    public C1() {
-    }
-
-    public C1(Object obj) {
-    }
-
-    public int field1 = 0;
-
-    public int field2 = 0;
-
-    public int method1() {
-        return 0;
-    }
-
-    /**
-     * Overload of method1() to demonstrate how all
-     * overloads are combined into a single meta keyword
-     */
-    public int method1(String s) {
-        return 0;
-    }
-
-    public int method2(String s1, String s2) {
-        return 0;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/MetaTag/p2/C2.java b/langtools/test/com/sun/javadoc/MetaTag/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/MetaTag/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java b/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
deleted file mode 100644
index a69a5431f4e..00000000000
--- a/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      4766385
- * @summary  Test that the header option for upper left frame
- *           is present for three sets of options: (1) -header,
- *           (2) -packagesheader, and (3) -header -packagesheader
- * @author   dkramer
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main PackagesHeader
- */
-
-public class PackagesHeader extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        JavadocTester tester = new PackagesHeader();
-        tester.runTests();
-    }
-
-    @Test
-    void testHeader() {
-        // First test with -header only
-        javadoc("-d", "out-header",
-                "-header", "Main Frame Header",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Test that the -header shows up in the packages frame
-        checkOutput("overview-frame.html", true,
-                "Main Frame Header");
-    }
-
-    @Test
-    void testPackagesHeader() {
-        // Second test with -packagesheader only
-        javadoc("-d", "out-packages-header",
-                "-packagesheader", "Packages Frame Header",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Test that the -packagesheader string shows
-        // up in the packages frame
-        checkOutput("overview-frame.html", true,
-                "Packages Frame Header");
-    }
-
-    @Test
-    void testBothHeaders() {
-        // Third test with both -packagesheader and -header
-        javadoc("-d", "out-both",
-                "-packagesheader", "Packages Frame Header",
-                "-header", "Main Frame Header",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Test that the both headers show up and are different
-        checkOutput("overview-frame.html", true,
-                "Packages Frame Header");
-
-        checkOutput("overview-summary.html", true,
-                "Main Frame Header");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/PackagesHeader/p1/C1.java b/langtools/test/com/sun/javadoc/PackagesHeader/p1/C1.java
deleted file mode 100644
index e72eeab81a0..00000000000
--- a/langtools/test/com/sun/javadoc/PackagesHeader/p1/C1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/PackagesHeader/p2/C2.java b/langtools/test/com/sun/javadoc/PackagesHeader/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/PackagesHeader/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java b/langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java
deleted file mode 100644
index 31f60ee247b..00000000000
--- a/langtools/test/com/sun/javadoc/T6735320/SerialFieldTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.io.ObjectStreamField;
-import java.io.Serializable;
-
-public class SerialFieldTest implements Serializable {
-    /**
-     * @serialField
-     */
-    private static final ObjectStreamField[] serialPersistentFields = {
-        new ObjectStreamField("i", int.class),
-    };
-}
diff --git a/langtools/test/com/sun/javadoc/T6735320/T6735320.java b/langtools/test/com/sun/javadoc/T6735320/T6735320.java
deleted file mode 100644
index c71a3166b0a..00000000000
--- a/langtools/test/com/sun/javadoc/T6735320/T6735320.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 6735320
- * @summary javadoc throws exception if serialField value is missing
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main T6735320
- */
-
-public class T6735320 extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        T6735320 tester = new T6735320();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                testSrc("SerialFieldTest.java"));
-        checkExit(Exit.FAILED);
-        checkOutput(Output.STDERR, false,
-                "StringIndexOutOfBoundsException");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java b/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java
deleted file mode 100644
index fb0b0453e92..00000000000
--- a/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4275630 4749453 4625400 4753048 4415270 8074521
- * @summary  Generated HTML is invalid with frames.
- *           Displays unnecessary horizontal scroll bars.
- *           Missing whitespace in DOCTYPE declaration
- *           HTML table tags inserted in wrong place in pakcage use page
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main ValidHtml
- */
-
-public class ValidHtml extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        ValidHtml tester = new ValidHtml();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        // Test for all cases except the split index page
-        javadoc("-d", "out",
-                    "-doctitle", "Document Title",
-                    "-windowtitle", "Window Title",
-                    "-use",
-                    "-overview", testSrc("overview.html"),
-                    "-sourcepath", testSrc,
-                    "p1", "p2");
-        checkExit(Exit.OK);
-
-        // Test the proper DOCTYPE element are present:
-        checkOutput("index.html",              true, LOOSE);
-        checkOutput("overview-summary.html",   true, LOOSE);
-        checkOutput("p1/package-summary.html", true, LOOSE);
-        checkOutput("p1/C.html",               true, LOOSE);
-        checkOutput("overview-frame.html",     true, LOOSE);
-        checkOutput("allclasses-frame.html",   true, LOOSE);
-        checkOutput("p1/package-frame.html",   true, LOOSE);
-
-        // Test for IFRAME element:
-        checkOutput("index.html", true,
-                "<iframe");
-
-        // Test the table elements are in the correct order:
-        checkOutput("p1/package-use.html", true,
-                "</td>\n"
-                + "</tr>");
-    }
-
-    private static final String LOOSE =
-            "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
-}
diff --git a/langtools/test/com/sun/javadoc/ValidHtml/overview.html b/langtools/test/com/sun/javadoc/ValidHtml/overview.html
deleted file mode 100644
index 732aaabbaf1..00000000000
--- a/langtools/test/com/sun/javadoc/ValidHtml/overview.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-This document is generated from sample source code and HTML files 
-with examples of a wide variety of Java language constructs: packages, 
-subclasses, subinterfaces, nested classes, nested interfaces,
-inheriting from other packages, constructors, fields,
-methods, and so forth.
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/ValidHtml/p1/C.java b/langtools/test/com/sun/javadoc/ValidHtml/p1/C.java
deleted file mode 100644
index c565d608fe5..00000000000
--- a/langtools/test/com/sun/javadoc/ValidHtml/p1/C.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C {
-    /**
-     * @param  classparam  C type included for "use"test
-     * @return String "Hi"
-     */
-
-    public String publicMethod(C classparam) {
-        return "Hi";
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/ValidHtml/p2/C2.java b/langtools/test/com/sun/javadoc/ValidHtml/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/ValidHtml/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
deleted file mode 100644
index f2d4dc4985e..00000000000
--- a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4720849
- * @summary  com.sun.tools.doclets.standard.Standard contains hard-coded version number
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main VersionNumber
- */
-
-
-/**
- * Runs javadoc and runs regression tests on the resulting HTML.
- */
-public class VersionNumber extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        VersionNumber tester = new VersionNumber();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "p1");
-        checkExit(Exit.OK);
-
-        // Test the proper DOCTYPE element is present:
-        checkOutput("p1/C.html", true,
-                "<!-- Generated by javadoc (");
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/VersionNumber/p1/C.java b/langtools/test/com/sun/javadoc/VersionNumber/p1/C.java
deleted file mode 100644
index c565d608fe5..00000000000
--- a/langtools/test/com/sun/javadoc/VersionNumber/p1/C.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-public class C {
-    /**
-     * @param  classparam  C type included for "use"test
-     * @return String "Hi"
-     */
-
-    public String publicMethod(C classparam) {
-        return "Hi";
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java b/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
deleted file mode 100644
index cd11450050d..00000000000
--- a/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4530730
- * @summary stddoclet: With frames off, window titles have "()" appended
- * @author dkramer
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main WindowTitles
- */
-
-/**
- * Runs javadoc and runs regression tests on the resulting HTML.
- */
-public class WindowTitles extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        WindowTitles tester = new WindowTitles();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        // Test for all cases except the split index page
-        javadoc("-d", "out-1",
-                "-use",
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkTitle("overview-summary.html",     "Overview");
-        checkTitle("overview-tree.html",        "Class Hierarchy");
-        checkTitle("overview-frame.html",       "Overview List");
-        checkTitle("p1/package-summary.html",   "p1");
-        checkTitle("p1/package-frame.html",     "p1");
-        checkTitle("p1/package-tree.html",      "p1 Class Hierarchy");
-        checkTitle("p1/package-use.html",       "Uses of Package p1");
-        checkTitle("p1/C1.html",                "C1");
-        checkTitle("allclasses-frame.html",     "All Classes");
-        checkTitle("allclasses-noframe.html",   "All Classes");
-        checkTitle("constant-values.html",      "Constant Field Values");
-        checkTitle("deprecated-list.html",      "Deprecated List");
-        checkTitle("serialized-form.html",      "Serialized Form");
-        checkTitle("help-doc.html",             "API Help");
-        checkTitle("index-all.html",            "Index");
-        checkTitle("p1/class-use/C1.html",      "Uses of Class p1.C1");
-    }
-
-    @Test
-    void test2() {
-        // Test only for the split-index case (and run on only one package)
-        javadoc("-d", "out-2",
-                "-splitindex",
-                "-sourcepath", testSrc,
-                "p1");
-        checkExit(Exit.OK);
-
-        checkTitle("index-files/index-1.html", "C-Index");
-    }
-
-    void checkTitle(String file, String title) {
-        checkOutput(file, true, "<title>" + title + "</title>");
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/WindowTitles/p1/C1.java b/langtools/test/com/sun/javadoc/WindowTitles/p1/C1.java
deleted file mode 100644
index 85dc58cfd91..00000000000
--- a/langtools/test/com/sun/javadoc/WindowTitles/p1/C1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p1;
-
-import java.io.Serializable;
-
-public class C1 implements Serializable {
-}
diff --git a/langtools/test/com/sun/javadoc/WindowTitles/p2/C2.java b/langtools/test/com/sun/javadoc/WindowTitles/p2/C2.java
deleted file mode 100644
index d33673efcff..00000000000
--- a/langtools/test/com/sun/javadoc/WindowTitles/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/_template/Template.java b/langtools/test/com/sun/javadoc/_template/Template.java
deleted file mode 100644
index 92a36f867df..00000000000
--- a/langtools/test/com/sun/javadoc/_template/Template.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @ test
- * @ bug      <BUG-ID>
- * @ summary  <BUG-SYNOPSIS>
- * @ author   <AUTHOR> or delete
- * @ library  ../lib/
- * @ build    JavadocTester <CLASS NAME>
- * @ run main <CLASS NAME>
- */
-
-public class Template extends JavadocTester {
-
-    //Javadoc arguments.
-    private static final String[] ARGS = new String[] {
-        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR
-    };
-
-    //Input for string search tests.
-    private static final String[][] TEST = NO_TEST;
-    private static final String[][] NEGATED_TEST = NO_TEST;
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     */
-    public static void main(String[] args) {
-        Template tester = new Template();
-        tester.run(ARGS, TEST, NEGATED_TEST);
-        tester.printSummary();
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/_template/TemplateComplete.java b/langtools/test/com/sun/javadoc/_template/TemplateComplete.java
deleted file mode 100644
index cb15e989a35..00000000000
--- a/langtools/test/com/sun/javadoc/_template/TemplateComplete.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @ test
- * @ bug      <BUG-ID>
- * @ summary  <BUG-SYNOPSIS>
- * @ author   <AUTHOR> or delete
- * @ library  ../lib/
- * @ build    JavadocTester <CLASS NAME>
- * @ run main <CLASS NAME>
- */
-
-public class TemplateComplete extends JavadocTester {
-
-    //Javadoc arguments.
-    private static final String[] ARGS = new String[] {
-        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR
-    };
-
-    //Input for string search tests.
-    private static final String[][] TEST = NO_TEST;
-    private static final String[][] NEGATED_TEST = NO_TEST;
-
-    //Input for Javadoc return code test.
-    private static final int EXPECTED_EXIT_CODE = 0;
-
-
-    //Input for file diff test.
-    private static final String DIFFDIR1 = null;
-    private static final String DIFFDIR2 = null;
-    private static final String[][] FILES_TO_DIFF = {};
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     */
-    public static void main(String[] args) {
-        TemplateComplete tester = new TemplateComplete();
-        int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST);
-        tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode);
-        tester.runDiffs(DIFFDIR1, DIFFDIR2, FILES_TO_DIFF, false);
-        tester.printSummary();
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/constantValues/A.java b/langtools/test/com/sun/javadoc/constantValues/A.java
deleted file mode 100644
index 703c1c7ee9f..00000000000
--- a/langtools/test/com/sun/javadoc/constantValues/A.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg2;
-
-public class A {
-   /** Test constant. */
-   public static final String DEMO= "y<abs(x)";
-   /** Connection URL for the JDBC Driver. */
-   public static final String THIS_IS_OK= "y < abs(x)";
-
-   public static final String DEMO_STRING = "<Hello World>";
-
-   public A() {
-   }
-}
diff --git a/langtools/test/com/sun/javadoc/constantValues/TestConstantValues.java b/langtools/test/com/sun/javadoc/constantValues/TestConstantValues.java
deleted file mode 100644
index 74d7f5dff16..00000000000
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValues.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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.
- */
-
-public class TestConstantValues {
-
-    /**
-     * Test 1 passes ({@value}).
-     */
-    public static final int TEST1PASSES = 500000;
-
-
-    /**
-     * Test 2 passes ({@value}).
-     */
-    public static final String TEST2PASSES = "My String";
-
-}
diff --git a/langtools/test/com/sun/javadoc/constantValues/TestConstantValues2.java b/langtools/test/com/sun/javadoc/constantValues/TestConstantValues2.java
deleted file mode 100644
index 727d4d2d299..00000000000
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValues2.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public interface TestConstantValues2 {
-
-    /**
-     * Test 3 passes ({@value}).
-     */
-    public static final int TEST3PASSES = 500000;
-
-
-    /**
-     * Test 4 passes ({@value}).
-     */
-    public static final String TEST4PASSES = "My String";
-
-}
diff --git a/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java b/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
deleted file mode 100644
index 36269fe1db7..00000000000
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4504730 4526070 5077317
- * @summary Test the generation of constant-values.html.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestConstantValuesDriver
- */
-public class TestConstantValuesDriver extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestConstantValuesDriver tester = new TestConstantValuesDriver();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                testSrc("TestConstantValues.java"),
-                testSrc("TestConstantValues2.java"),
-                testSrc("A.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("constant-values.html", true,
-                "TEST1PASSES",
-                "TEST2PASSES",
-                "TEST3PASSES",
-                "TEST4PASSES",
-                "<code>\"&lt;Hello World&gt;\"</code>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java b/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
deleted file mode 100644
index 30e50dcad55..00000000000
--- a/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4525364
- * @summary Determine if duplicate throws tags can be used.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDupThrowsTags
- */
-public class TestDupThrowsTags extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDupThrowsTags tester = new TestDupThrowsTags();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                testSrc("TestDupThrowsTags.java"));
-        checkExit(Exit.FAILED);
-
-        checkOutput("TestDupThrowsTags.html", true,
-                "Test 1 passes",
-                "Test 2 passes",
-                "Test 3 passes",
-                "Test 4 passes");
-    }
-
-    /**
-     * @throws java.io.IOException Test 1 passes
-     * @throws java.io.IOException Test 2 passes
-     * @throws java.lang.NullPointerException Test 3 passes
-     * @throws java.io.IOException Test 4 passes
-     */
-    public void method() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/lib/JavadocTester.java b/langtools/test/com/sun/javadoc/lib/JavadocTester.java
deleted file mode 100644
index e958f68f328..00000000000
--- a/langtools/test/com/sun/javadoc/lib/JavadocTester.java
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.ref.SoftReference;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Test framework for running javadoc and performing tests on the resulting output.
- *
- * <p>
- * Tests are typically written as subtypes of JavadocTester, with a main
- * method that creates an instance of the test class and calls the runTests()
- * method. The runTests() methods calls all the test methods declared in the class,
- * and then calls a method to print a summary, and throw an exception if
- * any of the test methods reported a failure.
- *
- * <p>
- * Test methods are identified with a @Test annotation. They have no parameters.
- * The name of the method is not important, but if you have more than one, it is
- * recommended that the names be meaningful and suggestive of the test case
- * contained therein.
- *
- * <p>
- * Typically, a test method will invoke javadoc, and then perform various
- * checks on the results. The standard checks are:
- *
- * <dl>
- * <dt>checkExitCode
- * <dd>Check the exit code returned from javadoc.
- * <dt>checkOutput
- * <dd>Perform a series of checks on the contents on a file or output stream
- *     generated by javadoc.
- *     The checks can be either that a series of strings are found or are not found.
- * <dt>checkFiles
- * <dd>Perform a series of checks on the files generated by javadoc.
- *     The checks can be that a series of files are found or are not found.
- * </dl>
- *
- * <pre><code>
- *  public class MyTester extends JavadocTester {
- *      public static void main(String... args) throws Exception {
- *          MyTester tester = new MyTester();
- *          tester.runTests();
- *      }
- *
- *      // test methods...
- *      @Test
- *      void test() {
- *          javadoc(<i>args</i>);
- *          checkExit(Exit.OK);
- *          checkOutput(<i>file</i>, true,
- *              <i>strings-to-find</i>);
- *          checkOutput(<i>file</i>, false,
- *              <i>strings-to-not-find</i>);
- *      }
- *  }
- * </code></pre>
- *
- * <p>
- * If javadoc is run more than once in a test method, you can compare the
- * results that are generated with the diff method. Since files written by
- * javadoc typically contain a timestamp, you may want to use the -notimestamp
- * option if you are going to compare the results from two runs of javadoc.
- *
- * <p>
- * If you have many calls of checkOutput that are very similar, you can write
- * your own check... method to reduce the amount of duplication. For example,
- * if you want to check that many files contain the same string, you could
- * write a method that takes a varargs list of files and calls checkOutput
- * on each file in turn with the string to be checked.
- *
- * <p>
- * You can also write you own custom check methods, which can use
- * readFile to get the contents of a file generated by javadoc,
- * and then use pass(...) or fail(...) to report whether the check
- * succeeded or not.
- *
- * <p>
- * You can have many separate test methods, each identified with a @Test
- * annotation. However, you should <b>not</b> assume they will be called
- * in the order declared in your source file.  If the order of a series
- * of javadoc invocations is important, do that within a single method.
- * If the invocations are independent, for better clarity, use separate
- * test methods, each with their own set of checks on the results.
- *
- * @author Doug Kramer
- * @author Jamie Ho
- * @author Jonathan Gibbons (rewrite)
- */
-public abstract class JavadocTester {
-
-    public static final String FS = System.getProperty("file.separator");
-    public static final String PS = System.getProperty("path.separator");
-    public static final String NL = System.getProperty("line.separator");
-
-    public enum Output {
-        /** The name for error output from javadoc. */
-        ERROR,
-        /** The name for the notice output from javadoc. */
-        NOTICE,
-        /** The name for the warning output  from javadoc. */
-        WARNING,
-        /** The name for any output written to System.out. */
-        STDOUT,
-        /** The name for any output written to System.err. */
-        STDERR
-    }
-
-    /** The output directory used in the most recent call of javadoc. */
-    protected File outputDir;
-
-    /** The exit code of the most recent call of javadoc. */
-    private int exitCode;
-
-    /** The output generated by javadoc to the various writers and streams. */
-    private final Map<Output, String> outputMap = new EnumMap<>(Output.class);
-
-    /** A cache of file content, to avoid reading files unnecessarily. */
-    private final Map<File,SoftReference<String>> fileContentCache = new HashMap<>();
-
-    /** Stream used for logging messages. */
-    private final PrintStream out = System.out;
-
-    /** The directory containing the source code for the test. */
-    public static final String testSrc = System.getProperty("test.src");
-
-    /**
-     * Get the path for a source file in the test source directory.
-     * @param path the path of a file or directory in the source directory
-     * @return the full path of the specified file
-     */
-    public static String testSrc(String path) {
-        return new File(testSrc, path).getPath();
-    }
-
-    /**
-     * Alternatives for checking the contents of a directory.
-     */
-    public enum DirectoryCheck {
-        /**
-         * Check that the directory is empty.
-         */
-        EMPTY((file, name) -> true),
-        /**
-         * Check that the directory does not contain any HTML files,
-         * such as may have been generated by a prior run of javadoc
-         * using this directory.
-         * For now, the check is only performed on the top level directory.
-         */
-        NO_HTML_FILES((file, name) -> name.endsWith(".html")),
-        /**
-         * No check is performed on the directory contents.
-         */
-        NONE(null) { @Override void check(File dir) { } };
-
-        /** The filter used to detect that files should <i>not</i> be present. */
-        FilenameFilter filter;
-
-        DirectoryCheck(FilenameFilter f) {
-            filter = f;
-        }
-
-        void check(File dir) {
-            if (dir.isDirectory()) {
-                String[] contents = dir.list(filter);
-                if (contents == null)
-                    throw new Error("cannot list directory: " + dir);
-                if (contents.length > 0)
-                    throw new Error("directory has unexpected content: " + dir);
-            }
-        }
-    }
-
-    private DirectoryCheck outputDirectoryCheck = DirectoryCheck.EMPTY;
-
-    /** The current subtest number. Incremented when checking(...) is called. */
-    private int numTestsRun = 0;
-
-    /** The number of subtests passed. Incremented when passed(...) is called. */
-    private int numTestsPassed = 0;
-
-    /** The current run of javadoc. Incremented when javadoc is called. */
-    private int javadocRunNum = 0;
-
-    /** The name of the standard doclet. */
-    // This ought not to be necessary; there ought to be a javadoc entry point
-    // that does not require this to be know externally.
-    private static final String standardDocletClassName =
-            "com.sun.tools.doclets.standard.Standard";
-
-    /** Marker annotation for test methods to be invoked by runTests. */
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface Test { }
-
-    /**
-     * Run all methods annotated with @Test, followed by printSummary.
-     * Typically called on a tester object in main()
-     * @throws Exception if any errors occurred
-     */
-    public void runTests() throws Exception {
-        for (Method m: getClass().getDeclaredMethods()) {
-            Annotation a = m.getAnnotation(Test.class);
-            if (a != null) {
-                try {
-                    out.println("Running test " + m.getName());
-                    m.invoke(this, new Object[] { });
-                } catch (InvocationTargetException e) {
-                    Throwable cause = e.getCause();
-                    throw (cause instanceof Exception) ? ((Exception) cause) : e;
-                }
-                out.println();
-            }
-        }
-        printSummary();
-    }
-
-    /**
-     * Run javadoc.
-     * The output directory used by this call and the final exit code
-     * will be saved for later use.
-     * To aid the reader, it is recommended that calls to this method
-     * put each option and the arguments it takes on a separate line.
-     *
-     * Example:
-     * <pre><code>
-     *  javadoc("-d", "out",
-     *          "-sourcepath", testSrc,
-     *          "-notimestamp",
-     *          "pkg1", "pkg2", "pkg3/C.java");
-     * </code></pre>
-     *
-     * @param args the arguments to pass to javadoc
-     */
-    public void javadoc(String... args) {
-        outputMap.clear();
-        fileContentCache.clear();
-
-        javadocRunNum++;
-        if (javadocRunNum == 1) {
-            out.println("Running javadoc...");
-        } else {
-            out.println("Running javadoc (run "
-                                    + javadocRunNum + ")...");
-        }
-        outputDir = new File(".");
-        for (int i = 0; i < args.length - 2; i++) {
-            if (args[i].equals("-d")) {
-                outputDir = new File(args[++i]);
-                break;
-            }
-        }
-        out.println("args: " + Arrays.toString(args));
-//        log.setOutDir(outputDir);
-
-        outputDirectoryCheck.check(outputDir);
-
-        // These are the primary streams used by javadoc
-        WriterOutput errOut = new WriterOutput();
-        WriterOutput warnOut = new WriterOutput();
-        WriterOutput noticeOut = new WriterOutput();
-        // These are to catch output to System.out and System.err,
-        // in case these are used instead of the primary streams
-        StreamOutput sysOut = new StreamOutput(System.out, System::setOut);
-        StreamOutput sysErr = new StreamOutput(System.err, System::setErr);
-
-        try {
-            exitCode = com.sun.tools.javadoc.Main.execute(
-                    "javadoc",
-                    errOut.pw, warnOut.pw, noticeOut.pw,
-                    standardDocletClassName,
-                    args);
-        } finally {
-            outputMap.put(Output.STDOUT, sysOut.close());
-            outputMap.put(Output.STDERR, sysErr.close());
-            outputMap.put(Output.ERROR, errOut.close());
-            outputMap.put(Output.WARNING, warnOut.close());
-            outputMap.put(Output.NOTICE, noticeOut.close());
-        }
-
-        outputMap.forEach((name, text) -> {
-            if (!text.isEmpty()) {
-                out.println("javadoc " + name + ":");
-                out.println(text);
-            }
-        });
-    }
-
-    /**
-     * Set the kind of check for the initial contents of the output directory
-     * before javadoc is run.
-     * The filter should return true for files that should <b>not</b> appear.
-     * @param c the kind of check to perform
-     */
-    public void setOutputDirectoryCheck(DirectoryCheck c) {
-        outputDirectoryCheck = c;
-    }
-
-    public enum Exit {
-        OK(0),
-        FAILED(1);
-
-        Exit(int code) {
-            this.code = code;
-        }
-
-        final int code;
-    }
-
-    /**
-     * Check the exit code of the most recent call of javadoc.
-     *
-     * @param expected the exit code that is required for the test
-     * to pass.
-     */
-    public void checkExit(Exit expected) {
-        checking("check exit code");
-        if (exitCode == expected.code) {
-            passed("return code " + exitCode);
-        } else {
-            failed("return code " + exitCode +"; expected " + expected.code + " (" + expected + ")");
-        }
-    }
-
-    /**
-     * Check for content in (or not in) the generated output.
-     * Within the search strings, the newline character \n
-     * will be translated to the platform newline character sequence.
-     * @param path a path within the most recent output directory
-     *  or the name of one of the output buffers, identifying
-     *  where to look for the search strings.
-     * @param expectedFound true if all of the search strings are expected
-     *  to be found, or false if all of the strings are expected to be
-     *  not found
-     * @param strings the strings to be searched for
-     */
-    public void checkOutput(String path, boolean expectedFound, String... strings) {
-        // Read contents of file
-        String fileString;
-        try {
-            fileString = readFile(outputDir, path);
-        } catch (Error e) {
-            if (!expectedFound) {
-                failed("Error reading file: " + e);
-                return;
-            }
-            throw e;
-        }
-        checkOutput(path, fileString, expectedFound, strings);
-    }
-
-    /**
-     * Check for content in (or not in) the one of the output streams written by
-     * javadoc. Within the search strings, the newline character \n
-     * will be translated to the platform newline character sequence.
-     * @param output the output stream to check
-     * @param expectedFound true if all of the search strings are expected
-     *  to be found, or false if all of the strings are expected to be
-     *  not found
-     * @param strings the strings to be searched for
-     */
-    public void checkOutput(Output output, boolean expectedFound, String... strings) {
-        checkOutput(output.toString(), outputMap.get(output), expectedFound, strings);
-    }
-
-    private void checkOutput(String path, String fileString, boolean expectedFound, String... strings) {
-        for (String stringToFind : strings) {
-//            log.logCheckOutput(path, expectedFound, stringToFind);
-            checking("checkOutput");
-            // Find string in file's contents
-            boolean isFound = findString(fileString, stringToFind);
-            if (isFound == expectedFound) {
-                passed(path + ": " + (isFound ? "found:" : "not found:") + "\n"
-                        + stringToFind + "\n");
-            } else {
-                failed(path + ": " + (isFound ? "found:" : "not found:") + "\n"
-                        + stringToFind + "\n");
-            }
-        }
-    }
-
-    /**
-     * Check for files in (or not in) the generated output.
-     * @param expectedFound true if all of the files are expected
-     *  to be found, or false if all of the files are expected to be
-     *  not found
-     * @param paths the files to check, within the most recent output directory.
-     * */
-    public void checkFiles(boolean expectedFound, String... paths) {
-        for (String path: paths) {
-//            log.logCheckFile(path, expectedFound);
-            checking("checkFile");
-            File file = new File(outputDir, path);
-            boolean isFound = file.exists();
-            if (isFound == expectedFound) {
-                passed(path + ": " + (isFound ? "found:" : "not found:") + "\n");
-            } else {
-                failed(path + ": " + (isFound ? "found:" : "not found:") + "\n");
-            }
-        }
-    }
-
-    /**
-     * Check that a series of strings are found in order in a file in
-     * the generated output.
-     * @param path the file to check
-     * @param strings  the strings whose order to check
-     */
-    public void checkOrder(String path, String... strings) {
-        String fileString = readOutputFile(path);
-        int prevIndex = -1;
-        for (String s : strings) {
-            int currentIndex = fileString.indexOf(s);
-            checking(s + " at index " + currentIndex);
-            if (currentIndex == -1) {
-                failed(s + " not found.");
-                continue;
-            }
-            if (currentIndex > prevIndex) {
-                passed(s + " is in the correct order");
-            } else {
-                failed(s + " is in the wrong order.");
-            }
-            prevIndex = currentIndex;
-        }
-    }
-
-    /**
-     * Ensures that a series of strings appear only once, in the generated output,
-     * noting that, this test does not exhaustively check for all other possible
-     * duplicates once one is found.
-     * @param path the file to check
-     * @param strings ensure each are unique
-     */
-    public void checkUnique(String path, String... strings) {
-        String fileString = readOutputFile(path);
-        for (String s : strings) {
-            int currentIndex = fileString.indexOf(s);
-            checking(s + " at index " + currentIndex);
-            if (currentIndex == -1) {
-                failed(s + " not found.");
-                continue;
-            }
-            int nextindex = fileString.indexOf(s, currentIndex + s.length());
-            if (nextindex == -1) {
-                passed(s + " is unique");
-            } else {
-                failed(s + " is not unique, found at " + nextindex);
-            }
-        }
-    }
-
-    /**
-     * Compare a set of files in each of two directories.
-     *
-     * @param baseDir1 the directory containing the first set of files
-     * @param baseDir2 the directory containing the second set of files
-     * @param files the set of files to be compared
-     */
-    public void diff(String baseDir1, String baseDir2, String... files) {
-        File bd1 = new File(baseDir1);
-        File bd2 = new File(baseDir2);
-        for (String file : files) {
-            diff(bd1, bd2, file);
-        }
-    }
-
-    /**
-     * A utility to copy a directory from one place to another.
-     *
-     * @param targetDir the directory to copy.
-     * @param destDir the destination to copy the directory to.
-     */
-    // TODO: convert to using java.nio.Files.walkFileTree
-    public void copyDir(String targetDir, String destDir) {
-        try {
-            File targetDirObj = new File(targetDir);
-            File destDirParentObj = new File(destDir);
-            File destDirObj = new File(destDirParentObj, targetDirObj.getName());
-            if (! destDirParentObj.exists()) {
-                destDirParentObj.mkdir();
-            }
-            if (! destDirObj.exists()) {
-                destDirObj.mkdir();
-            }
-            String[] files = targetDirObj.list();
-            for (String file : files) {
-                File srcFile = new File(targetDirObj, file);
-                File destFile = new File(destDirObj, file);
-                if (srcFile.isFile()) {
-                    out.println("Copying " + srcFile + " to " + destFile);
-                    copyFile(destFile, srcFile);
-                } else if(srcFile.isDirectory()) {
-                    copyDir(srcFile.getAbsolutePath(), destDirObj.getAbsolutePath());
-                }
-            }
-        } catch (IOException exc) {
-            throw new Error("Could not copy " + targetDir + " to " + destDir);
-        }
-    }
-
-    /**
-     * Copy source file to destination file.
-     *
-     * @param destfile the destination file
-     * @param srcfile the source file
-     * @throws IOException
-     */
-    public void copyFile(File destfile, File srcfile) throws IOException {
-        Files.copy(srcfile.toPath(), destfile.toPath());
-    }
-
-    /**
-     * Read a file from the output directory.
-     *
-     * @param fileName  the name of the file to read
-     * @return          the file in string format
-     */
-    public String readOutputFile(String fileName) throws Error {
-        return readFile(outputDir, fileName);
-    }
-
-    protected String readFile(String fileName) throws Error {
-        return readFile(outputDir, fileName);
-    }
-
-    protected String readFile(String baseDir, String fileName) throws Error {
-        return readFile(new File(baseDir), fileName);
-    }
-
-    /**
-     * Read the file and return it as a string.
-     *
-     * @param baseDir   the directory in which to locate the file
-     * @param fileName  the name of the file to read
-     * @return          the file in string format
-     */
-    private String readFile(File baseDir, String fileName) throws Error {
-        try {
-            File file = new File(baseDir, fileName);
-            SoftReference<String> ref = fileContentCache.get(file);
-            String content = (ref == null) ? null : ref.get();
-            if (content != null)
-                return content;
-
-            content = new String(Files.readAllBytes(file.toPath()));
-            fileContentCache.put(file, new SoftReference(content));
-            return content;
-        } catch (FileNotFoundException e) {
-            System.err.println(e);
-            throw new Error("File not found: " + fileName);
-        } catch (IOException e) {
-            System.err.println(e);
-            throw new Error("Error reading file: " + fileName);
-        }
-    }
-
-    protected void checking(String message) {
-        numTestsRun++;
-        print("Starting subtest " + numTestsRun, message);
-    }
-
-    protected void passed(String message) {
-        numTestsPassed++;
-        print("Passed", message);
-    }
-
-    protected void failed(String message) {
-        print("FAILED", message);
-    }
-
-    private void print(String prefix, String message) {
-        if (message.isEmpty())
-            out.println(prefix);
-        else {
-            out.print(prefix);
-            out.print(": ");
-            out.println(message.replace("\n", NL));
-        }
-    }
-
-    /**
-     * Print a summary of the test results.
-     */
-    protected void printSummary() {
-//        log.write();
-        if (numTestsRun != 0 && numTestsPassed == numTestsRun) {
-            // Test passed
-            out.println();
-            out.println("All " + numTestsPassed + " subtests passed");
-        } else {
-            // Test failed
-            throw new Error((numTestsRun - numTestsPassed)
-                    + " of " + (numTestsRun)
-                    + " subtests failed");
-        }
-    }
-
-    /**
-     * Search for the string in the given file and return true
-     * if the string was found.
-     *
-     * @param fileString    the contents of the file to search through
-     * @param stringToFind  the string to search for
-     * @return              true if the string was found
-     */
-    private boolean findString(String fileString, String stringToFind) {
-        // javadoc (should) always use the platform newline sequence,
-        // but in the strings to find it is more convenient to use the Java
-        // newline character. So we translate \n to NL before we search.
-        stringToFind = stringToFind.replace("\n", NL);
-        return fileString.contains(stringToFind);
-    }
-
-    /**
-     * Compare the two given files.
-     *
-     * @param baseDir1 the directory in which to locate the first file
-     * @param baseDir2 the directory in which to locate the second file
-     * @param file the file to compare in the two base directories
-     * @param throwErrorIFNoMatch flag to indicate whether or not to throw
-     * an error if the files do not match.
-     * @return true if the files are the same and false otherwise.
-     */
-    private void diff(File baseDir1, File baseDir2, String file) {
-        String file1Contents = readFile(baseDir1, file);
-        String file2Contents = readFile(baseDir2, file);
-        checking("diff " + new File(baseDir1, file) + ", " + new File(baseDir2, file));
-        if (file1Contents.trim().compareTo(file2Contents.trim()) == 0) {
-            passed("files are equal");
-        } else {
-            failed("files differ");
-        }
-    }
-
-    /**
-     * Utility class to simplify the handling of temporarily setting a
-     * new stream for System.out or System.err.
-     */
-    private static class StreamOutput {
-        // functional interface to set a stream.
-        private interface Initializer {
-            void set(PrintStream s);
-        }
-
-        private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        private final PrintStream ps = new PrintStream(baos);
-        private final PrintStream prev;
-        private final Initializer init;
-
-        StreamOutput(PrintStream s, Initializer init) {
-            prev = s;
-            init.set(ps);
-            this.init = init;
-        }
-
-        String close() {
-            init.set(prev);
-            ps.close();
-            return baos.toString();
-        }
-    }
-
-    /**
-     * Utility class to simplify the handling of creating an in-memory PrintWriter.
-     */
-    private static class WriterOutput {
-        private final StringWriter sw = new StringWriter();
-        final PrintWriter pw = new PrintWriter(sw);
-        String close() {
-            pw.close();
-            return sw.toString();
-        }
-    }
-
-
-//    private final Logger log = new Logger();
-
-    //--------- Logging --------------------------------------------------------
-    //
-    // This class writes out the details of calls to checkOutput and checkFile
-    // in a canonical way, so that the resulting file can be checked against
-    // similar files from other versions of JavadocTester using the same logging
-    // facilities.
-
-    static class Logger {
-        private static final int PREFIX = 40;
-        private static final int SUFFIX = 20;
-        private static final int MAX = PREFIX + SUFFIX;
-        List<String> tests = new ArrayList<>();
-        String outDir;
-        String rootDir = rootDir();
-
-        static String rootDir() {
-            File f = new File(".").getAbsoluteFile();
-            while (!new File(f, ".hg").exists())
-                f = f.getParentFile();
-            return f.getPath();
-        }
-
-        void setOutDir(File outDir) {
-            this.outDir = outDir.getPath();
-        }
-
-        void logCheckFile(String file, boolean positive) {
-            // Strip the outdir because that will typically not be the same
-            if (file.startsWith(outDir + "/"))
-                file = file.substring(outDir.length() + 1);
-            tests.add(file + " " + positive);
-        }
-
-        void logCheckOutput(String file, boolean positive, String text) {
-            // Compress the string to be displayed in the log file
-            String simpleText = text.replaceAll("\\s+", " ").replace(rootDir, "[ROOT]");
-            if (simpleText.length() > MAX)
-                simpleText = simpleText.substring(0, PREFIX)
-                        + "..." + simpleText.substring(simpleText.length() - SUFFIX);
-            // Strip the outdir because that will typically not be the same
-            if (file.startsWith(outDir + "/"))
-                file = file.substring(outDir.length() + 1);
-            // The use of text.hashCode ensure that all of "text" is taken into account
-            tests.add(file + " " + positive + " " + text.hashCode() + " " + simpleText);
-        }
-
-        void write() {
-            // sort the log entries because the subtests may not be executed in the same order
-            tests.sort((a, b) -> a.compareTo(b));
-            try (BufferedWriter bw = new BufferedWriter(new FileWriter("tester.log"))) {
-                for (String t: tests) {
-                    bw.write(t);
-                    bw.newLine();
-                }
-            } catch (IOException e) {
-                throw new Error("problem writing log: " + e);
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java b/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
deleted file mode 100644
index 9988daef26f..00000000000
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4640745
- * @summary This test verifys that the -link option handles absolute paths.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestAbsLinkPath
- */
-
-public class TestAbsLinkPath extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestAbsLinkPath tester = new TestAbsLinkPath();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        String out1 = "out1";
-        javadoc("-d", out1, "-sourcepath", testSrc, "pkg2");
-        checkExit(Exit.OK);
-
-        javadoc("-d", "out2",
-                "-sourcepath", testSrc,
-                "-link", "../" + out1,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C1.html", true,
-                "C2.html");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg1/C1.java b/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg1/C1.java
deleted file mode 100644
index a641f1b79ec..00000000000
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg1/C1.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1;
-
-import pkg2.*;
-
-
-/**
- * Class 1
- */
-public class C1 extends C2 {}
diff --git a/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg2/C2.java b/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg2/C2.java
deleted file mode 100644
index 8b220c55279..00000000000
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/pkg2/C2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-/**
- * Class 2
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java b/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
deleted file mode 100644
index 991ad9df808..00000000000
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      8004891
- * @summary  Make sure that the abstract method is identified correctly
- *           if the abstract modifier is present explicitly or implicitly.
- * @author   bpatel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestAbstractMethod
- */
-
-public class TestAbstractMethod extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestAbstractMethod tester = new TestAbstractMethod();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", true,
-                "<td class=\"colFirst\"><code>default void</code></td>",
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>"
-                + "All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(2);\">Instance Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t3\" "
-                + "class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
-                + "Abstract Methods</a></span><span class=\"tabEnd\">&nbsp;</span>"
-                + "</span><span id=\"t5\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(16);\">Default Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span></caption>");
-
-        checkOutput("pkg/B.html", true,
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>"
-                + "All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(2);\">Instance Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t3\" "
-                + "class=\"tableTab\"><span><a href=\"javascript:show(4);\">Abstract "
-                + "Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t4\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(8);\">Concrete Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span></caption>",
-                "<td class=\"colFirst\"><code>abstract void</code></td>");
-
-        checkOutput("pkg/C.html", true,
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>"
-                + "All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(2);\">Instance Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t5\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(16);\">Default Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span></caption>",
-                "<td class=\"colFirst\"><code>default void</code></td>");
-
-        checkOutput("pkg/A.html", false,
-                "<td class=\"colFirst\"><code>abstract void</code></td>");
-
-        checkOutput("pkg/B.html", false,
-                "<span><a href=\"javascript:show(16);\">Default Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span>",
-                "<td class=\"colFirst\"><code>default void</code></td>");
-
-        checkOutput("pkg/C.html", false,
-                "<span><a href=\"javascript:show(4);\">Abstract Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/A.java b/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/A.java
deleted file mode 100644
index c83ee5d5b0d..00000000000
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/A.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-public interface A {
-
-    public void method1();
-
-    public default void defaultMethod() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/B.java b/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/B.java
deleted file mode 100644
index 91d83a8ba73..00000000000
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/B.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-public abstract class B {
-
-    public abstract void method1();
-
-    public void method2() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/C.java b/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/C.java
deleted file mode 100644
index 1dc33bcce54..00000000000
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/pkg/C.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-public interface C {
-
-    public default void onlyMethod() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java b/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
deleted file mode 100644
index f04ad41f44d..00000000000
--- a/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8025633 8025524 8081854
- * @summary Test for valid name attribute in HTML anchors.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestAnchorNames
- */
-
-public class TestAnchorNames extends JavadocTester {
-
-    private static final String[] ARGS = new String[] {
-
-    };
-
-    public static void main(String[] args) throws Exception {
-        TestAnchorNames tester = new TestAnchorNames();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-source", "8", //so that '_' can be used as an identifier
-                "-use",
-                "pkg1");
-        checkExit(Exit.OK);
-
-        // Test some section markers and links to these markers
-        checkOutput("pkg1/RegClass.html", true,
-                "<a name=\"skip.navbar.top\">",
-                "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">",
-                "<a name=\"nested.class.summary\">",
-                "<a href=\"#nested.class.summary\">",
-                "<a name=\"method.summary\">",
-                "<a href=\"#method.summary\">",
-                "<a name=\"field.detail\">",
-                "<a href=\"#field.detail\">",
-                "<a name=\"constructor.detail\">",
-                "<a href=\"#constructor.detail\">");
-
-        // Test some members and link to these members
-        checkOutput("pkg1/RegClass.html", true,
-                //The marker for this appears in the serialized-form.html which we will
-                //test below
-                "<a href=\"../serialized-form.html#pkg1.RegClass\">");
-
-        // Test some fields
-        checkOutput("pkg1/RegClass.html", true,
-                "<a name=\"Z:Z_\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z_\">",
-                "<a name=\"Z:Z_:D\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z_:D\">",
-                "<a name=\"Z:Z:D_\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z:D_\">",
-                "<a name=\"Z:Z:Dfield\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z:Dfield\">",
-                "<a name=\"fieldInCla:D:D\">",
-                "<a href=\"../pkg1/RegClass.html#fieldInCla:D:D\">",
-                "<a name=\"S_:D:D:D:D:DINT\">",
-                "<a href=\"../pkg1/RegClass.html#S_:D:D:D:D:DINT\">",
-                "<a name=\"method:D:D\">",
-                "<a href=\"../pkg1/RegClass.html#method:D:D\">");
-
-        checkOutput("pkg1/DeprMemClass.html", true,
-                "<a name=\"Z:Z_field_In_Class\">",
-                "<a href=\"../pkg1/DeprMemClass.html#Z:Z_field_In_Class\">");
-
-        // Test constructor
-        checkOutput("pkg1/RegClass.html", true,
-                "<a name=\"RegClass-java.lang.String-int-\">",
-                "<a href=\"../pkg1/RegClass.html#RegClass-java.lang.String-int-\">");
-
-        // Test some methods
-        checkOutput("pkg1/RegClass.html", true,
-                "<a name=\"Z:Z_methodInClass-java.lang.String-\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z_methodInClass-java.lang.String-\">",
-                "<a name=\"method--\">",
-                "<a href=\"../pkg1/RegClass.html#method--\">",
-                "<a name=\"foo-java.util.Map-\">",
-                "<a href=\"../pkg1/RegClass.html#foo-java.util.Map-\">",
-                "<a name=\"methodInCla:Ds-java.lang.String:A-\">",
-                "<a href=\"../pkg1/RegClass.html#methodInCla:Ds-java.lang.String:A-\">",
-                "<a name=\"Z:Z_methodInClas:D-java.lang.String-int-\">",
-                "<a href=\"../pkg1/RegClass.html#Z:Z_methodInClas:D-java.lang.String-int-\">",
-                "<a name=\"methodD-pkg1.RegClass.:DA-\">",
-                "<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.:DA-\">",
-                "<a name=\"methodD-pkg1.RegClass.D:A-\">",
-                "<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.D:A-\">");
-
-        checkOutput("pkg1/DeprMemClass.html", true,
-                "<a name=\"Z:Z:Dmethod_In_Class--\">",
-                "<a href=\"../pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">");
-
-        // Test enum
-        checkOutput("pkg1/RegClass.Te$t_Enum.html", true,
-                "<a name=\"Z:Z:DFLD2\">",
-                "<a href=\"../pkg1/RegClass.Te$t_Enum.html#Z:Z:DFLD2\">");
-
-        // Test nested class
-        checkOutput("pkg1/RegClass._NestedClas$.html", true,
-                "<a name=\"Z:Z_NestedClas:D--\">",
-                "<a href=\"../pkg1/RegClass._NestedClas$.html#Z:Z_NestedClas:D--\">");
-
-        // Test class use page
-        checkOutput("pkg1/class-use/DeprMemClass.html", true,
-                "<a href=\"../../pkg1/RegClass.html#d____mc\">");
-
-        // Test deprecated list page
-        checkOutput("deprecated-list.html", true,
-                "<a href=\"pkg1/DeprMemClass.html#Z:Z_field_In_Class\">",
-                "<a href=\"pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">");
-
-        // Test constant values page
-        checkOutput("constant-values.html", true,
-                "<a href=\"pkg1/RegClass.html#S_:D:D:D:D:DINT\">");
-
-        // Test serialized form page
-        checkOutput("serialized-form.html", true,
-                //This is the marker for the link that appears in the pkg1.RegClass.html page
-                "<a name=\"pkg1.RegClass\">");
-
-        // Test member name index page
-        checkOutput("index-all.html", true,
-                "<a name=\"I:Z:Z:D\">",
-                "<a href=\"#I:Z:Z:D\">$",
-                "<a href=\"#I:Z:Z_\">_");
-
-        // The marker name conversion should only affect HTML anchors. It should not
-        // affect the lables.
-        checkOutput("pkg1/RegClass.html", false,
-                " Z:Z_",
-                " Z:Z:Dfield",
-                " Z:Z_field_In_Class",
-                " S_:D:D:D:D:DINT");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java
deleted file mode 100644
index 7d2407656e6..00000000000
--- a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/DeprMemClass.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-public class DeprMemClass
-{
-    /**
-     * Field in the class.
-     * @deprecated Do not use this field.
-     */
-    public int _field_In_Class;
-
-    public int _fld;
-
-    /**
-     * Method in the class.
-     * @deprecated Do not use this method.
-     */
-    public void $method_In_Class() {
-    }
-
-    public void regularMethod() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java b/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
deleted file mode 100644
index 60aae773eb6..00000000000
--- a/langtools/test/com/sun/javadoc/testAnchorNames/pkg1/RegClass.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @serial This is the serial tag's comment.
- */
-public class RegClass implements Serializable {
-
-    /**
-     * Normal field in class.
-     */
-    public String field;
-
-    /**
-     * Normal field in class.
-     */
-    public String method$$;
-
-    /**
-     * Filed staring with $.
-     */
-    public String $field;
-
-    /**
-     * Filed staring with underscore.
-     */
-    public String _field;
-
-    /**
-     * Serial field
-     * @serial
-     */
-    public boolean t_e$t;
-
-    /**
-     * Field in class with a $ in the name.
-     */
-    public String fieldInCla$$;
-
-    /**
-     * Field name as just an underscore.
-     */
-    public int _;
-
-    /**
-     * Field name as just a $.
-     */
-    public int $;
-
-    /**
-     * Field name with underscore and $.
-     */
-    public int _$;
-
-    /**
-     * Field name with $ and underscore.
-     */
-    public int $_;
-
-    /**
-     * An array.
-     */
-    public int arr[];
-
-    /**
-     * Another array.
-     */
-    public int[] arr1;
-
-    /**
-     * A constant field.
-     */
-    public static final int S_$$$$$INT = 0;
-
-    /**
-     * Another field.
-     */
-    public DeprMemClass d____mc;
-
-    /**
-     * An enum.
-     */
-    public static enum Te$t_Enum {
-        FLD_1,
-        $FLD2
-    };
-
-    /**
-     * A constructor.
-     */
-    public RegClass(String p, int i) {
-    }
-
-    /**
-     * Method in Class.
-     * @param p a string
-     */
-    public void _methodInClass(String p) {
-    }
-
-    /**
-     * Method in Class.
-     * @param p a string
-     * @param i an int
-     */
-    public void _methodInClas$(String p, int i) {
-    }
-
-    /**
-     * Method with $ in the name.
-     * @param p a string array
-     */
-    public void methodInCla$s(String[] p) {
-    }
-
-    /**
-     * Method with D[] as a parameter.
-     * @param p an array of D
-     */
-    public void methodD(D[] p) {
-    }
-
-    /**
-     * Method with $A as a parameter.
-     * @param p an object of $A
-     */
-    public void methodD($A p) {
-    }
-
-    /**
-     * Serial test.
-     * @serialData This is a serial data comment.
-     * @return null
-     */
-    protected Object $readResolve(){return null;}
-
-    /**
-     * Simple method.
-     */
-    public void method() {}
-
-    /**
-     * Generics.
-     */
-    public static <A> void foo(Map<A, Map<A, A>> map) {}
-
-    /**
-     * A nested class.
-     */
-    public class _NestedClas$ {}
-
-    /**
-     * Nested class D.
-     */
-    class D {}
-
-    /**
-     * Nested class $A.
-     */
-    class $A {}
-}
diff --git a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java b/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
deleted file mode 100644
index 9061e1082b7..00000000000
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, 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 8025633 8081854
- * @summary  Make sure that annotations types with optional elements have
- *           element headers
- * @author   Mahmood Ali
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestAnnotationOptional
- */
-
-public class TestAnnotationOptional extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestAnnotationOptional tester = new TestAnnotationOptional();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/AnnotationOptional.html", true,
-            "<a name=\"annotation.type.element.detail\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java b/langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
deleted file mode 100644
index 6b774c2d7f0..00000000000
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type with optional value element.
- *
- * @author Mahmood Ali
- * @since 1.5
- */
-@Documented public @interface AnnotationOptional {
-    String value() default "";
-}
diff --git a/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java b/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
deleted file mode 100644
index 657919c16e1..00000000000
--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4973609 8015249 8025633 8026567
- * @summary  Make sure that annotation types with 0 members does not have
- *           extra HR tags.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestAnnotationTypes
- */
-
-public class TestAnnotationTypes extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestAnnotationTypes tester = new TestAnnotationTypes();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/AnnotationTypeField.html", true,
-                "<li>Summary:&nbsp;</li>\n"
-                + "<li><a href=\"#annotation.type."
-                + "field.summary\">Field</a>&nbsp;|&nbsp;</li>",
-                "<li>Detail:&nbsp;</li>\n"
-                + "<li><a href=\"#annotation.type."
-                + "field.detail\">Field</a>&nbsp;|&nbsp;</li>",
-                "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->",
-                "<h3>Field Summary</h3>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../"
-                + "pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>"
-                + "</code>&nbsp;</td>",
-                "<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->",
-                "<h4>DEFAULT_NAME</h4>\n"
-                + "<pre>public static final&nbsp;java."
-                + "lang.String&nbsp;DEFAULT_NAME</pre>");
-
-        checkOutput("pkg/AnnotationType.html", true,
-                "<li>Summary:&nbsp;</li>\n"
-                + "<li>Field&nbsp;|&nbsp;</li>",
-                "<li>Detail:&nbsp;</li>\n"
-                + "<li>Field&nbsp;|&nbsp;</li>");
-
-        checkOutput("pkg/AnnotationType.html", false,
-                "<HR>\n\n"
-                + "<P>\n\n"
-                + "<P>"
-                + "<!-- ========= END OF CLASS DATA ========= -->" + "<HR>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java
deleted file mode 100644
index 701f651dca6..00000000000
--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type.
- *
- * @author Jamie Ho.
- * @since 1.5
- */
-@Documented public @interface AnnotationType {
-
-}
diff --git a/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java b/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java
deleted file mode 100644
index 1dabafcc8db..00000000000
--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationTypeField.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test for annotation type fields.
- */
-@Documented public @interface AnnotationTypeField {
-    String DEFAULT_NAME = "test";
-
-    String name() default DEFAULT_NAME;
-}
diff --git a/langtools/test/com/sun/javadoc/testBackSlashInLink/C.java b/langtools/test/com/sun/javadoc/testBackSlashInLink/C.java
deleted file mode 100644
index d55b5db5274..00000000000
--- a/langtools/test/com/sun/javadoc/testBackSlashInLink/C.java
+++ /dev/null
@@ -1,7 +0,0 @@
-/* /nodynamiccopyright/ */
-
-/**
- * This is a comment.
- */
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
deleted file mode 100644
index 22669111603..00000000000
--- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4511110
- * @summary Test to make sure that the link to source documentation
- * has a forward slash.  It would be wrong to use a back slash.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestBackSlashInLink
- */
-
-public class TestBackSlashInLink extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBackSlashInLink tester = new TestBackSlashInLink();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-linksource",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "src-html/C.html#line.7");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
deleted file mode 100644
index a7a53c95fe9..00000000000
--- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4691095 6306394
- * @summary Test to make sure that Javadoc emits a useful warning
- * when a bad package.html file is in the JAR.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestBadPackageFileInJar
- */
-
-public class TestBadPackageFileInJar extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBadPackageFileInJar tester = new TestBadPackageFileInJar();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-classpath",  testSrc("badPackageFileInJar.jar"),
-                "pkg");
-        checkExit(Exit.FAILED);
-
-        checkOutput(Output.ERROR, true,
-                "badPackageFileInJar.jar" + FS + "pkg/package.html: error - Body tag missing from HTML");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar
deleted file mode 100644
index 5e71b3b33709e910b3561706c89bf7661e26445c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmWIWW@Zs#-~d9Ug{Ha;NPv@pg~8V~#8KDN&rSc|DFy~+h5&DN4v-2asImZ@nni#r
z;F^6M{XE@VgG2Ou-9G!CIql=Et9OytTUYDcne&^246YbIcv__A<*VcAd$DvC3+Id%
zlCRR9O<f}PRP~ug2Fvtknm^Li#Gi_Xi%nnhOia7tnd<AzPemV#7{Sh&%KKE-7i1X_
zBb+0S<`)5=Y(aLqenDb#c4B&}UPei7&gPREC(mwt{Akm~b_1|cYKtZo@d6cs6bE=S
zGKnyt1`N#CpnyRIaG!#L30*6)3qiqx0JcCTTq{x_A)5g539`dLjzfSmKqk7s0=!w-
PKq{Dla5s<^X9V#8z>#D)

diff --git a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java
deleted file mode 100644
index 6a87dc85897..00000000000
--- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testBadSourceFile/C1.java b/langtools/test/com/sun/javadoc/testBadSourceFile/C1.java
deleted file mode 100644
index 3898fcf865b..00000000000
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/C1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2003, 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.package1;
-
-/**
- * This is a comment.
- */
-public class C1 {
-
-
-        public void foo(int p) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testBadSourceFile/C2.java b/langtools/test/com/sun/javadoc/testBadSourceFile/C2.java
deleted file mode 100644
index 60683128e25..00000000000
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-/**
- * @see C1#foo(int)
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
deleted file mode 100644
index 1eac87d244c..00000000000
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4835749
- * @summary  Make sure exception is not thrown if there is a bad source
- *           file in the same directory as the file being documented.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestBadSourceFile
- */
-
-public class TestBadSourceFile extends JavadocTester {
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        TestBadSourceFile tester = new TestBadSourceFile();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                testSrc("C2.java"));
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testBaseClass/Bar.java b/langtools/test/com/sun/javadoc/testBaseClass/Bar.java
deleted file mode 100644
index 57ca4225767..00000000000
--- a/langtools/test/com/sun/javadoc/testBaseClass/Bar.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 1999, 2002, 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 baz.*;
-
-/** First line of comments for Bar
- *  Second line of comments for Bar
- */
-public class Bar extends Foo {
-} // end class Bar
diff --git a/langtools/test/com/sun/javadoc/testBaseClass/BaseClass.java b/langtools/test/com/sun/javadoc/testBaseClass/BaseClass.java
deleted file mode 100644
index 1c896bd342b..00000000000
--- a/langtools/test/com/sun/javadoc/testBaseClass/BaseClass.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1999, 2002, 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.
- */
-
-/**
- * Regression test for:
- * Javadoc does not process base class. If user specifies few classes on the
- * command line and few packages, with a situation where one of the specified
- * classes(on the command line) extends a class from one of the packages, then
- * due to some anomaly in ordering in which all the class and package objects
- * get constructed, few classes were getting marked as "not included", even
- * thought they were included in this run and hence documentation for those
- * packages was wrong. The test case for which javadoc was failing is given
- * in bug# 4197513.
- *
- * @bug 4197513
- * @summary Javadoc does not process base class.
- * @build BaseClass.java
- * @run shell BaseClassWrapper.sh
- * @author Atul M Dambalkar
- */
-
-import com.sun.javadoc.*;
-
-public class BaseClass {
-
-  public static boolean start(RootDoc root) throws Exception {
-     if (!root.classNamed("baz.Foo").isIncluded()) {
-         throw new Exception("Base class is not included: baz.Foo");
-     }
-     return true;
-  }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
deleted file mode 100644
index 15da3d7d858..00000000000
--- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4197513
- * @summary Javadoc does not process base class.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build BaseClass
- * @build JavadocTester
- * @run main TestBaseClass
- */
-
-public class TestBaseClass extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBaseClass tester = new TestBaseClass();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-sourcepath", testSrc,
-                "-docletpath", testSrc,
-                "-doclet", "BaseClass",
-                testSrc("Bar.java"), "baz");
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testBaseClass/baz/Foo.java b/langtools/test/com/sun/javadoc/testBaseClass/baz/Foo.java
deleted file mode 100644
index 5d25eb1bb90..00000000000
--- a/langtools/test/com/sun/javadoc/testBaseClass/baz/Foo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 baz;
-
-public class Foo {}
diff --git a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
deleted file mode 100644
index 638947bd8dd..00000000000
--- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4165985
- * @summary Determine the end of the first sentence using BreakIterator.
- * If the first sentence of "method" is parsed correctly, the test passes.
- * Correct Answer: "The class is empty (i.e. it has no members)."
- * Wrong Answer: "The class is empty (i.e."
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestBreakIterator
- */
-
-public class TestBreakIterator extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBreakIterator tester = new TestBreakIterator();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-breakiterator",
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/BreakIteratorTest.html", true,
-            "The class is empty (i.e. it has no members).");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java b/langtools/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java
deleted file mode 100644
index b8dfb7f4d62..00000000000
--- a/langtools/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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 pkg;
-
-/**
- * The class is empty (i.e. it has no members).
- */
-public class BreakIteratorTest {
-}
diff --git a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
deleted file mode 100644
index 514bff820eb..00000000000
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4979486
- * @summary  Make sure tool parses CR line separators properly.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestCRLineSeparator
- */
-
-import java.io.*;
-import java.util.*;
-
-public class TestCRLineSeparator extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestCRLineSeparator tester = new TestCRLineSeparator();
-        tester.runTests();
-    }
-
-    @Test
-    void test() throws IOException {
-        initFiles(new File(testSrc), new File("src"), "pkg");
-        javadoc("-d", "out",
-                "-sourcepath", "src",
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/MyClass.html", true,
-                "Line 1\n"
-                + " Line 2");
-    }
-
-    // recursively copy files from fromDir to toDir, replacing newlines
-    // with \r
-    void initFiles(File fromDir, File toDir, String f) throws IOException {
-        File from_f = new File(fromDir, f);
-        File to_f = new File(toDir, f);
-        if (from_f.isDirectory()) {
-            to_f.mkdirs();
-            for (String child: from_f.list()) {
-                initFiles(from_f, to_f, child);
-            }
-        } else {
-            List<String> lines = new ArrayList<>();
-            try (BufferedReader in = new BufferedReader(new FileReader(from_f))) {
-                String line;
-                while ((line = in.readLine()) != null)
-                    lines.add(line);
-            }
-            try (BufferedWriter out = new BufferedWriter(new FileWriter(to_f))) {
-                for (String line: lines) {
-                    out.write(line);
-                    out.write("\r");
-                }
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java b/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
deleted file mode 100644
index 4c82d6785b8..00000000000
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004, 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.
- */
-
-package pkg;
-
-/**
- * Line 1
- * Line 2
- */
-public class MyClass {}
-
diff --git a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java
deleted file mode 100644
index a273340c72c..00000000000
--- a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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      7052170 8047745
- * @summary  Run a test on -charset to make sure the charset gets generated as a
- *           part of the meta tag.
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestCharset
- */
-
-public class TestCharset extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestCharset tester = new TestCharset();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-charset", "ISO-8859-1",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("index.html", true,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">");
-        checkOutput("pkg/Foo.html", true,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">");
-
-        checkOutput("index.html", false,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"ISO-8859-1\">");
-        checkOutput("pkg/Foo.html", false,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"ISO-8859-1\">");
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("index.html", true,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">");
-        checkOutput("pkg/Foo.html", true,
-            "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java b/langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java
deleted file mode 100644
index 62d07e54bf7..00000000000
--- a/langtools/test/com/sun/javadoc/testCharset/pkg/Foo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg;
-
-public class Foo {}
diff --git a/langtools/test/com/sun/javadoc/testClassCrossReferences/C.java b/langtools/test/com/sun/javadoc/testClassCrossReferences/C.java
deleted file mode 100644
index b274009c208..00000000000
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/C.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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.
- */
-
-/**
- * Cross link to package: {@link java.math Link to math package}<br>
- * Cross link to inner class: {@link javax.swing.text.AbstractDocument.AttributeContext Link to AttributeContext innerclass} <br>
- * Cross link to class: {@link java.math.BigDecimal Link to external class BigDecimal}<br>
- * Cross link to member: {@link java.math.BigInteger#gcd(java.math.BigInteger) Link to external member gcd}<br>
- */
-public class C {
-
-    public String toString() {
-        return "";
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
deleted file mode 100644
index 28120d4ae5c..00000000000
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4652655 4857717 8025633 8026567
- * @summary This test verifies that class cross references work properly.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @build TestClassCrossReferences
- * @run main TestClassCrossReferences
- */
-
-public class TestClassCrossReferences extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestClassCrossReferences tester = new TestClassCrossReferences();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        final String uri = "http://java.sun.com/j2se/1.4/docs/api/";
-
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", uri, testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<a href=\"" + uri + "java/math/package-summary.html?is-external=true\">"
-                + "<code>Link to math package</code></a>",
-                "<a href=\"" + uri + "javax/swing/text/AbstractDocument.AttributeContext.html?is-external=true\" "
-                + "title=\"class or interface in javax.swing.text\"><code>Link to AttributeContext innerclass</code></a>",
-                "<a href=\"" + uri + "java/math/BigDecimal.html?is-external=true\" "
-                + "title=\"class or interface in java.math\"><code>Link to external class BigDecimal</code></a>",
-                "<a href=\"" + uri + "java/math/BigInteger.html?is-external=true#gcd-java.math.BigInteger-\" "
-                + "title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>",
-                "<dl>\n"
-                + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>\n"
-                + "</dl>");
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testClassCrossReferences/package-list b/langtools/test/com/sun/javadoc/testClassCrossReferences/package-list
deleted file mode 100644
index 34804b3540c..00000000000
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/package-list
+++ /dev/null
@@ -1,2 +0,0 @@
-java.math
-javax.swing.text
diff --git a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
deleted file mode 100644
index 4603593404b..00000000000
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4632553 4973607 8026567
- * @summary  No need to include type name (class, interface, etc.) before
- *           every single type in class tree.
- *           Make sure class tree includes heirarchy for enums and annotation
- *           types.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestClassTree
- */
-
-public class TestClassTree extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestClassTree tester = new TestClassTree();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/package-tree.html", true,
-                "<ul>\n"
-                + "<li class=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" "
-                + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>",
-                "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n"
-                + "<ul>\n"
-                + "<li class=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" "
-                + "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> "
-                + "(implements java.lang.annotation.Annotation)</li>\n"
-                + "</ul>",
-                "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n"
-                + "<ul>\n"
-                + "<li class=\"circle\">java.lang.Object\n"
-                + "<ul>\n"
-                + "<li class=\"circle\">java.lang.Enum&lt;E&gt; (implements java.lang."
-                + "Comparable&lt;T&gt;, java.io.Serializable)\n"
-                + "<ul>\n"
-                + "<li class=\"circle\">pkg.<a href=\"../pkg/Coin.html\" "
-                + "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>\n"
-                + "</ul>\n"
-                + "</li>\n"
-                + "</ul>\n"
-                + "</li>\n"
-                + "</ul>");
-
-        checkOutput("pkg/package-tree.html", false,
-                "<li class=\"circle\">class pkg.<a href=\"../pkg/ParentClass.html\" "
-                + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testClassTree/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testClassTree/pkg/AnnotationType.java
deleted file mode 100644
index 831bfdb32c2..00000000000
--- a/langtools/test/com/sun/javadoc/testClassTree/pkg/AnnotationType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type.
- *
- * @author Jamie Ho.
- * @since 1.5
- */
-@Documented public @interface AnnotationType {
-
-    /**
-     * The copyright holder.
-     */
-    String optional() default "unknown";
-
-   /**
-    * The year of the copyright.
-    */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java b/langtools/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java
deleted file mode 100644
index 0ce95d6c1f9..00000000000
--- a/langtools/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class ChildClass extends ParentClass {}
diff --git a/langtools/test/com/sun/javadoc/testClassTree/pkg/Coin.java b/langtools/test/com/sun/javadoc/testClassTree/pkg/Coin.java
deleted file mode 100644
index ec13a84b337..00000000000
--- a/langtools/test/com/sun/javadoc/testClassTree/pkg/Coin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-/**
- * This is a sample Enum.
- *
- * @author Jamie Ho
- */
-public enum Coin {
-
-  Penny, Nickel, Dime;
-
-public Coin(int i) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java b/langtools/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java
deleted file mode 100644
index 3eb577eec3c..00000000000
--- a/langtools/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class ParentClass {}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/C5.java b/langtools/test/com/sun/javadoc/testCmndLineClass/C5.java
deleted file mode 100644
index be24cc60132..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/C5.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-/**
- *This is a description for C5.
- */
-
-public class C5  {
-
-    public static final int I = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java b/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
deleted file mode 100644
index e03b498e82d..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4506980
- * @summary Test to make sure that there is no difference in the output
- * when specifying packages on the command line and specifying individual
- * classes.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestCmndLineClass
- */
-
-public class TestCmndLineClass extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestCmndLineClass tester = new TestCmndLineClass();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String outdir1 = "out-1";
-        String outdir2 = "out-2";
-
-        javadoc("-d", outdir1,
-                "-sourcepath", testSrc,
-                "-notimestamp",
-                testSrc("C5.java"), "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        javadoc("-d", outdir2,
-                "-sourcepath", testSrc,
-                "-notimestamp",
-                testSrc("C5.java"),
-                testSrc("pkg1/C1.java"),
-                testSrc("pkg1/C2.java"),
-                testSrc("pkg2/C3.java"),
-                testSrc("pkg2/C4.java"));
-        checkExit(Exit.OK);
-
-        diff(outdir1, outdir2,
-                "C5.html",
-                "pkg1/C1.html",
-                "pkg1/C2.html",
-                "pkg2/C3.html",
-                "pkg2/C4.html");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java
deleted file mode 100644
index 9859d07be68..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1;
-
-/**
- *This is a description for C1.
- */
-
-public class C1 {
-
-    public static final int I = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java
deleted file mode 100644
index 2961a45b447..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1;
-
-/**
- *This is a description for C2.
- */
-
-public class C2  {
-
-    public static final int I = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html
deleted file mode 100644
index ea77c793ffa..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-
-    This is a description for package 1.
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java
deleted file mode 100644
index f0595fbc948..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-/**
- *This is a description for C3.
- */
-
-public class C3  {
-
-    public static final int I = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java
deleted file mode 100644
index d25c28ffaf7..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-/**
- *This is a description for C4.
- */
-
-public class C4  {
-
-    public static final int I = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html b/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html
deleted file mode 100644
index 224f3f55d68..00000000000
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-
-    This is a description for package 2.
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java b/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
deleted file mode 100644
index 2968d6adb4d..00000000000
--- a/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8027977
- * @summary Test to verify javadoc executes without CompletionFailure exception.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestCompletionFailure
- */
-
-public class TestCompletionFailure extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestCompletionFailure tester = new TestCompletionFailure();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput(Output.STDERR, false,
-                "sun.util.locale.provider.LocaleProviderAdapter");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java b/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java
deleted file mode 100644
index a02ffe9f34a..00000000000
--- a/langtools/test/com/sun/javadoc/testCompletionFailure/pkg1/NumberFormatTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-import java.text.NumberFormat;
-
-public abstract class NumberFormatTest extends NumberFormat { }
diff --git a/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java b/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
deleted file mode 100644
index 76c89c0633f..00000000000
--- a/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4681599
- * @summary Test to make sure that constant values page does not get
- * generated when doclet has nothing to document.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestConstantValuesPage
- */
-
-public class TestConstantValuesPage extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestConstantValuesPage tester = new TestConstantValuesPage();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "foo");
-        checkExit(Exit.FAILED);
-
-        checkOutput(Output.NOTICE, false,
-                "constant-values.html...");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testConstructorIndent/C.java b/langtools/test/com/sun/javadoc/testConstructorIndent/C.java
deleted file mode 100644
index 2eaaf1133c4..00000000000
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/C.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class C {
-
-    /**
-     * This is just a simple constructor.
-     * @param i a param.
-     */
-    public C(int i) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
deleted file mode 100644
index d4e5784c775..00000000000
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4904037 8026567
- * @summary  The constructor comments should be surrounded by
- *           <dl></dl>.  Check for this in the output.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestConstructorIndent
- */
-
-public class TestConstructorIndent extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestConstructorIndent tester = new TestConstructorIndent();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<div class=\"block\">"
-                + "This is just a simple constructor.</div>\n"
-                + "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:</span></dt>\n"
-                + "<dd><code>i</code> - a param.</dd>\n"
-                + "</dl>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java b/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
deleted file mode 100644
index 176a1f78878..00000000000
--- a/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8025524 8031625 8081854
- * @summary Test for constructor name which should be a non-qualified name.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestConstructors
- */
-
-public class TestConstructors extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestConstructors tester = new TestConstructors();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/Outer.html", true,
-                "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, \n"
-                + "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, \n"
-                + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, \n"
-                + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, \n"
-                + "<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, \n"
-                + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>",
-                "Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, "
-                + "<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, "
-                + "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>"
-                + "NestedInner(int)</code></a>",
-                "<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()",
-                "<a name=\"Outer--\">",
-                "<a href=\"../pkg1/Outer.html#Outer-int-\">Outer</a></span>(int&nbsp;i)",
-                "<a name=\"Outer-int-\">");
-
-        checkOutput("pkg1/Outer.Inner.html", true,
-                "<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>()",
-                "<a name=\"Inner--\">",
-                "<a href=\"../pkg1/Outer.Inner.html#Inner-int-\">Inner</a></span>(int&nbsp;i)",
-                "<a name=\"Inner-int-\">");
-
-        checkOutput("pkg1/Outer.Inner.NestedInner.html", true,
-                "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>()",
-                "<a name=\"NestedInner--\">",
-                "<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\">NestedInner</a></span>(int&nbsp;i)",
-                "<a name=\"NestedInner-int-\">");
-
-        checkOutput("pkg1/Outer.Inner.html", false,
-                "Outer.Inner--",
-                "Outer.Inner-int-");
-
-        checkOutput("pkg1/Outer.Inner.NestedInner.html", false,
-                "Outer.Inner.NestedInner--",
-                "Outer.Inner.NestedInner-int-");
-
-        checkOutput("pkg1/Outer.html", false,
-                "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>",
-                "<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>",
-                "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>",
-                "<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testConstructors/pkg1/Outer.java b/langtools/test/com/sun/javadoc/testConstructors/pkg1/Outer.java
deleted file mode 100644
index 9d8f76fefb9..00000000000
--- a/langtools/test/com/sun/javadoc/testConstructors/pkg1/Outer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * Test link tag.
- * Link: {@link pkg1.Outer.Inner#Inner()}, {@link pkg1.Outer#Outer(int)}, {@link pkg1.Outer.Inner.NestedInner#NestedInner(int)}
- *
- * @see Outer.Inner#Inner()
- * @see Outer.Inner#Inner(int)
- * @see Outer.Inner.NestedInner#NestedInner()
- * @see Outer.Inner.NestedInner#NestedInner(int)
- * @see Outer#Outer()
- * @see Outer#Outer(int)
- */
-public class Outer {
-
-    /**
-     * An outer constructor.
-     */
-    public Outer() {
-    }
-
-    /**
-     * Another outer constructor.
-     */
-    public Outer(int i) {
-    }
-
-    /**
-     * A nested class.
-     */
-    public class Inner {
-
-        /**
-         * An inner constructor.
-         */
-        public Inner() {
-        }
-
-        /**
-         * Another inner constructor.
-         */
-        public Inner(int i) {
-        }
-
-        /**
-         * A nested inner class.
-         */
-        public class NestedInner {
-
-            /**
-             * A nested inner constructor.
-             */
-            public NestedInner() {
-            }
-
-            /**
-             * Another nested inner constructor.
-             */
-            public NestedInner(int i) {
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCustomTag/TagTestClass.java b/langtools/test/com/sun/javadoc/testCustomTag/TagTestClass.java
deleted file mode 100644
index 6bf742d36fb..00000000000
--- a/langtools/test/com/sun/javadoc/testCustomTag/TagTestClass.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-/**
- * @customTag A custom tag.
- * @unknownTag An unknown tag
- */
-public class TagTestClass {
-
-    public void method(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java b/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
deleted file mode 100644
index f71567146ab..00000000000
--- a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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      8006248
- * @summary  Test custom tag. Verify that an unknown tag generates appropriate warnings.
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
- * @build    JavadocTester taglets.CustomTag
- * @run main TestCustomTag
- */
-
-public class TestCustomTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestCustomTag tester = new TestCustomTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-1",
-                "-tagletpath", testSrc, // TODO: probably useless
-                "-taglet", "taglets.CustomTag",
-                "-sourcepath",  testSrc,
-                "-XDaccessInternalAPI",
-                testSrc("TagTestClass.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, true,
-                "warning - @unknownTag is an unknown tag.");
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2",
-                "-tagletpath", testSrc,  // TODO: probably useless
-                "-taglet", "taglets.CustomTag",
-                "-sourcepath", testSrc,
-                "-XDaccessInternalAPI",
-                testSrc("TagTestClass.java"));
-        checkExit(Exit.FAILED);
-
-        checkOutput(Output.ERROR, true,
-                "error: unknown tag: unknownTag");
-    }
-
-    @Test
-    void test3() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-3",
-                "-sourcepath", testSrc,
-                testSrc("TagTestClass.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING,  true,
-            "warning - @customTag is an unknown tag.",
-            "warning - @unknownTag is an unknown tag.");
-    }
-
-    @Test
-    void test4() {
-        javadoc("-d", "out-4",
-                "-sourcepath",  testSrc,
-                testSrc("TagTestClass.java"));
-        checkExit(Exit.FAILED);
-
-        checkOutput(Output.ERROR, true,
-            "error: unknown tag: customTag",
-            "error: unknown tag: unknownTag");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testCustomTag/taglets/CustomTag.java b/langtools/test/com/sun/javadoc/testCustomTag/taglets/CustomTag.java
deleted file mode 100644
index d626771141e..00000000000
--- a/langtools/test/com/sun/javadoc/testCustomTag/taglets/CustomTag.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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 taglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-
-public class CustomTag extends BaseTaglet {
-
-    public CustomTag() {
-        name = "customTag";
-    }
-
-    public static void register(Map tagletMap) {
-       CustomTag tag = new CustomTag();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        ArrayList inlineTags = new ArrayList();
-        inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"simpleTagLabel\">Custom Tag:</span></dt><dd>"));
-        inlineTags.addAll(Arrays.asList(tag.inlineTags()));
-        inlineTags.add(new TextTag(tag.holder(), "</dd>"));
-        return writer.commentTagsToOutput(tag,
-                (Tag[]) inlineTags.toArray(new Tag[] {}));
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
deleted file mode 100644
index 0da414fe5db..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4927552 8026567
- * @summary  <DESC>
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestDeprecatedDocs
- */
-
-public class TestDeprecatedDocs extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDeprecatedDocs tester = new TestDeprecatedDocs();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("deprecated-list.html", true,
-                "annotation_test1 passes",
-                "annotation_test2 passes",
-                "annotation_test3 passes",
-                "class_test1 passes",
-                "class_test2 passes",
-                "class_test3 passes",
-                "class_test4 passes",
-                "enum_test1 passes",
-                "enum_test2 passes",
-                "error_test1 passes",
-                "error_test2 passes",
-                "error_test3 passes",
-                "error_test4 passes",
-                "exception_test1 passes",
-                "exception_test2 passes",
-                "exception_test3 passes",
-                "exception_test4 passes",
-                "interface_test1 passes",
-                "interface_test2 passes",
-                "interface_test3 passes",
-                "interface_test4 passes",
-                "pkg.DeprecatedClassByAnnotation",
-                "pkg.DeprecatedClassByAnnotation()",
-                "pkg.DeprecatedClassByAnnotation.method()",
-                "pkg.DeprecatedClassByAnnotation.field"
-        );
-
-        checkOutput("pkg/DeprecatedClassByAnnotation.html", true,
-                "<pre>@Deprecated\n"
-                + "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>\n"
-                + "extends java.lang.Object</pre>",
-                "<pre>@Deprecated\n"
-                + "public&nbsp;int field</pre>\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>",
-                "<pre>@Deprecated\n"
-                + "public&nbsp;DeprecatedClassByAnnotation()</pre>\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>",
-                "<pre>@Deprecated\n"
-                + "public&nbsp;void&nbsp;method()</pre>\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
deleted file mode 100644
index f234c2b2b48..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-@Deprecated()
-public class DeprecatedClassByAnnotation {
-
-    @Deprecated()
-    public int field;
-
-    @Deprecated()
-    public DeprecatedClassByAnnotation() {}
-
-    @Deprecated()
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java
deleted file mode 100644
index 6443f2eec00..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * @deprecated annotation_test1 passes.
- */
-@Documented public @interface TestAnnotationType {
-
-    /**
-     * @deprecated annotation_test2 passes.
-     */
-    String optional() default "unknown";
-
-   /**
-     * @deprecated annotation_test3 passes.
-     */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java
deleted file mode 100644
index 5320c376080..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * @deprecated class_test1 passes.
- */
-public class TestClass {
-
-    /**
-     * @deprecated class_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated class_test3 passes.
-     */
-    public TestClass() {}
-
-    /**
-     * @deprecated class_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java
deleted file mode 100644
index 218a9b4761e..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * @deprecated enum_test1 passes.
- */
-public enum TestEnum {
-
-    /**
-     * @deprecated enum_test2 passes.
-     */
-    ONE, TWO, THREE;
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java
deleted file mode 100644
index d456a63d2ad..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * @deprecated error_test1 passes.
- */
-public class TestError extends Error {
-
-    /**
-     * @deprecated error_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated error_test3 passes.
-     */
-    public TestError() {}
-
-    /**
-     * @deprecated error_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java
deleted file mode 100644
index d91a81c1fbe..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * @deprecated exception_test1 passes.
- */
-public class TestException extends Exception {
-
-    /**
-     * @deprecated exception_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated exception_test3 passes.
-     */
-    public TestException() {}
-
-    /**
-     * @deprecated exception_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java b/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java
deleted file mode 100644
index 052dd9bf9c2..00000000000
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * @deprecated interface_test1 passes.
- */
-public class TestInterface {
-
-    /**
-     * @deprecated interface_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated interface_test3 passes.
-     */
-    public TestInterface() {}
-
-    /**
-     * @deprecated interface_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
deleted file mode 100644
index 1f6c585e8e4..00000000000
--- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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.
- */
-
-/*
- * Portions Copyright (c) 2012 IBM Corporation
- */
-
-/*
- * @test
- * @bug      8000743
- * @summary  Run tests on -docencoding to see if the value is
-             used for stylesheet as well.
- * @author   jayashree viswanathan
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestDocEncoding
- */
-
-public class TestDocEncoding extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDocEncoding tester = new TestDocEncoding();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-docencoding", "Cp930",
-                "-sourcepath", testSrc,
-                "-notimestamp",
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("stylesheet.css", false,
-                "body {\n"
-                + "    background-color:#ffffff;");
-    }
-}
-
diff --git a/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java b/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java
deleted file mode 100644
index 134fda22906..00000000000
--- a/langtools/test/com/sun/javadoc/testDocEncoding/pkg/Test.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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
- * 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.
- */
-
-/*
- * Portions Copyright (c) 2012 IBM Corporation
- */
-
-package pkg;
-
-public class Test {}
-
diff --git a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
deleted file mode 100644
index 74100d21106..00000000000
--- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4927928
- * @summary  Make sure that option validation errors and sent to the
- *           DocErrorReporter.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestDocErrorReporter
- */
-
-public class TestDocErrorReporter extends JavadocTester {
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        TestDocErrorReporter tester = new TestDocErrorReporter();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-encoding", "xyz",
-                testSrc("TestDocErrorReporter.java"));
-
-        checkExit(Exit.FAILED);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
deleted file mode 100644
index 6bcdbcc3462..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4258405 4973606 8024096
- * @summary This test verifies that the doc-file directory does not
- *          get overwritten when the sourcepath is equal to the destination
- *          directory.
- *          Also test that -docfilessubdirs and -excludedocfilessubdir both work.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDocFileDir
- */
-
-public class TestDocFileDir extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDocFileDir tester = new TestDocFileDir();
-        tester.runTests();
-    }
-
-    // Output dir = "", Input dir = ""
-    @Test
-    void test1() {
-        copyDir(testSrc("pkg"), ".");
-        setOutputDirectoryCheck(DirectoryCheck.NO_HTML_FILES);
-        javadoc("pkg/C.java");
-        checkExit(Exit.OK);
-        checkOutput("pkg/doc-files/testfile.txt", true,
-            "This doc file did not get trashed.");
-    }
-
-    // Output dir = Input Dir
-    @Test
-    void test2() {
-        String outdir = "out2";
-        copyDir(testSrc("pkg"), outdir);
-        setOutputDirectoryCheck(DirectoryCheck.NO_HTML_FILES);
-        javadoc("-d", outdir,
-            "-sourcepath", "blah" + PS + outdir + PS + "blah",
-            "pkg");
-        checkExit(Exit.OK);
-        checkOutput("pkg/doc-files/testfile.txt", true,
-            "This doc file did not get trashed.");
-    }
-
-    // Exercising -docfilessubdirs and -excludedocfilessubdir
-    @Test
-    void test3() {
-        String outdir = "out3";
-        setOutputDirectoryCheck(DirectoryCheck.NONE);
-        javadoc("-d", outdir,
-                "-sourcepath", testSrc,
-                "-docfilessubdirs",
-                "-excludedocfilessubdir", "subdir-excluded1:subdir-excluded2",
-                "pkg");
-        checkExit(Exit.OK);
-        checkFiles(true,
-                "pkg/doc-files/subdir-used1/testfile.txt",
-                "pkg/doc-files/subdir-used2/testfile.txt");
-        checkFiles(false,
-                "pkg/doc-files/subdir-excluded1/testfile.txt",
-                "pkg/doc-files/subdir-excluded2/testfile.txt");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/C.java b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/C.java
deleted file mode 100644
index 1d9742f4a35..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/C.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/*******************************
- * Just a dummy class used for
- * testing purposes.
- *******************************/
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt
deleted file mode 100644
index 0a93d4c4444..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-passed
-
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt
deleted file mode 100644
index 0a93d4c4444..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-passed
-
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt
deleted file mode 100644
index 0a93d4c4444..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-passed
-
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt
deleted file mode 100644
index 0a93d4c4444..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-passed
-
diff --git a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt b/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt
deleted file mode 100644
index d3a844313d7..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This doc file did not get trashed.
-
diff --git a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java b/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
deleted file mode 100644
index 8bf77ba4506..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8008949
- * @summary verify that doc-files get copied
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDocFiles
- */
-
-public class TestDocFiles extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDocFiles tester = new TestDocFiles();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/doc-files/test.txt", true,
-                "test file");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDocFiles/pkg/Test.java b/langtools/test/com/sun/javadoc/testDocFiles/pkg/Test.java
deleted file mode 100644
index 708a284c072..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFiles/pkg/Test.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, 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 pkg;
-
-public class Test { }
-
diff --git a/langtools/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt b/langtools/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt
deleted file mode 100644
index ec25cd31475..00000000000
--- a/langtools/test/com/sun/javadoc/testDocFiles/pkg/doc-files/test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-this is a test file
-
diff --git a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
deleted file mode 100644
index 841b110d76d..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4369014 4851991
- * @summary Determine if the docRoot inline tag works properly.
- * If docRoot performs as documented, the test passes.
- * Make sure that the docRoot tag works with the -bottom option.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDocRootInlineTag
- */
-
-public class TestDocRootInlineTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDocRootInlineTag tester = new TestDocRootInlineTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String uri = "http://www.java.sun.com/j2se/1.4/docs/api";
-
-        javadoc("-bottom", "The value of @docRoot is \"{@docRoot}\"",
-                "-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", uri, testSrc,
-                testSrc("TestDocRootTag.java"), "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("TestDocRootTag.html", true,
-                "<a href=\"" + uri + "/java/io/File.html?is-external=true\" "
-                + "title=\"class or interface in java.io\"><code>File</code></a>",
-                "<a href=\"./glossary.html\">glossary</a>",
-                "<a href=\"" + uri + "/java/io/File.html?is-external=true\" "
-                + "title=\"class or interface in java.io\"><code>Second File Link</code></a>",
-                "The value of @docRoot is \"./\"");
-
-        checkOutput("index-all.html", true,
-                "My package page is <a href=\"./pkg/package-summary.html\">here</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java
deleted file mode 100644
index b696144c7ef..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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.
- */
-
-/**
- * Here is the use of link: {@link java.io.File File}
- * Here is the use of docRoot: <a href="{@docRoot}/glossary.html">glossary</a>.
- * Here is the use of link: {@link java.io.File Second File Link}
- */
-public class TestDocRootTag {}
diff --git a/langtools/test/com/sun/javadoc/testDocRootInlineTag/package-list b/langtools/test/com/sun/javadoc/testDocRootInlineTag/package-list
deleted file mode 100644
index 43f52389204..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/package-list
+++ /dev/null
@@ -1 +0,0 @@
-java.io
diff --git a/langtools/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java b/langtools/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java
deleted file mode 100644
index 22070cb4f80..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * My package page is <a href="{@docRoot}/pkg/package-summary.html">here</a>
- *
- */
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
deleted file mode 100644
index 2011ac32d7c..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 6553182 8025416 8029504
- * @summary This test verifies the -Xdocrootparent option.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDocRootLink
- */
-public class TestDocRootLink extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestDocRootLink tester = new TestDocRootLink();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C1.html", true,
-            "Refer <a href=\"../../technotes/guides/index.html\">Here</a>",
-            "This <a href=\"../pkg2/C2.html\">Here</a> should not be replaced\n" +
-            " with an absolute link.",
-            "Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and\n" +
-            " <a href=\"../pkg2/C2.html\">Link 2</a>.");
-
-        checkOutput("pkg1/package-summary.html", true,
-            "<a href=\"../../technotes/guides/index.html\">\n" +
-            "            Test document 1</a>",
-            "<a href=\"../pkg2/C2.html\">\n" +
-            "            Another Test document 1</a>",
-            "<a href=\"../technotes/guides/index.html\">\n" +
-            "            Another Test document 2.</a>");
-
-        // TODO: should this check *any* reference to http://download.oracle.com/
-        checkOutput("pkg1/C1.html", false,
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">");
-
-        checkOutput("pkg1/package-summary.html", false,
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">");
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2",
-                "-Xdocrootparent", "http://download.oracle.com/javase/7/docs",
-                "-sourcepath", testSrc,
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg2/C2.html", true,
-            "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>",
-            "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced\n" +
-            " with an absolute link.",
-            "Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and\n" +
-            " <a href=\"../pkg1/C1.html\">Link 2</a>.");
-
-        checkOutput("pkg2/package-summary.html", true,
-            "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">\n" +
-            "            Test document 1</a>",
-            "<a href=\"../pkg1/C1.html\">\n" +
-            "            Another Test document 1</a>",
-            "<a href=\"../technotes/guides/index.html\">\n" +
-            "            Another Test document 2.</a>");
-
-        checkOutput("pkg2/C2.html", false,
-            "<a href=\"../../technotes/guides/index.html\">",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">");
-
-        checkOutput("pkg2/package-summary.html", false,
-            "<a href=\"../../technotes/guides/index.html\">",
-            "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java
deleted file mode 100644
index 0ac8bf344c8..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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 pkg1;
-
-/**
- * Class 1. This is a test.
- * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a>. This link should
- * not be replaced with an absolute link.
- * This <a href="{@docRoot}/pkg2/C2.html">Here</a> should not be replaced
- * with an absolute link.
- * Testing <a href="{@docRoot}/technotes/guides/index.html">Link 1</a> and
- * <a href="{@docRoot}/pkg2/C2.html">Link 2</a>. 2 back-to-back links using
- * docroot. These should not be replaced with an absolute link.
- */
-public class C1 {}
diff --git a/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html b/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html
deleted file mode 100644
index 47630592284..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootLink/pkg1/package.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-<title>javax.management package</title>
-</head>
-<body bgcolor="white">
-    This is a test.
-    <p id="spec">
-        @see <a href="{@docRoot}/../technotes/guides/index.html">
-            Test document 1</a> should not be replaced with an absolute link.
-        @see <a href="{@docRoot}/pkg2/C2.html">
-            Another Test document 1</a> which should not be replaced with an absolute link.
-        <a href="{@docRoot}/technotes/guides/index.html">
-            Another Test document 2.</a> which should not be replaced with an absolute link.
-
-        @since 1.5
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java
deleted file mode 100644
index 45a37caa87f..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, 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 pkg2;
-
-/**
- * Class 2. This is a test.
- * Refer <a href="{@docRoot}/../technotes/guides/index.html">Here</a> should be
- * replaced with an absolute link.
- * This <a href="{@docRoot}/pkg1/C1.html">Here</a> should not be replaced
- * with an absolute link.
- * Testing <a href="{@docRoot}/technotes/guides/index.html">Link 1</a> and
- * <a href="{@docRoot}/pkg1/C1.html">Link 2</a>. Both should not be replaced with
- * an absolute link.
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html b/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html
deleted file mode 100644
index dd0b9a4870d..00000000000
--- a/langtools/test/com/sun/javadoc/testDocRootLink/pkg2/package.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-<title>javax.management package</title>
-</head>
-<body bgcolor="white">
-    This is a test.
-    <p id="spec">
-        @see <a href="{@docRoot}/../technotes/guides/index.html">
-            Test document 1</a> should be replaced with an absolute link.
-        @see <a href="{@docRoot}/pkg1/C1.html">
-            Another Test document 1</a> which should not be replaced with an absolute link.
-        <a href="{@docRoot}/technotes/guides/index.html">
-            Another Test document 2.</a> which should not be replaced with an absolute link.
-
-        @since 1.5
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java b/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
deleted file mode 100644
index e50cc181176..00000000000
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4745855
- * @summary Test to ensure that the doclet does not print out bad
- * warning messages about duplicate param tags.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestDupParamWarn
- */
-
-public class TestDupParamWarn extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        JavadocTester tester = new TestDupParamWarn();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, false,
-            "Parameter \"a\" is documented more than once.");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java b/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java
deleted file mode 100644
index 2677349a1c6..00000000000
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public interface Bar {
-
-    /**
-     * @param a blah.
-     * @param b blah.
-     */
-    void method(int a, int b);
-
-}
diff --git a/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java b/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java
deleted file mode 100644
index 8eb05016f79..00000000000
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public interface Foo extends Bar {
-
-    /**
-     * @param a blah.
-     * @param b blah.
-     */
-    void method(int a, int b);
-
-}
diff --git a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
deleted file mode 100644
index aacbb78e733..00000000000
--- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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 4483401 4483407 4483409 4483413 4494343
- * @summary Test to make sure that Javadoc behaves properly when
- * run on a completely empty class (no comments or members).
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestEmptyClass
- */
-
-public class TestEmptyClass extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestEmptyClass tester = new TestEmptyClass();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-classpath", testSrc("src"),
-                "-d", "out",
-                "-sourcepath", testSrc("src"),
-                testSrc("src/Empty.java"));
-        checkExit(Exit.OK);
-
-        //The overview tree should not link to classes that were not documented
-        checkOutput("overview-tree.html", false,
-                "<A HREF=\"TestEmptyClass.html\">");
-
-        //The index page should not link to classes that were not documented
-        checkOutput("index-all.html", false,
-                "<A HREF=\"TestEmptyClass.html\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testEmptyClass/src/Empty.java b/langtools/test/com/sun/javadoc/testEmptyClass/src/Empty.java
deleted file mode 100644
index 9d1f16ceccd..00000000000
--- a/langtools/test/com/sun/javadoc/testEmptyClass/src/Empty.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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.
- */
-
-public class Empty
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
deleted file mode 100644
index e3b0a4e7a85..00000000000
--- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      5008230
- * @summary  Check the outer class when documenting enclosing class/interface.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestEnclosingClass
- */
-
-public class TestEnclosingClass extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestEnclosingClass tester = new TestEnclosingClass();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/MyClass.MyInterface.html", true,
-                "Enclosing class:");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testEnclosingClass/pkg/MyClass.java b/langtools/test/com/sun/javadoc/testEnclosingClass/pkg/MyClass.java
deleted file mode 100644
index 023f2776795..00000000000
--- a/langtools/test/com/sun/javadoc/testEnclosingClass/pkg/MyClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class MyClass {
-    public interface MyInterface {}
-}
diff --git a/langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java b/langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java
deleted file mode 100644
index da11306c5cf..00000000000
--- a/langtools/test/com/sun/javadoc/testEncoding/EncodeTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, 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.
- */
-
-/**
- * Testing en\u00e7\u00f4ded string.
- * In the encoded comment string, Unicode U+00E7 is "Latin small letter C with cedilla"
- * and Unicode U+00F4 is "Latin small letter O with circumflex"
- */
-public class EncodeTest {
-}
diff --git a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
deleted file mode 100644
index a972225c98b..00000000000
--- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4661481 8024096
- * @summary This test determines if the value of the -encoding option is
- * properly passed from Javadoc to the source file parser.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestEncoding
- */
-
-public class TestEncoding extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestEncoding tester = new TestEncoding();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-encoding", "iso-8859-1",
-                testSrc("EncodeTest.java"));
-        checkExit(Exit.OK);
-
-        // If ??? is found in the output, the source file was not read with the correct encoding setting.
-        checkOutput("EncodeTest.html", false,
-                "??");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
deleted file mode 100644
index 74e06d72d88..00000000000
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4857717 8025633 8026567
- * @summary Test to make sure that externally overriden and implemented methods
- * are documented properly.  The method should still include "implements" or
- * "overrides" documentation even though the method is external.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester TestExternalOverridenMethod
- * @run main TestExternalOverridenMethod
- */
-
-public class TestExternalOverridenMethod extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestExternalOverridenMethod tester = new TestExternalOverridenMethod();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String uri = "http://java.sun.com/j2se/1.4.1/docs/api";
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", uri, testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/XReader.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"" + uri + "/java/io/FilterReader.html?is-external=true#read--\" "
-                + "title=\"class or interface in java.io\">read</a></code>&nbsp;in class&nbsp;<code>"
-                + "<a href=\"" + uri + "/java/io/FilterReader.html?is-external=true\" "
-                + "title=\"class or interface in java.io\">FilterReader</a></code></dd>",
-                "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
-                + "<dd><code><a href=\"" + uri + "/java/io/DataInput.html?is-external=true#readInt--\" "
-                + "title=\"class or interface in java.io\">readInt</a></code>&nbsp;in interface&nbsp;<code>"
-                + "<a href=\"" + uri + "/java/io/DataInput.html?is-external=true\" "
-                + "title=\"class or interface in java.io\">DataInput</a></code></dd>"
-        );
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/package-list b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/package-list
deleted file mode 100644
index 43f52389204..00000000000
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/package-list
+++ /dev/null
@@ -1 +0,0 @@
-java.io
diff --git a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java
deleted file mode 100644
index e98a05a090f..00000000000
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.io.*;
-
-public abstract class XReader extends FilterReader implements DataInput {
-
-   /**
-    * This tests overridding an external method.
-    */
-    public int read() throws IOException {
-       return 'W';
-    }
-
-   /**
-    * This tests implementing an external method.
-    */
-    public int readInt() throws IOException {
-       return 'W';
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
deleted file mode 100644
index e0f3736a656..00000000000
--- a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 8000418 8024288
- * @summary Verify that files use a common Generated By string
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestGeneratedBy
- */
-
-public class TestGeneratedBy extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestGeneratedBy tester = new TestGeneratedBy();
-        tester.runTests();
-    }
-
-    @Test
-    void testTimestamp() {
-        javadoc("-d", "out-timestamp",
-            "-sourcepath", testSrc,
-            "pkg");
-        checkExit(Exit.OK);
-
-        checkTimestamps(true);
-    }
-
-    @Test
-    void testNoTimestamp() {
-        javadoc("-d", "out-notimestamp",
-            "-notimestamp",
-            "-sourcepath", testSrc,
-            "pkg");
-        checkExit(Exit.OK);
-
-        checkTimestamps(false);
-    }
-
-    void checkTimestamps(boolean timestamp) {
-        checkTimestamps(timestamp,
-        "pkg/MyClass.html",
-        "pkg/package-summary.html",
-        "pkg/package-frame.html",
-        "pkg/package-tree.html",
-        "allclasses-noframe.html",
-        "constant-values.html",
-        "allclasses-frame.html",
-        "overview-tree.html",
-        "deprecated-list.html",
-        "serialized-form.html",
-        "help-doc.html",
-        "index-all.html",
-        "index.html");
-
-    }
-
-    void checkTimestamps(boolean timestamp, String... files) {
-        String version = System.getProperty("java.version");
-        String genBy = "Generated by javadoc";
-        if (timestamp) genBy += " (" + version + ") on ";
-
-        for (String file: files) {
-            // genBy is the current standard "Generated by" text
-            checkOutput(file, true, genBy);
-
-            // These are older versions of the "Generated by" text
-            checkOutput(file, false,
-                (timestamp
-                    ? "Generated by javadoc (version"
-                    : "Generated by javadoc ("),
-                "Generated by javadoc on");
-        }
-    }
-}
-
diff --git a/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java b/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java
deleted file mode 100644
index b3b699b1d0a..00000000000
--- a/langtools/test/com/sun/javadoc/testGeneratedBy/pkg/MyClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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
- * 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 pkg;
-
-import java.io.Serializable;
-
-public class MyClass implements Serializable {
-}
diff --git a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
deleted file mode 100644
index d3a588cd01c..00000000000
--- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4924383
- * @summary  Test to make sure the -group option does not cause a bad warning
- *           to be printed.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestGroupOption
- */
-
-public class TestGroupOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestGroupOption tester = new TestGroupOption();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        //Make sure the warning is not printed when -group is used correctly.
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "-group", "Package One", "pkg1",
-                "-group", "Package Two", "pkg2",
-                "-group", "Package Three", "pkg3",
-                "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, false,
-                "-group");
-    }
-
-    @Test
-    void test2() {
-        //Make sure the warning is printed when -group is not used correctly.
-        javadoc("-d", "out-2",
-                "-sourcepath", testSrc,
-                "-group", "Package One", "pkg1",
-                "-group", "Package One", "pkg2",
-                "-group", "Package One", "pkg3",
-                "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, true,
-                "-group");
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testGroupOption/pkg1/C.java b/langtools/test/com/sun/javadoc/testGroupOption/pkg1/C.java
deleted file mode 100644
index 4b841c1698c..00000000000
--- a/langtools/test/com/sun/javadoc/testGroupOption/pkg1/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg1;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testGroupOption/pkg2/C.java b/langtools/test/com/sun/javadoc/testGroupOption/pkg2/C.java
deleted file mode 100644
index 2c2280c5ecc..00000000000
--- a/langtools/test/com/sun/javadoc/testGroupOption/pkg2/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg2;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testGroupOption/pkg3/C.java b/langtools/test/com/sun/javadoc/testGroupOption/pkg3/C.java
deleted file mode 100644
index b34f7d22c2a..00000000000
--- a/langtools/test/com/sun/javadoc/testGroupOption/pkg3/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
deleted file mode 100644
index 1d0d82bda59..00000000000
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4905786 6259611
- * @summary  Make sure that headings use the TH tag instead of the TD tag.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @build    TestHeadings
- * @run main TestHeadings
- */
-
-public class TestHeadings extends JavadocTester {
-
-    private static final String[][] TEST = {
-
-        {
-        },
-        { "serialized-form.html"
-        },
-        { "serialized-form.html"
-        },
-
-        {
-        },
-        { "overview-frame.html"
-        },
-        {
-        }
-    };
-
-    public static void main(String... args) throws Exception {
-        TestHeadings tester = new TestHeadings();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-use",
-                "-header", "Test Files",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        //Package summary
-        checkOutput("pkg1/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
-                + ">Description</th>");
-
-        // Class documentation
-        checkOutput("pkg1/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Field and Description</th>",
-                "<h3>Methods inherited from class&nbsp;java.lang.Object</h3>");
-
-        // Class use documentation
-        checkOutput("pkg1/class-use/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Field and Description</th>");
-
-        // Deprecated
-        checkOutput("deprecated-list.html", true,
-                "<th class=\"colOne\" scope=\"col\">Method and Description</th>");
-
-        // Constant values
-        checkOutput("constant-values.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Modifier and Type</th>\n"
-                + "<th scope=\"col\">Constant Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Value</th>");
-
-        // Serialized Form
-        checkOutput("serialized-form.html", true,
-                "<h2 title=\"Package\">Package&nbsp;pkg1</h2>",
-                "<h3>Class <a href=\"pkg1/C1.html\" title=\"class in pkg1\">"
-                + "pkg1.C1</a> extends java.lang.Object implements Serializable</h3>",
-                "<h3>Serialized Fields</h3>");
-
-        // Overview Frame
-        checkOutput("overview-frame.html", true,
-                "<h1 title=\"Test Files\" class=\"bar\">Test Files</h1>",
-                "<title>Overview List</title>");
-
-        // Overview Summary
-        checkOutput("overview-summary.html", true,
-                "<title>Overview</title>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHeadings/pkg1/C1.java b/langtools/test/com/sun/javadoc/testHeadings/pkg1/C1.java
deleted file mode 100644
index fce98649e6e..00000000000
--- a/langtools/test/com/sun/javadoc/testHeadings/pkg1/C1.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg1;
-
-import pkg2.*;
-import java.io.Serializable;
-
-/**
- * @serial This is the serial tag's comment.
- */
-public class C1 implements Serializable {
-
-    public C2 field;
-
-    public static final String CONSTANT1 = "C1";
-
-    public C2 method(C2 param) {
-        return param;
-    }
-
-    /**
-     * @deprecated don't use this anymore.
-     */
-    public void deprecatedMethod() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHeadings/pkg2/C2.java b/langtools/test/com/sun/javadoc/testHeadings/pkg2/C2.java
deleted file mode 100644
index 75cc21c29ab..00000000000
--- a/langtools/test/com/sun/javadoc/testHeadings/pkg2/C2.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg2;
-
-import pkg1.*;
-import java.io.Serializable;
-
-/**
- * @serial This is the serial tag's comment.
- */
-public class C2 implements Serializable {
-
-    public C1 field;
-
-    public static final String CONSTANT1 = "C2";
-
-    public C1 method(C1 param) {
-        return param;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
deleted file mode 100644
index 7a75e430ce7..00000000000
--- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      7132631
- * @summary  Make sure that the help file is generated correctly.
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestHelpFile
- */
-
-public class TestHelpFile extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHelpFile tester = new TestHelpFile();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("TestHelpFile.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("help-doc.html", true,
-            "<a href=\"constant-values.html\">Constant Field Values</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
deleted file mode 100644
index 09fff50c505..00000000000
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4934778 4777599 6553182
- * @summary  Make sure that the -help option works properly.  Make sure
- *           the help link appears in the documentation.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester TestHelpOption
- * @run main TestHelpOption
- */
-
-public class TestHelpOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHelpOption tester = new TestHelpOption();
-        tester.runTests();
-    }
-
-    @Test
-    void testWithOption() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                "-help",
-                testSrc("TestHelpOption.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(true);
-    }
-
-    @Test
-    void testWithoutOption() {
-        javadoc("-d", "out2",
-                "-sourcepath", testSrc,
-                testSrc("TestHelpOption.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(false);
-    }
-
-    private void checkOutput(boolean withOption) {
-        checkOutput(Output.STDOUT, withOption,
-                "-d ",
-                "-use ",
-                "-version ",
-                "-author ",
-                "-docfilessubdirs ",
-                "-splitindex ",
-                "-windowtitle ",
-                "-doctitle ",
-                "-header ",
-                "-footer ",
-                "-bottom ",
-                "-link ",
-                "-linkoffline ",
-                "-excludedocfilessubdir ",
-                "-group ",
-                "-nocomment ",
-                "-nodeprecated ",
-                "-noqualifier ",
-                "-nosince ",
-                "-notimestamp ",
-                "-nodeprecatedlist ",
-                "-notree ",
-                "-noindex ",
-                "-nohelp ",
-                "-nonavbar ",
-                "-serialwarn ",
-                "-tag ",
-                "-taglet ",
-                "-tagletpath ",
-                "-charset ",
-                "-helpfile ",
-                "-linksource ",
-                "-sourcetab ",
-                "-keywords ",
-                "-stylesheetfile ",
-                "-docencoding ");
-
-        checkOutput("TestHelpOption.html", !withOption,
-                "<li><a href=\"help-doc.html\">Help</a></li>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
deleted file mode 100644
index 84a7ec703d3..00000000000
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4492178
- * @summary Test to make sure that hidden overriden members are not
- * documented as inherited.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHiddenMembers
- */
-
-public class TestHiddenMembers extends JavadocTester {
-
-    private static final String[][] NEGATED_TEST = {
-        { }
-        };
-    private static final String[] ARGS =
-        new String[] {
-
-        };
-
-    public static void main(String... args) throws Exception {
-        TestHiddenMembers tester = new TestHiddenMembers();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        // We should not inherit any members from BaseClass because they are all overriden and hidden
-        // (declared as private).
-        // TODO: check normal case of generated tags: upper case of lower case
-        checkOutput("pkg/SubClass.html", false,
-            "inherited from class pkg.<A HREF=\"../pkg/BaseClass.html\">BaseClass</A>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java b/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java
deleted file mode 100644
index 6a54fe6df5f..00000000000
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class BaseClass {
-
-  public int pubField = 1;
-
-  public class pubInnerClass{}
-
-  public void pubMethod() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java b/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java
deleted file mode 100644
index 2b8a851e195..00000000000
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class SubClass extends BaseClass {
-
-  private int pubField = 1;
-
-  private class pubInnerClass{}
-
-  private void pubMethod() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHref/TestHref.java b/langtools/test/com/sun/javadoc/testHref/TestHref.java
deleted file mode 100644
index aebb73a1445..00000000000
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4663254 8016328 8025633 8026567 8081854
- * @summary  Verify that spaces do not appear in hrefs and anchors.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestHref
- */
-
-public class TestHref extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHref tester = new TestHref();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C1.html", true,
-                //External link.
-                "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait-long-int-\"",
-                //Member summary table link.
-                "href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\"",
-                //Anchor test.
-                "<a name=\"method-int-int-java.util.ArrayList-\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                //Backward compatibility anchor test."pkg/C1.html",
-                "<a name=\"method-int-int-java.util.ArrayList-\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-
-        checkOutput("pkg/C2.html", true,
-                //{@link} test.
-                "Link: <a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">",
-                //@see test.
-                "See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">"
-        );
-
-        checkOutput("pkg/C4.html", true,
-                //Header does not link to the page itself.
-                "Class C4&lt;E extends C4&lt;E&gt;&gt;</h2>",
-                //Signature does not link to the page itself.
-                "public abstract class <span class=\"typeNameLabel\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
-        );
-
-        checkOutput(Output.WARNING, false,
-                "<a> tag is malformed");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHref/package-list b/langtools/test/com/sun/javadoc/testHref/package-list
deleted file mode 100644
index 46af8ccb0d0..00000000000
--- a/langtools/test/com/sun/javadoc/testHref/package-list
+++ /dev/null
@@ -1 +0,0 @@
-java.lang
diff --git a/langtools/test/com/sun/javadoc/testHref/pkg/C1.java b/langtools/test/com/sun/javadoc/testHref/pkg/C1.java
deleted file mode 100644
index c37ba91ed80..00000000000
--- a/langtools/test/com/sun/javadoc/testHref/pkg/C1.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.util.*;
-
-/**
- * @see java.lang.Object#wait(long, int)
- */
-public class C1 {
-
-    public <E> void method(int param1, int param2, ArrayList<E> param3) {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHref/pkg/C2.java b/langtools/test/com/sun/javadoc/testHref/pkg/C2.java
deleted file mode 100644
index 2bcb5de7d23..00000000000
--- a/langtools/test/com/sun/javadoc/testHref/pkg/C2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.util.*;
-
-/**
- * Link: {@link pkg.C1#method(int, int, java.util.ArrayList)}
- * @see  pkg.C1#method(int, int, java.util.ArrayList)
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testHref/pkg/C4.java b/langtools/test/com/sun/javadoc/testHref/pkg/C4.java
deleted file mode 100644
index 3e3e3fe7ab2..00000000000
--- a/langtools/test/com/sun/javadoc/testHref/pkg/C4.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg;
-
-public abstract class C4<E extends C4<E>> {
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
deleted file mode 100644
index 5242faa7c71..00000000000
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4638015
- * @summary Determine if Hrefs are processed properly when they
- * appear in doc comments.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHrefInDocComment
- */
-
-public class TestHrefInDocComment extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHrefInDocComment tester = new TestHrefInDocComment();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc, "pkg");
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java b/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java
deleted file mode 100644
index c734943e6bc..00000000000
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/**
- * Here's the <a href="mailto:skeet@pobox.com">first</a>
- * and here's the <a href="http://www.pobox.com">second</a>.
- */
-public interface I1 {}
diff --git a/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java b/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java
deleted file mode 100644
index dd3cc3edcfa..00000000000
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-   /*****
-    * Just a dummy interface used to reproduce a bug.
-    */
-
-   public interface I2 {
-   }
diff --git a/langtools/test/com/sun/javadoc/testHtmlComments/C.java b/langtools/test/com/sun/javadoc/testHtmlComments/C.java
deleted file mode 100644
index d147801ce46..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlComments/C.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
deleted file mode 100644
index 4a2d3025982..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4904038
- * @summary  The field detail comment should not show up in the output if there
- *           are no fields to document.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestHtmlComments
- */
-
-public class TestHtmlComments extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHtmlComments tester = new TestHtmlComments();
-        tester.runTests();
-    }
-
-    @Test
-    void run() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", false,
-            "<!-- ============ FIELD DETAIL =========== -->");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
deleted file mode 100644
index 6a1f316f6cb..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, 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 6786690 6820360 8025633 8026567
- * @summary This test verifies the nesting of definition list tags.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlDefinitionListTag
- */
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class TestHtmlDefinitionListTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test_Comment_Deprecated() {
-//        tester.run(ARGS1, TEST_ALL, NEGATED_TEST_NO_C5);
-//        tester.runTestsOnHTML(NO_TEST,  NEGATED_TEST_C5);
-//        tester.runTestsOnHTML(TEST_CMNT_DEPR, NO_TEST);
-        javadoc("-Xdoclint:none",
-                "-d", "out-1",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-        checkCommon(true);
-        checkCommentDeprecated(true);
-    }
-
-    @Test
-    void test_NoComment_Deprecated() {
-//        tester.run(ARGS2, TEST_ALL, NEGATED_TEST_NO_C5);
-//        tester.runTestsOnHTML(NO_TEST,  NEGATED_TEST_C5);
-//        tester.runTestsOnHTML(NO_TEST, TEST_CMNT_DEPR);
-        javadoc("-Xdoclint:none",
-                "-d", "out-2",
-                "-nocomment",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-        checkCommon(true);
-        checkCommentDeprecated(false); // ??
-    }
-
-    @Test
-    void test_Comment_NoDeprecated() {
-//        tester.run(ARGS3, TEST_ALL, NEGATED_TEST_NO_C5);
-//        tester.runTestsOnHTML(TEST_NODEPR, TEST_NOCMNT_NODEPR);
-        javadoc("-Xdoclint:none",
-                "-d", "out-3",
-                "-nodeprecated",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-        checkCommon(false);
-        checkNoDeprecated();
-        checkNoCommentNoDeprecated(false);
-    }
-
-    @Test
-    void testNoCommentNoDeprecated() {
-//        tester.run(ARGS4, TEST_ALL, NEGATED_TEST_NO_C5);
-//        tester.runTestsOnHTML(TEST_NOCMNT_NODEPR, TEST_CMNT_DEPR);
-        javadoc("-Xdoclint:none",
-                "-d", "out-4",
-                "-nocomment",
-                "-nodeprecated",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-        checkCommon(false);
-        checkNoCommentNoDeprecated(true);
-        checkCommentDeprecated(false);
-    }
-
-    void checkCommon(boolean checkC5) {
-        // Test common to all runs of javadoc. The class signature should print
-        // properly enclosed definition list tags and the Annotation Type
-        // Optional Element should print properly nested definition list tags
-        // for default value.
-        checkOutput("pkg1/C1.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">C1</span>\n" +
-                "extends java.lang.Object\n" +
-                "implements java.io.Serializable</pre>");
-        checkOutput("pkg1/C4.html", true,
-                "<dl>\n" +
-                "<dt>Default:</dt>\n" +
-                "<dd>true</dd>\n" +
-                "</dl>");
-
-        // Test for valid HTML generation which should not comprise of empty
-        // definition list tags.
-        List<String> files= new ArrayList<>(Arrays.asList(
-            "pkg1/package-summary.html",
-            "pkg1/C1.html",
-            "pkg1/C1.ModalExclusionType.html",
-            "pkg1/C2.html",
-            "pkg1/C2.ModalType.html",
-            "pkg1/C3.html",
-            "pkg1/C4.html",
-            "overview-tree.html",
-            "serialized-form.html"
-        ));
-
-        if (checkC5)
-            files.add("pkg1/C5.html");
-
-        for (String f: files) {
-            checkOutput(f, false,
-                    "<dl></dl>",
-                    "<dl>\n</dl>");
-        }
-    }
-
-    void checkCommentDeprecated(boolean expectFound) {
-        // Test for normal run of javadoc in which various ClassDocs and
-        // serialized form should have properly nested definition list tags
-        // enclosing comments, tags and deprecated information.
-        checkOutput("pkg1/package-summary.html", expectFound,
-                "<dl>\n" +
-                "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
-                "<dd>JDK1.0</dd>\n" +
-                "</dl>");
-
-        checkOutput("pkg1/C1.html", expectFound,
-                "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>JDK1.0</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>"
-                + "C2</code></a>, \n"
-                + "<a href=\"../serialized-form.html#pkg1.C1\">"
-                + "Serialized Form</a></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:</span></dt>\n"
-                + "<dd><code>title</code> - the title</dd>\n"
-                + "<dd><code>test</code> - boolean value"
-                + "</dd>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span></dt>\n"
-                + "<dd><code>java.lang.IllegalArgumentException</code> - if the "
-                + "<code>owner</code>'s\n"
-                + "     <code>GraphicsConfiguration</code> is not from a screen "
-                + "device</dd>\n"
-                + "<dd><code>HeadlessException</code></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:</span></dt>\n"
-                + "<dd><code>undecorated"
-                + "</code> - <code>true</code> if no decorations are\n"
-                + "         to be enabled;\n"
-                + "         <code>false</code> "
-                + "if decorations are to be enabled.</dd>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:"
-                + "</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd>"
-                + "<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()"
-                + "</code></a></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span></dt>\n"
-                + "<dd><code>java.io.IOException</code></dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:"
-                + "</span></dt>\n"
-                + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg1/C2.html", expectFound,
-                "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:"
-                + "</span></dt>\n"
-                + "<dd><code>set</code> - boolean</dd>\n"
-                + "<dt><span class=\"simpleTagLabel\">"
-                + "Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "</dl>");
-
-        checkOutput("serialized-form.html", expectFound,
-                "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span>"
-                + "</dt>\n"
-                + "<dd><code>"
-                + "java.io.IOException</code></dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">This field indicates whether the C1 is "
-                + "undecorated.</div>\n"
-                + "&nbsp;\n"
-                + "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">Reads the object stream.</div>\n"
-                + "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:"
-                + "</span></dt>\n"
-                + "<dd><code>java.io.IOException</code></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;</div>\n"
-                + "<div class=\"block\">The name for this class.</div>");
-    }
-
-    void checkNoDeprecated() {
-        // Test with -nodeprecated option. The ClassDocs should have properly nested
-        // definition list tags enclosing comments and tags. The ClassDocs should not
-        // display definition list for deprecated information. The serialized form
-        // should display properly nested definition list tags for comments, tags
-        // and deprecated information.
-        checkOutput("pkg1/package-summary.html", true,
-                "<dl>\n" +
-                "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
-                "<dd>JDK1.0</dd>\n" +
-                "</dl>");
-
-        checkOutput("pkg1/C1.html", true,
-                "<dl>\n" +
-                "<dt><span class=\"simpleTagLabel\">Since:</span>" +
-                "</dt>\n" +
-                "<dd>JDK1.0</dd>\n" +
-                "<dt><span class=\"seeLabel\">See Also:" +
-                "</span></dt>\n" +
-                "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" +
-                "<code>C2</code></a>, \n" +
-                "<a href=\"../serialized-form.html#pkg1.C1\">" +
-                "Serialized Form</a></dd>\n" +
-                "</dl>");
-
-        checkOutput("pkg1/C1.html", true,
-                "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:"
-                + "</span></dt>\n"
-                + "<dd><code>title</code> - the title</dd>\n"
-                + "<dd><code>"
-                + "test</code> - boolean value</dd>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:"
-                + "</span></dt>\n"
-                + "<dd><code>java.lang.IllegalArgumentException"
-                + "</code> - if the <code>owner</code>'s\n"
-                + "     <code>GraphicsConfiguration"
-                + "</code> is not from a screen device</dd>\n"
-                + "<dd><code>"
-                + "HeadlessException</code></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"paramLabel\">Parameters:"
-                + "</span></dt>\n"
-                + "<dd><code>undecorated</code> - <code>true</code>"
-                + " if no decorations are\n"
-                + "         to be enabled;\n"
-                + "         <code>false</code> if decorations are to be enabled."
-                + "</dd>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg1/C1.html#readObject--\">"
-                + "<code>readObject()</code></a></dd>\n"
-                + "</dl>",
-                "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span>"
-                + "</dt>\n"
-                + "<dd><code>java.io.IOException</code></dd>\n"
-                + "<dt>"
-                + "<span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>");
-
-        checkOutput("serialized-form.html", true,
-                "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span>"
-                + "</dt>\n"
-                + "<dd><code>"
-                + "java.io.IOException</code></dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">This field indicates whether the C1 is "
-                + "undecorated.</div>\n"
-                + "&nbsp;\n"
-                + "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">Reads the object stream.</div>\n"
-                + "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:"
-                + "</span></dt>\n"
-                + "<dd><code>java.io.IOException</code></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;</div>\n"
-                + "<div class=\"block\">"
-                + "The name for this class.</div>");
-    }
-
-    void checkNoCommentNoDeprecated(boolean expectFound) {
-        // Test with -nocomment and -nodeprecated options. The ClassDocs whould
-        // not display definition lists for any member details.
-        checkOutput("pkg1/C1.html", expectFound,
-                "<pre>public&nbsp;void&nbsp;readObject()\n" +
-                "                throws java.io.IOException</pre>\n" +
-                "</li>");
-
-        checkOutput("pkg1/C2.html", expectFound,
-                "<pre>public&nbsp;C2()</pre>\n" +
-                "</li>");
-
-        checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,
-                "<pre>public " +
-                "static final&nbsp;<a href=\"../pkg1/C1.ModalExclusionType.html\" " +
-                "title=\"enum in pkg1\">C1.ModalExclusionType</a> " +
-                "APPLICATION_EXCLUDE</pre>\n" +
-                "</li>");
-
-        checkOutput("serialized-form.html", expectFound,
-                "<pre>boolean " +
-                "undecorated</pre>\n" +
-                "<div class=\"block\"><span class=\"deprecatedLabel\">" +
-                "Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
-                " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" +
-                "setUndecorated(boolean)</code></a>.</span></div>\n" +
-                "</li>",
-                "<span class=\"deprecatedLabel\">" +
-                "Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version" +
-                " 1.5, replaced by\n" +
-                " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
-                "<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
-                "</li>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java
deleted file mode 100644
index 60110da8c04..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * A class comment for testing.
- *
- * @author      Bhavesh Patel
- * @see C2
- * @since       JDK1.0
- */
-
-public class C1 implements Serializable {
-
-    /**
-     * This field indicates whether the C1 is undecorated.
-     *
-     * @see #setUndecorated(boolean)
-     * @since 1.4
-     * @serial
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-    public boolean undecorated = false;
-
-    private String title;
-
-    /**
-     * This enum specifies the possible modal exclusion types.
-     *
-     * @since 1.6
-     */
-    public static enum ModalExclusionType {
-        /**
-         * No modal exclusion.
-         */
-        NO_EXCLUDE,
-        /**
-         * <code>APPLICATION_EXCLUDE</code> indicates that a top-level window
-         * won't be blocked by any application-modal dialogs. Also, it isn't
-         * blocked by document-modal dialogs from outside of its child hierarchy.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * Constructor.
-     *
-     * @param title the title
-     * @param test boolean value
-     * @exception IllegalArgumentException if the <code>owner</code>'s
-     *     <code>GraphicsConfiguration</code> is not from a screen device
-     * @exception HeadlessException
-     */
-     public C1(String title, boolean test) {
-
-     }
-
-     public C1(String title) {
-
-     }
-
-    /**
-     * Method comments.
-     * @param  undecorated <code>true</code> if no decorations are
-     *         to be enabled;
-     *         <code>false</code> if decorations are to be enabled.
-     * @see    #readObject()
-     * @since 1.4
-     */
-    public void setUndecorated(boolean undecorated) {
-        /* Make sure we don't run in the middle of peer creation.*/
-    }
-
-    /**
-     * @see #setUndecorated(boolean)
-     */
-    public void readObject() throws IOException {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java
deleted file mode 100644
index 0b67bae0d42..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * A class comment for testing.
- *
- * @author      Bhavesh Patel
- * @see C1
- * @since       JDK1.0
- */
-
-public class C2 implements Serializable {
-
-    /**
-     * This field indicates title.
-     */
-    String title;
-
-    public static enum ModalType {
-        NO_EXCLUDE
-    };
-
-    /**
-     * Constructor.
-     *
-     */
-     public C2() {
-
-     }
-
-     public C2(String title) {
-
-     }
-
-     /**
-     * Set visible.
-     *
-     * @param set boolean
-     * @since 1.4
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-     public void setVisible(boolean set) {
-     }
-
-     /**
-     * Reads the object stream.
-     *
-     * @param s ObjectInputStream
-     * @throws IOException
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-     public void readObject(ObjectInputStream s) throws IOException {
-     }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java
deleted file mode 100644
index 1ccc2f2b33e..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * Test Annotation class.
- *
- * @author Bhavesh Patel
- * @since 1.5
- */
-@Retention(RetentionPolicy.SOURCE)
-public @interface C3 {
-    /**
-     * Comment.
-     */
-    String[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java
deleted file mode 100644
index fea124de2cf..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.lang.annotation.*;
-
-/*
- * The @Inherited annotation has no effect when applied to an interface.
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface C4 {
-    boolean value() default true;
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java
deleted file mode 100644
index 5b5e4bc1143..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.Serializable;
-
-/**
- * Test for Serializable
- *
- * @author Bhavesh Patel
- * @deprecated This class is no longer used.
- */
-@Deprecated
-public abstract class C5 implements Serializable {
-
-    /**
-     * The name for this class.
-     *
-     * @serial
-     */
-    private String name;
-
-    /**
-     * @serial
-     */
-    private int publicKey;
-
-    /**
-     * Constructor for serialization only.
-     */
-    protected C5() {
-
-    }
-
-    /**
-     * Prints general information.
-     *
-     */
-    public void printInfo() {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java
deleted file mode 100644
index 1df4d9eda5f..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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 package 1.
- *
- * @since JDK1.0
- */
-package pkg1;
diff --git a/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java b/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java
deleted file mode 100644
index 1f4182cbe5c..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 6851834
- * @summary This test verifies the HTML document generation for javadoc output.
- * @library ../lib
- * @modules jdk.javadoc/com.sun.tools.doclets.formats.html.markup
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit
- * @build JavadocTester
- * @author Bhavesh Patel
- * @run main TestHtmlDocument
- */
-
-import com.sun.tools.doclets.formats.html.markup.*;
-
-/**
- * The class reads each file, complete with newlines, into a string to easily
- * compare the existing markup with the generated markup.
- */
-public class TestHtmlDocument extends JavadocTester {
-
-    // Entry point
-    public static void main(String... args) throws Exception {
-        TestHtmlDocument tester = new TestHtmlDocument();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        checking("markup");
-        // Check whether the generated markup is same as the existing markup.
-        String expected = readFile(testSrc, "testMarkup.html").replace("\n", NL);
-        String actual = generateHtmlTree();
-        if (actual.equals(expected)) {
-            passed("");
-        } else {
-            failed("expected content in " + testSrc("testMarkup.html") + "\n"
-                + "Actual output:\n"
-                + actual);
-        }
-    }
-
-    // Generate the HTML output using the HTML document generation within doclet.
-    public static String generateHtmlTree() {
-        // Document type for the HTML document
-        DocType htmlDocType = DocType.TRANSITIONAL;
-        HtmlTree html = new HtmlTree(HtmlTag.HTML);
-        HtmlTree head = new HtmlTree(HtmlTag.HEAD);
-        HtmlTree title = new HtmlTree(HtmlTag.TITLE);
-        // String content within the document
-        StringContent titleContent = new StringContent("Markup test");
-        title.addContent(titleContent);
-        head.addContent(title);
-        // Test META tag
-        HtmlTree meta = new HtmlTree(HtmlTag.META);
-        meta.addAttr(HtmlAttr.NAME, "keywords");
-        meta.addAttr(HtmlAttr.CONTENT, "testContent");
-        head.addContent(meta);
-        // Test invalid META tag
-        HtmlTree invmeta = new HtmlTree(HtmlTag.META);
-        head.addContent(invmeta);
-        // Test LINK tag
-        HtmlTree link = new HtmlTree(HtmlTag.LINK);
-        link.addAttr(HtmlAttr.REL, "testRel");
-        link.addAttr(HtmlAttr.HREF, "testLink.html");
-        head.addContent(link);
-        // Test invalid LINK tag
-        HtmlTree invlink = new HtmlTree(HtmlTag.LINK);
-        head.addContent(invlink);
-        html.addContent(head);
-        // Comment within the document
-        Comment bodyMarker = new Comment("======== START OF BODY ========");
-        html.addContent(bodyMarker);
-        HtmlTree body = new HtmlTree(HtmlTag.BODY);
-        Comment pMarker = new Comment("======== START OF PARAGRAPH ========");
-        body.addContent(pMarker);
-        HtmlTree p = new HtmlTree(HtmlTag.P);
-        StringContent bodyContent = new StringContent(
-                "This document is generated from sample source code and HTML " +
-                "files with examples of a wide variety of Java language constructs: packages, " +
-                "subclasses, subinterfaces, nested classes, nested interfaces," +
-                "inheriting from other packages, constructors, fields," +
-                "methods, and so forth. ");
-        p.addContent(bodyContent);
-        StringContent anchorContent = new StringContent("Click Here");
-        p.addContent(HtmlTree.A("testLink.html", anchorContent));
-        StringContent pContent = new StringContent(" to <test> out a link.");
-        p.addContent(pContent);
-        body.addContent(p);
-        HtmlTree p1 = new HtmlTree(HtmlTag.P);
-        // Test another version of A tag.
-        HtmlTree anchor = new HtmlTree(HtmlTag.A);
-        anchor.addAttr(HtmlAttr.HREF, "testLink.html");
-        anchor.addAttr(HtmlAttr.ID, "Another version of a tag");
-        p1.addContent(anchor);
-        body.addContent(p1);
-        // Test for empty tags.
-        HtmlTree dl = new HtmlTree(HtmlTag.DL);
-        html.addContent(dl);
-        // Test for empty nested tags.
-        HtmlTree dlTree = new HtmlTree(HtmlTag.DL);
-        dlTree.addContent(new HtmlTree(HtmlTag.DT));
-        dlTree.addContent(new HtmlTree (HtmlTag.DD));
-        html.addContent(dlTree);
-        HtmlTree dlDisplay = new HtmlTree(HtmlTag.DL);
-        dlDisplay.addContent(new HtmlTree(HtmlTag.DT));
-        HtmlTree dd = new HtmlTree (HtmlTag.DD);
-        StringContent ddContent = new StringContent("Test DD");
-        dd.addContent(ddContent);
-        dlDisplay.addContent(dd);
-        body.addContent(dlDisplay);
-        StringContent emptyString = new StringContent("");
-        body.addContent(emptyString);
-        Comment emptyComment = new Comment("");
-        body.addContent(emptyComment);
-        HtmlTree hr = new HtmlTree(HtmlTag.HR);
-        body.addContent(hr);
-        html.addContent(body);
-        HtmlDocument htmlDoc = new HtmlDocument(htmlDocType, html);
-        return htmlDoc.toString();
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlDocument/testLink.html b/langtools/test/com/sun/javadoc/testHtmlDocument/testLink.html
deleted file mode 100644
index a93d9cbba0c..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDocument/testLink.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Markup test</title>
-</head>
-<body>
-This is a test for link.
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testHtmlDocument/testMarkup.html b/langtools/test/com/sun/javadoc/testHtmlDocument/testMarkup.html
deleted file mode 100644
index 63b228fc2d7..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlDocument/testMarkup.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Markup test</title>
-<meta name="keywords" content="testContent">
-<link rel="testRel" href="testLink.html">
-</head>
-<!-- ======== START OF BODY ======== -->
-<body>
-<!-- ======== START OF PARAGRAPH ======== -->
-<p>This document is generated from sample source code and HTML files with examples of a wide variety of Java language constructs: packages, subclasses, subinterfaces, nested classes, nested interfaces,inheriting from other packages, constructors, fields,methods, and so forth. <a href="testLink.html">Click Here</a> to &lt;test&gt; out a link.</p>
-<p><a href="testLink.html" id="Another version of a tag"></a></p>
-<dl>
-<dd>Test DD</dd>
-</dl>
-<hr>
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
deleted file mode 100644
index cf0db1e59f9..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1999, 2015, 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 6786028 8026567
- * @summary This test verifies the use of <strong> HTML tag instead of <B> by Javadoc std doclet.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlStrongTag
- */
-
-public class TestHtmlStrongTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHtmlStrongTag tester = new TestHtmlStrongTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C1.html", true,
-            "<span class=\"seeLabel\">See Also:</span>");
-
-        checkOutput("pkg1/C1.html", false,
-            "<STRONG>Method Summary</STRONG>",
-            "<B>");
-
-        checkOutput("pkg1/package-summary.html", false,
-            "<STRONG>Class Summary</STRONG>");
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2",
-                "-sourcepath", testSrc,
-                "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg2/C2.html", true,
-                "<B>Comments:</B>");
-
-        checkOutput("pkg2/C2.html", false,
-                "<STRONG>Method Summary</STRONG>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java
deleted file mode 100644
index 12494346908..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- * 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 pkg1;
-
-/**
- * @see java.lang.Object#wait(long, int)
- */
-public class C1 {
-
-    public void method(int param1, int param2) {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java
deleted file mode 100644
index 94db0e44e38..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- * 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 pkg2;
-
-/**
- * <B>Comments:</B> Class 2
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java b/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
deleted file mode 100644
index 543ad19279d..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8008164
- * @summary Test styles on HTML tables generated by javadoc.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlTableStyles
- */
-
-public class TestHtmlTableStyles extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHtmlTableStyles tester = new TestHtmlTableStyles();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/TestTable.html", true,
-                "<table summary=\"Summary\" border cellpadding=3 cellspacing=1>",
-                "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, "
-                + "and an explanation\">",
-                "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing "
-                + "constructors, and an explanation\">",
-                "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, "
-                + "and an explanation\">");
-
-        checkOutput("pkg1/package-summary.html", true,
-                "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, "
-                + "and an explanation\">");
-
-        checkOutput("pkg1/class-use/TestTable.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">");
-
-        checkOutput("overview-summary.html", true,
-                "<table class=\"overviewSummary\" "
-                + "summary=\"Packages table, listing packages, and an explanation\">");
-
-        checkOutput("deprecated-list.html", true,
-            "<table class=\"deprecatedSummary\" summary=\"Deprecated Methods table, listing " +
-            "deprecated methods, and an explanation\">");
-
-        checkOutput("constant-values.html", true,
-            "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing " +
-            "constant fields, and values\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java b/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java
deleted file mode 100644
index 6e1c684d054..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg1/TestTable.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-/**
- * Testing table in documentation comment. In the generated documentation, it
- * should be displayed as a regular table and not have any styles that the javadoc
- * generated tables have.
- *
- * <table summary="Summary" border cellpadding=3 cellspacing=1>
- * <caption>Summary of test table</caption>
- *  <tr>
- *    <td></td>
- *    <td align=center colspan = 2> First Element (Head)</td>
- *    <td align=center colspan = 2> Last Element (Tail)</td>
- *  </tr>
- *  <tr>
- *    <td></td>
- *    <td align=center><em>Throws exception</em></td>
- *    <td align=center><em>Special value</em></td>
- *    <td align=center><em>Throws exception</em></td>
- *    <td align=center><em>Special value</em></td>
- *  </tr>
- *  <tr>
- *    <td>Insert</td>
- *    <td>addFirst(e)</td>
- *    <td>offerFirst(e)</td>
- *    <td>addLast(e)</td>
- *    <td>offerLast(e)</td>
- *  </tr>
- *  <tr>
- *    <td>Remove</td>
- *    <td>removeFirst()</td>
- *    <td>pollFirst()</td>
- *    <td>removeLast()</td>
- *    <td>pollLast()</td>
- *  </tr>
- * </table>
- */
-public class TestTable
-{
-    /**
-     * Field in Class.
-     */
-    public String field;
-
-    /**
-     * Field constant in Class.
-     */
-    public static final int fieldCnst = 0;
-
-    /**
-     * Method in Class.
-     */
-    public void methodInClass(int i) {}
-
-    /**
-     * Deprecated method in Class.
-     * @deprecated Do not use it.
-     */
-    public void deprMethod() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java b/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java
deleted file mode 100644
index 8414e49bc99..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/pkg2/TestUse.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg2;
-
-import pkg1.*;
-
-/**
- * Testing use of TestTable.
- */
-public class TestUse
-{
-    public TestTable tTable;
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
deleted file mode 100644
index b3766d2b335..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, 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      6786688 8008164
- * @summary  HTML tables should have table summary, caption and table headers.
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestHtmlTableTags
- */
-
-public class TestHtmlTableTags extends JavadocTester {
-
-    //Javadoc arguments.
-    private static final String[] ARGS = new String[] {
-
-    };
-
-
-    public static void main(String... args) throws Exception {
-        TestHtmlTableTags tester = new TestHtmlTableTags();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkHtmlTableSummaries();
-        checkHtmlTableCaptions();
-        checkHtmlTableHeaders();
-    }
-
-    /*
-     * Tests for validating summary for HTML tables
-     */
-    void checkHtmlTableSummaries() {
-        //Package summary
-        checkOutput("pkg1/package-summary.html", true,
-                "<table class=\"typeSummary\" summary=\"Class Summary table, "
-                + "listing classes, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Interface Summary table, "
-                + "listing interfaces, and an explanation\">");
-
-        checkOutput("pkg2/package-summary.html", true,
-                "<table class=\"typeSummary\" summary=\"Enum Summary table, "
-                + "listing enums, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Annotation Types Summary table, "
-                + "listing annotation types, and an explanation\">");
-
-        // Class documentation
-        checkOutput("pkg1/C1.html", true,
-                "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, "
-                + "and an explanation\">",
-                "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, "
-                + "and an explanation\">");
-
-        checkOutput("pkg2/C2.html", true,
-                "<table class=\"memberSummary\" summary=\"Nested Class Summary table, listing "
-                + "nested classes, and an explanation\">",
-                "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing "
-                + "constructors, and an explanation\">");
-
-        checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<table class=\"memberSummary\" summary=\"Enum Constant Summary table, listing "
-                + "enum constants, and an explanation\">");
-
-        checkOutput("pkg2/C3.html", true,
-                "<table class=\"memberSummary\" summary=\"Required Element Summary table, "
-                + "listing required elements, and an explanation\">");
-
-        checkOutput("pkg2/C4.html", true,
-                "<table class=\"memberSummary\" summary=\"Optional Element Summary table, "
-                + "listing optional elements, and an explanation\">");
-
-        // Class use documentation
-        checkOutput("pkg1/class-use/I1.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
-
-        checkOutput("pkg1/class-use/C1.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing methods, and an explanation\">");
-
-        checkOutput("pkg2/class-use/C2.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing methods, and an explanation\">");
-
-        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
-
-        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing methods, and an explanation\">");
-
-        // Package use documentation
-        checkOutput("pkg1/package-use.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing classes, and an explanation\">");
-
-        checkOutput("pkg2/package-use.html", true,
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing classes, and an explanation\">");
-
-        // Deprecated
-        checkOutput("deprecated-list.html", true,
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Fields table, listing deprecated fields, "
-                + "and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Methods table, listing deprecated methods, "
-                + "and an explanation\">");
-
-        // Constant values
-        checkOutput("constant-values.html", true,
-                "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing "
-                + "constant fields, and values\">");
-
-        // Overview Summary
-        checkOutput("overview-summary.html", true,
-                "<table class=\"overviewSummary\" "
-                + "summary=\"Packages table, listing packages, and an explanation\">");
-    }
-
-    /*
-     * Tests for validating caption for HTML tables
-     */
-    void checkHtmlTableCaptions() {
-        //Package summary
-        checkOutput("pkg1/package-summary.html", true,
-                "<caption><span>Class Summary</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Interface Summary</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        checkOutput("pkg2/package-summary.html", true,
-                "<caption><span>Enum Summary</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Annotation Types Summary</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        // Class documentation
-        checkOutput("pkg1/C1.html", true,
-                "<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
-                + "Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
-                + "Instance Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:show(8);\">"
-                + "Concrete Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
-                + "Deprecated Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "</caption>");
-
-        checkOutput("pkg2/C2.html", true,
-                "<caption><span>Nested Classes</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span>Constructors</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<caption><span>Enum Constants</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        checkOutput("pkg2/C3.html", true,
-                "<caption><span>Required Elements</span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>");
-
-        checkOutput("pkg2/C4.html", true,
-                "<caption><span>Optional Elements</span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>");
-
-        // Class use documentation
-        checkOutput("pkg1/class-use/I1.html", true,
-                "<caption><span>Packages that use <a href=\"../../pkg1/I1.html\" "
-                + "title=\"interface in pkg1\">I1</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        checkOutput("pkg1/class-use/C1.html", true,
-                "<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">"
-                + "pkg2</a> declared as <a href=\"../../pkg1/C1.html\" "
-                + "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">"
-                + "pkg2</a> that return <a href=\"../../pkg1/C1.html\" "
-                + "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        checkOutput("pkg2/class-use/C2.html", true,
-                "<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">"
-                + "pkg1</a> declared as <a href=\"../../pkg2/C2.html\" "
-                + "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">"
-                + "pkg1</a> that return <a href=\"../../pkg2/C2.html\" "
-                + "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">"
-                + "pkg2</a> that return <a href=\"../../pkg2/C2.ModalExclusionType.html\" "
-                + "title=\"enum in pkg2\">C2.ModalExclusionType</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        // Package use documentation
-        checkOutput("pkg1/package-use.html", true,
-                "<caption><span>Packages that use <a href=\"../pkg1/package-summary.html\">"
-                + "pkg1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span>Classes in <a href=\"../pkg1/package-summary.html\">"
-                + "pkg1</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        checkOutput("pkg2/package-use.html", true,
-                "<caption><span>Packages that use <a href=\"../pkg2/package-summary.html\">"
-                + "pkg2</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span>Classes in <a href=\"../pkg2/package-summary.html\">"
-                + "pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        // Deprecated
-        checkOutput("deprecated-list.html", true,
-                "<caption><span>Deprecated Fields</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Deprecated Methods</span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>");
-
-        // Constant values
-        checkOutput("constant-values.html", true,
-                "<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">"
-                + "C1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>");
-
-        // Overview Summary
-        checkOutput("overview-summary.html", true,
-                "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
-    }
-
-    /*
-     * Test for validating headers for HTML tables
-     */
-    void checkHtmlTableHeaders() {
-        //Package summary
-        checkOutput("pkg1/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
-                + ">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Interface</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
-                + ">Description</th>");
-
-        checkOutput("pkg2/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Enum</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
-                + ">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Annotation Type</th>\n"
-                + "<th class=\"colLast\""
-                + " scope=\"col\">Description</th>");
-
-        // Class documentation
-        checkOutput("pkg1/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Field and Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>");
-
-        checkOutput("pkg2/C2.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Class and Description</th>",
-                "<th class=\"colOne\" scope=\"col\">Constructor and Description</th>");
-
-        checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<th class=\"colOne\" scope=\"col\">Enum Constant and Description</th>");
-
-        checkOutput("pkg2/C3.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Required Element and Description</th>");
-
-        checkOutput("pkg2/C4.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Optional Element and Description</th>");
-
-        // Class use documentation
-        checkOutput("pkg1/class-use/I1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
-
-        checkOutput("pkg1/class-use/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Field and Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>");
-
-        checkOutput("pkg2/class-use/C2.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Field and Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>");
-
-        checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>");
-
-        // Package use documentation
-        checkOutput("pkg1/package-use.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colOne\" scope=\"col\">Class and Description</th>");
-
-        checkOutput("pkg2/package-use.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colOne\" scope=\"col\">Class and Description</th>");
-
-        // Deprecated
-        checkOutput("deprecated-list.html", true,
-                "<th class=\"colOne\" scope=\"col\">Field and Description</th>",
-                "<th class=\"colOne\" scope=\"col\">Method and Description</th>");
-
-        // Constant values
-        checkOutput("constant-values.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Modifier and Type</th>\n"
-                + "<th"
-                + " scope=\"col\">Constant Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Value</th>");
-
-        // Overview Summary
-        checkOutput("overview-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
-                + "Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
-                + ">Description</th>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java
deleted file mode 100644
index 2c55b4d6f24..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import pkg2.*;
-
-/**
- * A test class.
- *
- * @author Bhavesh Patel
- */
-public class C1 implements I1 {
-
-    /**
-     * Test field for class.
-     */
-    public C2 field;
-
-    /**
-     * Constant value.
-     */
-    public static final String CONSTANT1 = "C1";
-
-    /**
-     * A test constructor.
-     */
-    C1() {
-    }
-
-    /**
-     * Method thats does some processing.
-     *
-     * @param param some parameter that is passed.
-     * @return a sample object.
-     */
-    public C2 method(C2 param) {
-        return param;
-    }
-
-    /**
-     * Method that is implemented.
-     *
-     * @param a some random value.
-     * @param b some random value.
-     */
-    public void method1(int a, int b) {
-    }
-
-    /**
-     * Another inherited method.
-     * @param c some value.
-     */
-    public void method2(int c) {
-    }
-
-    /**
-     * @deprecated don't use this anymore.
-     */
-    public void deprecatedMethod() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java
deleted file mode 100644
index e386b3655d2..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-/**
- * A sample interface used to test table tags.
- *
- * @author Bhavesh Patel
- */
-public interface I1 {
-
-    /**
-     * A test method.
-     *
-     * @param a blah.
-     * @param b blah.
-     */
-    void method1(int a, int b);
-
-    /**
-     * Another test method.
-     *
-     * @param c blah.
-     */
-    void method2(int c);
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java
deleted file mode 100644
index 4efe4d616a7..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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 package 1 used to test table tags.
- */
-package pkg1;
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java
deleted file mode 100644
index 977aba7d29b..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- */
-
-package pkg2;
-
-import pkg1.*;
-
-/**
- * Another test class.
- *
- * @author Bhavesh Patel
- */
-public class C2 {
-
-    /**
-     * A test field.
-     */
-    public C1 field;
-
-    /**
-     * @deprecated don't use this field anymore.
-     */
-    public C1 dep_field;
-
-    /**
-     * A sample enum.
-     */
-    public static enum ModalExclusionType {
-        /**
-         * Test comment.
-         */
-        NO_EXCLUDE,
-        /**
-         * Another comment.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * A string constant.
-     */
-    public static final String CONSTANT1 = "C2";
-
-    /**
-     * A sample method.
-     *
-     * @param param some parameter.
-     * @return a test object.
-     */
-    public C1 method(C1 param) {
-        return param;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java
deleted file mode 100644
index f2c6177644c..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C3.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package pkg2;
-
-import java.lang.annotation.*;
-
-/**
- * Test Annotation class.
- *
- * @author Bhavesh Patel
- */
-public @interface C3 {
-    /**
-     * Comment.
-     */
-    String[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java
deleted file mode 100644
index 990b4373ad3..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package pkg2;
-
-import java.lang.annotation.*;
-
-/*
- * A sample interface.
- */
-public @interface C4 {
-    boolean value() default true;
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java b/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java
deleted file mode 100644
index 3a6054778d1..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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 package 2 used to test table tags.
- */
-package pkg2;
diff --git a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java b/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
deleted file mode 100644
index aa6527fcf68..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, 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 6786682
- * @summary This test verifies the use of lang attribute by <HTML>.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlTag
- */
-
-import java.util.Locale;
-
-public class TestHtmlTag extends JavadocTester {
-    private static final String defaultLanguage = Locale.getDefault().getLanguage();
-    public static void main(String... args) throws Exception {
-        TestHtmlTag tester = new TestHtmlTag();
-        tester.runTests();
-    }
-    @Test
-    void test_default() {
-        javadoc("-locale", defaultLanguage,
-                "-d", "out-default",
-                "-sourcepath", testSrc,
-                "pkg1");
-
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C1.html", true,
-            "<html lang=\"" + defaultLanguage + "\">");
-
-        checkOutput("pkg1/package-summary.html", true,
-            "<html lang=\"" + defaultLanguage + "\">");
-
-        checkOutput("pkg1/C1.html", false,
-                "<html>");
-    }
-
-    @Test
-    void test_ja() {
-        // TODO: why does this test need/use pkg2; why can't it use pkg1
-        // like the other two tests, so that we can share the check methods?
-        javadoc("-locale", "ja",
-                "-d", "out-ja",
-                "-sourcepath", testSrc,
-                "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg2/C2.html", true,
-                "<html lang=\"ja\">");
-
-        checkOutput("pkg2/package-summary.html", true,
-                "<html lang=\"ja\">");
-
-        checkOutput("pkg2/C2.html", false,
-                "<html>");
-    }
-
-    @Test
-    void test_en_US() {
-        javadoc("-locale", "en_US",
-                "-d", "out-en_US",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C1.html", true,
-                "<html lang=\"en\">");
-
-        checkOutput("pkg1/package-summary.html", true,
-                "<html lang=\"en\">");
-
-        checkOutput("pkg1/C1.html", false,
-                "<html>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java b/langtools/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java
deleted file mode 100644
index 2bf453e2c9b..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-public class C1 {
-
-    public void method(int param1, int param2) {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java b/langtools/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java
deleted file mode 100644
index 56cf26235f6..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package pkg2;
-
-/**
- * <B>Comments:</B> Class 2
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java b/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java
deleted file mode 100644
index 2b05eda025e..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java
+++ /dev/null
@@ -1,1913 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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 8072945 8081854 8141492 8148985 8150188
- * @summary Test the version of HTML generated by the javadoc tool.
- * @author bpatel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestHtmlVersion
- */
-
-public class TestHtmlVersion extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestHtmlVersion tester = new TestHtmlVersion();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1", "-private", "-linksource", "-html5",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-
-        html5Output();
-        html5NegatedOutput();
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2", "-private", "-linksource", "-html4",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-
-        html4Output();
-        html4NegatedOutput();
-    }
-
-    @Test
-    void test3() {
-        javadoc("-d", "out-3", "-private", "-linksource",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-
-        html4Output();
-        html4NegatedOutput();
-    }
-
-    @Test
-    void test4() {
-        javadoc("-d", "out-4", "-private", "-linksource", "-html5",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg3");
-        checkExit(Exit.OK);
-    }
-
-    void html5Output() {
-        // Test for overview-frame page
-        checkOutput("overview-frame.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<nav role=\"navigation\" class=\"indexNav\">\n"
-                + "<ul>\n"
-                + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<h2 title=\"Packages\">Packages</h2>");
-
-        // Test for allclasses-frame page
-        checkOutput("allclasses-frame.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Test for allclasses-noframe page
-        checkOutput("allclasses-noframe.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Test for overview-summary page
-        checkOutput("overview-summary.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"overviewSummary\">\n"
-                + "<caption>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for package-frame page
-        checkOutput("pkg/package-frame.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\">\n"
-                + "<h1 class=\"bar\"><a href=\"../pkg/package-summary.html\" target=\"classFrame\">pkg</a></h1>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interfaces\">Interfaces</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Classes\">Classes</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enums\">Enums</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Exceptions\">Exceptions</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Errors\">Errors</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Types\">Annotation Types</h2>");
-
-        // Test for package-summary page
-        checkOutput("pkg/package-summary.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"typeSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Package pkg Description\">Package pkg Description</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for package-tree page
-        checkOutput("pkg/package-tree.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<li class=\"circle\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for package-use page
-        checkOutput("pkg1/package-use.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"useSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for constant-values page
-        checkOutput("constant-values.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"constantsSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Contents\">Contents</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"pkg\">pkg.*</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for deprecated-list page
-        checkOutput("deprecated-list.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"deprecatedSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for serialized-form page
-        checkOutput("serialized-form.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Package\">Package&nbsp;pkg</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for overview-tree page
-        checkOutput("overview-tree.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<li class=\"circle\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for index-all page
-        checkOutput("index-all.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "</header>\n"
-                + "<main role=\"main\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for src-html page
-        checkOutput("src-html/pkg/AnotherClass.html", true,
-                "<!DOCTYPE HTML>",
-                "<main role=\"main\">\n"
-                + "<div class=\"sourceContainer\">");
-
-        // Test for help-doc page
-        checkOutput("help-doc.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2>Overview</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2>Package</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2>Class/Interface</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for a regular class page and members (nested class, field, constructore and method)
-        checkOutput("pkg/AnotherClass.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"nested.class.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"field.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"field.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for enum page
-        checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"enum.constant.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"enum.constant.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for interface page
-        checkOutput("pkg2/Interface.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for error page
-        checkOutput("pkg/TestError.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for exception page
-        checkOutput("pkg/TestException.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for annotation page
-        checkOutput("pkg2/TestAnnotationType.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.required.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.optional.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.element.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Element Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for class use page
-        checkOutput("pkg1/class-use/RegClass.html", true,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<table class=\"useSummary\">",
-                "<section role=\"region\"><a id=\"pkg\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Uses of <a href=\"../../pkg1/RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Test for main index page
-        checkOutput("index.html", true,
-                "<!DOCTYPE HTML>",
-                "<link rel=\"stylesheet\" type=\"text/css\" href=\"stylesheet.css\" title=\"Style\">",
-                "<body onload=\"loadFrames()\">\n"
-                + "<main role=\"main\">\n"
-                + "<div class=\"mainContainer\">\n"
-                + "<div class=\"leftContainer\">\n"
-                + "<div class=\"leftTop\">\n"
-                + "<iframe src=\"overview-frame.html\" name=\"packageListFrame\" title=\"All Packages\"></iframe>\n"
-                + "</div>");
-    }
-
-    void html5NegatedOutput() {
-        // Negated test for overview-frame page
-        checkOutput("overview-frame.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexNav\">\n"
-                + "<ul>\n"
-                + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
-                "<div class=\"indexContainer\">\n"
-                + "<h2 title=\"Packages\">Packages</h2>");
-
-        // Negated test for allclasses-frame page
-        checkOutput("allclasses-frame.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Negated test for allclasses-noframe page
-        checkOutput("allclasses-noframe.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Negated test for overview-summary page
-        checkOutput("overview-summary.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"overviewSummary\" summary=\"Packages table, listing packages, and an explanation\">\n"
-                + "<caption>",
-                "</noscript>\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->");
-
-        // Negated test for package-frame page
-        checkOutput("pkg/package-frame.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<body>\n"
-                + "<h1 class=\"bar\"><a href=\"../pkg/package-summary.html\" target=\"classFrame\">pkg</a></h1>");
-
-        // Negated test for package-summary page
-        checkOutput("pkg/package-summary.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
-
-        // Negated test for package-tree page
-        checkOutput("pkg/package-tree.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-
-        // Negated test for package-use page
-        checkOutput("pkg1/package-use.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
-
-        // Negated test for constant-values page
-        checkOutput("constant-values.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
-
-        // Negated test for deprecated-list page
-        checkOutput("deprecated-list.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">\n"
-                + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
-                + "<h2 title=\"Contents\">Contents</h2>",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Classes table, listing deprecated classes, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Enums table, listing deprecated enums, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Exceptions table, listing deprecated exceptions, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Errors table, listing deprecated errors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Annotation Types table, listing deprecated annotation types, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Fields table, listing deprecated fields, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Methods table, listing deprecated methods, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Constructors table, listing deprecated constructors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Enum Constants table, listing deprecated enum constants, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Annotation Type Elements table, listing deprecated annotation type elements, and an explanation\">");
-
-        // Negated test for serialized-form page
-        checkOutput("serialized-form.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<li class=\"blockList\">\n"
-                + "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
-
-        // Negated test for overview-tree page
-        checkOutput("overview-tree.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<div class=\"contentContainer\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
-                "</ul>\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>",
-                "</ul>\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>");
-
-        // Negated test for index-all page
-        checkOutput("index-all.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"contentContainer\">");
-
-        // Negated test for src-html page
-        checkOutput("src-html/pkg/AnotherClass.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<body>\n"
-                + "<div class=\"sourceContainer\">");
-
-        // Negated test for help-doc page
-        checkOutput("help-doc.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<h2>Overview</h2>",
-                "<li class=\"blockList\">\n"
-                + "<h2>Package</h2>",
-                "<li class=\"blockList\">\n"
-                + "<h2>Class/Interface</h2>");
-
-        // Negated test for a regular class page and members (nested class, field, constructore and method)
-        checkOutput("pkg/AnotherClass.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== NESTED CLASS SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"nested.class.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
-                "<!-- =========== FIELD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, and an explanation\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing constructors, and an explanation\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ FIELD DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Detail</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Negated test for enum page
-        checkOutput("pkg/AnotherClass.ModalExclusionType.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Detail</h3>",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Negated test for interface page
-        checkOutput("pkg2/Interface.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Negated test for error page
-        checkOutput("pkg/TestError.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>");
-
-        // Negated test for exception page
-        checkOutput("pkg/TestException.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>");
-
-        // Negated test for annotation page
-        checkOutput("pkg2/TestAnnotationType.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Required Element Summary table, listing required elements, and an explanation\">",
-                "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
-                "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Element Detail</h3>");
-
-        // Negated test for class use page
-        checkOutput("pkg1/class-use/RegClass.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
-                "<li class=\"blockList\"><a name=\"pkg\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Uses of <a href=\"../../pkg1/RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">");
-
-        // Negated test for main index page
-        checkOutput("index.html", false,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<body>\n"
-                + "<div class=\"mainContainer\">\n");
-    }
-
-    void html4Output() {
-        // Test for overview-frame page
-        checkOutput("overview-frame.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexNav\">\n"
-                + "<ul>\n"
-                + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
-                "<div class=\"indexContainer\">\n"
-                + "<h2 title=\"Packages\">Packages</h2>");
-
-        // Test for allclasses-frame page
-        checkOutput("allclasses-frame.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Test for allclasses-noframe page
-        checkOutput("allclasses-noframe.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<div class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Test for overview-summary page
-        checkOutput("overview-summary.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"overviewSummary\" summary=\"Packages table, listing packages, and an explanation\">\n"
-                + "<caption>",
-                "</noscript>\n"
-                + "<div class=\"fixedNav\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->");
-
-        // Test for package-frame page
-        checkOutput("pkg/package-frame.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<body>\n"
-                + "<h1 class=\"bar\"><a href=\"../pkg/package-summary.html\" target=\"classFrame\">pkg</a></h1>");
-
-        // Test for package-summary page
-        checkOutput("pkg/package-summary.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"typeSummary\" summary=\"Interface Summary table, listing interfaces, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Class Summary table, listing classes, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Enum Summary table, listing enums, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Exception Summary table, listing exceptions, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Error Summary table, listing errors, and an explanation\">",
-                "<table class=\"typeSummary\" summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
-
-        // Test for package-tree page
-        checkOutput("pkg/package-tree.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<li class=\"circle\">");
-
-        // Test for package-use page
-        checkOutput("pkg1/package-use.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">");
-
-        // Test for constant-values page
-        checkOutput("constant-values.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<table class=\"constantsSummary\" summary=\"Constant Field Values table, listing constant fields, and values\">");
-
-        // Test for deprecated-list page
-        checkOutput("deprecated-list.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">\n"
-                + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
-                + "<h2 title=\"Contents\">Contents</h2>",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Classes table, listing deprecated classes, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Enums table, listing deprecated enums, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Exceptions table, listing deprecated exceptions, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Errors table, listing deprecated errors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Annotation Types table, listing deprecated annotation types, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Fields table, listing deprecated fields, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Methods table, listing deprecated methods, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Constructors table, listing deprecated constructors, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Enum Constants table, listing deprecated enum constants, and an explanation\">",
-                "<table class=\"deprecatedSummary\" summary=\"Deprecated Annotation Type Elements table, listing deprecated annotation type elements, and an explanation\">");
-
-        // Test for serialized-form page
-        checkOutput("serialized-form.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<li class=\"blockList\">\n"
-                + "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
-
-        // Test for overview-tree page
-        checkOutput("overview-tree.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<li class=\"circle\">",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<h1 class=\"title\">Hierarchy For All Packages</h1>\n"
-                + "<span class=\"packageHierarchyLabel\">Package Hierarchies:</span>",
-                "<div class=\"contentContainer\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
-                "</ul>\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>",
-                "</ul>\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>");
-
-        // Test for index-all page
-        checkOutput("index-all.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"contentContainer\">");
-
-        // Test for src-html page
-        checkOutput("src-html/pkg/AnotherClass.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<body>\n"
-                + "<div class=\"sourceContainer\">");
-
-        // Test for help-doc page
-        checkOutput("help-doc.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<h2>Overview</h2>",
-                "<li class=\"blockList\">\n"
-                + "<h2>Package</h2>",
-                "<li class=\"blockList\">\n"
-                + "<h2>Class/Interface</h2>");
-
-        // Test for a regular class page and members (nested class, field, constructore and method)
-        checkOutput("pkg/AnotherClass.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== NESTED CLASS SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"nested.class.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
-                "<!-- =========== FIELD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Field Summary table, listing fields, and an explanation\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Constructor Summary table, listing constructors, and an explanation\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ FIELD DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Detail</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Test for enum page
-        checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Detail</h3>",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Test for interface page
-        checkOutput("pkg2/Interface.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Method Summary table, listing methods, and an explanation\">",
-                "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>");
-
-        // Test for error page
-        checkOutput("pkg/TestError.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>");
-
-        // Test for exception page
-        checkOutput("pkg/TestException.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>");
-
-        // Test for annotation page
-        checkOutput("pkg2/TestAnnotationType.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ======== START OF CLASS DATA ======== -->\n"
-                + "<div class=\"header\">",
-                "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Required Element Summary table, listing required elements, and an explanation\">",
-                "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\" summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
-                "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Element Detail</h3>");
-
-        // Test for class use page
-        checkOutput("pkg1/class-use/RegClass.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<meta name=\"date\"",
-                "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">",
-                "<table class=\"useSummary\" summary=\"Use table, listing packages, and an explanation\">",
-                "<li class=\"blockList\"><a name=\"pkg\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Uses of <a href=\"../../pkg1/RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "<table class=\"useSummary\" summary=\"Use table, listing fields, and an explanation\">");
-
-        // Test for main index page
-        checkOutput("index.html", true,
-                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
-                "<link rel=\"stylesheet\" type=\"text/css\" href=\"stylesheet.css\" title=\"Style\">",
-                "<body onload=\"loadFrames()\">\n"
-                + "<div class=\"mainContainer\">\n"
-                + "<div class=\"leftContainer\">\n"
-                + "<div class=\"leftTop\">\n"
-                + "<iframe src=\"overview-frame.html\" name=\"packageListFrame\" title=\"All Packages\"></iframe>\n"
-                + "</div>");
-    }
-
-    void html4NegatedOutput() {
-        // Negated test for overview-frame page
-        checkOutput("overview-frame.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<nav role=\"navigation\" class=\"indexNav\">\n"
-                + "<ul>\n"
-                + "<li><a href=\"allclasses-frame.html\" target=\"packageFrame\">All&nbsp;Classes</a></li>",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<h2 title=\"Packages\">Packages</h2>");
-
-        // Negated test for allclasses-frame page
-        checkOutput("allclasses-frame.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Negated test for allclasses-noframe page
-        checkOutput("allclasses-noframe.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\" class=\"indexContainer\">\n"
-                + "<ul>\n"
-                + "<li>");
-
-        // Negated test for overview-summary page
-        checkOutput("overview-summary.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"overviewSummary\">\n"
-                + "<caption>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->");
-
-        // Negated test for package-frame page
-        checkOutput("pkg/package-frame.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<main role=\"main\">\n"
-                + "<h1 class=\"bar\"><a href=\"../pkg/package-summary.html\" target=\"classFrame\">pkg</a></h1>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interfaces\">Interfaces</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Classes\">Classes</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enums\">Enums</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Exceptions\">Exceptions</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Errors\">Errors</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Types\">Annotation Types</h2>");
-
-        // Negated test for package-summary page
-        checkOutput("pkg/package-summary.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"typeSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Package pkg Description\">Package pkg Description</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for package-tree page
-        checkOutput("pkg/package-tree.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for package-use page
-        checkOutput("pkg1/package-use.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"useSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for constant-values page
-        checkOutput("constant-values.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"constantsSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Contents\">Contents</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"pkg\">pkg.*</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for deprecated-list page
-        checkOutput("deprecated-list.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<table class=\"deprecatedSummary\">",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for serialized-form page
-        checkOutput("serialized-form.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Package\">Package&nbsp;pkg</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for overview-tree page
-        checkOutput("overview-tree.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Class Hierarchy\">Class Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Interface Hierarchy\">Interface Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for index-all page
-        checkOutput("index-all.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "</header>\n"
-                + "<main role=\"main\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for src-html page
-        checkOutput("src-html/pkg/AnotherClass.html", false,
-                "<!DOCTYPE HTML>",
-                "<main role=\"main\">\n"
-                + "<div class=\"sourceContainer\">");
-
-        // Negated test for help-doc page
-        checkOutput("help-doc.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<h2>Overview</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2>Package</h2>\n",
-                "<section role=\"region\">\n"
-                + "<h2>Class/Interface</h2>\n",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for a regular class page and members (nested class, field, constructore and method)
-        checkOutput("pkg/AnotherClass.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"nested.class.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Nested Class Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"field.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"field.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Field Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for enum page
-        checkOutput("pkg/AnotherClass.ModalExclusionType.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"enum.constant.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"enum.constant.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Enum Constant Detail</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for interface page
-        checkOutput("pkg2/Interface.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"method.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Method Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for error page
-        checkOutput("pkg/TestError.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for exception page
-        checkOutput("pkg/TestException.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Summary</h3>",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"constructor.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Constructor Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for annotation page
-        checkOutput("pkg2/TestAnnotationType.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.required.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Required Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.optional.element.summary\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Optional Element Summary</h3>\n"
-                + "<table class=\"memberSummary\">",
-                "<section role=\"region\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a id=\"annotation.type.element.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Element Detail</h3>",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for class use page
-        checkOutput("pkg1/class-use/RegClass.html", false,
-                "<!DOCTYPE HTML>",
-                "<meta name=\"dc.created\"",
-                "<a id=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>",
-                "<header role=\"banner\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ========= START OF TOP NAVBAR ======= -->",
-                "<main role=\"main\">\n"
-                + "<div class=\"header\">",
-                "<table class=\"useSummary\">",
-                "<section role=\"region\"><a id=\"pkg\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Uses of <a href=\"../../pkg1/RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h3>\n"
-                + "\n"
-                + "<table class=\"useSummary\">",
-                "<footer role=\"contentinfo\">\n"
-                + "<nav role=\"navigation\">\n"
-                + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
-
-        // Negated test for main index page
-        checkOutput("index.html", false,
-                "<!DOCTYPE HTML>",
-                "<body>\n"
-                + "<main role=\"main\">\n"
-                + "<div class=\"mainContainer\">\n");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnnotationType.java
deleted file mode 100644
index a79a1e829d8..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnnotationType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is a test annotation type.
- *
- * @author Bhavesh Patel.
- * @since 9
- */
-@Documented public @interface AnnotationType {
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnotherClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnotherClass.java
deleted file mode 100644
index 766ec96ee80..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/AnotherClass.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-import pkg1.*;
-
-/**
- * Another test class.
- *
- * @author Bhavesh Patel
- */
-public class AnotherClass {
-
-    /**
-     * A test field.
-     */
-    public RegClass field;
-
-    /**
-     * Constant field.
-     */
-    public static final String CONSTANT_FIELD_3 = "constant";
-
-    /**
-     * @deprecated don't use this field anymore.
-     */
-    public RegClass dep_field;
-
-    /**
-     * A sample enum.
-     */
-    public static enum ModalExclusionType {
-        /**
-         * Test comment.
-         */
-        NO_EXCLUDE,
-        /**
-         * Another comment.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * A string constant.
-     */
-    public static final String CONSTANT1 = "C2";
-
-    /**
-     * A sample method.
-     *
-     * @param param some parameter.
-     * @return a test object.
-     */
-    public Class method(pkg1.RegClass param) {
-        return param;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestError.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestError.java
deleted file mode 100644
index 6c83964c8d1..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestError.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * Error class.
- */
-public class TestError extends Error {
-
-    /**
-     * Constructs a test error.
-     */
-    public TestError() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestException.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestException.java
deleted file mode 100644
index 43b54795b94..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * Thrown when a TestException occurs.
- */
-public class TestException extends Exception {
-
-    /**
-     * Constructs a {@code TestException} with no detail message.
-     */
-    public TestException() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestInterface.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestInterface.java
deleted file mode 100644
index 0159e2a1e48..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/TestInterface.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * This is a description for an Interface.
- */
-
-public interface TestInterface {
-
-    public void method();
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/package-info.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/package-info.java
deleted file mode 100644
index 51a46e7e1b0..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015, 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 package.
- */
-package pkg;
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/NestedInnerClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/NestedInnerClass.java
deleted file mode 100644
index fd1dcc5d2d1..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/NestedInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and the inner class is private
- * and a nested inner class is protected.
- *
- * @author      Bhavesh Patel
- */
-
-class NestedInnerClass {
-
-    private static class InnerClass {
-
-        protected static class ProNestedInnerClass implements java.io.Serializable {
-
-            public final int SERIALIZABLE_CONSTANT2 = 1;
-
-            /**
-             * @param s ObjectInputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void readObject(ObjectInputStream s) throws IOException {
-            }
-
-            /**
-             * @param s ObjectOutputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void writeObject(ObjectOutputStream s) throws IOException {
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java
deleted file mode 100644
index c90d519281f..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PrivateIncludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is private which is included using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PrivateIncludeInnerClass {
-
-    /**
-     * @serial include
-     */
-    private static class PriInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/ProtectedInnerClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/ProtectedInnerClass.java
deleted file mode 100644
index 0488e6c0f7c..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/ProtectedInnerClass.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where outer class is package private and the inner class is
- * protected.
- *
- * @author      Bhavesh Patel
- */
-
-class ProtectedInnerClass {
-
-    protected static class ProInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT1 = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PublicExcludeInnerClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PublicExcludeInnerClass.java
deleted file mode 100644
index c888a1fee79..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/PublicExcludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is public which is excluded using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PublicExcludeInnerClass {
-
-    /**
-     * @serial exclude
-     */
-    public static class PubInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT3 = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/RegClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/RegClass.java
deleted file mode 100644
index 84bbb641ee8..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg1/RegClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-/**
- *This is a description for Class.
- */
-
-public class RegClass {
-
-    /**
-     * Constant field.
-     */
-    public static final String CONSTANT_FIELD_1 = "constant";
-
-    /**
-     * Another constant field.
-     */
-    public static final int CONSTANT_FIELD_2 = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java
deleted file mode 100644
index b8500c1ab31..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/DeprecatedClassByAnnotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-@Deprecated()
-public class DeprecatedClassByAnnotation {
-
-    @Deprecated()
-    public int field;
-
-    @Deprecated()
-    public DeprecatedClassByAnnotation() {}
-
-    @Deprecated()
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/Interface.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/Interface.java
deleted file mode 100644
index 23daea00215..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/Interface.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * This is a description for an Interface.
- */
-
-public interface Interface {
-
-    public void method1();
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestAnnotationType.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestAnnotationType.java
deleted file mode 100644
index 13917315d40..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestAnnotationType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-import java.lang.annotation.*;
-
-/**
- * @deprecated annotation_test1 passes.
- */
-@Documented public @interface TestAnnotationType {
-
-    /**
-     * @deprecated annotation_test2 passes.
-     */
-    String optional() default "unknown";
-
-   /**
-     * @deprecated annotation_test3 passes.
-     */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestClass.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestClass.java
deleted file mode 100644
index 754b15dd8c9..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestClass.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated class_test1 passes.
- */
-public class TestClass {
-
-    /**
-     * @deprecated class_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated constant field.
-     */
-    public static final int CONSTANT_FIELD = 2;
-
-    /**
-     * @deprecated class_test3 passes.
-     */
-    public TestClass() {}
-
-    /**
-     * @deprecated class_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestEnum.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestEnum.java
deleted file mode 100644
index 59c424a47e6..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated enum_test1 passes.
- */
-public enum TestEnum {
-
-    /**
-     * @deprecated enum_test2 passes.
-     */
-    ONE, TWO, THREE;
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestError.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestError.java
deleted file mode 100644
index 41e3b4493bd..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestError.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated error_test1 passes.
- */
-public class TestError extends Error {
-
-    /**
-     * @deprecated error_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated error_test3 passes.
-     */
-    public TestError() {}
-
-    /**
-     * @deprecated error_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestException.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestException.java
deleted file mode 100644
index 8e2a1e75999..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated exception_test1 passes.
- */
-public class TestException extends Exception {
-
-    /**
-     * @deprecated exception_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated exception_test3 passes.
-     */
-    public TestException() {}
-
-    /**
-     * @deprecated exception_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestInterface.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestInterface.java
deleted file mode 100644
index c115a690ecf..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg2/TestInterface.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated interface_test1 passes.
- */
-public class TestInterface {
-
-    /**
-     * @deprecated interface_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated interface_test3 passes.
-     */
-    public TestInterface() {}
-
-    /**
-     * @deprecated interface_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg3/ClassNoConstants.java b/langtools/test/com/sun/javadoc/testHtmlVersion/pkg3/ClassNoConstants.java
deleted file mode 100644
index 6530d6437b8..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/pkg3/ClassNoConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg3;
-
-/**
- * This is an empty class specifically testing for no Constant value.
- */
-
-public class ClassNoConstants {
-}
diff --git a/langtools/test/com/sun/javadoc/testHtmlVersion/profile-rtjar-includes.txt b/langtools/test/com/sun/javadoc/testHtmlVersion/profile-rtjar-includes.txt
deleted file mode 100644
index 3c7101e6e17..00000000000
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/profile-rtjar-includes.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-PROFILE_1_RTJAR_INCLUDE_PACKAGES := \
-    pkg
-
-PROFILE_1_RTJAR_INCLUDE_TYPES := \
-    pkg1/Class.class
-
-PROFILE_1_RTJAR_EXCLUDE_TYPES := 
-
-PROFILE_1_INCLUDE_METAINF_SERVICES := 
-
-
-PROFILE_2_RTJAR_INCLUDE_PACKAGES := \
-    pkg1
-
-PROFILE_2_RTJAR_INCLUDE_TYPES := 
-
-PROFILE_2_RTJAR_EXCLUDE_TYPES := 
-
-PROFILE_2_INCLUDE_METAINF_SERVICES := 
-
-
-PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
-    pkg2
-
-PROFILE_3_RTJAR_INCLUDE_TYPES := 
-
-PROFILE_3_RTJAR_EXCLUDE_TYPES := 
-
-PROFILE_3_INCLUDE_METAINF_SERVICES := 
-
diff --git a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java b/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
deleted file mode 100644
index 1cd3dc30859..00000000000
--- a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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      8011288 8062647
- * @summary  Erratic/inconsistent indentation of signatures
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestIndentation
- */
-
-public class TestIndentation extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestIndentation tester = new TestIndentation();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "p");
-        checkExit(Exit.OK);
-
-        checkOutput("p/Indent.html", true,
-                "<pre>public&nbsp;&lt;T&gt;&nbsp;void&nbsp;m(T&nbsp;t1,",
-                "\n"
-                + "                  T&nbsp;t2)",
-                "\n"
-                + "           throws java.lang.Exception");
-
-        // Test indentation of annotations and annotated method arguments
-        checkOutput("p/IndentAnnot.html", false,
-                " @Deprecated",
-                "                int&nbsp;b)",
-                "                java.lang.Object...&nbsp;b)");
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testIndentation/p/Indent.java b/langtools/test/com/sun/javadoc/testIndentation/p/Indent.java
deleted file mode 100644
index 888ad91edb2..00000000000
--- a/langtools/test/com/sun/javadoc/testIndentation/p/Indent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2013, 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 p;
-
-public class Indent {
-    public <T> void m(T t1, T t2) throws Exception { }
-}
diff --git a/langtools/test/com/sun/javadoc/testIndentation/p/IndentAnnot.java b/langtools/test/com/sun/javadoc/testIndentation/p/IndentAnnot.java
deleted file mode 100644
index 0bc84a539b1..00000000000
--- a/langtools/test/com/sun/javadoc/testIndentation/p/IndentAnnot.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2015, 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 p;
-
-public class IndentAnnot {
-    public void f1(int a, int b) {}
-
-    public void f2(int a, Object... b) {}
-
-    @Deprecated
-    public void f3(int a, int b) {}
-
-    @SafeVarargs
-    public void f4(int a, Object... b) {}
-
-    @SafeVarargs
-    @Deprecated
-    public void f5(int a, Object... b) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testIndex/NoPackage.java b/langtools/test/com/sun/javadoc/testIndex/NoPackage.java
deleted file mode 100644
index d96948d5c6e..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/NoPackage.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2004, 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.
- */
-
-public class NoPackage {}
diff --git a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java
deleted file mode 100644
index 1ad48381305..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4852280 4517115 4973608 4994589 8026567
- * @summary  Perform tests on index.html file.
- *           Also test that index-all.html has the appropriate output.
- *           Test for unnamed package in index.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestIndex
- */
-
-public class TestIndex extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestIndex tester = new TestIndex();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", testSrc("NoPackage.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("index.html", true,
-                "<iframe src=\"overview-summary.html\" name=\"classFrame\" title=\""
-                + "Package, class and interface descriptions\" class=\"rightIframe\">");
-
-        //Test index-all.html
-        checkOutput("index-all.html", true,
-                "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>"
-                + " - Class in <a href=\"pkg/package-summary.html\">pkg</a>",
-                "<a href=\"pkg/Interface.html\" title=\"interface in pkg\">"
-                + "<span class=\"typeNameLink\">Interface</span></a> - Interface in "
-                + "<a href=\"pkg/package-summary.html\">pkg</a>",
-                "<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">"
-                + "<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in "
-                + "<a href=\"pkg/package-summary.html\">pkg</a>",
-                "<a href=\"pkg/Coin.html\" title=\"enum in pkg\">"
-                + "<span class=\"typeNameLink\">Coin</span></a> - Enum in "
-                + "<a href=\"pkg/package-summary.html\">pkg</a>",
-                "Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>",
-                "<dl>\n"
-                + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">"
-                + "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" "
-                + "title=\"class in pkg\">C</a></dt>\n"
-                + "<dd>&nbsp;</dd>\n"
-                + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> "
-                + "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">"
-                + "C</a></dt>\n"
-                + "<dd>&nbsp;</dd>\n"
-                + "</dl>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java
deleted file mode 100644
index 831bfdb32c2..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type.
- *
- * @author Jamie Ho.
- * @since 1.5
- */
-@Documented public @interface AnnotationType {
-
-    /**
-     * The copyright holder.
-     */
-    String optional() default "unknown";
-
-   /**
-    * The year of the copyright.
-    */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testIndex/pkg/C.java b/langtools/test/com/sun/javadoc/testIndex/pkg/C.java
deleted file mode 100644
index de02c8b23e8..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/pkg/C.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class C {
-
-    //Test that Java appears before JDK in the index.  The fact
-    //that 'D' is uppercase and 'a' is lowercase should make no difference
-    //in ordering.
-    public static final String JDK = "1.5";
-    public static final String Java = "1.5";
-
-}
diff --git a/langtools/test/com/sun/javadoc/testIndex/pkg/Coin.java b/langtools/test/com/sun/javadoc/testIndex/pkg/Coin.java
deleted file mode 100644
index ec13a84b337..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/pkg/Coin.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-/**
- * This is a sample Enum.
- *
- * @author Jamie Ho
- */
-public enum Coin {
-
-  Penny, Nickel, Dime;
-
-public Coin(int i) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testIndex/pkg/Interface.java b/langtools/test/com/sun/javadoc/testIndex/pkg/Interface.java
deleted file mode 100644
index a465698914f..00000000000
--- a/langtools/test/com/sun/javadoc/testIndex/pkg/Interface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public interface Interface {}
diff --git a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
deleted file mode 100644
index 396bf4137b0..00000000000
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4524136
- * @summary Test to make sure label is used for inline links.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestInlineLinkLabel
- */
-
-public class TestInlineLinkLabel extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestInlineLinkLabel tester = new TestInlineLinkLabel();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C1.html", true,
-                //Search for the label to the package link.
-                "<a href=\"../pkg/package-summary.html\"><code>Here is a link to a package</code></a>",
-                //Search for the label to the class link
-                "<a href=\"../pkg/C2.html\" title=\"class in pkg\"><code>Here is a link to a class</code></a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java b/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java
deleted file mode 100644
index 1f10c6bba66..00000000000
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/**
- * {@link pkg Here is a link to a package}.<br>
- * {@link pkg.C2 Here is a link to a class}.
- */
-public class C1 {}
diff --git a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java b/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java
deleted file mode 100644
index 0d1a08f09ac..00000000000
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/**
- * This is a comment.
- */
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html b/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html
deleted file mode 100644
index c3081013f4e..00000000000
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-  This is a comment.
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
deleted file mode 100644
index bfded2cf7fe..00000000000
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4682448 4947464 5029946 8025633 8026567
- * @summary  Verify that the public modifier does not show up in the
- *           documentation for public methods, as recommended by the JLS.
- *           If A implements I and B extends A, B should be in the list of
- *           implementing classes in the documentation for I.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestInterface
- */
-
-public class TestInterface extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestInterface tester = new TestInterface();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/Interface.html", true,
-                "<pre>int&nbsp;method()</pre>",
-                "<pre>static final&nbsp;int field</pre>",
-                // Make sure known implementing class list is correct and omits type parameters.
-                "<dl>\n"
-                + "<dt>All Known Implementing Classes:</dt>\n"
-                + "<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child"
-                + "</a>, <a href=\"../pkg/Parent.html\" title=\"class in pkg\">Parent"
-                + "</a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/Child.html", true,
-                // Make sure "All Implemented Interfaces": has substituted type parameters
-                "<dl>\n"
-                + "<dt>All Implemented Interfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">"
-                + "Interface</a>&lt;T&gt;</dd>\n"
-                + "</dl>",
-                //Make sure Class Tree has substituted type parameters.
-                "<ul class=\"inheritance\">\n"
-                + "<li>java.lang.Object</li>\n"
-                + "<li>\n"
-                + "<ul class=\"inheritance\">\n"
-                + "<li><a href=\"../pkg/Parent.html\" title=\"class in pkg\">"
-                + "pkg.Parent</a>&lt;T&gt;</li>\n"
-                + "<li>\n"
-                + "<ul class=\"inheritance\">\n"
-                + "<li>pkg.Child&lt;T&gt;</li>\n"
-                + "</ul>\n"
-                + "</li>\n"
-                + "</ul>\n"
-                + "</li>\n"
-                + "</ul>",
-                //Make sure "Specified By" has substituted type parameters.
-                "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>"
-                + "</code>&nbsp;in interface&nbsp;<code>"
-                + "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">"
-                + "Interface</a>&lt;<a href=\"../pkg/Child.html\" title=\"type parameter in Child\">"
-                + "T</a>&gt;</code></dd>",
-                //Make sure "Overrides" has substituted type parameters.
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>"
-                + "</code>&nbsp;in class&nbsp;<code><a href=\"../pkg/Parent.html\" "
-                + "title=\"class in pkg\">Parent</a>&lt;<a href=\"../pkg/Child.html\" "
-                + "title=\"type parameter in Child\">T</a>&gt;</code></dd>");
-
-        checkOutput("pkg/Parent.html", true,
-                //Make sure "Direct Know Subclasses" omits type parameters
-                "<dl>\n"
-                + "<dt>Direct Known Subclasses:</dt>\n"
-                + "<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child"
-                + "</a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/Interface.html", false,
-                "public int&nbsp;method()",
-                "public static final&nbsp;int field");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testInterface/pkg/Child.java b/langtools/test/com/sun/javadoc/testInterface/pkg/Child.java
deleted file mode 100644
index b572c298176..00000000000
--- a/langtools/test/com/sun/javadoc/testInterface/pkg/Child.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-public class Child<T> extends Parent<T> {
-
-    public int method() {
-        return 1;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testInterface/pkg/Interface.java b/langtools/test/com/sun/javadoc/testInterface/pkg/Interface.java
deleted file mode 100644
index 2b4a17b07ff..00000000000
--- a/langtools/test/com/sun/javadoc/testInterface/pkg/Interface.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-public interface Interface<E> {
-
-    /**
-     * The public modifier of this interface field should not show up
-     * in the documentation.
-     */
-    public final int field = 1;
-
-    /**
-     * The public modifier of this interface method should not show up in the
-     * documentation.
-     *
-     * @return some dummy integer.
-     */
-    public int method();
-
-}
diff --git a/langtools/test/com/sun/javadoc/testInterface/pkg/Parent.java b/langtools/test/com/sun/javadoc/testInterface/pkg/Parent.java
deleted file mode 100644
index ef44568c8e3..00000000000
--- a/langtools/test/com/sun/javadoc/testInterface/pkg/Parent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-public class Parent<E> implements Interface<E> {
-
-    public int method() {
-        return 1;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java b/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
deleted file mode 100644
index fca7722169a..00000000000
--- a/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 7112427 8012295 8025633 8026567 8061305 8081854
- * @summary Test of the JavaFX doclet features.
- * @author jvalenta
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestJavaFX
- */
-
-public class TestJavaFX extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestJavaFX tester = new TestJavaFX();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                "-javafx",
-                "-package",
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/C.html", true,
-                "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                    + "<dd><a href=\"../pkg1/C.html#getRate--\"><code>getRate()</code></a>, \n"
-                    + "<a href=\"../pkg1/C.html#setRate-double-\">"
-                    + "<code>setRate(double)</code></a></dd>",
-                "<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>\n"
-                    + "<div class=\"block\">Sets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
-                "<pre>public final&nbsp;double&nbsp;getRate()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property rate.</div>\n"
-                    + "<dl>\n"
-                    + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                    + "<a href=\"../pkg1/C.html#rateProperty\">rate</a></span></code>\n"
-                    + "<div class=\"block\">Defines the direction/speed at which the "
-                    + "<code>Timeline</code> is expected to",
-                "<span class=\"simpleTagLabel\">Default value:</span>",
-                "<span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                    + "<dd>JavaFX 8.0</dd>",
-                "<p>Sets the value of the property <code>Property</code>",
-                "<p>Gets the value of the property <code>Property</code>",
-                "<span class=\"simpleTagLabel\">Property description:</span>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                    + "<a href=\"../pkg1/C.html#setTestMethodProperty--\">"
-                    + "setTestMethodProperty</a></span>()</code>&nbsp;</td>",
-                "<h4>isPaused</h4>\n"
-                    + "<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n"
-                    + "<div class=\"block\">Gets the value of the property paused.</div>");
-
-        checkOutput("pkg1/C.html", false,
-                "A()");
-
-        checkOutput("pkg1/D.html", true,
-                "<h3>Properties inherited from class&nbsp;pkg1."
-                    + "<a href=\"../pkg1/C.html\" title=\"class in pkg1\">C</a></h3>\n"
-                    + "<code><a href=\"../pkg1/C.html#pausedProperty\">"
-                    + "paused</a>, <a href=\"../pkg1/C.html#rateProperty\">rate</a></code></li>");
-    }
-    /*
-     * Test with -javafx option enabled, to ensure property getters and setters
-     * are treated correctly.
-     */
-    @Test
-    void test2() {
-        javadoc("-d", "out2a",
-                "-sourcepath", testSrc,
-                "-javafx",
-                "-package",
-                "pkg2");
-        checkExit(Exit.OK);
-        checkOutput("pkg2/Test.html", true,
-                "<li class=\"blockList\"><a name=\"property.detail\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<h3>Property Detail</h3>\n"
-                + "<a name=\"betaProperty\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<h4>beta</h4>\n"
-                + "<pre>public&nbsp;java.lang.Object betaProperty</pre>\n"
-                + "</li>\n"
-                + "</ul>\n"
-                + "<a name=\"gammaProperty\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<h4>gamma</h4>\n"
-                + "<pre>public final&nbsp;java.util.List&lt;"
-                + "java.lang.String&gt; gammaProperty</pre>\n"
-                + "</li>\n"
-                + "</ul>\n"
-                + "<a name=\"deltaProperty\">\n"
-                + "<!--   -->\n"
-                + "</a>\n"
-                + "<ul class=\"blockListLast\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<h4>delta</h4>\n"
-                + "<pre>public final&nbsp;java.util.List&lt;"
-                + "java.util.Set&lt;? super java.lang.Object&gt;&gt; deltaProperty</pre>\n"
-                + "</li>\n"
-                + "</ul>\n"
-                + "</li>");
-    }
-    /*
-     * Test without -javafx option, to ensure property getters and setters
-     * are treated just like any other java method.
-     */
-    @Test
-    void test3() {
-        javadoc("-d", "out2b",
-                "-sourcepath", testSrc,
-                "-package",
-                "pkg2");
-        checkExit(Exit.OK);
-        checkOutput("pkg2/Test.html", false, "<h3>Property Summary</h3>");
-        checkOutput("pkg2/Test.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>\n"
-                + "</tr>\n"
-                + "<tr id=\"i0\" class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code>&lt;T&gt;&nbsp;java.lang.Object</code></td>\n"
-                + "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                + "<a href=\"../pkg2/Test.html#alphaProperty-java.util.List-\">"
-                + "alphaProperty</a></span>(java.util.List&lt;T&gt;&nbsp;foo)</code>&nbsp;</td>\n"
-                + "</tr>\n"
-                + "<tr id=\"i1\" class=\"rowColor\">\n"
-                + "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
-                + "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                + "<a href=\"../pkg2/Test.html#betaProperty--\">betaProperty</a></span>()</code>"
-                + "&nbsp;</td>\n"
-                + "</tr>\n"
-                + "<tr id=\"i2\" class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code>"
-                + "java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
-                + "</code></td>\n"
-                + "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                + "<a href=\"../pkg2/Test.html#deltaProperty--\">"
-                + "deltaProperty</a></span>()</code>&nbsp;</td>\n"
-                + "</tr>\n"
-                + "<tr id=\"i3\" class=\"rowColor\">\n"
-                + "<td class=\"colFirst\"><code>java.util.List&lt;java.lang.String&gt;"
-                + "</code></td>\n"
-                + "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
-                + "<a href=\"../pkg2/Test.html#gammaProperty--\">gammaProperty</a>"
-                + "</span>()</code>&nbsp;</td>"
-        );
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java b/langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java
deleted file mode 100644
index 060bb7a356f..00000000000
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/C.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class C {
-
-    /**
-     * @propertySetter Property
-     * @propertyDescription PropertyDescription
-     */
-    public void CC() {}
-
-    /**
-     * @propertyGetter Property
-     *
-     */
-    public void B() {}
-
-    /**
-     * Method A documentation
-     * @treatAsPrivate
-     */
-    public void A() {}
-
-    /**
-     * Field i
-     * @defaultValue 1.0
-     */
-    public int i;
-
-
-    /**
-     * Defines the direction/speed at which the {@code Timeline} is expected to
-     * be played.
-     * @defaultValue 11
-     * @since JavaFX 8.0
-     */
-    private DoubleProperty rate;
-
-    public final void setRate(double value) {}
-
-    public final double getRate() {}
-
-    public final DoubleProperty rateProperty() {}
-
-    private BooleanProperty paused;
-
-    public final void setPaused(boolean value) {}
-
-    public final double isPaused() {}
-
-    /**
-     * Defines if paused
-     * @defaultValue false
-     */
-    public final BooleanProperty pausedProperty() {}
-
-    class DoubleProperty {}
-
-    class BooleanProperty {}
-
-    public final BooleanProperty setTestMethodProperty() {}
-
-    private class Inner {
-        private BooleanProperty testMethodProperty() {}
-
-        /**
-         * Defines the direction/speed at which the {@code Timeline} is expected to
-         * be played.
-         * @defaultValue 11
-         */
-        private DoubleProperty rate;
-
-        public final void setRate(double value) {}
-
-        public final double getRate() {}
-
-        public final DoubleProperty rateProperty() {}
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java b/langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java
deleted file mode 100644
index 77953add545..00000000000
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg1/D.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class D extends C {}
diff --git a/langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java b/langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java
deleted file mode 100644
index 9e1973d944c..00000000000
--- a/langtools/test/com/sun/javadoc/testJavaFX/pkg2/Test.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg2;
-
-import java.util.List;
-import java.util.Set;
-
-
-public class Test {
-    public <T> Object alphaProperty(List<T> foo) { return null; }
-    public Object betaProperty() { return null; }
-    public final  List<String> gammaProperty()  {return null;}
-    public final List<Set<? super Object>> deltaProperty() {return null;}
-}
diff --git a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
deleted file mode 100644
index 7ce84428383..00000000000
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2004, 2016, 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      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
- * @summary  Verify that the output has the right javascript.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestJavascript
- */
-
-public class TestJavascript extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestJavascript tester = new TestJavascript();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", testSrc("TestJavascript.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C.html", true,
-                "<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>");
-
-        checkOutput("TestJavascript.html", true,
-                "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>");
-
-        checkOutput("index.html", true,
-                "<script type=\"text/javascript\">\n"
-                + "    tmpTargetPage = \"\" + window.location.search;\n"
-                + "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")\n"
-                + "        tmpTargetPage = tmpTargetPage.substring(1);\n"
-                + "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))\n"
-                + "        tmpTargetPage = \"undefined\";\n"
-                + "    targetPage = tmpTargetPage;\n"
-                + "    function validURL(url) {\n"
-                + "        try {\n"
-                + "            url = decodeURIComponent(url);\n"
-                + "        }\n"
-                + "        catch (error) {\n"
-                + "            return false;\n"
-                + "        }\n"
-                + "        var pos = url.indexOf(\".html\");\n"
-                + "        if (pos == -1 || pos != url.length - 5)\n"
-                + "            return false;\n"
-                + "        var allowNumber = false;\n"
-                + "        var allowSep = false;\n"
-                + "        var seenDot = false;\n"
-                + "        for (var i = 0; i < url.length - 5; i++) {\n"
-                + "            var ch = url.charAt(i);\n"
-                + "            if ('a' <= ch && ch <= 'z' ||\n"
-                + "                    'A' <= ch && ch <= 'Z' ||\n"
-                + "                    ch == '$' ||\n"
-                + "                    ch == '_' ||\n"
-                + "                    ch.charCodeAt(0) > 127) {\n"
-                + "                allowNumber = true;\n"
-                + "                allowSep = true;\n"
-                + "            } else if ('0' <= ch && ch <= '9'\n"
-                + "                    || ch == '-') {\n"
-                + "                if (!allowNumber)\n"
-                + "                     return false;\n"
-                + "            } else if (ch == '/' || ch == '.') {\n"
-                + "                if (!allowSep)\n"
-                + "                    return false;\n"
-                + "                allowNumber = false;\n"
-                + "                allowSep = false;\n"
-                + "                if (ch == '.')\n"
-                + "                     seenDot = true;\n"
-                + "                if (ch == '/' && seenDot)\n"
-                + "                     return false;\n"
-                + "            } else {\n"
-                + "                return false;\n"
-                + "            }\n"
-                + "        }\n"
-                + "        return true;\n"
-                + "    }\n"
-                + "    function loadFrames() {\n"
-                + "        if (targetPage != \"\" && targetPage != \"undefined\")\n"
-                + "             top.classFrame.location = top.targetPage;\n"
-                + "    }\n"
-                + "</script>");
-
-        checkOutput("index.html", true,
-                "<body onload=\"loadFrames()\"");
-
-        //Make sure title javascript only runs if is-external is not true
-        checkOutput("pkg/C.html", true,
-                "    try {\n"
-                + "        if (location.href.indexOf('is-external=true') == -1) {\n"
-                + "            parent.document.title=\"C\";\n"
-                + "        }\n"
-                + "    }\n"
-                + "    catch(err) {\n"
-                + "    }");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testJavascript/pkg/C.java b/langtools/test/com/sun/javadoc/testJavascript/pkg/C.java
deleted file mode 100644
index 54a0e1feda9..00000000000
--- a/langtools/test/com/sun/javadoc/testJavascript/pkg/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
deleted file mode 100644
index a0848d03990..00000000000
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      8004893 8022738 8029143
- * @summary  Make sure that the lambda feature changes work fine in
- *           javadoc.
- * @author   bpatel
- * @library  ../lib/
- * @modules jdk.javadoc
- * @build    JavadocTester TestLambdaFeature
- * @run main TestLambdaFeature
- */
-
-/*
- * NOTE : This test should be elided when version 1.7 support is removed from the JDK
- *              or the negative part of the test showing 1.7's non-support should be
- *              removed [ 8022738 ]
- */
-
-public class TestLambdaFeature extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestLambdaFeature tester = new TestLambdaFeature();
-        tester.runTests();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-d", "out-default",
-                "-sourcepath", testSrc,
-                "pkg", "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", true,
-                "<td class=\"colFirst\"><code>default void</code></td>",
-                "<pre>default&nbsp;void&nbsp;defaultMethod()</pre>",
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>"
-                + "All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(2);\">Instance Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span><span id=\"t3\" "
-                + "class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
-                + "Abstract Methods</a></span><span class=\"tabEnd\">&nbsp;</span>"
-                + "</span><span id=\"t5\" class=\"tableTab\"><span>"
-                + "<a href=\"javascript:show(16);\">Default Methods</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></span></caption>",
-                "<dl>\n"
-                + "<dt>Functional Interface:</dt>\n"
-                + "<dd>This is a functional interface and can therefore be used as "
-                + "the assignment target for a lambda expression or method "
-                + "reference.</dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg1/FuncInf.html", true,
-                "<dl>\n"
-                + "<dt>Functional Interface:</dt>\n"
-                + "<dd>This is a functional interface and can therefore be used as "
-                + "the assignment target for a lambda expression or method "
-                + "reference.</dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/A.html", false,
-                "<td class=\"colFirst\"><code>default default void</code></td>",
-                "<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>");
-
-        checkOutput("pkg/B.html", false,
-                "<td class=\"colFirst\"><code>default void</code></td>",
-                "<dl>\n"
-                + "<dt>Functional Interface:</dt>");
-
-        checkOutput("pkg1/NotAFuncInf.html", false,
-                "<dl>\n"
-                + "<dt>Functional Interface:</dt>\n"
-                + "<dd>This is a functional interface and can therefore be used as "
-                + "the assignment target for a lambda expression or method "
-                + "reference.</dd>\n"
-                + "</dl>");
-    }
-
-    @Test
-    void testSource7() {
-        javadoc("-d", "out-7",
-                "-sourcepath", testSrc,
-                "-source", "1.7",
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/FuncInf.html", false,
-                "<dl>\n"
-                + "<dt>Functional Interface:</dt>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
deleted file mode 100644
index 8e5992baebf..00000000000
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/A.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg;
-
-@FunctionalInterface
-public interface A {
-
-    public void method1();
-
-    public default void defaultMethod() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/B.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/B.java
deleted file mode 100644
index ccc58e191d2..00000000000
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg/B.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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
- * 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 pkg;
-
-public abstract class B {
-
-    public abstract void method1();
-
-    public void method2() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
deleted file mode 100644
index bace6ea9b98..00000000000
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/FuncInf.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-@FunctionalInterface
-public interface FuncInf<V> {
-
-    V call() throws Exception;
-}
diff --git a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java b/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java
deleted file mode 100644
index 24ad4cd393e..00000000000
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/pkg1/NotAFuncInf.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public interface NotAFuncInf<V> {
-
-    V call() throws Exception;
-}
diff --git a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
deleted file mode 100644
index 7752f91674e..00000000000
--- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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 4232882 8014636
- * @summary Javadoc strips all of the leading spaces when the comment
- *    does not begin with a star.  This RFE allows users to
- *    begin their comment without a leading star without leading
- *    spaces stripped
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main LeadingSpaces
- */
-
-public class LeadingSpaces extends JavadocTester {
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        LeadingSpaces tester = new LeadingSpaces();
-        tester.runTests();
-    }
-
-    @Test
-    void testLeadingSpaces() {
-        javadoc("-d", "out", "-sourcepath", testSrc,
-                testSrc("LeadingSpaces.java"));
-        checkExit(Exit.OK);
-        checkOutput("LeadingSpaces.html", true,
-                  "        1\n"
-                + "          2\n"
-                + "            3\n"
-                + "              4\n"
-                + "                5\n"
-                + "                  6\n"
-                + "                    7");
-    }
-
-    /**
-       This leading spaces in the &lt;pre&gt; block below should be
-       preserved.
-       <pre>
-        1
-          2
-            3
-              4
-                5
-                  6
-                    7
-       </pre>
-     */
-    public void method(){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testLegacyTaglet/C.java b/langtools/test/com/sun/javadoc/testLegacyTaglet/C.java
deleted file mode 100644
index f4dbce77af1..00000000000
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/C.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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.
- */
-
-/**
- * This is an {@underline underline}.
- * @todo Finish this class.
- * @check Check this.
- */
-public class C {
-
-    /**
-     * @todo Tag in Method.
-     */
-    public void mtd() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLegacyTaglet/Check.java b/langtools/test/com/sun/javadoc/testLegacyTaglet/Check.java
deleted file mode 100644
index de511c13b3f..00000000000
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/Check.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2013, 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 com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-import java.util.Map;
-
-public class Check implements Taglet {
-
-    private static final String TAG_NAME = "check";
-    private static final String TAG_HEADER = "Check:";
-
-    /**
-     * Return true since the tag can be used in package documentation.
-     *
-     * @return true since the tag can be used in package documentation.
-     */
-    public boolean inPackage() {
-        return true;
-    }
-
-    /**
-     * Return true since the tag can be used in overview documentation.
-     *
-     * @return true since the tag can be used in overview documentation.
-     */
-    public boolean inOverview() {
-        return true;
-    }
-
-    /**
-     * Return true since the tag can be used in type (class/interface)
-     * documentation.
-     *
-     * @return true since the tag can be used in type (class/interface)
-     * documentation.
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * Return true since the tag can be used in constructor documentation.
-     *
-     * @return true since the tag can be used in constructor documentation.
-     */
-    public boolean inConstructor() {
-        return true;
-    }
-
-    /**
-     * Return true since the tag can be used in field documentation.
-     *
-     * @return true since the tag can be used in field documentation.
-     */
-    public boolean inField() {
-        return true;
-    }
-
-    /**
-     * Return true since the tag can be used in method documentation.
-     *
-     * @return true since the tag can be used in method documentation.
-     */
-    public boolean inMethod() {
-        return true;
-    }
-
-    /**
-     * Return false since the tag is not an inline tag.
-     *
-     * @return false since the tag is not an inline tag.
-     */
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    /**
-     * Register this taglet.
-     *
-     * @param tagletMap the map to register this tag to.
-     */
-    @SuppressWarnings("unchecked")
-    public static void register(Map tagletMap) {
-        Check tag = new Check();
-        Taglet t = (Taglet) tagletMap.get(tag.getName());
-        if (t != null) {
-            tagletMap.remove(tag.getName());
-        }
-        tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * Return the name of this custom tag.
-     *
-     * @return the name of this tag.
-     */
-    public String getName() {
-        return TAG_NAME;
-    }
-
-    /**
-     * Given the tag representation of this custom tag, return its string
-     * representation.
-     *
-     * @param tag the tag representation of this custom tag.
-     */
-    public String toString(Tag tag) {
-        return "<dt><span class=\"simpleTagLabel\">" + TAG_HEADER + ":</span></dt><dd>" + tag.text() +
-                "</dd>\n";
-    }
-
-    /**
-     * Given an array of tags representing this custom tag, return its string
-     * representation.
-     *
-     * @param tags the array of tags representing of this custom tag.
-     * @return null to test if the javadoc throws an exception or not.
-     */
-    public String toString(Tag[] tags) {
-        return null;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java b/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
deleted file mode 100644
index 0ed0f129c5b..00000000000
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4638723 8015882
- * @summary Test to ensure that the refactored version of the standard
- * doclet still works with Taglets that implement the 1.4.0 interface.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester ToDoTaglet UnderlineTaglet Check
- * @run main TestLegacyTaglet
- */
-
-public class TestLegacyTaglet extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestLegacyTaglet tester = new TestLegacyTaglet();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-tagletpath", testSrc,
-                "-taglet", "ToDoTaglet",
-                "-taglet", "Check",
-                "-taglet", "UnderlineTaglet",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-        checkOutput("C.html", true,
-                "This is an <u>underline</u>",
-                "<DT><B>To Do:</B><DD><table summary=\"Summary\" cellpadding=2 cellspacing=0><tr>" +
-                "<td bgcolor=\"yellow\">Finish this class.</td></tr></table></DD>",
-                "<DT><B>To Do:</B><DD><table summary=\"Summary\" cellpadding=2 cellspacing=0><tr>" +
-                "<td bgcolor=\"yellow\">Tag in Method.</td></tr></table></DD>");
-        checkOutput(Output.STDERR, false,
-                "NullPointerException");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java b/langtools/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java
deleted file mode 100644
index a2a0cd5541a..00000000000
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2003, 2007, 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 com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-import java.util.Map;
-
-/**
- * A sample Taglet representing @todo. This tag can be used in any kind of
- * {@link com.sun.javadoc.Doc}.  It is not an inline tag. The text is displayed
- * in yellow to remind the developer to perform a task.  For
- * example, "@todo Fix this!" would be shown as:
- * <DL>
- * <DT>
- * <B>To Do:</B>
- * <DD><table summary="Summary" cellpadding=2 cellspacing=0><tr><td bgcolor="yellow">Fix this!
- * </td></tr></table></DD>
- * </DL>
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-public class ToDoTaglet implements Taglet {
-
-    private static final String NAME = "todo";
-    private static final String HEADER = "To Do:";
-
-    /**
-     * Return the name of this custom tag.
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in field documentation.
-     * @return true since <code>@todo</code>
-     * can be used in field documentation and false
-     * otherwise.
-     */
-    public boolean inField() {
-        return true;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in constructor documentation.
-     * @return true since <code>@todo</code>
-     * can be used in constructor documentation and false
-     * otherwise.
-     */
-    public boolean inConstructor() {
-        return true;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in method documentation.
-     * @return true since <code>@todo</code>
-     * can be used in method documentation and false
-     * otherwise.
-     */
-    public boolean inMethod() {
-        return true;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in method documentation.
-     * @return true since <code>@todo</code>
-     * can be used in overview documentation and false
-     * otherwise.
-     */
-    public boolean inOverview() {
-        return true;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in package documentation.
-     * @return true since <code>@todo</code>
-     * can be used in package documentation and false
-     * otherwise.
-     */
-    public boolean inPackage() {
-        return true;
-    }
-
-    /**
-     * Will return true since <code>@todo</code>
-     * can be used in type documentation (classes or interfaces).
-     * @return true since <code>@todo</code>
-     * can be used in type documentation and false
-     * otherwise.
-     */
-    public boolean inType() {
-        return true;
-    }
-
-    /**
-     * Will return false since <code>@todo</code>
-     * is not an inline tag.
-     * @return false since <code>@todo</code>
-     * is not an inline tag.
-     */
-
-    public boolean isInlineTag() {
-        return false;
-    }
-
-    /**
-     * Register this Taglet.
-     * @param tagletMap  the map to register this tag to.
-     */
-    public static void register(Map tagletMap) {
-       ToDoTaglet tag = new ToDoTaglet();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation.
-     * @param tag   the <code>Tag</code> representation of this custom tag.
-     */
-    public String toString(Tag tag) {
-        return "<DT><B>" + HEADER + "</B><DD>"
-               + "<table summary=\"Summary\" cellpadding=2 cellspacing=0><tr><td bgcolor=\"yellow\">"
-               + tag.text()
-               + "</td></tr></table></DD>\n";
-    }
-
-    /**
-     * Given an array of <code>Tag</code>s representing this custom
-     * tag, return its string representation.
-     * @param tags  the array of <code>Tag</code>s representing of this custom tag.
-     */
-    public String toString(Tag[] tags) {
-        if (tags.length == 0) {
-            return null;
-        }
-        String result = "\n<DT><B>" + HEADER + "</B><DD>";
-        result += "<table summary=\"Summary\" cellpadding=2 cellspacing=0><tr><td bgcolor=\"yellow\">";
-        for (int i = 0; i < tags.length; i++) {
-            if (i > 0) {
-                result += ", ";
-            }
-            result += tags[i].text();
-        }
-        return result + "</td></tr></table></DD>\n";
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java b/langtools/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java
deleted file mode 100644
index 0bf224e66a4..00000000000
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2003, 2007, 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 com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-import java.util.Map;
-
-/**
- * A sample Inline Taglet representing {@underline ...}. This tag can be used in any kind of
- * {@link com.sun.javadoc.Doc}.  The text is simple underlined.  For
- * example, "@underline UNDERLINE ME" would be shown as: <u>UNDERLINE ME</u>.
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-public class UnderlineTaglet implements Taglet {
-
-    private String NAME = "underline";
-
-    /**
-     * Return the name of this custom tag.
-     */
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inField() {
-        return false;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inConstructor() {
-        return true;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inMethod() {
-        return false;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inOverview() {
-        return false;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inPackage() {
-        return false;
-    }
-
-    /**
-     * Will return false since this is an inline tag.
-     * @return false since this is an inline tag.
-     */
-    public boolean inType() {
-        return false;
-    }
-
-    /**
-     * Will return true since this is an inline tag.
-     * @return true since this is an inline tag.
-     */
-
-    public boolean isInlineTag() {
-        return true;
-    }
-
-    /**
-     * Register this Taglet.
-     * @param tagletMap  the map to register this tag to.
-     */
-    public static void register(Map tagletMap) {
-       UnderlineTaglet tag = new UnderlineTaglet();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * Given the <code>Tag</code> representation of this custom
-     * tag, return its string representation.
-     * @param tag he <code>Tag</code> representation of this custom tag.
-     */
-    public String toString(Tag tag) {
-        return "<u>" + tag.text() + "</u>";
-    }
-
-    /**
-     * This method should not be called since arrays of inline tags do not
-     * exist.  Method {@link #tostring(Tag)} should be used to convert this
-     * inline tag to a string.
-     * @param tags the array of <code>Tag</code>s representing of this custom tag.
-     */
-    public String toString(Tag[] tags) {
-        return null;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java b/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
deleted file mode 100644
index af3522557a5..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4625883
- * @summary Make sure that bad -link arguments trigger warnings.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestBadLinkOption
- */
-
-public class TestBadLinkOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestBadLinkOption tester = new TestBadLinkOption();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String out = "out";
-        javadoc("-d", out,
-                "-sourcepath", testSrc,
-                "-link", out,
-                "pkg");
-        checkExit(Exit.OK);
-
-        // TODO: the file it is trying to read, out/out/package-list, warrants investigation
-        checkOutput(Output.WARNING, true,
-                "Error reading file:");
-
-        checkOutput(Output.ERROR, false,
-                "Error reading file:");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
deleted file mode 100644
index f4181faac58..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2002, 2016, 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 4720957 5020118 8026567 8038976
- * @summary Test to make sure that -link and -linkoffline link to
- * right files, and URLs with and without trailing slash are accepted.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestLinkOption
- */
-
-import java.io.File;
-
-public class TestLinkOption extends JavadocTester {
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     */
-    public static void main(String... args) throws Exception {
-        TestLinkOption tester = new TestLinkOption();
-        tester.runTests();
-    }
-
-    // The following test runs javadoc multiple times; it is important that the
-    // first one is run first, since the subsequent runs refer to the output
-    // it generates. Therefore we run everything serially in a single @Test
-    // method and not in independent @Test methods.
-    @Test
-    void test() {
-        String mylib = "mylib";
-        String[] javacArgs = {
-            "-d", mylib, testSrc + "/extra/StringBuilder.java"
-        };
-        com.sun.tools.javac.Main.compile(javacArgs);
-
-        // Generate the documentation using -linkoffline and a URL as the first parameter.
-        String out1 = "out1";
-        String url = "http://acme.com/jdk/";
-        javadoc("-d", out1,
-                "-classpath", mylib,
-                "-sourcepath", testSrc,
-                "-linkoffline", url, testSrc + "/jdk",
-                "-package",
-                "pkg", "mylib.lang");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C.html", true,
-                "<a href=\"" + url + "java/lang/String.html?is-external=true\" "
-                + "title=\"class or interface in java.lang\"><code>Link to String Class</code></a>",
-                //Make sure the parameters are indented properly when the -link option is used.
-                "(int&nbsp;p1,\n"
-                + "      int&nbsp;p2,\n"
-                + "      int&nbsp;p3)",
-                "(int&nbsp;p1,\n"
-                + "      int&nbsp;p2,\n"
-                + "      <a href=\"" + url + "java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">"
-                + "Object</a>&nbsp;p3)");
-
-        checkOutput("mylib/lang/StringBuilderChild.html", true,
-                "<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>\n"
-                + "extends <a href=\"" + url + "java/lang/Object.html?is-external=true\" "
-                + "title=\"class or interface in java.lang\">Object</a></pre>"
-        );
-
-        // Generate the documentation using -linkoffline and a relative path as the first parameter.
-        // We will try linking to the docs generated in test 1 with a relative path.
-        String out2 = "out2";
-        javadoc("-d", out2,
-                "-sourcepath", testSrc,
-                "-linkoffline", "../" + out1, out1,
-                "-package",
-                "pkg2");
-        checkExit(Exit.OK);
-        checkOutput("pkg2/C2.html", true,
-            "This is a link to <a href=\"../../" + out1 + "/pkg/C.html?is-external=true\" " +
-            "title=\"class or interface in pkg\"><code>Class C</code></a>."
-        );
-
-        String out3 = "out3";
-        javadoc(createArguments(out3, out1, true));  // with trailing slash
-        checkExit(Exit.OK);
-
-        String out4 = "out4";
-        javadoc(createArguments(out4, out1, false)); // without trailing slash
-        checkExit(Exit.OK);
-        // Note: the following test is very weak, and will fail if ever the text
-        // of the message is changed. We should have a separate test to verify
-        // this is the text that is given when there is a problem with a URL
-        checkOutput(Output.WARNING, false,
-                "warning - Error fetching URL");
-    }
-
-    /*
-     * Create the documentation using the -link option, vary the behavior with
-     * both trailing and no trailing slash. We are only interested in ensuring
-     * that the command executes with no errors or related warnings.
-     */
-    static String[] createArguments(String outDir, String packageDir, boolean withTrailingSlash) {
-        String packagePath = new File(packageDir).getAbsolutePath();
-        if (withTrailingSlash) {
-            // add the trailing slash, if it is not present!
-            if (!packagePath.endsWith(FS)) {
-                packagePath = packagePath + FS;
-            }
-        } else {
-            // remove the trailing slash, if it is present!
-            if (packagePath.endsWith(FS)) {
-                packagePath = packagePath.substring(0, packagePath.length() - 1);
-            }
-        }
-        String args[] = {
-            "-d", outDir,
-            "-sourcepath", testSrc,
-            "-link", "file:///" + packagePath,
-            "-package",
-            "pkg2"
-        };
-        System.out.println("packagePath: " + packagePath);
-        return args;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java b/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
deleted file mode 100644
index 20154e33820..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4739870
- * @summary Make sure that a new line may act as a separator between
- * link and label.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestNewLineInLink
- */
-
-public class TestNewLineInLink extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNewLineInLink tester = new TestNewLineInLink();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api", testSrc,
-                "testNewLineInLink");
-        checkExit(Exit.OK);
-
-        checkOutput(Output.ERROR, false,
-                "illegal character");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/extra/StringBuilder.java b/langtools/test/com/sun/javadoc/testLinkOption/extra/StringBuilder.java
deleted file mode 100644
index d59d286dc0d..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/extra/StringBuilder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016, 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 mylib.lang;
-
-abstract class AbstractStringBuilder {
-    abstract void m();
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/jdk/package-list b/langtools/test/com/sun/javadoc/testLinkOption/jdk/package-list
deleted file mode 100644
index fecd4d4ffb3..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/jdk/package-list
+++ /dev/null
@@ -1,135 +0,0 @@
-java.applet
-java.awt
-java.awt.color
-java.awt.datatransfer
-java.awt.dnd
-java.awt.event
-java.awt.font
-java.awt.geom
-java.awt.im
-java.awt.im.spi
-java.awt.image
-java.awt.image.renderable
-java.awt.print
-java.beans
-java.beans.beancontext
-java.io
-java.lang
-java.lang.ref
-java.lang.reflect
-java.math
-java.net
-java.nio
-java.nio.channels
-java.nio.channels.spi
-java.nio.charset
-java.nio.charset.spi
-java.rmi
-java.rmi.activation
-java.rmi.dgc
-java.rmi.registry
-java.rmi.server
-java.security
-java.security.acl
-java.security.cert
-java.security.interfaces
-java.security.spec
-java.sql
-java.text
-java.util
-java.util.jar
-java.util.logging
-java.util.prefs
-java.util.regex
-java.util.zip
-javax.accessibility
-javax.crypto
-javax.crypto.interfaces
-javax.crypto.spec
-javax.imageio
-javax.imageio.event
-javax.imageio.metadata
-javax.imageio.plugins.jpeg
-javax.imageio.spi
-javax.imageio.stream
-javax.naming
-javax.naming.directory
-javax.naming.event
-javax.naming.ldap
-javax.naming.spi
-javax.net
-javax.net.ssl
-javax.print
-javax.print.attribute
-javax.print.attribute.standard
-javax.print.event
-javax.rmi
-javax.rmi.CORBA
-javax.security.auth
-javax.security.auth.callback
-javax.security.auth.kerberos
-javax.security.auth.login
-javax.security.auth.spi
-javax.security.auth.x500
-javax.security.cert
-javax.sound.midi
-javax.sound.midi.spi
-javax.sound.sampled
-javax.sound.sampled.spi
-javax.sql
-javax.swing
-javax.swing.border
-javax.swing.colorchooser
-javax.swing.event
-javax.swing.filechooser
-javax.swing.plaf
-javax.swing.plaf.basic
-javax.swing.plaf.metal
-javax.swing.plaf.multi
-javax.swing.table
-javax.swing.text
-javax.swing.text.html
-javax.swing.text.html.parser
-javax.swing.text.rtf
-javax.swing.tree
-javax.swing.undo
-javax.transaction
-javax.transaction.xa
-javax.xml.parsers
-javax.xml.transform
-javax.xml.transform.dom
-javax.xml.transform.sax
-javax.xml.transform.stream
-org.ietf.jgss
-org.omg.CORBA
-org.omg.CORBA.DynAnyPackage
-org.omg.CORBA.ORBPackage
-org.omg.CORBA.TypeCodePackage
-org.omg.CORBA.portable
-org.omg.CORBA_2_3
-org.omg.CORBA_2_3.portable
-org.omg.CosNaming
-org.omg.CosNaming.NamingContextExtPackage
-org.omg.CosNaming.NamingContextPackage
-org.omg.Dynamic
-org.omg.DynamicAny
-org.omg.DynamicAny.DynAnyFactoryPackage
-org.omg.DynamicAny.DynAnyPackage
-org.omg.IOP
-org.omg.IOP.CodecFactoryPackage
-org.omg.IOP.CodecPackage
-org.omg.Messaging
-org.omg.PortableInterceptor
-org.omg.PortableInterceptor.ORBInitInfoPackage
-org.omg.PortableServer
-org.omg.PortableServer.CurrentPackage
-org.omg.PortableServer.POAManagerPackage
-org.omg.PortableServer.POAPackage
-org.omg.PortableServer.ServantLocatorPackage
-org.omg.PortableServer.portable
-org.omg.SendingContext
-org.omg.stub.java.rmi
-org.w3c.dom
-org.xml.sax
-org.xml.sax.ext
-org.xml.sax.helpers
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/mylib/lang/StringBuilderChild.java b/langtools/test/com/sun/javadoc/testLinkOption/mylib/lang/StringBuilderChild.java
deleted file mode 100644
index d81e3cee806..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/mylib/lang/StringBuilderChild.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2004, 2016, 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 mylib.lang;
-
-/**
- * @author Jamie Ho
- */
-public abstract class StringBuilderChild extends AbstractStringBuilder {
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/pkg/C.java b/langtools/test/com/sun/javadoc/testLinkOption/pkg/C.java
deleted file mode 100644
index ee8c38b84a2..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/pkg/C.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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 pkg;
-
-/*****************************************************
- * {@link java.lang.String Link to String Class}.
- ****************************************************/
-public class C {
-
-public Object method(int p1, int p2, int p3) {
-    return null;
-}
-
-public Object method(int p1, int p2, Object p3) {
-    return p3;
-}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/pkg2/C2.java b/langtools/test/com/sun/javadoc/testLinkOption/pkg2/C2.java
deleted file mode 100644
index 29be11a5d1e..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/pkg2/C2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-/*******************************************
- * This is a link to {@link pkg.C Class C}.
- *******************************************/
-
-public class C2 {}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java b/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java
deleted file mode 100644
index 1b2270fe351..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 testNewLineInLink;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html b/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
deleted file mode 100644
index a03aa66b101..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-{@link java.awt.Color#getAlpha()
-getAlpha}
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
deleted file mode 100644
index d3a1305d7c1..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4732864 6280605 7064544 8014636 8016328 8025633
- * @summary  Make sure that you can link from one member to another using
- *           non-qualified name, furthermore, ensure the right one is linked.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestLinkTaglet
- */
-
-public class TestLinkTaglet extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestLinkTaglet tester = new TestLinkTaglet();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", testSrc("checkPkg/B.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C.html", true,
-                "Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n"
-                + " Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n"
-                + " Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n"
-                + " Qualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n"
-                + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n"
-                + " Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(InnerC, InnerC2)</code></a>.<br/>");
-
-        checkOutput("pkg/C.InnerC.html", true,
-                "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n"
-                + " Link to member in inner class: <a href=\"../pkg/C.InnerC2.html#MEMBER2\"><code>C.InnerC2.MEMBER2</code></a> <br/>\n"
-                + " Link to another inner class: <a href=\"../pkg/C.InnerC2.html\" title=\"class in pkg\"><code>C.InnerC2</code></a>");
-
-        checkOutput("pkg/C.InnerC2.html", true,
-                "<dl>\n"
-                + "<dt>Enclosing class:</dt>\n"
-                + "<dd><a href=\"../pkg/C.html\" title=\"class in pkg\">C</a></dd>\n"
-                + "</dl>");
-
-        checkOutput(Output.WARNING, false,
-                "Tag @see: reference not found: A");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java b/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java
deleted file mode 100644
index 28574785b16..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 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 checkPkg;
-
-/**
- * 6280605
- */
-public class A {
-        public void m(){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java b/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java
deleted file mode 100644
index ef897adfc0f..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2005, 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 checkPkg;
-
-/**6280605
- * @see A
- */
-public class B {
-
-        /**
-     * @see A#m()
-     */
-        public void m2();
-
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/pkg/C.java b/langtools/test/com/sun/javadoc/testLinkTaglet/pkg/C.java
deleted file mode 100644
index 3e79cd7435b..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/pkg/C.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- *
- * 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 pkg;
-
-/**
- * Qualified Link: {@link pkg.C.InnerC}.<br/>
- * Unqualified Link1: {@link C.InnerC}.<br/>
- * Unqualified Link2: {@link InnerC}.<br/>
- * Qualified Link: {@link #method(pkg.C.InnerC, pkg.C.InnerC2)}.<br/>
- * Unqualified Link: {@link #method(C.InnerC, C.InnerC2)}.<br/>
- * Unqualified Link: {@link #method(InnerC, InnerC2)}.<br/>
- */
-public class C {
-
-    public InnerC MEMBER = new InnerC();
-    /**
-     *  A red herring inner class to confuse the matching, thus to
-     *  ensure the right one is linked.
-     */
-    public class RedHerringInnerC {}
-
-    /**
-     * Link to member in outer class: {@link #MEMBER} <br/>
-     * Link to member in inner class: {@link InnerC2#MEMBER2} <br/>
-     * Link to another inner class: {@link InnerC2}
-     */
-    public class InnerC {}
-
-    /**
-     * Link to conflicting member in inner class: {@link #MEMBER} <br/>
-     */
-    public class InnerC2 {
-        public static final int MEMBER = 1;
-        public static final int MEMBER2 = 1;
-    }
-
-    public void method(InnerC p1, InnerC2 p2){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
deleted file mode 100644
index ae94edaa78f..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4521661 8081854
- * @summary Test to make sure that there is a link with a proper anchor
- * from a serializable class to serialized-form.html.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestLinkToSerialForm
- */
-
-public class TestLinkToSerialForm extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestLinkToSerialForm tester = new TestLinkToSerialForm();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("serialized-form.html", true,
-                "<a name=\"pkg.C\">");
-        checkOutput("pkg/C.html", true,
-                "<a href=\"../serialized-form.html#pkg.C\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java b/langtools/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java
deleted file mode 100644
index 80c9f9b46ed..00000000000
--- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class C implements java.io.Serializable {}
diff --git a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
deleted file mode 100644
index b2e2ecdd923..00000000000
--- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      8002387 8014636
- * @summary  Improve rendered HTML formatting for {@code}
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestLiteralCodeInPre
- */
-
-public class TestLiteralCodeInPre extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestLiteralCodeInPre tester = new TestLiteralCodeInPre();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-Xdoclint:none",
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/Test.html", true,
-                "no_pre()</pre>\n"
-                + "<div class=\"block\">abc<code>def</code>ghi</div>",
-                "no_pre_extra_whitespace()</pre>\n"
-                + "<div class=\"block\">abc<code>def  </code>ghi</div>",
-                "in_pre()</pre>\n"
-                + "<div class=\"block\"><pre> abc<code>  def  </code>ghi</pre></div>",
-                "pre_after_text()</pre>\n"
-                + "<div class=\"block\">xyz <pre> abc<code>  def  </code>ghi</pre></div>",
-                "after_pre()</pre>\n"
-                + "<div class=\"block\">xyz <pre> pqr </pre> abc<code>def  </code>ghi</div>",
-                "back_in_pre()</pre>\n"
-                + "<div class=\"block\">xyz <pre> pqr </pre> mno <pre> abc<code>  def  </code>ghi</pre></div>",
-                "typical_usage_code()</pre>\n"
-                + "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
-                + " Example:  <pre><code>\n"
-                + "   line 1 &lt;T&gt; void m(T t) {\n"
-                + "   line 2     // do something with T\n"
-                + "   line 3 }\n"
-                + " </code></pre>\n"
-                + " and so it goes.</div>",
-                "typical_usage_literal()</pre>\n"
-                + "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
-                + " Example:  <pre>\n"
-                + "   line 1 &lt;T&gt; void m(T t) {\n"
-                + "   line 2     // do something with T\n"
-                + "   line 3 }\n"
-                + " </pre>\n"
-                + " and so it goes.</div>",
-                "recommended_usage_literal()</pre>\n"
-                + "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
-                + " Example:  <pre>\n"
-                + "   line 1 &lt;T&gt; void m(T t) {\n"
-                + "   line 2     // do something with T\n"
-                + "   line 3 } </pre>\n"
-                + " and so it goes.</div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/pkg/Test.java b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/pkg/Test.java
deleted file mode 100644
index 3d6fffbe6c1..00000000000
--- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/pkg/Test.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg;
-
-/** */
-public class Test {
-    /**
-     * abc{@code def}ghi
-     */
-    public void no_pre() { }
-
-    /**
-     * abc{@code  def  }ghi
-     */
-    public void no_pre_extra_whitespace() { }
-
-    /**
-     * <pre> abc{@code  def  }ghi</pre>
-     */
-    public void in_pre() { }
-
-    /**
-     * xyz <pre> abc{@code  def  }ghi</pre>
-     */
-    public void pre_after_text() { }
-
-    /**
-     * xyz <pre> pqr </pre> abc{@code  def  }ghi
-     */
-    public void after_pre() { }
-
-    /**
-     * xyz <pre> pqr </pre> mno <pre> abc{@code  def  }ghi</pre>
-     */
-    public void back_in_pre() { }
-
-    /**
-     * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-     * Example:  <pre>{@code
-     *   line 1 <T> void m(T t) {
-     *   line 2     // do something with T
-     *   line 3 }
-     * }</pre>
-     * and so it goes.
-     */
-    public void typical_usage_code() { }
-
-    /**
-     * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-     * Example:  <pre>{@literal
-     *   line 1 <T> void m(T t) {
-     *   line 2     // do something with T
-     *   line 3 }
-     * }</pre>
-     * and so it goes.
-     */
-    public void typical_usage_literal() { }
-
-    /**
-     * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-     * Example:  <pre>{@literal
-     *   line 1 <T> void m(T t) {
-     *   line 2     // do something with T
-     *   line 3 } }</pre>
-     * and so it goes.
-     */
-    public void recommended_usage_literal() { }
-
-    /**
-     * abc {@code
-     */
-    public void bad_code_no_content() { }
-
-    /**
-     * abc {@code abc
-     */
-    public void bad_code_content() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
deleted file mode 100644
index 029a4650b81..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4638588 4635809 6256068 6270645 8025633 8026567
- * @summary Test to make sure that members are inherited properly in the Javadoc.
- *          Verify that inheritence labels are correct.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestMemberInheritence
- */
-
-public class TestMemberInheritence extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestMemberInheritence tester = new TestMemberInheritence();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", "diamond", "inheritDist");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/SubClass.html", true,
-                // Public field should be inherited
-                "<a href=\"../pkg/BaseClass.html#pubField\">",
-                // Public method should be inherited
-                "<a href=\"../pkg/BaseClass.html#pubMethod--\">",
-                // Public inner class should be inherited.
-                "<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">",
-                // Protected field should be inherited
-                "<a href=\"../pkg/BaseClass.html#proField\">",
-                // Protected method should be inherited
-                "<a href=\"../pkg/BaseClass.html#proMethod--\">",
-                // Protected inner class should be inherited.
-                "<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">",
-                // New labels as of 1.5.0
-                "Nested classes/interfaces inherited from class&nbsp;pkg."
-                + "<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>",
-                "Nested classes/interfaces inherited from interface&nbsp;pkg."
-                + "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</a>");
-
-        checkOutput("pkg/BaseClass.html", true,
-                // Test overriding/implementing methods with generic parameters.
-                "<dl>\n"
-                + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">"
-                + "getAnnotation</a></code>&nbsp;in interface&nbsp;<code>"
-                + "<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">"
-                + "BaseInterface</a></code></dd>\n"
-                + "</dl>");
-
-        checkOutput("diamond/Z.html", true,
-                // Test diamond inheritence member summary (6256068)
-                "<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>");
-
-        checkOutput("inheritDist/C.html", true,
-                // Test that doc is inherited from closed parent (6270645)
-                "<div class=\"block\">m1-B</div>");
-
-        checkOutput("pkg/SubClass.html", false,
-                "<a href=\"../pkg/BaseClass.html#staticMethod--\">staticMethod</a></code>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/A.java b/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/A.java
deleted file mode 100644
index 2b2fae78cb2..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/A.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 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 diamond;
-
-//6256068
-public interface A {
-    /**
-     * aDoc.
-     */
-    void aMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/B.java b/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/B.java
deleted file mode 100644
index ff5698bc885..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/B.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 diamond;
-
-public interface B extends A {
-    /**
-     * bDoc.
-     */
-    void bMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/C.java b/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/C.java
deleted file mode 100644
index 08b81ad7b34..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/C.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 diamond;
-
-public interface C extends B {
-    /**
-     * cDoc.
-     */
-    void cMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/X.java b/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/X.java
deleted file mode 100644
index 8ba5cbca1c6..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/X.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 diamond;
-
-public interface X extends A {
-    /**
-     * xDoc.
-     */
-    void xMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java b/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java
deleted file mode 100644
index 1db7f8e17f9..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 diamond;
-
-public interface Z extends X, C {
-    /**
-     * zDoc.
-     */
-    void zMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java b/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java
deleted file mode 100644
index fa75e2459ea..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 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 inheritDist;
-
-//6270645
-public interface A {
-    /**
-     * m1-A
-     */
-    void m1();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java b/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java
deleted file mode 100644
index 71e1dc2e583..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 inheritDist;
-
-public interface B extends A {
-    /**
-     * m1-B
-     */
-    void m1();
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java b/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java
deleted file mode 100644
index e54c247ff11..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2005, 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 inheritDist;
-
-public class C implements B {
-    public void m1() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java b/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java
deleted file mode 100644
index e0b67a3ad28..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-public class BaseClass implements BaseInterface {
-
-  public int pubField = 1;
-
-  public class pubInnerClass{}
-
-  public void pubMethod() {}
-
-  protected int proField = 1;
-
-  protected class proInnerClass{}
-
-  protected void proMethod() {}
-
-  public <B extends Annotation> B getAnnotation(Class<B> annotationClass) {
-      return null;
-  }
-
-  public static void staticMethod(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java b/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java
deleted file mode 100644
index 757e42efc42..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-public interface BaseInterface {
-
-    public class NestedClassFromInterface{}
-
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass);
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java b/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java
deleted file mode 100644
index a0df883619b..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, 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 pkg;
-
-import java.lang.annotation.*;
-
-public class SubClass extends BaseClass {
-
-    public <C extends Annotation> C getAnnotation(Class<C> annotationClass) {
-        return null;
-    }
-
-    public static void staticMethod(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
deleted file mode 100644
index 9c91b39f7dd..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4951228 6290760 8025633 8026567 8081854
- * @summary  Test the case where the overriden method returns a different
- *           type than the method in the child class.  Make sure the
- *           documentation is inherited but the return type isn't.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestMemberSummary
- */
-
-public class TestMemberSummary extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestMemberSummary tester = new TestMemberSummary();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg","pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/PublicChild.html", true,
-                // Check return type in member summary.
-                "<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
-                + "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">"
-                + "returnTypeTest</a></span>()</code>",
-                // Check return type in member detail.
-                "<pre>public&nbsp;<a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">"
-                + "PublicChild</a>&nbsp;returnTypeTest()</pre>");
-
-        // Legacy anchor dimensions (6290760)
-        checkOutput("pkg2/A.html", true,
-                "<a name=\"f-java.lang.Object:A-\">\n"
-                + "<!--   -->\n"
-                + "</a><a name=\"f-T:A-\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java b/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java
deleted file mode 100644
index a3fa4bd0f0b..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-class PrivateParent {
-
-    /**
-     * Test to make sure the member summary inherits documentation
-     * properly.
-     */
-    public PrivateParent returnTypeTest() {
-        return this;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java b/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java
deleted file mode 100644
index 11e98b6f03e..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class PublicChild extends PrivateParent {
-
-    public PublicChild returnTypeTest() {
-        return this;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMemberSummary/pkg2/A.java b/langtools/test/com/sun/javadoc/testMemberSummary/pkg2/A.java
deleted file mode 100644
index 56945518eb7..00000000000
--- a/langtools/test/com/sun/javadoc/testMemberSummary/pkg2/A.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg2;
-
-public interface A {
-    void f(Object x);
-    <T> void f(T[] x);
-}
diff --git a/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java b/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
deleted file mode 100644
index f429730b23a..00000000000
--- a/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      8002304 8024096
- * @summary  Test for various method types in the method summary table
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestMethodTypes
- */
-
-public class TestMethodTypes extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestMethodTypes tester = new TestMethodTypes();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/A.html", true,
-                "var methods = {",
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
-                + "Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">"
-                + "Static Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
-                + "Instance Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:show(8);\">"
-                + "Concrete Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
-                + "Deprecated Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "</caption>",
-                "<tr id=\"i0\" class=\"altColor\">");
-
-        checkOutput("pkg1/B.html", true,
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
-                + "Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
-                + "Instance Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
-                + "Abstract Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "</caption>");
-
-        checkOutput("pkg1/D.html", true,
-                "var methods = {",
-                "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
-                + "Methods</span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
-                + "Instance Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
-                + "Abstract Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t4\" class=\"tableTab\"><span><a href=\"javascript:show(8);\">"
-                + "Concrete Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "<span id=\"t6\" class=\"tableTab\"><span><a href=\"javascript:show(32);\">"
-                + "Deprecated Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>"
-                + "</caption>",
-                "<tr id=\"i0\" class=\"altColor\">");
-
-        checkOutput("pkg1/A.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
-                + "</caption>");
-
-        checkOutput("pkg1/B.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
-                + "</caption>");
-
-        checkOutput("pkg1/D.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
-                + "</caption>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/A.java b/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/A.java
deleted file mode 100644
index 6a75d86eebd..00000000000
--- a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/A.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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
- * 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 pkg1;
-
-/**
- * This class has a mixture of different types of methods. The methods summary
- * table should appear with "All Methods", "Static Methods", "Instance Methods",
- * "Concrete Methods" and "Deprecated Methods".
- */
-public class A {
-
-    /**
-     * This is the first concrete instance method.
-     */
-    public void readObject() {
-    }
-
-    /**
-     * This is the second concrete instance method.
-     */
-    public final void setStub() {
-    }
-
-    /**
-     * This is the third concrete instance method.
-     */
-    public String getParameter() {
-         return "test";
-     }
-
-    /**
-     * This is the first concrete instance deprecated method.
-     * @deprecated This is a deprecated method that should appear in the tab.
-     */
-    public void resize() {
-    }
-
-    /**
-     * This is the fourth concrete instance method.
-     */
-    public void showStatus() {
-    }
-
-    /**
-     * This is the first concrete static method.
-     */
-    public final static void staticMethod() {
-    }
-
-    /**
-     * This is the second concrete instance deprecated method.
-     */
-    @Deprecated
-    public void init() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/B.java b/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/B.java
deleted file mode 100644
index 1404e095645..00000000000
--- a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/B.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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
- * 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 pkg1;
-
-/**
- * This interface has different types of methods such as "Instance Methods" and
- * "Abstract Methods". All the tabs will display same list of methods.
- */
-public interface B {
-
-    /**
-     * This is the first abstract instance method.
-     */
-    public void setName();
-
-    /**
-     * This is the second abstract instance method.
-     */
-    public String getName();
-
-    /**
-     * This is the third abstract instance method.
-     */
-    public boolean addEntry();
-
-    /**
-     * This is the fourth abstract instance method.
-     */
-    public boolean removeEntry();
-
-    /**
-     * This is the fifth abstract instance method.
-     */
-    public String getPermissions();
-}
diff --git a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/D.java b/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/D.java
deleted file mode 100644
index 2d6b36c697c..00000000000
--- a/langtools/test/com/sun/javadoc/testMethodTypes/pkg1/D.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- * 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 pkg1;
-
-/**
- * This class is marked as deprecated and has a mixture of different types of
- * methods such as "Instance Methods", "Abstract Methods" and "Concrete
- * Methods". None of the methods are marked as deprecated but since the class is
- * deprecated, the methods will also be deprecated and "Deprecated Methods" tab
- * will also be shown with all the methods.
- */
-@Deprecated
-public abstract class D {
-
-    /**
-     * This is the first abstract instance method.
-     */
-    public abstract void readObject();
-
-    /**
-     * This is the first concrete instance method.
-     */
-    public final void setStub() {
-    }
-
-    /**
-     * This is the second concrete instance method.
-     */
-    public String getParameter() {
-         return "test";
-     }
-}
diff --git a/langtools/test/com/sun/javadoc/testModifier/Interface.java b/langtools/test/com/sun/javadoc/testModifier/Interface.java
deleted file mode 100644
index 93a5c6e5039..00000000000
--- a/langtools/test/com/sun/javadoc/testModifier/Interface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1999, 2002, 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.
- */
-
-public interface Interface {
-   public void method();
-}
diff --git a/langtools/test/com/sun/javadoc/testModifier/ModifierAbstract.java b/langtools/test/com/sun/javadoc/testModifier/ModifierAbstract.java
deleted file mode 100644
index 02ac6670e05..00000000000
--- a/langtools/test/com/sun/javadoc/testModifier/ModifierAbstract.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1999, 2002, 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.
- */
-
-/**
- *  Regression test for:
- *  Javadoc puts abstract keyword in the modifier string for the interfaces.
- *  Keyword `abstract' is not necessary since interfaces are implicitly
- *  abstract.
- *
- *  @bug 4210388
- *  @summary Javadoc declares interfaces to be "abstract".
- *  @build ModifierAbstract.java
- *  @run shell ModifierAbstractWrapper.sh
- *  @author Atul M Dambalkar
- */
-
-import com.sun.javadoc.*;
-import java.lang.*;
-
-public class ModifierAbstract {
-
-  public static boolean start(RootDoc root) throws Exception {
-
-    ClassDoc[] classarr = root.classes();
-    for (int i = 0; i < classarr.length; i++) {
-        if (classarr[i].isInterface()) {
-            String modifier = classarr[i].modifiers();
-            if (modifier.indexOf("abstract") > 0) {
-                throw new Exception("Keyword `abstract' found in the " +
-                                    "modifier string for class " +
-                                    classarr[i].qualifiedName());
-            }
-        }
-    }
-    return true;
-  }
-}
diff --git a/langtools/test/com/sun/javadoc/testModifier/Test.java b/langtools/test/com/sun/javadoc/testModifier/Test.java
deleted file mode 100644
index 9ea731ae9ae..00000000000
--- a/langtools/test/com/sun/javadoc/testModifier/Test.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public class Test {
-
-      /**
-       * Test1 for first sentence<p> This is second sentence.
-       */
-      public String testStr1;
-
-      /**
-       * Test2 for first sentence</p> This is second sentence.
-       */
-      public String testStr2;
-
-      /**
-       * Test3 for first sentence<pre> This is second sentence.</pre>
-       */
-      public String testStr3;
-
-      /**
-       * <pre>Test4 for first sentence</pre> This is second sentence.
-       */
-      public String testStr4;
-
-      /**
-       * Test5 for first sentence<h1> This is second sentence.</h1>
-       */
-      public String testStr5;
-
-      /**
-       * Test6 for first sentence<h2> This is second sentence.</h2>
-       */
-      public String testStr6;
-
-      /**
-       * Test7 for first sentence<h3> This is second sentence.</h3>
-       */
-      public String testStr7;
-
-      /**
-       * Test8 for first sentence<h4> This is second sentence.</h4>
-       */
-      public String testStr8;
-
-      /**
-       * Test9 for first sentence<hr> This is second sentence.
-       */
-      public String testStr9;
-
-      /**
-       * <h1>Test10 for first sentence</h1> This is second sentence.
-       */
-      public String testStr10;
-
-      /**
-       * <h2>Test11 for first sentence</h2> This is second sentence.
-       */
-      public String testStr11;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testModifier/TestModifier.java b/langtools/test/com/sun/javadoc/testModifier/TestModifier.java
deleted file mode 100644
index d7e7971a530..00000000000
--- a/langtools/test/com/sun/javadoc/testModifier/TestModifier.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4210388
- * @summary Javadoc declares interfaces to be "abstract".
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build ModifierAbstract
- * @build JavadocTester
- * @run main TestModifier
- */
-
-public class TestModifier extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestModifier tester = new TestModifier();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-sourcepath", testSrc,
-                "-docletpath", testSrc,
-                "-doclet", "ModifierAbstract",
-                testSrc("Interface.java"), testSrc("Test.java"));
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
deleted file mode 100644
index fa1dc3c1f8b..00000000000
--- a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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      4131628 4664607 7025314 8023700 7198273 8025633 8026567 8081854 8150188
- * @summary  Make sure the Next/Prev Class links iterate through all types.
- *           Make sure the navagation is 2 columns, not 3.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNavigation
- */
-
-public class TestNavigation extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNavigation tester = new TestNavigation();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", true,
-                "<li>Prev&nbsp;Class</li>",
-                "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>");
-
-        checkOutput("pkg/C.html", true,
-                "<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>",
-                "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>");
-
-        checkOutput("pkg/E.html", true,
-                "<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>",
-                "<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>");
-
-        checkOutput("pkg/I.html", true,
-                "<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>",
-                "<li>Next&nbsp;Class</li>",
-                // Test for 4664607
-                "<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
-                + "<a name=\"navbar.top.firstrow\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-
-        // Remaining tests check for additional padding to offset the fixed navigation bar.
-        checkOutput("pkg/A.html", true,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<!-- ======== START OF CLASS DATA ======== -->");
-
-        checkOutput("pkg/package-summary.html", true,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">");
-    }
-
-    // Test for checking additional padding to offset the fixed navigation bar in HTML5.
-    @Test
-    void test1() {
-        javadoc("-d", "out-1", "-html5",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", true,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "</nav>\n"
-                + "</header>\n"
-                + "<!-- ======== START OF CLASS DATA ======== -->");
-
-        checkOutput("pkg/package-summary.html", true,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "</nav>");
-    }
-
-    // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML4.
-    @Test
-    void test2() {
-        javadoc("-d", "out-2", "-nonavbar",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", false,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<!-- ======== START OF CLASS DATA ======== -->");
-
-        checkOutput("pkg/package-summary.html", false,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "<div class=\"header\">");
-    }
-
-    // Test to make sure that no extra padding for nav bar gets generated if -nonavbar is specified for HTML5.
-    @Test
-    void test3() {
-        javadoc("-d", "out-3", "-html5", "-nonavbar",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/A.html", false,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "</nav>\n"
-                + "</header>\n"
-                + "<!-- ======== START OF CLASS DATA ======== -->");
-
-        checkOutput("pkg/package-summary.html", false,
-                "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "</div>\n"
-                + "<div class=\"navPadding\">&nbsp;</div>\n"
-                + "</nav>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNavigation/pkg/A.java b/langtools/test/com/sun/javadoc/testNavigation/pkg/A.java
deleted file mode 100644
index d15bc962603..00000000000
--- a/langtools/test/com/sun/javadoc/testNavigation/pkg/A.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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 pkg;
-
-/**
- * Sample Annotation Type.
- */
-public @interface A {}
diff --git a/langtools/test/com/sun/javadoc/testNavigation/pkg/C.java b/langtools/test/com/sun/javadoc/testNavigation/pkg/C.java
deleted file mode 100644
index 68a26ded2e2..00000000000
--- a/langtools/test/com/sun/javadoc/testNavigation/pkg/C.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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 pkg;
-
-/**
- * Sample Class.
- */
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testNavigation/pkg/E.java b/langtools/test/com/sun/javadoc/testNavigation/pkg/E.java
deleted file mode 100644
index faf605914d1..00000000000
--- a/langtools/test/com/sun/javadoc/testNavigation/pkg/E.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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 pkg;
-
-/**
- * Sample Enum.
- */
-public enum E {}
diff --git a/langtools/test/com/sun/javadoc/testNavigation/pkg/I.java b/langtools/test/com/sun/javadoc/testNavigation/pkg/I.java
deleted file mode 100644
index 81a15903074..00000000000
--- a/langtools/test/com/sun/javadoc/testNavigation/pkg/I.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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 pkg;
-
-/**
- * Sample Interface.
- */
-public interface I {}
diff --git a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
deleted file mode 100644
index fd6388d875b..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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      6758050 8025633
- * @summary  Test HTML output for nested generic types.
- * @author   bpatel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNestedGenerics
- */
-
-public class TestNestedGenerics extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNestedGenerics tester = new TestNestedGenerics();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/NestedGenerics.html", true,
-            "<div class=\"block\">Contains <a " +
-            "href=\"../pkg/NestedGenerics.html#foo-java.util.Map-\"><code>foo" +
-            "(java.util.Map&lt;A, java.util.Map&lt;A, A&gt;&gt;)</code></a></div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java b/langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java
deleted file mode 100644
index 181084cf706..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 pkg;
-
-import java.util.Map;
-
-/** Contains {@link #foo} */
-public class NestedGenerics {
-  public static <A> void foo(Map<A, Map<A, A>> map) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java b/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
deleted file mode 100644
index a95b88fafef..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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 Test for nested inline tags. *
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
- * @build JavadocTester
- * @build testtaglets.UnderlineTaglet
- * @build testtaglets.BoldTaglet
- * @build testtaglets.GreenTaglet
- * @run main TestNestedInlineTag
- */
-
-/**
- * This should be green, underlined and bold (Class): {@underline {@bold {@green My test}}} .
- */
-public class TestNestedInlineTag extends JavadocTester {
-    /**
-     * This should be green, underlined and bold (Field): {@underline {@bold {@green My test}}} .
-     */
-    public int field;
-
-    /**
-     * This should be green, underlined and bold (Constructor): {@underline {@bold {@green My test}}} .
-     */
-    public TestNestedInlineTag(){}
-
-    /**
-     * This should be green, underlined and bold (Method): {@underline {@bold {@green My test}}} .
-     */
-    public void method(){}
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        TestNestedInlineTag tester = new TestNestedInlineTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-taglet", "testtaglets.UnderlineTaglet",
-                "-taglet", "testtaglets.BoldTaglet",
-                "-taglet", "testtaglets.GreenTaglet",
-                "-XDaccessInternalAPI",
-                testSrc("TestNestedInlineTag.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("TestNestedInlineTag.html", true,
-                //Test nested inline tag in class description.
-                "This should be green, underlined and bold (Class): <u><b><font color=\"green\">My test</font></b></u>",
-                //Test nested inline tag in field description.
-                "This should be green, underlined and bold (Field): <u><b><font color=\"green\">My test</font></b></u>",
-                //Test nested inline tag in constructor description.
-                "This should be green, underlined and bold (Constructor): <u><b><font color=\"green\">My test</font></b></u>",
-                //Test nested inline tag in method description.
-                "This should be green, underlined and bold (Method): <u><b><font color=\"green\">My test</font></b></u>"
-        );
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java b/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java
deleted file mode 100644
index 82f3a159d37..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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 testtaglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-/**
- * An inline Taglet representing {@bold}
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-public class BoldTaglet extends BaseInlineTaglet {
-
-    public BoldTaglet() {
-        name = "bold";
-    }
-
-    public static void register(Map tagletMap) {
-       BoldTaglet tag = new BoldTaglet();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        ArrayList inlineTags = new ArrayList();
-        inlineTags.add(new TextTag(tag.holder(), "<b>"));
-        inlineTags.addAll(Arrays.asList(tag.inlineTags()));
-        inlineTags.add(new TextTag(tag.holder(), "</b>"));
-        return writer.commentTagsToOutput(tag, (Tag[]) inlineTags.toArray(new Tag[] {}));
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java b/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java
deleted file mode 100644
index 87273c41388..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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 testtaglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-
-/**
- * An inline Taglet representing {@green}
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-public class GreenTaglet extends BaseInlineTaglet {
-
-
-    public GreenTaglet() {
-        name = "green";
-    }
-
-    public static void register(Map tagletMap) {
-       GreenTaglet tag = new GreenTaglet();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        ArrayList inlineTags = new ArrayList();
-        inlineTags.add(new TextTag(tag.holder(), "<font color=\"green\">"));
-        inlineTags.addAll(Arrays.asList(tag.inlineTags()));
-        inlineTags.add(new TextTag(tag.holder(), "</font>"));
-        return writer.commentTagsToOutput(tag, (Tag[]) inlineTags.toArray(new Tag[] {}));
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java b/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java
deleted file mode 100644
index f5465fd7e64..00000000000
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2001, 2016, 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 testtaglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-
-/**
- * An inline Taglet representing {@underline}
- *
- * @author Jamie Ho
- * @since 1.4
- */
-
-public class UnderlineTaglet extends BaseInlineTaglet {
-
-
-    public UnderlineTaglet() {
-        name = "underline";
-    }
-
-    public static void register(Map tagletMap) {
-       UnderlineTaglet tag = new UnderlineTaglet();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        ArrayList inlineTags = new ArrayList();
-        inlineTags.add(new TextTag(tag.holder(), "<u>"));
-        inlineTags.addAll(Arrays.asList(tag.inlineTags()));
-        inlineTags.add(new TextTag(tag.holder(), "</u>"));
-        return writer.commentTagsToOutput(tag, (Tag[]) inlineTags.toArray(new Tag[] {}));
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
deleted file mode 100644
index 5865ed7e0ef..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4789689 4905985 4927164 4827184 4993906 5004549 7025314 7010344 8025633 8026567
- * @summary  Run Javadoc on a set of source files that demonstrate new
- *           language features.  Check the output to ensure that the new
- *           language features are properly documented.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNewLanguageFeatures
- */
-
-public class TestNewLanguageFeatures extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNewLanguageFeatures tester = new TestNewLanguageFeatures();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                "-use", "-sourcepath",
-                testSrc,
-                "pkg", "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkEnums();
-        checkTypeParameters();
-        checkVarArgs();
-        checkAnnotationTypeUsage();
-    }
-
-    //=================================
-    // ENUM TESTING
-    //=================================
-    void checkEnums() {
-        checkOutput("pkg/Coin.html", true,
-                // Make sure enum header is correct.
-                "Enum Coin</h2>",
-                // Make sure enum signature is correct.
-                "<pre>public enum "
-                + "<span class=\"typeNameLabel\">Coin</span>\n"
-                + "extends java.lang.Enum&lt;<a href=\"../pkg/Coin.html\" "
-                + "title=\"enum in pkg\">Coin</a>&gt;</pre>",
-                // Check for enum constant section
-                "<caption><span>Enum Constants"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                // Detail for enum constant
-                "<span class=\"memberNameLink\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>",
-                // Automatically insert documentation for values() and valueOf().
-                "Returns an array containing the constants of this enum type,",
-                "Returns the enum constant of this type with the specified name",
-                "for (Coin c : Coin.values())",
-                "Overloaded valueOf() method has correct documentation.",
-                "Overloaded values method  has correct documentation.");
-
-        // NO constructor section
-        checkOutput("pkg/Coin.html", false,
-                "<h3>Constructor Summary</h3>");
-    }
-
-    //=================================
-    // TYPE PARAMETER TESTING
-    //=================================
-
-    void checkTypeParameters() {
-        checkOutput("pkg/TypeParameters.html", true,
-                // Make sure the header is correct.
-                "Class TypeParameters&lt;E&gt;</h2>",
-                // Check class type parameters section.
-                "<dt><span class=\"paramLabel\">Type Parameters:</span></dt>\n"
-                + "<dd><code>E</code> - "
-                + "the type parameter for this class.",
-                // Type parameters in @see/@link
-                "<dl>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
-                + "<dd>"
-                + "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "<code>TypeParameters</code></a></dd>\n"
-                + "</dl>",
-                // Method that uses class type parameter.
-                "(<a href=\"../pkg/TypeParameters.html\" title=\"type "
-                + "parameter in TypeParameters\">E</a>&nbsp;param)",
-                // Method type parameter section.
-                "<span class=\"paramLabel\">Type Parameters:</span></dt>\n"
-                + "<dd><code>T</code> - This is the first "
-                + "type parameter.</dd>\n"
-                + "<dd><code>V</code> - This is the second type "
-                + "parameter.",
-                // Signature of method with type parameters
-                "public&nbsp;&lt;T extends java.util.List,V&gt;&nbsp;"
-                + "java.lang.String[]&nbsp;methodThatHasTypeParameters");
-
-        checkOutput("pkg/Wildcards.html", true,
-                // Wildcard testing.
-                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "TypeParameters</a>&lt;? super java.lang.String&gt;&nbsp;a",
-                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "TypeParameters</a>&lt;? extends java.lang.StringBuffer&gt;&nbsp;b",
-                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "TypeParameters</a>&nbsp;c");
-
-        checkOutput(Output.WARNING, true,
-                // Bad type parameter warnings.
-                "warning - @param argument "
-                + "\"<BadClassTypeParam>\" is not a type parameter name.",
-                "warning - @param argument "
-                + "\"<BadMethodTypeParam>\" is not a type parameter name.");
-
-        // Signature of subclass that has type parameters.
-        checkOutput("pkg/TypeParameterSubClass.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass&lt;T extends "
-                + "java.lang.String&gt;</span>\n"
-                + "extends "
-                + "<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">"
-                + "TypeParameterSuperClass</a>&lt;T&gt;</pre>");
-
-        // Interface generic parameter substitution
-        // Signature of subclass that has type parameters.
-        checkOutput("pkg/TypeParameters.html", true,
-                "<dl>\n"
-                + "<dt>All Implemented Interfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">"
-                + "SubInterface</a>&lt;E&gt;, <a href=\"../pkg/SuperInterface.html\" "
-                + "title=\"interface in pkg\">SuperInterface</a>&lt;E&gt;</dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/SuperInterface.html", true,
-                "<dl>\n"
-                + "<dt>All Known Subinterfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">"
-                + "SubInterface</a>&lt;V&gt;</dd>\n"
-                + "</dl>");
-        checkOutput("pkg/SubInterface.html", true,
-                "<dl>\n"
-                + "<dt>All Superinterfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">"
-                + "SuperInterface</a>&lt;V&gt;</dd>\n"
-                + "</dl>");
-
-        //==============================================================
-        // Handle multiple bounds.
-        //==============================================================
-        checkOutput("pkg/MultiTypeParameters.html", true,
-                "public&nbsp;&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;&nbsp;T&nbsp;foo(T&nbsp;t)");
-
-        //==============================================================
-        // Test Class-Use Documentation for Type Parameters.
-        //==============================================================
-        // ClassUseTest1: <T extends Foo & Foo2>
-        checkOutput("pkg2/class-use/Foo.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
-                + "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" "
-                + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
-                + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo"
-                + "</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">"
-                + "Foo2</a>&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo.html\" title=\"class in "
-                + "pkg2\">Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest1."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
-                + "ClassUseTest1.html#method-T-\">method</a></span>"
-                + "(T&nbsp;t)</code>&nbsp;</td>",
-                "<caption><span>Fields in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
-                + "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "td class=\"colFirst\"><code><a href=\"../../pkg2/"
-                + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
-                + "&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\""
-                + ">Foo</a>&gt;</code></td>"
-        );
-
-        checkOutput("pkg2/class-use/ParamTest.html", true,
-                "<caption><span>Fields in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> declared as <a href=\"../"
-                + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
-                + "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code><a href=\"../../pkg2/"
-                + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a "
-                + "href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</a"
-                + ">&gt;</code></td>"
-        );
-
-        checkOutput("pkg2/class-use/Foo2.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo2.html\" title=\"interface "
-                + "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" "
-                + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
-                + "<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo"
-                + "</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">"
-                + "Foo2</a>&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo2.html\" title=\"interface "
-                + "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">"
-                + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../../"
-                + "pkg2/ClassUseTest1.html#method-T-\">method</a></span>"
-                + "(T&nbsp;t)</code>&nbsp;</td>"
-        );
-
-        // ClassUseTest2: <T extends ParamTest<Foo3>>
-        checkOutput("pkg2/class-use/ParamTest.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" "
-                + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
-                + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">"
-                + "ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
-                + "Foo3</a>&gt;&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
-                + "ClassUseTest2.html#method-T-\">method</a></span>"
-                + "(T&nbsp;t)</code>&nbsp;</td>",
-                "<caption><span>Fields in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> declared as <a href=\"../"
-                + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
-                + "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code><a href=\"../../pkg2/"
-                + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
-                + "&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">"
-                + "Foo</a>&gt;</code></td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
-                + "../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest"
-                + "</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in "
-                + "pkg2\">Foo3</a>&gt;&gt;<br><a href=\"../../pkg2/"
-                + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
-                + "&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in "
-                + "pkg2\">Foo3</a>&gt;</code></td>"
-        );
-
-        checkOutput("pkg2/class-use/Foo3.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
-                + "Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" "
-                + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
-                + "<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">"
-                + "ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">"
-                + "Foo3</a>&gt;&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo3.html\" title=\"class in "
-                + "pkg2\">Foo3</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/"
-                + "ClassUseTest2.html#method-T-\">method</a></span>"
-                + "(T&nbsp;t)</code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> that return types with "
-                + "arguments of type <a href=\"../../pkg2/Foo3.html\" title"
-                + "=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../../"
-                + "pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;"
-                + "<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3"
-                + "</a>&gt;&gt;<br><a href=\"../../pkg2/ParamTest.html\" "
-                + "title=\"class in pkg2\">ParamTest</a>&lt;<a href=\"../../pkg2/"
-                + "Foo3.html\" title=\"class in pkg2\">Foo3</a>&gt;</code></td>"
-        );
-
-        // ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
-        checkOutput("pkg2/class-use/ParamTest2.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class "
-                + "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" "
-                + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
-                + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
-                + "ParamTest2</a>&lt;java.util.List&lt;? extends "
-                + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">"
-                + "Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/ParamTest2.html\" title=\"class "
-                + "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3"
-                + ".</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
-                + "html#method-T-\">method</a></span>(T&nbsp;t)</code>&nbsp;</td>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
-                + "../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
-                + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
-                + "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
-                + "&gt;&gt;<br><a href=\"../../pkg2/ParamTest2.html\" "
-                + "title=\"class in pkg2\">ParamTest2</a>&lt;java.util.List"
-                + "&lt;? extends <a href=\"../../pkg2/Foo4.html\" title=\""
-                + "class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
-        );
-
-        checkOutput("pkg2/class-use/Foo4.html", true,
-                "<caption><span>Classes in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" "
-                + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
-                + "<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
-                + "ParamTest2</a>&lt;java.util.List&lt;? extends "
-                + "<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">"
-                + "Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type parameters of "
-                + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
-                + "html#method-T-\">method</a></span>(T&nbsp;t)</code>"
-                + "&nbsp;</td>",
-                "<caption><span>Methods in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> that return types with "
-                + "arguments of type <a href=\"../../pkg2/Foo4.html\" "
-                + "title=\"class in pkg2\">Foo4</a></span><span class=\""
-                + "tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
-                + "../pkg2/ParamTest2.html\" title=\"class in pkg2\">"
-                + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
-                + "/../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
-                + "&gt;&gt;<br><a href=\"../../pkg2/ParamTest2.html\" "
-                + "title=\"class in pkg2\">ParamTest2</a>&lt;java.util.List"
-                + "&lt;? extends <a href=\"../../pkg2/Foo4.html\" title=\""
-                + "class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
-        );
-
-        // Type parameters in constructor and method args
-        checkOutput("pkg2/class-use/Foo4.html", true,
-                "<caption><span>Method parameters in <a href=\"../../pkg2/"
-                + "package-summary.html\">pkg2</a> with type arguments of "
-                + "type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>\n"
-                + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Method and Description</th>\n"
-                + "</tr>\n"
-                + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code>void</code></td>\n"
-                + "<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3."
-                + "html#method-java.util.Set-\">method</a></span>(java."
-                + "util.Set&lt;<a href=\"../../pkg2/Foo4.html\" title=\""
-                + "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code>&nbsp;</td>\n"
-                + "</tr>\n"
-                + "</tbody>",
-                "<caption><span>Constructor parameters in <a href=\"../../"
-                + "pkg2/package-summary.html\">pkg2</a> with type arguments "
-                + "of type <a href=\"../../pkg2/Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>"
-        );
-
-        //=================================
-        // TYPE PARAMETER IN INDEX
-        //=================================
-        checkOutput("index-all.html", true,
-                "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">"
-                + "method(Vector&lt;Object&gt;)</a></span>"
-        );
-
-        // TODO: duplicate of previous case; left in delibarately for now to simplify comparison testing
-        //=================================
-        // TYPE PARAMETER IN INDEX
-        //=================================
-        checkOutput("index-all.html", true,
-                "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">"
-                + "method(Vector&lt;Object&gt;)</a></span>"
-        );
-
-        // No type parameters in class frame.
-        checkOutput("allclasses-frame.html", false,
-                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "TypeParameters</a>&lt;<a href=\"../pkg/TypeParameters.html\" "
-                + "title=\"type parameter in TypeParameters\">E</a>&gt;"
-        );
-
-    }
-
-    //=================================
-    // VAR ARG TESTING
-    //=================================
-    void checkVarArgs() {
-        checkOutput("pkg/VarArgs.html", true,
-                "(int...&nbsp;i)",
-                "(int[][]...&nbsp;i)",
-                "-int:A...-",
-                "<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">"
-                + "TypeParameters</a>...&nbsp;t");
-    }
-
-    //=================================
-    // ANNOTATION TYPE TESTING
-    //=================================
-    void checkAnnotationTypes() {
-        checkOutput("pkg/AnnotationType.html", true,
-                // Make sure the summary links are correct.
-                "<li>Summary:&nbsp;</li>\n"
-                + "<li>Field&nbsp;|&nbsp;</li>\n"
-                + "<li><a href=\"#annotation.type.required.element.summary\">"
-                + "Required</a>&nbsp;|&nbsp;</li>\n"
-                + "<li>"
-                + "<a href=\"#annotation.type.optional.element.summary\">Optional</a></li>",
-                // Make sure the detail links are correct.
-                "<li>Detail:&nbsp;</li>\n"
-                + "<li>Field&nbsp;|&nbsp;</li>\n"
-                + "<li><a href=\"#annotation.type.element.detail\">Element</a></li>",
-                // Make sure the heading is correct.
-                "Annotation Type AnnotationType</h2>",
-                // Make sure the signature is correct.
-                "public @interface <span class=\"memberNameLabel\">AnnotationType</span>",
-                // Make sure member summary headings are correct.
-                "<h3>Required Element Summary</h3>",
-                "<h3>Optional Element Summary</h3>",
-                // Make sure element detail heading is correct
-                "Element Detail",
-                // Make sure default annotation type value is printed when necessary.
-                "<dl>\n"
-                + "<dt>Default:</dt>\n"
-                + "<dd>\"unknown\"</dd>\n"
-                + "</dl>");
-    }
-
-    //=================================
-    // ANNOTATION TYPE USAGE TESTING
-    //=================================
-    void checkAnnotationTypeUsage() {
-        checkOutput("pkg/package-summary.html", true,
-                // PACKAGE
-                "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"Package Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)");
-
-        checkOutput("pkg/AnnotationTypeUsage.html", true,
-                // CLASS
-                "<pre><a href=\"../pkg/AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
-                + "=\"Class Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required--\">"
-                + "required</a>=1994)\n"
-                + "public class <span class=\"typeNameLabel\">"
-                + "AnnotationTypeUsage</span>\n"
-                + "extends java.lang.Object</pre>",
-                // FIELD
-                "<pre><a href=\"../pkg/AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
-                + "=\"Field Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required--\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;int field</pre>",
-                // CONSTRUCTOR
-                "<pre><a href=\"../pkg/AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
-                + "=\"Constructor Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required--\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;AnnotationTypeUsage()</pre>",
-                // METHOD
-                "<pre><a href=\"../pkg/AnnotationType.html\" "
-                + "title=\"annotation in pkg\">@AnnotationType</a>("
-                + "<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>"
-                + "=\"Method Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required--\">"
-                + "required</a>=1994)\n"
-                + "public&nbsp;void&nbsp;method()</pre>",
-                // METHOD PARAMS
-                "<pre>public&nbsp;void&nbsp;methodWithParams("
-                + "<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
-                + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">"
-                + "optional</a>=\"Parameter Annotation\",<a "
-                + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n"
-                + "                             int&nbsp;documented,\n"
-                + "                             int&nbsp;undocmented)</pre>",
-                // CONSTRUCTOR PARAMS
-                "<pre>public&nbsp;AnnotationTypeUsage(<a "
-                + "href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
-                + "@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">"
-                + "optional</a>=\"Constructor Param Annotation\",<a "
-                + "href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n"
-                + "                           int&nbsp;documented,\n"
-                + "                           int&nbsp;undocmented)</pre>");
-
-        //=================================
-        // Annotatation Type Usage
-        //=================================
-        checkOutput("pkg/class-use/AnnotationType.html", true,
-                "<caption><span>Packages with annotations of type <a href=\""
-                + "../../pkg/AnnotationType.html\" title=\"annotation in pkg\">"
-                + "AnnotationType</a></span><span class=\"tabEnd\">&nbsp;"
-                + "</span></caption>",
-                "<caption><span>Classes in <a href=\"../../pkg/"
-                + "package-summary.html\">pkg</a> with annotations of type "
-                + "<a href=\"../../pkg/AnnotationType.html\" title=\""
-                + "annotation in pkg\">AnnotationType</a></span><span class"
-                + "=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span>Fields in <a href=\"../../pkg/"
-                + "package-summary.html\">pkg</a> with annotations of type "
-                + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Methods in <a href=\"../../pkg/"
-                + "package-summary.html\">pkg</a> with annotations of type "
-                + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Method parameters in <a href=\"../../pkg/"
-                + "package-summary.html\">pkg</a> with annotations of type "
-                + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Constructors in <a href=\"../../pkg/"
-                + "package-summary.html\">pkg</a> with annotations of type "
-                + "<a href=\"../../pkg/AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
-                + "&nbsp;</span></caption>",
-                "<caption><span>Constructor parameters in <a href=\"../../"
-                + "pkg/package-summary.html\">pkg</a> with annotations of "
-                + "type <a href=\"../../pkg/AnnotationType.html\" title=\""
-                + "annotation in pkg\">AnnotationType</a></span><span class=\""
-                + "tabEnd\">&nbsp;</span></caption>"
-        );
-
-        //==============================================================
-        // ANNOTATION TYPE USAGE TESTING (When @Documented is omitted)
-        //===============================================================
-        checkOutput("pkg/AnnotationTypeUsage.html", false,
-                // CLASS
-                "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
-                + "public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>",
-                // FIELD
-                "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
-                + "public int <span class=\"memberNameLabel\">field</span>",
-                // CONSTRUCTOR
-                "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
-                + "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()",
-                // METHOD
-                "<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
-                + "                <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n"
-                + "public void <span class=\"memberNameLabel\">method</span>()");
-
-        //=================================
-        // Make sure annotation types do not
-        // trigger this warning.
-        //=================================
-        checkOutput(Output.WARNING, false,
-                "Internal error: package sets don't match: [] with: null");
-
-        //=================================
-        // ANNOTATION TYPE USAGE TESTING (All Different Types).
-        //=================================
-        checkOutput("pkg1/B.html", true,
-                // Integer
-                "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,",
-                // Double
-                "<a href=\"../pkg1/A.html#d--\">d</a>=3.14,",
-                // Boolean
-                "<a href=\"../pkg1/A.html#b--\">b</a>=true,",
-                // String
-                "<a href=\"../pkg1/A.html#s--\">s</a>=\"sigh\",",
-                // Class
-                "<a href=\"../pkg1/A.html#c--\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,",
-                // Bounded Class
-                "<a href=\"../pkg1/A.html#w--\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,",
-                // Enum
-                "<a href=\"../pkg1/A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,",
-                // Annotation Type
-                "<a href=\"../pkg1/A.html#a--\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994),",
-                // String Array
-                "<a href=\"../pkg1/A.html#sa--\">sa</a>={\"up\",\"down\"},",
-                // Primitive
-                "<a href=\"../pkg1/A.html#primitiveClassTest--\">primitiveClassTest</a>=boolean.class,");
-
-        // XXX:  Add array test case after this if fixed:
-        //5020899: Incorrect internal representation of class-valued annotation elements
-        // Make sure that annotations are surrounded by <pre> and </pre>
-        checkOutput("pkg1/B.html", true,
-                "<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>",
-                "public interface <span class=\"typeNameLabel\">B</span></pre>");
-
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java
deleted file mode 100644
index 5c2a3e59905..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type.
- *
- * @author Jamie Ho.
- * @since 1.5
- */
-@Documented public @interface AnnotationType {
-
-    /**
-     * The copyright holder.
-     */
-    String optional() default "unknown";
-
-   /**
-    * The year of the copyright.
-    */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java
deleted file mode 100644
index 253d3b79e39..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is just a test annotation type this is not documented because it
- * is missing the @Documented tag.
- *
- * @author Jamie Ho.
- * @since 1.5
- */
-public @interface AnnotationTypeUndocumented {
-
-    /**
-     * The copyright holder.
-     */
-    String optional() default "unknown";
-
-   /**
-    * The year of the copyright.
-    */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java
deleted file mode 100644
index 02723e248f3..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-/**
- * Demonstrate annotation type usage.
- */
-
-@AnnotationType(optional="Class Annotation", required=1994)
-@AnnotationTypeUndocumented(optional="Class Annotation", required=1994)
-public class AnnotationTypeUsage {
-
-    @AnnotationType(optional="Field Annotation", required=1994)
-    @AnnotationTypeUndocumented(optional="Field Annotation", required=1994)
-    public int field;
-
-    @AnnotationType(optional="Constructor Annotation", required=1994)
-    @AnnotationTypeUndocumented(optional="Constructor Annotation", required=1994)
-    public AnnotationTypeUsage() {}
-
-    public AnnotationTypeUsage(
-        @AnnotationType(optional="Constructor Param Annotation", required=1994) int documented,
-        @AnnotationTypeUndocumented(optional="Constructor Param Annotation", required=1994) int undocmented) {}
-
-    @AnnotationType(optional="Method Annotation", required=1994)
-    @AnnotationTypeUndocumented(optional="Method Annotation", required=1994)
-    public void method() {}
-
-    public void methodWithParams(
-        @AnnotationType(optional="Parameter Annotation", required=1994) int documented,
-        @AnnotationTypeUndocumented(optional="Parameter Annotation", required=1994) int undocmented) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java
deleted file mode 100644
index 01a802e5bc0..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-/**
- * This is a sample Enum.
- *
- * @author Jamie Ho
- */
-public enum Coin {
-
-  Penny, Nickel, Dime;
-
-  /**
-   * Overloaded valueOf() method has correct documentation.
-   */
-  public static Coin valueOf(int foo) {
-      return null;
-  }
-
-  /**
-   * Overloaded values method  has correct documentation.
-   */
-  public static final Coin[] values(int foo) {
-      return null;
-  }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java
deleted file mode 100644
index 690442a3148..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-import java.util.*;
-
-public class MultiTypeParameters {
-
-    public <T extends Number & Runnable> T foo(T t) {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SubInterface.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SubInterface.java
deleted file mode 100644
index 8e0d8a55e2c..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SubInterface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public interface SubInterface<V> extends SuperInterface<V> {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java
deleted file mode 100644
index 11847120d2e..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public interface SuperInterface<U> {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java
deleted file mode 100644
index e34b45d6d64..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class TypeParameterSubClass<T extends String> extends TypeParameterSuperClass<T> {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java
deleted file mode 100644
index aeb7158a9df..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class TypeParameterSuperClass<E extends String> {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java
deleted file mode 100644
index 0c99db3b20b..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-import java.util.*;
-
-/**
- * Just a sample class with type parameters.  This is a link to myself:
- * {@link TypeParameters}
- *
- * @param <E> the type parameter for this class.
- * @param <BadClassTypeParam> this should cause a warning.
- * @see TypeParameters
- */
-
-public class TypeParameters<E> implements SubInterface<E> {
-
-    /**
-     * This method uses the type parameter of this class.
-     * @param param an object that is of type E.
-     * @return the parameter itself.
-     */
-    public E methodThatUsesTypeParameter(E param) {
-        return param;
-    }
-
-    /**
-     * This method has type parameters.  The list of type parameters is long
-     * so there should be a line break in the member summary table.
-     *
-     * @param <T> This is the first type parameter.
-     * @param <V> This is the second type parameter.
-     * @param <BadMethodTypeParam> this should cause a warning.
-     * @param param1 just a parameter.
-     * @param param2 just another parameter.
-     *
-     */
-    public <T extends List, V> String[] methodThatHasTypeParameters(T param1,
-        V param2) { return null;}
-
-    /**
-     * This method has type parameters.  The list of type parameters is short
-     * so there should not be a line break in the member summary table.
-     * @author Owner
-     *
-     * @param <A> This is the first type parameter.
-     */
-    public <A> void methodThatHasTypeParmaters(A... a) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java
deleted file mode 100644
index a98ae14689b..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * Test var args.
- */
-public class VarArgs {
-
-    /**
-     * @param i a param with var args.
-     */
-    public void methodWithVarArgs(int... i) {}
-
-    /**
-     * @param i a regular parameter.
-     * @param t a param with var args.
-     */
-    public void methodWithParamAndVarArgs(int i, TypeParameters... t) {}
-
-    /**
-     * @param i a param with var args.
-     */
-    public void singleArrayVarArg(int[]... i) {}
-
-    /**
-     * @param i a param with var args.
-     */
-    public void doubleArrayVarArgs(int[][]... i) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java
deleted file mode 100644
index bb017d8cfd4..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-/**
- * Wild card testing.
- */
-public class Wildcards {
-
-    /**
-     * Sample method with wildcards.
-     * @param a this is the first param.
-     * @param b this is the second param.
-     * @param c this is the third param.
-     */
-    public void methodWithWildCardParam(TypeParameters<? super String> a,
-        TypeParameters<? extends StringBuffer> b, TypeParameters c) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java
deleted file mode 100644
index eaea85d9da4..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 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.
- */
-
-@AnnotationType(optional="Package Annotation", required=1994)
-package pkg;
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java
deleted file mode 100644
index cd1fe75892d..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-import pkg.Coin;
-import pkg.*;
-import java.lang.annotation.*;
-
-@Documented public @interface A {
-    int i();
-    double d();
-    boolean b();
-    String s();
-    Class c();
-    Class<? extends TypeParameterSuperClass> w();
-    Coin[] e();
-    AnnotationType a();
-    String[] sa();
-    Class primitiveClassTest();
-    Class arrayClassTest();
-    Class arrayPrimitiveTest();
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java
deleted file mode 100644
index 4b8b8d9e905..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-import pkg.*;
-import pkg2.*;
-
-@A(i = 1+1,
-   d = 3.14,
-   b = true,
-   s = "sigh",
-   c = Foo.class,
-   w = TypeParameterSubClass.class,
-   e = Coin.Penny,
-   a = @AnnotationType(optional="foo",required=1994),
-   sa = {"up", "down"},
-   primitiveClassTest = boolean.class,
-   arrayClassTest = String[].class,
-   arrayPrimitiveTest = boolean[].class)
-public interface B {
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java
deleted file mode 100644
index e00afb52916..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class ClassUseTest1 <T extends Foo & Foo2> {
-
-    public ParamTest<Foo> field;
-
-    public <T extends Foo & Foo2> T method(T t) {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java
deleted file mode 100644
index fa9f6ce852a..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-import pkg.*;
-
-public class ClassUseTest2 <T extends ParamTest<Foo3>> {
-
-    public <T extends ParamTest<Foo3>> ParamTest<Foo3> method (T t) {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java
deleted file mode 100644
index 614cd7ca616..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-import pkg.*;
-import java.util.*;
-
-public class ClassUseTest3 <T extends ParamTest2<List<? extends Foo4>>> {
-
-    public ClassUseTest3(Set<Foo4> p) {}
-
-    public <T extends ParamTest2<List<? extends Foo4>>> ParamTest2<List<? extends Foo4>> method(T t) {
-        return null;
-    }
-
-    public void method(Set<Foo4> p) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java
deleted file mode 100644
index 5a20c93acc2..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg2;
-
-import java.util.*;
-
-public class Foo {
-
-    public void method(Vector<Object> o){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java
deleted file mode 100644
index f5a59982679..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public interface Foo2 {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java
deleted file mode 100644
index 7962690e381..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class Foo3 {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java
deleted file mode 100644
index fbcbe334639..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class Foo4 {}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java
deleted file mode 100644
index 3bdea60a88d..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class ParamTest<E> {
-}
diff --git a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java
deleted file mode 100644
index f8aff42fc3e..00000000000
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class ParamTest2<E> {
-}
diff --git a/langtools/test/com/sun/javadoc/testNoPackagesFile/C.java b/langtools/test/com/sun/javadoc/testNoPackagesFile/C.java
deleted file mode 100644
index d147801ce46..00000000000
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/C.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
deleted file mode 100644
index 5306ae06c1f..00000000000
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4475679
- * @summary  Verify that packages.html is no longer generated since it is no
- *           longer used.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNoPackagesFile
- */
-
-public class TestNoPackagesFile extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNoPackagesFile tester = new TestNoPackagesFile();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        // packages.html file should not be generated anymore.
-        checkFiles(false, "packages.html");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/C.java b/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/C.java
deleted file mode 100644
index 735a2d5f241..00000000000
--- a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/C.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2017, 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.
- */
-
-public class C {
-    /**
-     * case1 <ul> <li> end of sentence. <li> more </ul>
-     */
-    public void case1() {}
-
-    /**
-     * case2 <ul compact> <li> end of sentence. <li> more </ul>
-     */
-    public void case2() {}
-
-    /**
-     * case3 <ul type="square"> <li> end of sentence. <li> more </ul>
-     */
-    public void case3() {}
-
-    /**
-     * case4 <ul type="a<b"> <li> end of sentence. <li> more </ul>
-     */
-    public void case4() {}
-
-    /**
-     * case5 <ul type="a>b"> <li> end of sentence. <li> more </ul>
-     */
-    public void case5() {}
-
-    /**
-     * case6 <ul type='a>b'> <li> end of sentence. <li> more </ul>
-     */
-    public void case6() {}
-
-    /**
-     * case7 <ul type='"a>b"'> <li> end of sentence. <li> more </ul>
-     */
-    public void case7() {}
-
-    /**
-     * case8 <ul type="'a>b'"> <li> end of sentence. <li> more </ul>
-     */
-    public void case8() {}
-
-    /**
-     * case9 <ul type="'a'>b"> <li> end of sentence. <li> more </ul>
-     */
-    public void case9() {}
-
-    /**
-     * caseA <ul type='"a">b'> <li> end of sentence. <li> more </ul>
-     */
-    public void caseA() {}
-
-    /**
-     * caseB <blockquote>A block quote example:</blockquote>
-     */
-    public void caseB() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java b/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java
deleted file mode 100644
index 0bbe3f3b19a..00000000000
--- a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/Negative.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2017, 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.
- */
-
-public class Negative {
-    /**
-     * case1: A hanging &lt;  : <blockquote>xx</blockquote><
-     */
-    public void case1() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java b/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java
deleted file mode 100644
index 0dc129d70ff..00000000000
--- a/langtools/test/com/sun/javadoc/testNonInlineHtmlTagRemoval/TestNonInlineHtmlTagRemoval.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2017, 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      8048628 8174715
- * @summary  Verify html inline tags are removed correctly in the first sentence.
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNonInlineHtmlTagRemoval
- */
-
-public class TestNonInlineHtmlTagRemoval extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNonInlineHtmlTagRemoval tester = new TestNonInlineHtmlTagRemoval();
-        tester.runTests();
-    }
-
-    @Test
-    void testPositive() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<div class=\"block\">case1   end of sentence.</div>",
-                "<div class=\"block\">case2   end of sentence.</div>",
-                "<div class=\"block\">case3   end of sentence.</div>",
-                "<div class=\"block\">case4   end of sentence.</div>",
-                "<div class=\"block\">case5   end of sentence.</div>",
-                "<div class=\"block\">case6   end of sentence.</div>",
-                "<div class=\"block\">case7   end of sentence.</div>",
-                "<div class=\"block\">case8   end of sentence.</div>",
-                "<div class=\"block\">case9   end of sentence.</div>",
-                "<div class=\"block\">caseA   end of sentence.</div>",
-                "<div class=\"block\">caseB A block quote example:</div>");
-    }
-
-    @Test
-    void testNegative() {
-        javadoc("-d", "out2",
-                "-sourcepath", testSrc,
-                testSrc("Negative.java"));
-        checkExit(Exit.FAILED);
-
-        checkOutput("Negative.html", true,
-                "<div class=\"block\">case1: A hanging &lt;  : xx<</div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java b/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
deleted file mode 100644
index ad983a37423..00000000000
--- a/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4657239 4775743
- * @summary  Make sure a notification is printed when an output directory must
- *           be created.
- *           Make sure classname is not include in javadoc usage message.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestNotifications
- */
-
-public class TestNotifications extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestNotifications tester = new TestNotifications();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        String outDir = "out";
-
-        // Notify that the destination directory must be created.
-        javadoc("-d", outDir, "-sourcepath", testSrc, "pkg");
-        checkExit(Exit.OK);
-        checkOutput(Output.NOTICE, true,
-                "Creating destination directory: \"" + outDir);
-
-        // No need to notify that the destination must be created because
-        // it already exists.
-        setOutputDirectoryCheck(DirectoryCheck.NONE);
-        javadoc("-d", outDir, "-sourcepath", testSrc, "pkg");
-        checkExit(Exit.OK);
-        checkOutput(Output.NOTICE, false,
-                "Creating destination directory: \"" + outDir);
-    }
-
-    @Test
-    void test() {
-        //Make sure classname is not include in javadoc usage message.
-        setOutputDirectoryCheck(DirectoryCheck.NO_HTML_FILES);
-        javadoc("-help");
-        checkOutput(Output.NOTICE, false,
-                "[classnames]");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testNotifications/pkg/C.java b/langtools/test/com/sun/javadoc/testNotifications/pkg/C.java
deleted file mode 100644
index 9c0ae58144e..00000000000
--- a/langtools/test/com/sun/javadoc/testNotifications/pkg/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java b/langtools/test/com/sun/javadoc/testOptions/TestOptions.java
deleted file mode 100644
index 3aaf576b8a3..00000000000
--- a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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      4749567
- * @summary  Test the output for -header and -footer options.
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestOptions
- */
-
-public class TestOptions extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestOptions tester = new TestOptions();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-header", "Test header",
-                "-footer", "Test footer",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/package-summary.html", true,
-                "<div class=\"aboutLanguage\">Test header</div>",
-                "<div class=\"aboutLanguage\">Test footer</div>");
-    }
-}
-
diff --git a/langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java b/langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java
deleted file mode 100644
index b2a32176bd1..00000000000
--- a/langtools/test/com/sun/javadoc/testOptions/pkg/Foo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg;
-
-public class Foo {}
-
diff --git a/langtools/test/com/sun/javadoc/testOrdering/C.java b/langtools/test/com/sun/javadoc/testOrdering/C.java
deleted file mode 100644
index ce513bf97d6..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/C.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * Class in an unnamed package.
- */
-
-public class C {
-    /**
-     * A ctor
-     * @param c a param
-     */
-    public C(UsedInC c){}
-
-    /**
-     * another ctor
-     * @param c  a param
-     * @param s  a param
-     */
-    public C(UsedInC c, String s) {}
-
-    /**
-     * yet another ctor
-     * @param c  a param
-     * @param i  a param
-     */
-    public C(UsedInC c, int i) {}
-
-    /**
-     * Field in C.
-     */
-    public UsedInC fieldInC;
-
-    /**
-     * Method in C.
-     * @param p  a param
-     * @return UsedInC
-     */
-    public UsedInC methodInC(UsedInC p) { return p;}
-
-    /**
-     * A static method
-     * @param s  a param
-     * @return UsedInC
-     */
-    public static UsedInC ymethod(String s) {return null;}
-
-    /**
-     * Another static method variant
-     * @param value  a param
-     * @return UsedInC
-     */
-    public static UsedInC ymethod(int value) {return -1;}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java b/langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java
deleted file mode 100644
index f9d9ad8634d..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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 8039410 8042601 8042829 8049393 8050031
- * @summary test to determine if members are ordered correctly
- * @author ksrini
- * @library ../lib/
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestOrdering
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static java.nio.file.StandardOpenOption.*;
-
-public class TestOrdering extends JavadocTester {
-
-    public static void main(String[] args) throws Exception {
-        TestOrdering tester = new TestOrdering();
-        tester.runTests();
-    }
-
-    @Test
-    void testUnnamedPackagesForClassUse() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-use",
-                testSrc("C.java"), testSrc("UsedInC.java"));
-        checkExit(Exit.OK);
-        checkExecutableMemberOrdering("class-use/UsedInC.html");
-    }
-
-    @Test
-    void testNamedPackagesForClassUse() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg1");
-        checkExit(Exit.OK);
-        checkClassUseOrdering("pkg1/class-use/UsedClass.html");
-        checkOrder("pkg1/class-use/UsedClass.html", expectedClassUseMethodOrdering);
-        checkOrder("pkg1/class-use/UsedClass.html", expectedClassUseWithTypeParams);
-        checkOrder("pkg1/class-use/UsedClass.html", expectedInnerClassContructors);
-    }
-
-    enum ListOrder { NONE, REVERSE, SHUFFLE };
-    /*
-     * By default we do not shuffle the input list, in order to keep the list deterministic,
-     * and the test predictable. However, we can turn on the stress mode, by setting the following
-     * property if required.
-     */
-    static final ListOrder STRESS_MODE = Boolean.getBoolean("TestOrder.STRESS")
-            ? ListOrder.SHUFFLE
-            : ListOrder.REVERSE;
-
-    /*
-     * Controls the number of sibling packages,  pkg0, pkg1, pkg2, .....
-     */
-    static final int MAX_PACKAGES = 4;
-
-    /*
-     * Controls the number of children packages, pkg0, pkg0.pkg, pkg0.pkg.pkg, .....
-     * Note: having too long a depth (> 256 chars on Windows), will likely lead to
-     * cause problems with automated build and test systems.
-     */
-    static final int MAX_SUBPACKAGES_DEPTH = 4;
-    @Test
-    void testIndexOrdering() throws IOException {
-        final String clsname = "Add";
-        List<String> cmdArgs = new ArrayList();
-        cmdArgs.add("-d");
-        cmdArgs.add("out-2");
-        cmdArgs.add("-sourcepath");
-        cmdArgs.add("src");
-        cmdArgs.add("-package");
-        System.out.println("STRESS_MODE: " + STRESS_MODE);
-        emitFile(null, clsname, STRESS_MODE);
-        for (int width = 0 ; width < MAX_PACKAGES ; width++) {
-            String wpkgname = "add" + width;
-            String dpkgname = wpkgname;
-            emitFile(wpkgname, clsname, ListOrder.NONE); // list as-is
-            cmdArgs.add(wpkgname);
-            for (int depth = 1 ; depth < MAX_SUBPACKAGES_DEPTH ; depth++) {
-                dpkgname = dpkgname + ".add";
-                emitFile(dpkgname, clsname, STRESS_MODE);
-                cmdArgs.add(dpkgname);
-            }
-        }
-        File srcDir = new File(new File("."), "src");
-        cmdArgs.add(new File(srcDir, clsname + ".java").getPath());
-        javadoc(cmdArgs.toArray(new String[cmdArgs.size()]));
-        checkExit(Exit.OK);
-        checkOrder("index-all.html", composeTestVectors());
-        checkOrder("add0/add/package-tree.html", expectedPackageTreeOrdering);
-        checkOrder("overview-tree.html", expectedOverviewOrdering);
-    }
-
-    @Test
-    void testIndexTypeClustering() {
-        javadoc("-d", "out-3",
-                "-sourcepath", testSrc("src-2"),
-                "-use",
-                "a",
-                "b",
-                "e",
-                "something");
-        checkOrder("index-all.html", typeTestVectors);
-        checkExit(Exit.OK);
-    }
-    String[] typeTestVectors = {
-        "something</a> - package something</dt>",
-        "something</span></a> - Class in",
-        "something</span></a> - Enum in",
-        "something</span></a> - Interface in",
-        "something</span></a> - Annotation Type in",
-        "something</a></span> - Variable in class",
-        "something()</a></span> - Constructor",
-        "something()</a></span> - Method in class a.<a href=\"a/A.html\"",
-        "something()</a></span> - Method in class a.<a href=\"a/something.html\"",
-        "something()</a></span> - Method in class something.<a href=\"something/J.html\""
-    };
-    String[] composeTestVectors() {
-        List<String> testList = new ArrayList<>();
-
-        for (String x : expectedMethodOrdering) {
-            testList.add(x);
-            for (int i = 0; i < MAX_PACKAGES; i++) {
-                String wpkg = "add" + i;
-                testList.add(wpkg + "/" + x);
-                String dpkg = wpkg;
-                for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
-                    dpkg = dpkg + "/" + "add";
-                    testList.add(dpkg + "/" + x);
-                }
-            }
-        }
-        for (String x : expectedEnumOrdering) {
-            testList.add(x.replace("REPLACE_ME", "&lt;Unnamed&gt;"));
-            for (int i = 0; i < MAX_PACKAGES; i++) {
-                String wpkg = "add" + i;
-                testList.add(wpkg + "/" + x.replace("REPLACE_ME", wpkg));
-                String dpkg = wpkg;
-                for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
-                    dpkg = dpkg + "/" + "add";
-                    testList.add(dpkg + "/" + x.replace("REPLACE_ME", pathToPackage(dpkg)));
-                }
-            }
-        }
-        testList.addAll(Arrays.asList(expectedFieldOrdering));
-        return testList.toArray(new String[testList.size()]);
-    }
-    void checkExecutableMemberOrdering(String usePage) {
-        String contents = readFile(usePage);
-        // check constructors
-        checking("constructors");
-        int idx1 = contents.indexOf("C.html#C-UsedInC");
-        int idx2 = contents.indexOf("C.html#C-UsedInC-int");
-        int idx3 = contents.indexOf("C.html#C-UsedInC-java.lang.String");
-        if (idx1 == -1 || idx2 == -1 || idx3 == -1) {
-            failed("ctor strings not found");
-        } else if (idx1 > idx2 || idx2 > idx3 || idx1 > idx3) {
-            failed("ctor strings are out of order");
-        } else
-            passed("ctor strings are in order");
-
-        // check methods
-        checking("methods");
-        idx1 = contents.indexOf("C.html#ymethod-int");
-        idx2 = contents.indexOf("C.html#ymethod-java.lang.String");
-        if (idx1 == -1 || idx2 == -1) {
-            failed("#ymethod strings not found");
-        } else if (idx1 > idx2) {
-            failed("#ymethod strings are out of order");
-        } else
-            passed("Executable Member Ordering: OK");
-    }
-
-    void checkClassUseOrdering(String usePage) {
-        checkClassUseOrdering(usePage, "pkg1/C#ITERATION#.html#zfield");
-        checkClassUseOrdering(usePage, "pkg1/C#ITERATION#.html#fieldInC#ITERATION#");
-        checkClassUseOrdering(usePage, "pkg1/C#ITERATION#.html#zmethod-pkg1.UsedClass");
-        checkClassUseOrdering(usePage, "pkg1/C#ITERATION#.html#methodInC#ITERATION#");
-    }
-
-    void checkClassUseOrdering(String usePage, String searchString) {
-        String contents = readFile(usePage);
-        int lastidx = 0;
-        System.out.println("testing for " + searchString);
-        for (int i = 1; i < 5; i++) {
-            String s = searchString.replaceAll("#ITERATION#", Integer.toString(i));
-            checking(s);
-            int idx = contents.indexOf(s);
-            if (idx < lastidx) {
-                failed(s + ", member ordering error, last:" + lastidx + ", got:" + idx);
-            } else {
-                passed("\tlast: " + lastidx + " got:" + idx);
-            }
-            lastidx = idx;
-        }
-    }
-
-    static String[] contents = {
-        "public add ADDADD;",
-        "public add AddAdd;",
-        "public add addadd;",
-        "public enum add {add, ADD, addd, ADDD};",
-        "public enum ADD {ADD, add, addd, ADDD};",
-        "public void   add(){}",
-        "public void   add(double d){}",
-        "public void   add(int i, float f){}",
-        "public void   add(float f, int i){}",
-        "public void   add(double d, byte b){}",
-        "public Double add(Double d) {return (double) 22/7;}",
-        "public double add(double d1, double d2) {return d1 + d2;}",
-        "public double add(double d1, Double  d2) {return d1 + d2;}",
-        "public Float  add(float f) {return (float) 22/7;}",
-        "public void   add(int i){}",
-        "public int    add(Integer i) {return 0;}"
-    };
-
-    void emitFile(String pkgname, String clsname, ListOrder order) throws IOException {
-        File srcDir = new File("src");
-        File outDir = pkgname == null
-            ? srcDir
-            : new File(srcDir, pkgname.replace(".", File.separator));
-        File outFile = new File(outDir, clsname + ".java");
-        outDir.mkdirs();
-        List<String> scratch = new ArrayList<>(Arrays.asList(contents));
-        switch (order) {
-            case SHUFFLE:
-                Collections.shuffle(scratch);
-                break;
-            case REVERSE:
-                Collections.reverse(scratch);
-                break;
-            default:
-                // leave list as-is
-        }
-        // insert the header
-        scratch.add(0, "public class " + clsname + " {");
-        if (pkgname != null) {
-            scratch.add(0, "package " + pkgname + ";");
-        }
-        // append the footer
-        scratch.add("}");
-        Files.write(outFile.toPath(), scratch, CREATE, TRUNCATE_EXISTING);
-    }
-
-    String pathToPackage(String in) {
-        return in.replace("/", ".");
-    }
-
-    final String expectedInnerClassContructors[] = {
-        "../../pkg1/A.html#A-pkg1.UsedClass-",
-        "../../pkg1/B.A.html#A-pkg1.UsedClass-",
-        "../../pkg1/B.html#B-pkg1.UsedClass-",
-        "../../pkg1/A.C.html#C-pkg1.UsedClass-java.lang.Object:A-",
-        "../../pkg1/A.C.html#C-pkg1.UsedClass-java.util.Collection-",
-        "../../pkg1/A.C.html#C-pkg1.UsedClass-java.util.List-"
-    };
-
-    final String expectedClassUseMethodOrdering[] = {
-        "../../pkg1/MethodOrder.html#m--",
-        "../../pkg1/MethodOrder.html#m-byte:A-",
-        "../../pkg1/MethodOrder.html#m-double-",
-        "../../pkg1/MethodOrder.html#m-double-double-",
-        "../../pkg1/MethodOrder.html#m-double-java.lang.Double-",
-        "../../pkg1/MethodOrder.html#m-int-",
-        "../../pkg1/MethodOrder.html#m-int-int-",
-        "../../pkg1/MethodOrder.html#m-int-java.lang.Integer-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Double-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Double-double-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Double-java.lang.Double-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Integer-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Integer-int-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Integer-java.lang.Integer-",
-        "../../pkg1/MethodOrder.html#m-java.lang.Object:A-",
-        "../../pkg1/MethodOrder.html#m-java.util.ArrayList-",
-        "../../pkg1/MethodOrder.html#m-java.util.Collection-",
-        "../../pkg1/MethodOrder.html#m-java.util.List-"
-    };
-    final String expectedClassUseWithTypeParams[] = {
-        "../../pkg1/MethodOrder.html#tpm-pkg1.UsedClass-",
-        "../../pkg1/MethodOrder.html#tpm-pkg1.UsedClass-pkg1.UsedClass-",
-        "../../pkg1/MethodOrder.html#tpm-pkg1.UsedClass-pkg1.UsedClass:A-",
-        "../../pkg1/MethodOrder.html#tpm-pkg1.UsedClass-java.lang.String-"
-    };
-    final String expectedMethodOrdering[] = {
-        "Add.html#add--",
-        "Add.html#add-double-",
-        "Add.html#add-double-byte-",
-        "Add.html#add-double-double-",
-        "Add.html#add-double-java.lang.Double-",
-        "Add.html#add-float-",
-        "Add.html#add-float-int-",
-        "Add.html#add-int-",
-        "Add.html#add-int-float-",
-        "Add.html#add-java.lang.Double-",
-        "Add.html#add-java.lang.Integer-"
-    };
-    final String expectedEnumOrdering[] = {
-        "Add.add.html\" title=\"enum in REPLACE_ME\"",
-        "Add.ADD.html\" title=\"enum in REPLACE_ME\""
-    };
-    final String expectedFieldOrdering[] = {
-        "Add.html#addadd\"",
-        "add0/add/add/add/Add.html#addadd\"",
-        "add0/add/add/Add.html#addadd\"",
-        "add0/add/Add.html#addadd\"",
-        "add0/Add.html#addadd\"",
-        "add1/add/add/add/Add.html#addadd\"",
-        "add1/add/add/Add.html#addadd\"",
-        "add1/add/Add.html#addadd\"",
-        "add1/Add.html#addadd\"",
-        "add2/add/add/add/Add.html#addadd\"",
-        "add2/add/add/Add.html#addadd\"",
-        "add2/add/Add.html#addadd\"",
-        "add2/Add.html#addadd\"",
-        "add3/add/add/add/Add.html#addadd\"",
-        "add3/add/add/Add.html#addadd\"",
-        "add3/add/Add.html#addadd\"",
-        "add3/Add.html#addadd\"",
-        "Add.html#AddAdd\"",
-        "add0/add/add/add/Add.html#AddAdd\"",
-        "add0/add/add/Add.html#AddAdd\"",
-        "add0/add/Add.html#AddAdd\"",
-        "add0/Add.html#AddAdd\"",
-        "add1/add/add/add/Add.html#AddAdd\"",
-        "add1/add/add/Add.html#AddAdd\"",
-        "add1/add/Add.html#AddAdd\"",
-        "add1/Add.html#AddAdd\"",
-        "add2/add/add/add/Add.html#AddAdd\"",
-        "add2/add/add/Add.html#AddAdd\"",
-        "add2/add/Add.html#AddAdd\"",
-        "add2/Add.html#AddAdd\"",
-        "add3/add/add/add/Add.html#AddAdd\"",
-        "add3/add/add/Add.html#AddAdd\"",
-        "add3/add/Add.html#AddAdd\"",
-        "add3/Add.html#AddAdd\"",
-        "Add.html#ADDADD\"",
-        "add0/add/add/add/Add.html#ADDADD\"",
-        "add0/add/add/Add.html#ADDADD\"",
-        "add0/add/Add.html#ADDADD\"",
-        "add0/Add.html#ADDADD\"",
-        "add1/add/add/add/Add.html#ADDADD\"",
-        "add1/add/add/Add.html#ADDADD\"",
-        "add1/add/Add.html#ADDADD\"",
-        "add1/Add.html#ADDADD\"",
-        "add2/add/add/add/Add.html#ADDADD\"",
-        "add2/add/add/Add.html#ADDADD\"",
-        "add2/add/Add.html#ADDADD\"",
-        "add2/Add.html#ADDADD\"",
-        "add3/add/add/add/Add.html#ADDADD\"",
-        "add3/add/add/Add.html#ADDADD\"",
-        "add3/add/Add.html#ADDADD\"",
-        "add3/Add.html#ADDADD\""
-    };
-    final String expectedPackageTreeOrdering[] = {
-        "<a href=\"../../add0/add/Add.add.html\" title=\"enum in add0.add\">",
-        "<a href=\"../../add0/add/Add.ADD.html\" title=\"enum in add0.add\">"
-    };
-    final String expectedOverviewOrdering[] = {
-        "<a href=\"Add.add.html\" title=\"enum in &lt;Unnamed&gt;\">",
-        "<a href=\"add0/Add.add.html\" title=\"enum in add0\">",
-        "<a href=\"add0/add/Add.add.html\" title=\"enum in add0.add\">",
-        "<a href=\"add0/add/add/Add.add.html\" title=\"enum in add0.add.add\">",
-        "<a href=\"add0/add/add/add/Add.add.html\" title=\"enum in add0.add.add.add\">",
-        "<a href=\"add1/Add.add.html\" title=\"enum in add1\">",
-        "<a href=\"add1/add/Add.add.html\" title=\"enum in add1.add\">",
-        "<a href=\"add1/add/add/Add.add.html\" title=\"enum in add1.add.add\">",
-        "<a href=\"add1/add/add/add/Add.add.html\" title=\"enum in add1.add.add.add\">",
-        "<a href=\"add2/Add.add.html\" title=\"enum in add2\">",
-        "<a href=\"add2/add/Add.add.html\" title=\"enum in add2.add\">",
-        "<a href=\"add2/add/add/Add.add.html\" title=\"enum in add2.add.add\">",
-        "<a href=\"add2/add/add/add/Add.add.html\" title=\"enum in add2.add.add.add\">",
-        "<a href=\"add3/Add.add.html\" title=\"enum in add3\">",
-        "<a href=\"add3/add/Add.add.html\" title=\"enum in add3.add\">",
-        "<a href=\"add3/add/add/Add.add.html\" title=\"enum in add3.add.add\">",
-        "<a href=\"add3/add/add/add/Add.add.html\" title=\"enum in add3.add.add.add\">",
-        "<a href=\"Add.ADD.html\" title=\"enum in &lt;Unnamed&gt;\">",
-        "<a href=\"add0/Add.ADD.html\" title=\"enum in add0\">",
-        "<a href=\"add0/add/Add.ADD.html\" title=\"enum in add0.add\">",
-        "<a href=\"add0/add/add/Add.ADD.html\" title=\"enum in add0.add.add\">",
-        "<a href=\"add0/add/add/add/Add.ADD.html\" title=\"enum in add0.add.add.add\">",
-        "<a href=\"add1/Add.ADD.html\" title=\"enum in add1\">",
-        "<a href=\"add1/add/Add.ADD.html\" title=\"enum in add1.add\">",
-        "<a href=\"add1/add/add/Add.ADD.html\" title=\"enum in add1.add.add\">",
-        "<a href=\"add1/add/add/add/Add.ADD.html\" title=\"enum in add1.add.add.add\">",
-        "<a href=\"add2/Add.ADD.html\" title=\"enum in add2\">",
-        "<a href=\"add2/add/Add.ADD.html\" title=\"enum in add2.add\">",
-        "<a href=\"add2/add/add/Add.ADD.html\" title=\"enum in add2.add.add\">",
-        "<a href=\"add2/add/add/add/Add.ADD.html\" title=\"enum in add2.add.add.add\">",
-        "<a href=\"add3/Add.ADD.html\" title=\"enum in add3\">",
-        "<a href=\"add3/add/Add.ADD.html\" title=\"enum in add3.add\">",
-        "<a href=\"add3/add/add/Add.ADD.html\" title=\"enum in add3.add.add\">",
-        "<a href=\"add3/add/add/add/Add.ADD.html\" title=\"enum in add3.add.add.add\">",
-    };
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/UsedInC.java b/langtools/test/com/sun/javadoc/testOrdering/UsedInC.java
deleted file mode 100644
index ad1eb9fd2c6..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/UsedInC.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * An empty class
- */
-public class UsedInC {}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java
deleted file mode 100644
index 56a6bc669d7..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/A.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-import java.util.Collection;
-import java.util.List;
-public class A {
-
-    /**
-     * Constructor
-     * @param a class
-     */
-    public A(UsedClass a) {}
-
-    /**
-     * test inner classes
-     */
-    public static class C {
-
-        /**
-         * inner classes constructor
-         * @param u a param
-         * @param array a param
-         */
-        public C(UsedClass u, Object[] array){}
-
-        /**
-         * inner classes constructor
-         * @param u a param
-         * @param collection a param
-         */
-        public C(UsedClass u, Collection collection){}
-
-        /**
-         * inner classes constructor
-         * @param u a param
-         * @param list a param
-         */
-        public C(UsedClass u, List list){}
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java
deleted file mode 100644
index 7f91bebc2cd..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/B.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-public class B {
-
-    /**
-     * constructor
-     * @param a param
-     */
-    public B(UsedClass a) {}
-
-    /**
-     * Inner class
-     */
-    static public class A {
-
-        /**
-         * constructor
-         * @param b param
-         */
-        public A(UsedClass b){}
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C1.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/C1.java
deleted file mode 100644
index 1301fdc3d0d..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C1.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * C1
- */
-
-public class C1 {
-
-    /**
-     * Field in C1.
-     */
-    public UsedClass fieldInC1;
-
-    /**
-     * A duplicated field
-     */
-    public UsedClass zfield;
-
-    /**
-     * Method in C1.
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass methodInC1(UsedClass p) {return p;}
-
-    /**
-     * A duplicated method to test ordering
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass zmethod(UsedClass p) {return p;}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C2.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/C2.java
deleted file mode 100644
index 2bee723e26b..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C2.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class C2 {
-
-    /**
-     * Field in C2.
-     */
-    public UsedClass fieldInC2;
-
-    /**
-     * another field
-     */
-    public C1 field = null;
-
-    /**
-     * A duplicated field
-     */
-    public UsedClass zfield;
-
-    /**
-     * Method in C2.
-     * @return C1
-     */
-    public C1 methodInC2() {return null;}
-
-    /**
-     * @param c1 a param
-     */
-    public void method(pkg1.C1 c1) {}
-
-    /**
-     * Method in C2.
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass methodInC2(UsedClass p) {return p;}
-
-    /**
-     * A duplicated method to test ordering
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass zmethod(UsedClass p) {
-        return p;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C3.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/C3.java
deleted file mode 100644
index 4af0076fd49..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C3.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class C3 {
-    /**
-     * Field in C3.
-     */
-    public UsedClass fieldInC3;
-
-    /**
-     * A duplicated field
-     */
-    public UsedClass zfield;
-
-    /**
-     * Method in C3.
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass methodInC3(UsedClass p) {return p;}
-
-    /**
-     * A duplicated method to test ordering
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass zmethod(UsedClass p) {return p;}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C4.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/C4.java
deleted file mode 100644
index c8e572e9558..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/C4.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-public class C4 {
-    /**
-     * Field in C4.
-     */
-    public UsedClass fieldInC4;
-
-    /**
-     * A duplicated field
-     */
-    public UsedClass zfield;
-
-    /**
-     * Method in C4.
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass methodInC4(UsedClass p) {return p;}
-
-    /**
-     * A duplicated method to test ordering
-     * @param p a param
-     * @return UsedClass
-     */
-    public UsedClass zmethod(UsedClass p) {return p;}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/MethodOrder.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/MethodOrder.java
deleted file mode 100644
index a380a0bdc5c..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/MethodOrder.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class MethodOrder {
-    /**
-     * method test for ordering parameters
-     * @return UsedClass something
-     */
-    public UsedClass m(){return null;}
-    /**
-     * method test for ordering parameters
-     * @param i a param
-     * @return UsedClass something
-     */
-    public UsedClass m(int i) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(int i1, int i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param array a param
-     * @return something
-     */
-    public UsedClass m(byte[] array) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param in a param
-     * @return something
-     */
-    public UsedClass m(Integer in) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(Integer i1, Integer i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(int i1, Integer i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(Integer i1, int i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param d a param
-     * @return something
-     */
-    public UsedClass m(double d) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(double i1, double i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param in a param
-     * @return something
-     */
-    public UsedClass m(Double in) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(Double i1, Double i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(double i1, Double i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param l1 param
-     * @return something
-     */
-    public UsedClass m(long l1) {return null;}
-
-    /**
-     *  method test for ordering parameters
-     * @param l1 param
-     * @param l2 param
-     * @return something
-     */
-    public UsedClass m(long l1, Long l2) {return null;}
-
-    /**
-     *  method test for ordering parameters
-     * @param l1 param
-     * @param l2 param
-     * @return something
-     */
-    public UsedClass m(long l1, long l2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param array a param
-     * @return something
-     */
-    public UsedClass m(Object[] array);
-
-    /**
-     * method test for ordering parameters
-     * @param arrayarray two dimensional array
-     * @return something
-     */
-    public UsedClass m(Object[][] arrayarray);
-
-    /**
-     * method test for ordering parameters
-     * @param i1 a param
-     * @param i2 a param
-     * @return something
-     */
-    public UsedClass m(Double i1, double i2) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param collection a param
-     * @return something
-     */
-    public UsedClass m(Collection collection) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param list a param
-     * @return something
-     */
-    public UsedClass m(List list) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param collection a param
-     * @return something
-     */
-    public UsedClass m(ArrayList<UsedClass> collection) {return null;}
-
-    /**
-     * method test for ordering parameters
-     * @param u use a type param
-     */
-    public void tpm(UsedClass<?> u) {}
-
-    /**
-     * method test for ordering parameters
-     * @param u1 use a type param
-     * @param u2 use a type param
-     */
-    public void tpm(UsedClass<?> u1, UsedClass<?> u2) {}
-
-    /**
-     * method test for ordering parameters
-     * @param u use a type param
-     * @param array use a type param and an array
-     */
-    public void tpm(UsedClass<?> u, UsedClass<?>[] array) {}
-
-    /**
-     * method test for ordering parameters
-     * @param u use type param with extends
-     * @param a some string
-     */
-    public void tpm(UsedClass<? extends UsedClass> u, String a) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/pkg1/UsedClass.java b/langtools/test/com/sun/javadoc/testOrdering/pkg1/UsedClass.java
deleted file mode 100644
index 2d11bc546ae..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/pkg1/UsedClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-/**
- * For class-use testing
- */
-public class UsedClass<T> {}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java
deleted file mode 100644
index fe0ee6c4b20..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/A.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package a;
-/**
- * A class
- */
-public class A {
-   /**
-    * a method
-    */
-   public void something() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java
deleted file mode 100644
index c0e521c9bbc..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/a/something.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package a;
-/**
- * A class
- */
-public class something {
-    /**
-     * A constructor
-     */
-    public something() {}
-    /**
-     * a method
-     */
-    public void something() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java
deleted file mode 100644
index 524b69280b4..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/B.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package b;
-/**
- * Another class
- */
-public class B {
-   /**
-    *  a field
-    */
-   public Object something;
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java
deleted file mode 100644
index e9c5ae015ae..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/b/something.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package b;
-/**
- * an annotation
- */
-public @interface something{}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java
deleted file mode 100644
index 8ef92368cf3..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/e/something.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package e;
-/**
- * An enum
- */
-public enum something {}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java
deleted file mode 100644
index 499106d5f60..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/J.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package something;
-public class J {
-   /**
-    * a method
-    */
-  public void something(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java
deleted file mode 100644
index 2ceca414974..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/package-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * A  package
- */
-package something;
diff --git a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java b/langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java
deleted file mode 100644
index d9c6fd194df..00000000000
--- a/langtools/test/com/sun/javadoc/testOrdering/src-2/something/something.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package something;
-/**
- * An interface
- */
-public interface something {}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
deleted file mode 100644
index 51ad72dec92..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4933335
- * @summary  Make sure that all inherited methods from multiple extended
- *           interfaces are documented
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestMultiInheritence
- */
-
-// TODO: should be TestMultiInheritance
-public class TestMultiInheritence extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestMultiInheritence tester = new TestMultiInheritence();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg3");
-        checkExit(Exit.OK);
-
-        // Method foo() is inherited from BOTH I2 and I3
-
-        checkOutput("pkg3/I1.html", true,
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">"
-                + "I2</a>",
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">"
-                + "I3</a>");
-
-        checkOutput("pkg3/I0.html", true,
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">"
-                + "I2</a>",
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">"
-                + "I3</a>");
-
-        // Method foo() is NOT inherited from I4 because it is overriden by I3.
-
-        checkOutput("pkg3/I1.html", false,
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">"
-                + "I4</a>");
-
-        checkOutput("pkg3/I0.html", false,
-                "Methods inherited from interface&nbsp;pkg3."
-                + "<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">"
-                + "I4</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
deleted file mode 100644
index 7d6f5d4f41d..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4368820 8025633 8026567
- * @summary  Inherited comment should link directly to member, not just
- *           class
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestOverridenMethodDocCopy
- */
-
-public class TestOverridenMethodDocCopy extends JavadocTester {
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     */
-    public static void main(String... args) throws Exception {
-        TestOverridenMethodDocCopy tester = new TestOverridenMethodDocCopy();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/SubClass.html", true,
-                "<span class=\"descfrmTypeLabel\">Description copied from class:&nbsp;<code>"
-                + "<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">"
-                + "BaseClass</a></code></span>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
deleted file mode 100644
index d595705ea93..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4634891 8026567
- * @summary Determine if overriden methods are properly documented when
- * -protected (default) visibility flag is used.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestOverridenPrivateMethods
- */
-
-public class TestOverridenPrivateMethods extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestOverridenPrivateMethods tester = new TestOverridenPrivateMethods();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        // The public method should be overridden
-        checkOutput("pkg1/SubClass.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod");
-
-        // The public method in different package should be overridden
-        checkOutput("pkg2/SubClass.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod");
-
-        checkOutput("pkg1/SubClass.html", false,
-                //The package private method should be overridden since the base and sub class are in the same
-                //package.  However, the link should not show up because the package private methods are not documented.
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod",
-                //The private method in should not be overridden
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod");
-
-        checkOutput("pkg2/SubClass.html", false,
-                //The private method in different package should not be overridden
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod",
-                //The package private method should not be overridden since the base and sub class are in
-                //different packages.
-                "Overrides:</span></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
deleted file mode 100644
index ecb9bc5c590..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4634891 8025633 8026567
- * @summary Determine if overridden methods are properly documented when
- * -protected (default) visibility flag is used.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestOverridenPrivateMethodsWithPackageFlag
- */
-
-public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestOverridenPrivateMethodsWithPackageFlag tester = new TestOverridenPrivateMethodsWithPackageFlag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-package",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        // The public method should be overridden
-        checkOutput("pkg1/SubClass.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">"
-                + "publicMethod</a></code>&nbsp;in class&nbsp;<code>"
-                + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>");
-
-        // The public method in different package should be overridden
-        checkOutput("pkg2/SubClass.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">"
-                + "publicMethod</a></code>&nbsp;in class&nbsp;<code>"
-                + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>");
-
-        // The package private method should be overridden since the base and sub class are in the same
-        // package.
-        checkOutput("pkg1/SubClass.html", true,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod--\">"
-                + "packagePrivateMethod</a></code>&nbsp;in class&nbsp;<code>"
-                + "<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>");
-
-        // The private method in should not be overridden
-        checkOutput("pkg1/SubClass.html", false,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">");
-
-        // The private method in different package should not be overridden
-        checkOutput("pkg2/SubClass.html", false,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">");
-
-        // The package private method should not be overridden since the base and sub class are in
-        // different packages.
-        checkOutput("pkg2/SubClass.html", false,
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
deleted file mode 100644
index c2f9481513e..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4634891 8026567
- * @summary Determine if overridden methods are properly documented when
- * -protected (default) visibility flag is used.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestOverridenPrivateMethodsWithPrivateFlag
- */
-
-public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestOverridenPrivateMethodsWithPrivateFlag tester = new TestOverridenPrivateMethodsWithPrivateFlag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-private",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        // The public method should be overridden
-        checkOutput("pkg1/SubClass.html", true,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod");
-
-        // The package private method should be overridden since the base and sub class are in the same
-        // package.
-        checkOutput("pkg1/SubClass.html", true,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod");
-
-        // The public method in different package should be overridden
-        checkOutput("pkg2/SubClass.html", true,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod");
-
-        // The private method in should not be overridden
-        checkOutput("pkg1/SubClass.html", false,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod");
-
-        // The private method in different package should not be overridden
-        checkOutput("pkg2/SubClass.html", false,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod");
-
-        // The package private method should not be overridden since the base and sub class are in
-        // different packages.
-        checkOutput("pkg2/SubClass.html", false,
-         "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
-                 "<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java
deleted file mode 100644
index 241345cedb0..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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 pkg1;
-
-public class BaseClass {
-
-  /*************************************************
-   * A public method that can be overriden.
-   *
-   */
-  public void publicMethod() {}
-
-
-  /*************************************************
-   * A package private method that can only
-   * be overriden by sub classes in the same package.
-   *
-   */
-  void packagePrivateMethod() {}
-
-  /*************************************************
-   * A private that cannot be overriden.
-   *
-   */
-  private void privateMethod() {}
-
-  /**
-   * These comments will be copied to the overriden method.
-   */
-  public void overridenMethodWithDocsToCopy() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java
deleted file mode 100644
index 5698fe985f9..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg1/SubClass.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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 pkg1;
-
-public class SubClass extends BaseClass {
-
-  /*************************************************
-   * This method should override the same public
-   * method in the base class.
-   *
-   */
-  public void publicMethod() {}
-
-
-  /*************************************************
-   * This method should override the same package
-   * private method in the base class because they
-   * are in the same package.
-   */
-  public void packagePrivateMethod() {}
-
-  /*************************************************
-   * This method should not override anything because
-   * the same method in the base class is private.
-   *
-   */
-  public void privateMethod() {}
-
-  public void overridenMethodWithDocsToCopy() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java
deleted file mode 100644
index 41962aa15b0..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-import pkg1.*;
-
-public class SubClass extends BaseClass {
-
-  /*************************************************
-   * This method should override the same public
-   * method in the base class.
-   *
-   */
-  public void publicMethod() {}
-
-
-  /*************************************************
-   * This method should not override the same package
-   * private method in the base class because they
-   * are in different packages.
-   */
-  public void packagePrivateMethod() {}
-
-  /*************************************************
-   * This method should not override anything because
-   * the same method in the base class is private.
-   *
-   */
-  public void privateMethod() {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I0.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I0.java
deleted file mode 100644
index 353425454f1..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I0.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public interface I0 extends I2, I3, I4 {}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java
deleted file mode 100644
index ec54ae256bc..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public interface I1 extends I2, I4, I3 {}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java
deleted file mode 100644
index 8d119527346..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public interface I2 {
-
-        public void foo();
-
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java
deleted file mode 100644
index 59015817cd6..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public interface I3 extends I4 {
-
-        public void foo();
-
-}
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I4.java b/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I4.java
deleted file mode 100644
index b0f52eaa91c..00000000000
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/pkg3/I4.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg3;
-
-public interface I4 {
-
-        public void foo();
-
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java
deleted file mode 100644
index 0b2aa882c76..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/C2.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Another test class.
- *
- * @author Bhavesh Patel
- */
-public class C2 {
-
-    public static enum ModalExclusionType {
-        /**
-         * Test comment.
-         */
-        NO_EXCLUDE,
-        /**
-         * Another comment.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * A string constant.
-     */
-    public static final String CONSTANT1 = "C2";
-
-    /**
-     * A sample method.
-     *
-     * @param param some parameter.
-     */
-    public void method(String param) {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java
deleted file mode 100644
index 61c6c18e03e..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.util.*;
-
-/**
-* Test Deprecated class
-* @deprecated This class is Deprecated.
-*/
-public class FooDepr {
-
-    public void method(Vector<Object> o){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
deleted file mode 100644
index 647f105ff13..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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      6492694 8026567 8048351
- * @summary  Test package deprecation.
- * @author   bpatel
- * @library  ../lib/
- * @modules jdk.javadoc
- * @build    JavadocTester TestPackageDeprecation
- * @run main TestPackageDeprecation
- */
-
-public class TestPackageDeprecation extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestPackageDeprecation tester = new TestPackageDeprecation();
-        tester.runTests();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-d", "out-default",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/package-summary.html", true,
-            "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" +
-            "<div class=\"block\"><span class=\"deprecationComment\">This package is Deprecated." +
-            "</span></div>"
-        );
-
-        checkOutput("deprecated-list.html", true,
-            "<li><a href=\"#package\">Deprecated Packages</a></li>"
-        );
-    }
-
-    @Test
-    void testNoDeprecated() {
-        javadoc("-d", "out-nodepr",
-                "-sourcepath", testSrc,
-                "-use",
-                "-nodeprecated",
-                "pkg", "pkg1", testSrc("C2.java"), testSrc("FooDepr.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", false,
-                "pkg1");
-        checkOutput("allclasses-frame.html", false,
-                "FooDepr");
-        checkOutput("class-use/C2.ModalExclusionType.html", true,
-                "<td class=\"colFirst\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></td>");
-
-        checkFiles(false,
-                "pkg1/package-summary.html",
-                "FooDepr.html");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java
deleted file mode 100644
index 82d82e695e4..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 pkg;
-
-public class A {
-   /** Test constant. */
-   public static final String DEMO= "y";
-   public static final String THIS_IS_OK= "(x)";
-
-   public String DEMO_STRING = "<Hello World>";
-
-   public A() {
-   }
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java
deleted file mode 100644
index 351ab5d4713..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 pkg1;
-
-public class ClassUseTest1 <T extends Foo & Foo2> {
-
-    public <T extends Foo & Foo2> T method(T t) {
-        return null;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java
deleted file mode 100644
index 6ef71c256c7..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 pkg1;
-
-import java.util.*;
-
-/**
-* Test Deprecated class
-* @deprecated This class is Deprecated.
-*/
-public class Foo {
-
-    public void method(Vector<Object> o){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java
deleted file mode 100644
index cef3bbc4246..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 pkg1;
-
-public interface Foo2 {}
diff --git a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java b/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java
deleted file mode 100644
index 1a330803b3f..00000000000
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/pkg1/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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 pkg1 used.
- * @deprecated This package is Deprecated.
- */
-package pkg1;
diff --git a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
deleted file mode 100644
index 05c343eee3f..00000000000
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4492643 4689286
- * @summary Test that a package page is properly generated when a .java file
- * passed to Javadoc.  Also test that the proper package links are generated
- * when single or multiple packages are documented.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestPackagePage
- */
-
-public class TestPackagePage extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestPackagePage tester = new TestPackagePage();
-        tester.runTests();
-    }
-
-    @Test
-    void testSinglePackage() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                testSrc("com/pkg/C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("com/pkg/package-summary.html", true,
-            "This is a package page.");
-
-        // With just one package, all general pages link to the single package page.
-        checkOutput("com/pkg/C.html", true,
-            "<a href=\"../../com/pkg/package-summary.html\">Package</a>");
-        checkOutput("com/pkg/package-tree.html", true,
-            "<li><a href=\"../../com/pkg/package-summary.html\">Package</a></li>");
-        checkOutput("deprecated-list.html", true,
-            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>");
-        checkOutput("index-all.html", true,
-            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>");
-        checkOutput("help-doc.html", true,
-            "<li><a href=\"com/pkg/package-summary.html\">Package</a></li>");
-    }
-
-    private static final String[][] TEST1 = {
-    };
-
-
-    @Test
-    void testMultiplePackages() {
-        javadoc("-d", "out-2",
-                "-sourcepath", testSrc,
-                "com.pkg", "pkg2");
-        checkExit(Exit.OK);
-
-        //With multiple packages, there is no package link in general pages.
-        checkOutput("deprecated-list.html", true,
-            "<li>Package</li>");
-        checkOutput("index-all.html", true,
-            "<li>Package</li>");
-        checkOutput("help-doc.html", true,
-            "<li>Package</li>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/C.java b/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/C.java
deleted file mode 100644
index 27c7478ed3d..00000000000
--- a/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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.pkg;
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/package.html b/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/package.html
deleted file mode 100644
index 1b7d27dc9c1..00000000000
--- a/langtools/test/com/sun/javadoc/testPackagePage/com/pkg/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-    <body>
-        This is a package page.
-    </body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testPackagePage/pkg2/C.java b/langtools/test/com/sun/javadoc/testPackagePage/pkg2/C.java
deleted file mode 100644
index a9349729a63..00000000000
--- a/langtools/test/com/sun/javadoc/testPackagePage/pkg2/C.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg2;
-
-/**
- * Just a dummy class in a dummy package.
- */
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
deleted file mode 100644
index b535b1ab7b2..00000000000
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4802275 4967243 8026567
- * @summary  Make sure param tags are still printed even though they do not
- *           match up with a real parameters.
- *           Make sure inheritDoc cannot be used in an invalid param tag.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestParamTaglet
- */
-
-public class TestParamTaglet extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestParamTaglet tester = new TestParamTaglet();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.FAILED);
-
-        checkOutput("pkg/C.html", true,
-                //Regular param tags.
-                "<span class=\"paramLabel\">Parameters:</span></dt>\n"
-                + "<dd><code>param1</code> - testing 1 2 3.</dd>\n"
-                + "<dd><code>param2</code> - testing 1 2 3.",
-                //Param tags that don't match with any real parameters.
-                "<span class=\"paramLabel\">Parameters:</span></dt>\n"
-                + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>\n"
-                + "<dd><code><I>p2</I></code> - testing 1 2 3.",
-                //{@inherit} doc misuse does not cause doclet to throw exception.
-                // Param is printed with nothing inherited.
-                //XXX: in the future when Configuration is available during doc inheritence,
-                //print a warning for this mistake.
-                "<code><I>inheritBug</I></code> -");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testParamTaglet/pkg/C.java b/langtools/test/com/sun/javadoc/testParamTaglet/pkg/C.java
deleted file mode 100644
index b6b037be5dc..00000000000
--- a/langtools/test/com/sun/javadoc/testParamTaglet/pkg/C.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class C extends Parent {
-
-    /**
-     * @param param1 testing 1 2 3.
-     * @param param2 testing 1 2 3.
-     */
-    public void regularParams(int param1, int param2) {}
-
-    /**
-     * @param <I>p1</I> testing 1 2 3.
-     * @param <I>p2</I> testing 1 2 3.
-     * @param <I>inheritBug</I> {@inheritDoc}
-     */
-    public void nonMatchingParams(int param1, int param2) {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java b/langtools/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java
deleted file mode 100644
index f0b380b19bd..00000000000
--- a/langtools/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class Parent {
-
-    /**
-     * Just a dummy method that is here for inheritDoc testing purposes.
-     */
-    public void nonMatchingParams(int param1, int param2) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
deleted file mode 100644
index 9d6b097bf63..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4780441 4874845 4978816 8014017 8016328 8025633 8026567
- * @summary  Make sure that when the -private flag is not used, members
- *           inherited from package private class are documented in the child.
- *
- *           Make sure that when a method inherits documentation from a method
- *           in a non-public class/interface, the non-public class/interface
- *           is not mentioned anywhere (not even in the signature or tree).
- *
- *           Make sure that when a private interface method with generic parameters
- *           is implemented, the comments can be inherited properly.
- *
- *           Make sure when no modifier appear in the class signature, the
- *           signature is displayed correctly without extra space at the beginning.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestPrivateClasses
- */
-
-public class TestPrivateClasses extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestPrivateClasses tester = new TestPrivateClasses();
-        tester.runTests();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-d", "out-default",
-                "-sourcepath", testSrc,
-                "pkg", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/PublicChild.html", true,
-                // Field inheritence from non-public superclass.
-                "<a href=\"../pkg/PublicChild.html#fieldInheritedFromParent\">"
-                + "fieldInheritedFromParent</a>",
-                // Method inheritance from non-public superclass.
-                "<a href=\"../pkg/PublicChild.html#methodInheritedFromParent-int-\">"
-                + "methodInheritedFromParent</a>",
-                // private class does not show up in tree
-                "<ul class=\"inheritance\">\n"
-                + "<li>java.lang.Object</li>\n"
-                + "<li>\n"
-                + "<ul class=\"inheritance\">\n"
-                + "<li>pkg.PublicChild</li>\n"
-                + "</ul>\n"
-                + "</li>\n"
-                + "</ul>",
-                // Method is documented as though it is declared in the inheriting method.
-                "<pre>public&nbsp;void&nbsp;methodInheritedFromParent(int&nbsp;p1)",
-                "<dl>\n"
-                + "<dt>All Implemented Interfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">"
-                + "PublicInterface</a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/PublicChild.html", false,
-                // Should not document that a method overrides method from private class.
-                "<span class=\"overrideSpecifyLabel\">Overrides:</span>",
-                // Should not document that a method specified by private interface.
-                "<span class=\"overrideSpecifyLabel\">Specified by:</span>",
-                // Should not mention that any documentation was copied.
-                "Description copied from",
-                // Don't extend private classes or interfaces
-                "PrivateParent",
-                "PrivateInterface");
-
-        checkOutput("pkg/PublicChild.html", false,
-                // Should not document comments from private inherited interfaces
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">" +
-                "<a href=\"../pkg/PublicChild.html#methodInterface-int-\">" +
-                "methodInterface</a></span>(int&nbsp;p1)</code>\n" +
-                "<div class=\"block\">Comment from interface.</div>\n</td>",
-                // and similarly one more
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">" +
-                "<a href=\"../pkg/PublicChild.html#methodInterface2-int-\">" +
-                "methodInterface2</a></span>(int&nbsp;p1)</code>\n" +
-                "<div class=\"block\">Comment from interface.</div>\n</td>"
-        );
-
-        checkOutput("pkg/PublicInterface.html", true,
-                // Field inheritance from non-public superinterface.
-                "<a href=\"../pkg/PublicInterface.html#fieldInheritedFromInterface\">"
-                + "fieldInheritedFromInterface</a>",
-                // Method inheritance from non-public superinterface.
-                "<a href=\"../pkg/PublicInterface.html#methodInterface-int-\">"
-                + "methodInterface</a>",
-                //Make sure implemented interfaces from private superclass are inherited
-                "<dl>\n"
-                + "<dt>All Known Implementing Classes:</dt>\n"
-                + "<dd><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">"
-                + "PublicChild</a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/PublicInterface.html", false,
-                "<span class=\"overrideSpecifyLabel\">Specified by:</span>",
-                "Description copied from",
-                "PrivateInterface",
-                "All Superinterfaces");
-
-        checkOutput("pkg2/C.html", false,
-                //Generic interface method test.
-                "This comment should get copied to the implementing class");
-
-        checkOutput("pkg2/C.html", false,
-                //Do not inherit private interface method with generic parameters.
-                //This method has been implemented.
-                "<span class=\"memberNameLink\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>");
-
-        checkOutput("constant-values.html", false,
-                // Make inherited constant are documented correctly.
-                "PrivateInterface");
-    }
-
-    @Test
-    void testPrivate() {
-        javadoc("-d", "out-private",
-                "-sourcepath", testSrc,
-                "-private",
-                "pkg", "pkg2");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/PublicChild.html", true,
-                // Field inheritence from non-public superclass.
-                "Fields inherited from class&nbsp;pkg."
-                + "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">"
-                + "PrivateParent</a>",
-                "<a href=\"../pkg/PrivateParent.html#fieldInheritedFromParent\">"
-                + "fieldInheritedFromParent</a>",
-                // Method inheritence from non-public superclass.
-                "Methods inherited from class&nbsp;pkg."
-                + "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">"
-                + "PrivateParent</a>",
-                "<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent-int-\">"
-                + "methodInheritedFromParent</a>",
-                // Should document that a method overrides method from private class.
-                "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-int-T-V-java.util.List-\">"
-                + "methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>"
-                + "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">"
-                + "PrivateParent</a></code></dd>",
-                // Should document that a method is specified by private interface.
-                "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">"
-                + "methodInterface</a></code>&nbsp;in interface&nbsp;<code>"
-                + "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">"
-                + "PrivateInterface</a></code></dd>",
-                // Should mention that any documentation was copied.
-                "Description copied from",
-                // Extend documented private classes or interfaces
-                "extends",
-                "<dl>\n"
-                + "<dt>All Implemented Interfaces:</dt>\n"
-                + "<dd><a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">"
-                + "PrivateInterface</a>, "
-                + "<a href=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">"
-                + "PublicInterface</a></dd>\n"
-                + "</dl>",
-                "<pre>public class <span class=\"typeNameLabel\">PublicChild</span>");
-
-        checkOutput("pkg/PublicInterface.html", true,
-                // Field inheritence from non-public superinterface.
-                "Fields inherited from interface&nbsp;pkg."
-                + "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">"
-                + "PrivateInterface</a>",
-                "<a href=\"../pkg/PrivateInterface.html#fieldInheritedFromInterface\">"
-                + "fieldInheritedFromInterface</a>",
-                // Method inheritance from non-public superinterface.
-                "Methods inherited from interface&nbsp;pkg."
-                + "<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">"
-                + "PrivateInterface</a>",
-                // Extend documented private classes or interfaces
-                "extends",
-                "All Superinterfaces",
-                //Make sure implemented interfaces from private superclass are inherited
-                "<dl>\n"
-                + "<dt>All Known Implementing Classes:</dt>\n"
-                + "<dd><a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">"
-                + "PrivateParent</a>, "
-                + "<a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild"
-                + "</a></dd>\n"
-                + "</dl>");
-
-        checkOutput("pkg/PrivateInterface.html", true,
-                "<a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">"
-                + "methodInterface</a>"
-        );
-
-        checkOutput("pkg2/C.html", true,
-                //Since private flag is used, we can document that private interface method
-                //with generic parameters has been implemented.
-                "<span class=\"descfrmTypeLabel\">Description copied from interface:&nbsp;<code>"
-                + "<a href=\"../pkg2/I.html#hello-T-\">I</a></code></span>",
-                "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n"
-                + "<dd><code><a href=\"../pkg2/I.html#hello-T-\">hello</a></code>"
-                + "&nbsp;in interface&nbsp;<code>"
-                + "<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>"
-                + "&lt;java.lang.String&gt;</code></dd>");
-
-        checkOutput("pkg/PrivateParent.html", true,
-                //Make sure when no modifier appear in the class signature, the
-                //signature is displayed correctly without extra space at the beginning.
-                "<pre>class <span class=\"typeNameLabel\">PrivateParent</span>");
-
-        checkOutput("pkg/PrivateParent.html", false,
-                "<pre> class <span class=\"typeNameLabel\">PrivateParent</span>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java
deleted file mode 100644
index 6cab990a1a1..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-interface PrivateInterface {
-
-    /**
-     * Comment from parent.
-     */
-    public static final int fieldInheritedFromInterface = 0;
-
-    /**
-     * Comment from interface.
-     * This is a link to myself: {@link #fieldInheritedFromInterface}
-     *
-     * @param p1 param from interface.
-     * @throws Exception exception from interface.
-     *
-     * @see #fieldInheritedFromInterface
-     */
-    public void methodInterface(int p1) throws Exception;
-
-    /**
-     * Comment from interface.
-     *
-     * @param p1 param from interface.
-     * @throws Exception exception from interface.
-     */
-    public void methodInterface2(int p1) throws Exception;
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java
deleted file mode 100644
index 2bff58b1386..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-import java.util.*;
-
-class PrivateParent implements PublicInterface {
-
-    /**
-     * Comment from parent.
-     */
-    public int fieldInheritedFromParent;
-
-    /**
-     * Comment from parent.
-     *
-     * @param p1 param from parent.
-     * @throws Exception exception from parent.
-     */
-    public void methodInheritedFromParent(int p1) throws Exception {
-    }
-
-    /**
-     * Comment from parent.
-     *
-     * @param p1 param from parent.
-     * @param p2 param from parent.
-     * @throws Exception exception from parent.
-     */
-    public <T extends List, V> PrivateParent methodOverridenFromParent(
-            char[] p1, int p2, T p3, V p4, List<String> p5)
-    throws Exception {
-        return this;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java
deleted file mode 100644
index 6b80ec686d4..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-import java.util.*;
-
-public class PublicChild extends PrivateParent
-    implements PrivateInterface {
-
-    public <T extends List, V> PublicChild methodOverridenFromParent(
-            char[] p1, int p2, T p3, V p4, List<String> p5)
-    throws Exception {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param p1 {@inheritDoc}
-     * @throws Exception {@inheritDoc}
-     */
-    public void methodInterface(int p1) throws Exception {
-    }
-
-    public void methodInterface2(int p1) throws Exception {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java
deleted file mode 100644
index 91adc38d9ef..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg/PublicInterface.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-public interface PublicInterface extends PrivateInterface {
-
-
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java
deleted file mode 100644
index 54a244e916c..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-public class C implements I<String> {
-        public void hello(String param) { }
-}
diff --git a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/I.java b/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/I.java
deleted file mode 100644
index bf2baa825e4..00000000000
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/pkg2/I.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg2;
-
-interface I<T> {
-        /**
-         * This comment should get copied to the implementing class
-         */
-        void hello(T param);
-}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
deleted file mode 100644
index 38983a98d2a..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4074234
- * @summary Make Javadoc capable of traversing/recursing all of given subpackages.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestRecurseSubPackages
- */
-
-public class TestRecurseSubPackages extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestRecurseSubPackages tester = new TestRecurseSubPackages();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-subpackages", "pkg1",
-                "-exclude", "pkg1.pkg2.packageToExclude");
-        checkExit(Exit.OK);
-
-        for (int i = 1; i <= 6; i++) {
-            checkOutput("allclasses-frame.html", true,
-                    "C" + i + ".html");
-        }
-
-        checkOutput("allclasses-frame.html", false,
-                "DummyClass.html");
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java
deleted file mode 100644
index 91505cafeca..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1;
-
-public class C1{}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java
deleted file mode 100644
index b5b1e7baa4b..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1;
-
-public class C2{}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java
deleted file mode 100644
index 4462109b778..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1.pkg2;
-
-public class C3{}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java
deleted file mode 100644
index 97b0812b7af..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1.pkg2;
-
-public class C4{}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java
deleted file mode 100644
index daa79b1f653..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1.pkg2.packageToExclude;
-
-public class DummyClass {}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java
deleted file mode 100644
index f4798520c77..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1.pkg2.pkg3;
-
-public class C5{}
diff --git a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java b/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java
deleted file mode 100644
index b52efb4ceeb..00000000000
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg1.pkg2.pkg3;
-
-public class C6{}
diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
deleted file mode 100644
index 52bf6e2f99a..00000000000
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4460354 8014636 8043186
- * @summary  Test to make sure that relative paths are redirected in the
- *           output so that they are not broken.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestRelativeLinks
- */
-
-public class TestRelativeLinks extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestRelativeLinks tester = new TestRelativeLinks();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-use",
-                "-sourcepath", testSrc,
-                "pkg", "pkg2");
-        checkExit(Exit.OK);
-
-        // These relative paths should stay relative because they appear
-        // in the right places.
-        checkOutput("pkg/C.html", true,
-            "<a href=\"relative-class-link.html\">relative class link</a>",
-            "<a href=\"relative-field-link.html\">relative field link</a>",
-            "<a href=\"relative-method-link.html\">relative method link</a>",
-            " <a\n" +
-            " href=\"relative-multi-line-link.html\">relative-multi-line-link</a>.");
-        checkOutput("pkg/package-summary.html", true,
-            "<a href=\"relative-package-link.html\">relative package link</a>");
-
-        // These relative paths should be redirected because they are in different
-        // places.
-
-        // INDEX PAGE
-        checkOutput("index-all.html", true,
-            "<a href=\"./pkg/relative-class-link.html\">relative class link</a>",
-            "<a href=\"./pkg/relative-field-link.html\">relative field link</a>",
-            "<a href=\"./pkg/relative-method-link.html\">relative method link</a>",
-            "<a href=\"./pkg/relative-package-link.html\">relative package link</a>",
-            " <a\n" +
-            " href=\"./pkg/relative-multi-line-link.html\">relative-multi-line-link</a>.");
-
-        // PACKAGE USE
-        checkOutput("pkg/package-use.html", true,
-            "<a href=\"../pkg/relative-package-link.html\">relative package link</a>.",
-            "<a href=\"../pkg/relative-class-link.html\">relative class link</a>");
-
-        // CLASS_USE
-        checkOutput("pkg/class-use/C.html", true,
-            "<a href=\"../../pkg/relative-field-link.html\">relative field link</a>",
-            "<a href=\"../../pkg/relative-method-link.html\">relative method link</a>",
-            "<a href=\"../../pkg/relative-package-link.html\">relative package link</a>",
-            " <a\n" +
-            " href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>.");
-
-        // PACKAGE OVERVIEW
-        checkOutput("overview-summary.html", true,
-            "<a href=\"./pkg/relative-package-link.html\">relative package link</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/C.java b/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/C.java
deleted file mode 100644
index 12af871502e..00000000000
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/C.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg;
-
-/**
- * Here is a relative link in a class:
- * <a href="relative-class-link.html">relative class link</a>.
- */
-public class C {
-
-    /**
-     * Here is a relative link in a field:\u0130
-     * <a href="relative-field-link.html">relative field link</a>.
-     */
-    public C field = null;
-
-    /**
-     * Here is a relative link in a method:
-     * <a href="relative-method-link.html">relative method link</a>.
-     */
-    public C method() { return null;}
-
-    /**
-     * Here is a relative link in a method:
-     * <a
-     * href="relative-multi-line-link.html">relative-multi-line-link</a>.
-     */
-    public C multipleLineTest() { return null;}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html b/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
deleted file mode 100644
index 42d6dffee0b..00000000000
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-	<body>
-		Here is a relative link in a package: 
-       <a href="relative-package-link.html">relative package link</a>.
-	</body>
-</html>
-
diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java b/langtools/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java
deleted file mode 100644
index 7343858b371..00000000000
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg2;
-
-/**
- * Just a dummy class to force the overview page to generate.
- */
-public class Foo {}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
deleted file mode 100644
index fa0ff4aa02a..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      8005092
- * @summary  Test repeated annotations output.
- * @author   bpatel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestRepeatedAnnotations
- */
-
-public class TestRepeatedAnnotations extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestRepeatedAnnotations tester = new TestRepeatedAnnotations();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C.html", true,
-                "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a> "
-                + "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a>",
-                "<a href=\"../pkg/ContaineeRegDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeRegDoc</a> "
-                + "<a href=\"../pkg/ContaineeRegDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeRegDoc</a>",
-                "<a href=\"../pkg/RegContainerDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContainerDoc</a>"
-                + "(<a href=\"../pkg/RegContainerDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeNotDoc</a>,"
-                + "<a href=\"../pkg/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeNotDoc</a>})",
-                "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a> "
-                + "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a> "
-                + "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a>",
-                "<a href=\"../pkg/ContainerSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContainerSynthDoc</a>("
-                + "<a href=\"../pkg/ContainerSynthDoc.html#value--\">value</a>="
-                + "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a>)",
-                "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a> "
-                + "<a href=\"../pkg/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg\">@ContaineeSynthDoc</a>");
-
-        checkOutput("pkg/D.html", true,
-                "<a href=\"../pkg/RegDoc.html\" title=\"annotation in pkg\">@RegDoc</a>"
-                + "(<a href=\"../pkg/RegDoc.html#x--\">x</a>=1)",
-                "<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>"
-                + "(<a href=\"../pkg/RegArryDoc.html#y--\">y</a>=1)",
-                "<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>"
-                + "(<a href=\"../pkg/RegArryDoc.html#y--\">y</a>={1,2})",
-                "<a href=\"../pkg/NonSynthDocContainer.html\" "
-                + "title=\"annotation in pkg\">@NonSynthDocContainer</a>"
-                + "(<a href=\"../pkg/NonSynthDocContainer.html#value--\">value</a>="
-                + "<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>)");
-
-        checkOutput("pkg1/C.html", true,
-                "<a href=\"../pkg1/RegContainerValDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContainerValDoc</a>"
-                + "(<a href=\"../pkg1/RegContainerValDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg1/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContaineeNotDoc</a>,"
-                + "<a href=\"../pkg1/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContaineeNotDoc</a>},"
-                + "<a href=\"../pkg1/RegContainerValDoc.html#y--\">y</a>=3)",
-                "<a href=\"../pkg1/ContainerValDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContainerValDoc</a>"
-                + "(<a href=\"../pkg1/ContainerValDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg1/ContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeNotDoc</a>,"
-                + "<a href=\"../pkg1/ContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeNotDoc</a>},"
-                + "<a href=\"../pkg1/ContainerValDoc.html#x--\">x</a>=1)");
-
-        checkOutput("pkg/C.html", false,
-                "<a href=\"../pkg/RegContaineeDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeDoc</a> "
-                + "<a href=\"../pkg/RegContaineeDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeDoc</a>",
-                "<a href=\"../pkg/RegContainerNotDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContainerNotDoc</a>"
-                + "(<a href=\"../pkg/RegContainerNotDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeNotDoc</a>,"
-                + "<a href=\"../pkg/RegContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg\">@RegContaineeNotDoc</a>})");
-
-        checkOutput("pkg1/C.html", false,
-                "<a href=\"../pkg1/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeSynthDoc</a> "
-                + "<a href=\"../pkg1/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeSynthDoc</a>",
-                "<a href=\"../pkg1/RegContainerValNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContainerValNotDoc</a>"
-                + "(<a href=\"../pkg1/RegContainerValNotDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg1/RegContaineeDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContaineeDoc</a>,"
-                + "<a href=\"../pkg1/RegContaineeDoc.html\" "
-                + "title=\"annotation in pkg1\">@RegContaineeDoc</a>},"
-                + "<a href=\"../pkg1/RegContainerValNotDoc.html#y--\">y</a>=4)",
-                "<a href=\"../pkg1/ContainerValNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContainerValNotDoc</a>"
-                + "(<a href=\"../pkg1/ContainerValNotDoc.html#value--\">value</a>={"
-                + "<a href=\"../pkg1/ContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeNotDoc</a>,"
-                + "<a href=\"../pkg1/ContaineeNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeNotDoc</a>},"
-                + "<a href=\"../pkg1/ContainerValNotDoc.html#x--\">x</a>=2)",
-                "<a href=\"../pkg1/ContainerSynthNotDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContainerSynthNotDoc</a>("
-                + "<a href=\"../pkg1/ContainerSynthNotDoc.html#value--\">value</a>="
-                + "<a href=\"../pkg1/ContaineeSynthDoc.html\" "
-                + "title=\"annotation in pkg1\">@ContaineeSynthDoc</a>)");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java
deleted file mode 100644
index 1c42b4fcf73..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/C.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-@ContainerSynthDoc(value={@ContaineeSynthDoc,@ContaineeSynthDoc})
-@ContainerRegDoc(value={@ContaineeRegDoc,@ContaineeRegDoc})
-@RegContainerDoc(value={@RegContaineeNotDoc,@RegContaineeNotDoc})
-@ContainerRegNotDoc(value={@RegContaineeDoc,@RegContaineeDoc})
-@RegContainerNotDoc(value={@RegContaineeNotDoc,@RegContaineeNotDoc})
-@ContaineeSynthDoc @ContaineeSynthDoc @ContaineeSynthDoc
-public class C {
-
-    @ContainerSynthDoc(value={@ContaineeSynthDoc})
-    public void test1() {}
-
-    @ContaineeSynthDoc @ContaineeSynthDoc
-    public void test2() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java
deleted file mode 100644
index 35bed4ba564..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeRegDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation contained by ContainerRegDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface ContaineeRegDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java
deleted file mode 100644
index a0208e201b3..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContaineeSynthDoc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented synthesized annotation contained by ContainerSynthDoc.
- * It will be used to annotate Class C and a method in the class using a synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-@Repeatable(ContainerSynthDoc.class)
-public @interface ContaineeSynthDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java
deleted file mode 100644
index 2cf4428153e..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegDoc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation container for ContaineeRegDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface ContainerRegDoc {
-
-    ContaineeRegDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java
deleted file mode 100644
index e2b2e32566d..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerRegNotDoc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation container for RegContaineeDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface ContainerRegNotDoc {
-
-    RegContaineeDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java
deleted file mode 100644
index bdf86ee8537..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/ContainerSynthDoc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented synthesized annotation container for ContaineeSynthDoc.
- * It will be used to annotate Class C and a method in the class using a synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface ContainerSynthDoc {
-
-    ContaineeSynthDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java
deleted file mode 100644
index 35cf349e104..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/D.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-@RegDoc(x=1)
-public class D {
-
-    @RegArryDoc(y={1})
-    public void test1() {}
-
-    @RegArryDoc(y={1,2})
-    public void test2() {}
-
-    @NonSynthDocContainer(value={@RegArryDoc})
-    public void test3() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java
deleted file mode 100644
index 8d2a7151f85..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/NonSynthDocContainer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation.
- * It will be used to annotate methods in class D.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface NonSynthDocContainer {
-
-    RegArryDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java
deleted file mode 100644
index cf42d831896..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegArryDoc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation.
- * It will be used to annotate methods in Class D.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegArryDoc {
-
-    int[] y();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java
deleted file mode 100644
index f72c405b76f..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation contained by ContainerRegNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegContaineeDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java
deleted file mode 100644
index 1d0cf218a85..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContaineeNotDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation contained by RegContainerNotDoc
- * and RegContainerDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface RegContaineeNotDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java
deleted file mode 100644
index cfe9457238e..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerDoc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation container for RegContainerDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegContainerDoc {
-
-    RegContaineeNotDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java
deleted file mode 100644
index 40560c451f1..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegContainerNotDoc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation container for RegContaineeNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface RegContainerNotDoc {
-
-    RegContaineeNotDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java
deleted file mode 100644
index 2769ae51b57..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg/RegDoc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation.
- * It will be used to annotate Class D.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegDoc {
-
-    int x();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java
deleted file mode 100644
index 665b915e6a9..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/C.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-@ContainerSynthNotDoc(value={@ContaineeSynthDoc,@ContaineeSynthDoc})
-@RegContainerValDoc(value={@RegContaineeNotDoc,@RegContaineeNotDoc},y=3)
-@ContainerValDoc(value={@ContaineeNotDoc,@ContaineeNotDoc},x=1)
-@RegContainerValNotDoc(value={@RegContaineeDoc,@RegContaineeDoc},y=4)
-@ContainerValNotDoc(value={@ContaineeNotDoc,@ContaineeNotDoc},x=2)
-public class C {
-
-    @ContainerSynthNotDoc(value={@ContaineeSynthDoc})
-    public void test1() {}
-
-    @ContaineeSynthDoc @ContaineeSynthDoc
-    public void test2() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java
deleted file mode 100644
index 1bf2b3eb9f9..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeNotDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation contained by ContainerValNotDoc
- * and ContainerValDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface ContaineeNotDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java
deleted file mode 100644
index a3211095282..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContaineeSynthDoc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented synthesized annotation contained by ContainerSynthNotDoc.
- * It will be used to annotate Class C and methods in the class using a synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-@Repeatable(ContainerSynthNotDoc.class)
-public @interface ContaineeSynthDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java
deleted file mode 100644
index 247dd1edd2e..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerSynthNotDoc.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented synthesized annotation container for ContaineeSynthDoc.
- * It will be used to annotate Class C and methods in the class using a synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface ContainerSynthNotDoc {
-
-    ContaineeSynthDoc[] value();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java
deleted file mode 100644
index 42052e9b446..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValDoc.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation container for ContaineeNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface ContainerValDoc {
-
-    ContaineeNotDoc[] value();
-
-    int x();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java
deleted file mode 100644
index 7b594f5d17f..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/ContainerValNotDoc.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation container for ContaineeNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface ContainerValNotDoc {
-
-    ContaineeNotDoc[] value();
-
-    int x();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java
deleted file mode 100644
index 4f9e1505b87..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeDoc.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation contained by RegContainerValNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegContaineeDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java
deleted file mode 100644
index 3368dcd8af9..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContaineeNotDoc.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation contained by RegContainerValDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface RegContaineeNotDoc {
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java
deleted file mode 100644
index 92035d30276..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValDoc.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a documented annotation container for RegContaineeNotDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-@Documented
-public @interface RegContainerValDoc {
-
-    RegContaineeNotDoc[] value();
-
-    int y();
-}
diff --git a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java
deleted file mode 100644
index 2732a4a750c..00000000000
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/pkg1/RegContainerValNotDoc.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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 pkg1;
-
-import java.lang.annotation.*;
-
-/**
- * This annotation is a non-documented annotation container for RegContaineeDoc.
- * It will be used to annotate Class C using a non-synthesized form.
- *
- * @author Bhavesh Patel
- */
-public @interface RegContainerValNotDoc {
-
-    RegContaineeDoc[] value();
-
-    int y();
-}
diff --git a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
deleted file mode 100644
index a422aecc866..00000000000
--- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4490068
- * @summary  Warn when a return tag is used on a method without a return type.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestReturnTag
- */
-
-public class TestReturnTag extends JavadocTester {
-
-    /**
-     * Trigger warning message when return tag is used on a void method.
-     *
-     * @return I really don't return anything.
-     */
-    public void method() {}
-
-    public static void main(String... args) throws Exception {
-        TestReturnTag tester = new TestReturnTag();
-        tester.runTests();
-    }
-
-    @Test
-    void tests() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("TestReturnTag.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, true,
-            "warning - @return tag cannot be used in method with void return type.");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/TestSearch.java b/langtools/test/com/sun/javadoc/testSearch/TestSearch.java
deleted file mode 100644
index b6ebc8ba744..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/TestSearch.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2015, 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 8141492
- * @summary Test the search feature of javadoc.
- * @author bpatel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSearch
- */
-
-public class TestSearch extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSearch tester = new TestSearch();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1", "-sourcepath", "-use", testSrc("UnnamedPkgClass.java"));
-        checkExit(Exit.OK);
-        checkSearchOutput("UnnamedPkgClass.html", true);
-        checkJqueryAndImageFiles(true);
-        checkFiles(false,
-                "package-search-index.zip",
-                "tag-search-index.zip");
-        checkFiles(true,
-                "member-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2", "-Xdoclint:none", "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkInvalidUsageIndexTag();
-        checkSearchOutput(true);
-        checkSingleIndex(true);
-        checkJqueryAndImageFiles(true);
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test3() {
-        javadoc("-d", "out-3", "-noindex", "-Xdoclint:none",
-                "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(false);
-        checkJqueryAndImageFiles(false);
-        checkFiles(false,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip",
-                "index-all.html");
-    }
-
-    @Test
-    void test4() {
-        javadoc("-d", "out-4", "-html5", "-Xdoclint:none",
-                "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(true);
-        checkSingleIndex(true);
-        checkJqueryAndImageFiles(true);
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test5() {
-        javadoc("-d", "out-5", "-noindex", "-html5", "-Xdoclint:none",
-                "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(false);
-        checkJqueryAndImageFiles(false);
-        checkFiles(false,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip",
-                "index-all.html");
-    }
-
-    @Test
-    void test6() {
-        javadoc("-d", "out-6", "-nocomment", "-Xdoclint:none",
-                "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(true);
-        checkIndexNoComment();
-        checkJqueryAndImageFiles(true);
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test7() {
-        javadoc("-d", "out-7", "-nodeprecated", "-Xdoclint:none",
-                "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(true);
-        checkIndexNoDeprecated();
-        checkJqueryAndImageFiles(true);
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test8() {
-        javadoc("-d", "out-8", "-splitindex", "-Xdoclint:none", "-sourcepath", testSrc,
-                "-use", "pkg", "pkg1", "pkg2", "pkg3");
-        checkExit(Exit.OK);
-        checkInvalidUsageIndexTag();
-        checkSearchOutput(true);
-        checkSplitIndex();
-        checkJqueryAndImageFiles(true);
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "tag-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    @Test
-    void test9() {
-        javadoc("-d", "out-9", "-sourcepath", testSrc, "-javafx", "-package",
-                "-use", "pkgfx", "pkg3");
-        checkExit(Exit.OK);
-        checkSearchOutput(true);
-        checkJavaFXOutput();
-        checkJqueryAndImageFiles(true);
-        checkFiles(false,
-                "tag-search-index.zip");
-        checkFiles(true,
-                "member-search-index.zip",
-                "package-search-index.zip",
-                "type-search-index.zip");
-    }
-
-    void checkSearchOutput(boolean expectedOutput) {
-        checkSearchOutput("overview-summary.html", expectedOutput);
-    }
-
-    void checkSearchOutput(String fileName, boolean expectedOutput) {
-        // Test for search related markup
-        checkOutput(fileName, expectedOutput,
-                "<link rel=\"stylesheet\" type=\"text/css\" href=\"jquery/jquery-ui.css\" title=\"Style\">\n",
-                "<script type=\"text/javascript\" src=\"jquery/jszip/dist/jszip.min.js\"></script>\n",
-                "<script type=\"text/javascript\" src=\"jquery/jszip-utils/dist/jszip-utils.min.js\"></script>\n",
-                "<!--[if IE]>\n",
-                "<script type=\"text/javascript\" src=\"jquery/jszip-utils/dist/jszip-utils-ie.min.js\"></script>\n",
-                "<![endif]-->\n",
-                "<script type=\"text/javascript\" src=\"jquery/jquery-1.10.2.js\"></script>\n",
-                "<script type=\"text/javascript\" src=\"jquery/jquery-ui.js\"></script>",
-                "var pathtoroot = \"./\";loadScripts(document, 'script');",
-                "<ul class=\"navListSearch\">\n",
-                "<li><span>SEARCH:&nbsp;</span>\n",
-                "<input type=\"text\" id=\"search\" value=\" \" disabled=\"disabled\">\n",
-                "<input type=\"reset\" id=\"reset\" value=\" \" disabled=\"disabled\">\n");
-        checkOutput(fileName, true,
-                "<div class=\"fixedNav\">");
-    }
-
-    void checkSingleIndex(boolean expectedOutput) {
-        // Test for search tags markup in index file.
-        checkOutput("index-all.html", expectedOutput,
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
-                        + "phrase with spaces</a></span> - Search tag in pkg</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">"
-                        + "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
-                        + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
-                        + "search phrase with desc deprecated</a></span> - Search tag in pkg2.TestAnnotationType</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
-                        + "SearchTagDeprecatedClass</a></span> - Search tag in pkg2.TestClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">"
-                        + "SingleWord</a></span> - Search tag in pkg</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.ModalExclusionType.html"
-                        + "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - "
-                        + "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.ModalExclusionType.html"
-                        + "#html-span-see-/span-\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search "
-                        + "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/AnotherClass.html#quoted\">quoted</a>"
-                        + "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>");
-        checkOutput("index-all.html", true,
-                "<div class=\"block\"><span class=\"deprecationComment\">class_test1 passes. Search tag"
-                        + " <a id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</a></span></div>",
-                "<div class=\"block\"><span class=\"deprecationComment\">error_test3 passes. Search tag for\n"
-                        + " method <a id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</a></span></div>");
-    }
-
-    void checkSplitIndex() {
-        // Test for search tags markup in split index file.
-        checkOutput("index-files/index-12.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg1/RegClass.html#searchphrase\">"
-                        + "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg1/RegClass.html#SearchWordWithDescription\">"
-                        + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
-                        + "search phrase with desc deprecated</a></span> - Search tag in pkg2.TestAnnotationType</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestClass.html#SearchTagDeprecatedClass\">"
-                        + "SearchTagDeprecatedClass</a></span> - Search tag in pkg2.TestClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#SingleWord\">"
-                        + "SingleWord</a></span> - Search tag in pkg</dt>");
-        checkOutput("index-files/index-9.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg/package-summary.html#phrasewithspaces\">"
-                        + "phrase with spaces</a></span> - Search tag in pkg</dt>");
-        checkOutput("index-files/index-8.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html"
-                        + "#nested%7B@indexnested_tag_test%7D\">nested {@index nested_tag_test}</a></span> - "
-                        + "Search tag in pkg.AnotherClass.ModalExclusionType.NO_EXCLUDE</dt>");
-        checkOutput("index-files/index-5.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.ModalExclusionType.html"
-                        + "#html-span-see-/span-\">html &lt;span&gt; see &lt;/span&gt;</a></span> - Search "
-                        + "tag in pkg.AnotherClass.ModalExclusionType.APPLICATION_EXCLUDE</dt>");
-        checkOutput("index-files/index-10.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"../pkg/AnotherClass.html#quoted\">quoted</a>"
-                        + "</span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>");
-    }
-
-    void checkIndexNoComment() {
-        // Test for search tags markup in index file when javadoc is executed with -nocomment.
-        checkOutput("index-all.html", false,
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
-                        + "phrase with spaces</a></span> - Search tag in pkg</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">"
-                        + "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
-                        + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
-                        + "search phrase with desc deprecated</a></span> - Search tag in pkg2.TestAnnotationType</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
-                        + "SearchTagDeprecatedClass</a></span> - Search tag in pkg2.TestClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">"
-                        + "SingleWord</a></span> - Search tag in pkg</dt>",
-                "<div class=\"block\"><span class=\"deprecationComment\">class_test1 passes. Search tag"
-                        + " <a id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</a></span></div>",
-                "<div class=\"block\"><span class=\"deprecationComment\">error_test3 passes. Search tag for\n"
-                        + " method <a id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</a></span></div>");
-        checkOutput("index-all.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>");
-    }
-
-    void checkIndexNoDeprecated() {
-        // Test for search tags markup in index file when javadoc is executed using -nodeprecated.
-        checkOutput("index-all.html", true,
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#phrasewithspaces\">"
-                        + "phrase with spaces</a></span> - Search tag in pkg</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#searchphrase\">"
-                        + "search phrase</a></span> - Search tag in pkg1.RegClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg1/RegClass.html#SearchWordWithDescription\">"
-                        + "SearchWordWithDescription</a></span> - Search tag in pkg1.RegClass.CONSTANT_FIELD_1</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/package-summary.html#SingleWord\">"
-                        + "SingleWord</a></span> - Search tag in pkg</dt>");
-        checkOutput("index-all.html", false,
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestAnnotationType.html#searchphrasewithdescdeprecated\">"
-                        + "search phrase with desc deprecated</a></span> - Search tag in pkg2.TestAnnotationType</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestClass.html#SearchTagDeprecatedClass\">"
-                        + "SearchTagDeprecatedClass</a></span> - Search tag in pkg2.TestClass</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestEnum.html#searchphrasedeprecated\">"
-                        + "search phrase deprecated</a></span> - Search tag in pkg2.TestEnum.ONE</dt>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg2/TestError.html#SearchTagDeprecatedMethod\">"
-                        + "SearchTagDeprecatedMethod</a></span> - Search tag in pkg2.TestError</dt>",
-                "<div class=\"block\"><span class=\"deprecationComment\">class_test1 passes. Search tag"
-                        + " <a id=\"SearchTagDeprecatedClass\">SearchTagDeprecatedClass</a></span></div>",
-                "<div class=\"block\"><span class=\"deprecationComment\">error_test3 passes. Search tag for\n"
-                        + " method <a id=\"SearchTagDeprecatedMethod\">SearchTagDeprecatedMethod</a></span></div>");
-    }
-
-    void checkJavaFXOutput() {
-        checkOutput("index-all.html", false, "test treat as private");
-    }
-
-    void checkInvalidUsageIndexTag() {
-        checkOutput(Output.WARNING, true,
-                "AnotherClass.java:33: warning - invalid usage of @index tag.",
-                "AnotherClass.java:38: warning - invalid usage of @index tag.",
-                "AnotherClass.java:43: warning - invalid usage of @index tag.",
-                "AnotherClass.java:75: warning - invalid usage of @index tag.");
-    }
-
-    void checkJqueryAndImageFiles(boolean expectedOutput) {
-        checkFiles(expectedOutput,
-                "search.js",
-                "jquery/jquery-1.10.2.js",
-                "jquery/jquery-ui.js",
-                "jquery/jquery-ui.css",
-                "jquery/jquery-ui.min.js",
-                "jquery/jquery-ui.min.css",
-                "jquery/jquery-ui.structure.min.css",
-                "jquery/jquery-ui.structure.css",
-                "jquery/external/jquery/jquery.js",
-                "jquery/jszip/dist/jszip.js",
-                "jquery/jszip/dist/jszip.min.js",
-                "jquery/jszip-utils/dist/jszip-utils.js",
-                "jquery/jszip-utils/dist/jszip-utils.min.js",
-                "jquery/jszip-utils/dist/jszip-utils-ie.js",
-                "jquery/jszip-utils/dist/jszip-utils-ie.min.js",
-                "jquery/images/ui-bg_flat_0_aaaaaa_40x100.png",
-                "jquery/images/ui-icons_454545_256x240.png",
-                "jquery/images/ui-bg_glass_95_fef1ec_1x400.png",
-                "jquery/images/ui-bg_glass_75_dadada_1x400.png",
-                "jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-                "jquery/images/ui-icons_888888_256x240.png",
-                "jquery/images/ui-icons_2e83ff_256x240.png",
-                "jquery/images/ui-bg_glass_65_ffffff_1x400.png",
-                "jquery/images/ui-icons_cd0a0a_256x240.png",
-                "jquery/images/ui-bg_glass_55_fbf9ee_1x400.png",
-                "jquery/images/ui-icons_222222_256x240.png",
-                "jquery/images/ui-bg_glass_75_e6e6e6_1x400.png",
-                "jquery/images/ui-bg_flat_75_ffffff_40x100.png",
-                "resources/x.png",
-                "resources/glass.png");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/UnnamedPkgClass.java b/langtools/test/com/sun/javadoc/testSearch/UnnamedPkgClass.java
deleted file mode 100644
index 60270171bfa..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/UnnamedPkgClass.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-
-/**
- * This is a class in unnamed package.
- */
-
-public class UnnamedPkgClass {
-    public void testMethod(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testSearch/pkg/AnnotationType.java
deleted file mode 100644
index a79a1e829d8..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/AnnotationType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-import java.lang.annotation.*;
-
-/**
- * This is a test annotation type.
- *
- * @author Bhavesh Patel.
- * @since 9
- */
-@Documented public @interface AnnotationType {
-
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/AnotherClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg/AnotherClass.java
deleted file mode 100644
index 71c5882d065..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/AnotherClass.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-import pkg1.*;
-
-/**
- * Another test class. Testing empty {@index }.
- *
- * @author Bhavesh Patel
- */
-public class AnotherClass {
-
-    /**
-     * A test field. Testing only white-spaces in index tag text {@index       }.
-     */
-    public RegClass field;
-
-    /**
-     * Constant field. Testing no text in index tag {@index}.
-     */
-    public static final String CONSTANT_FIELD_3 = "constant";
-
-    /**
-     * @deprecated don't use this field anymore.
-     */
-    public RegClass dep_field;
-
-    /**
-     * A sample enum.
-     */
-    public static enum ModalExclusionType {
-        /**
-         * Test comment. Testing inline tag inside index tag {@index "nested {@index nested_tag_test}"}
-         */
-        NO_EXCLUDE,
-        /**
-         * Another comment. Testing HTML inside index tag {@index "html <span> see </span>"}
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * A string constant. Testing {@index "quoted"no-space}.
-     */
-    public static final String CONSTANT1 = "C2";
-
-    /**
-     * A sample method. Testing search tag for {@index "unclosed quote}.
-     *
-     * @param param some parameter.
-     * @return a test object.
-     */
-    public Class method(pkg1.RegClass param) {
-        return param;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/TestError.java b/langtools/test/com/sun/javadoc/testSearch/pkg/TestError.java
deleted file mode 100644
index 6c83964c8d1..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/TestError.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * Error class.
- */
-public class TestError extends Error {
-
-    /**
-     * Constructs a test error.
-     */
-    public TestError() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/TestException.java b/langtools/test/com/sun/javadoc/testSearch/pkg/TestException.java
deleted file mode 100644
index 43b54795b94..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/TestException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * Thrown when a TestException occurs.
- */
-public class TestException extends Exception {
-
-    /**
-     * Constructs a {@code TestException} with no detail message.
-     */
-    public TestException() {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/TestInterface.java b/langtools/test/com/sun/javadoc/testSearch/pkg/TestInterface.java
deleted file mode 100644
index 11de2157a7a..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/TestInterface.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg;
-
-/**
- * This is a description for an Interface.
- * Test for {@index                                   "search term with spaces"       description }.
- */
-
-public interface TestInterface {
-
-    public void method();
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg/package-info.java b/langtools/test/com/sun/javadoc/testSearch/pkg/package-info.java
deleted file mode 100644
index 5f59cc19a67..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2015, 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 package. Testing search tag for package. Single {@index SingleWord} search tag.
- * Search {@index "phrase with spaces"}.
- */
-package pkg;
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg1/NestedInnerClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg1/NestedInnerClass.java
deleted file mode 100644
index fd1dcc5d2d1..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg1/NestedInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and the inner class is private
- * and a nested inner class is protected.
- *
- * @author      Bhavesh Patel
- */
-
-class NestedInnerClass {
-
-    private static class InnerClass {
-
-        protected static class ProNestedInnerClass implements java.io.Serializable {
-
-            public final int SERIALIZABLE_CONSTANT2 = 1;
-
-            /**
-             * @param s ObjectInputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void readObject(ObjectInputStream s) throws IOException {
-            }
-
-            /**
-             * @param s ObjectOutputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void writeObject(ObjectOutputStream s) throws IOException {
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg1/PrivateIncludeInnerClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg1/PrivateIncludeInnerClass.java
deleted file mode 100644
index c90d519281f..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg1/PrivateIncludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is private which is included using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PrivateIncludeInnerClass {
-
-    /**
-     * @serial include
-     */
-    private static class PriInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg1/ProtectedInnerClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg1/ProtectedInnerClass.java
deleted file mode 100644
index 0488e6c0f7c..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg1/ProtectedInnerClass.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where outer class is package private and the inner class is
- * protected.
- *
- * @author      Bhavesh Patel
- */
-
-class ProtectedInnerClass {
-
-    protected static class ProInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT1 = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg1/PublicExcludeInnerClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg1/PublicExcludeInnerClass.java
deleted file mode 100644
index c888a1fee79..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg1/PublicExcludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is public which is excluded using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PublicExcludeInnerClass {
-
-    /**
-     * @serial exclude
-     */
-    public static class PubInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT3 = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg1/RegClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg1/RegClass.java
deleted file mode 100644
index 36c173a0265..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg1/RegClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg1;
-
-/**
- * This is a description for Class. Search phrase {@index "search phrase" with description}.
- */
-
-public class RegClass {
-
-    /**
-     * Constant field. Search word {@index SearchWordWithDescription search word with desc}.
-     */
-    public static final String CONSTANT_FIELD_1 = "constant";
-
-    /**
-     * Another constant field.
-     */
-    public static final int CONSTANT_FIELD_2 = 1;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/DeprecatedClassByAnnotation.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/DeprecatedClassByAnnotation.java
deleted file mode 100644
index b8500c1ab31..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/DeprecatedClassByAnnotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-@Deprecated()
-public class DeprecatedClassByAnnotation {
-
-    @Deprecated()
-    public int field;
-
-    @Deprecated()
-    public DeprecatedClassByAnnotation() {}
-
-    @Deprecated()
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/Interface.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/Interface.java
deleted file mode 100644
index 23daea00215..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/Interface.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * This is a description for an Interface.
- */
-
-public interface Interface {
-
-    public void method1();
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestAnnotationType.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestAnnotationType.java
deleted file mode 100644
index 27de1a31915..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestAnnotationType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-import java.lang.annotation.*;
-
-/**
- * @deprecated annotation_test1 passes. Search phrase with desc
- * {@index "search phrase with desc deprecated" description for phrase deprecated}
- */
-@Documented public @interface TestAnnotationType {
-
-    /**
-     * @deprecated annotation_test2 passes.
-     */
-    String optional() default "unknown";
-
-   /**
-     * @deprecated annotation_test3 passes.
-     */
-    int required();
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestClass.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestClass.java
deleted file mode 100644
index b9c74e4188e..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestClass.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated class_test1 passes. Search tag {@index SearchTagDeprecatedClass}
- */
-public class TestClass {
-
-    /**
-     * @deprecated class_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated constant field.
-     */
-    public static final int CONSTANT_FIELD = 2;
-
-    /**
-     * @deprecated class_test3 passes.
-     */
-    public TestClass() {}
-
-    /**
-     * @deprecated class_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestEnum.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestEnum.java
deleted file mode 100644
index 759359ae322..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated enum_test1 passes.
- */
-public enum TestEnum {
-
-    /**
-     * @deprecated enum_test2 passes. Search phrase {@index "search phrase deprecated"}
-     */
-    ONE, TWO, THREE;
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestError.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestError.java
deleted file mode 100644
index 0ed37eba490..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestError.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated error_test1 passes.
- */
-public class TestError extends Error {
-
-    /**
-     * @deprecated error_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated error_test3 passes. Search tag for
-     * method {@index SearchTagDeprecatedMethod with description}
-     */
-    public TestError() {}
-
-    /**
-     * @deprecated error_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestException.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestException.java
deleted file mode 100644
index 8e2a1e75999..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated exception_test1 passes.
- */
-public class TestException extends Exception {
-
-    /**
-     * @deprecated exception_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated exception_test3 passes.
-     */
-    public TestException() {}
-
-    /**
-     * @deprecated exception_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestInterface.java b/langtools/test/com/sun/javadoc/testSearch/pkg2/TestInterface.java
deleted file mode 100644
index c115a690ecf..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg2/TestInterface.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg2;
-
-/**
- * @deprecated interface_test1 passes.
- */
-public class TestInterface {
-
-    /**
-     * @deprecated interface_test2 passes.
-     */
-    public int field;
-
-    /**
-     * @deprecated interface_test3 passes.
-     */
-    public TestInterface() {}
-
-    /**
-     * @deprecated interface_test4 passes.
-     */
-    public void method() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkg3/ClassNoConstants.java b/langtools/test/com/sun/javadoc/testSearch/pkg3/ClassNoConstants.java
deleted file mode 100644
index 6530d6437b8..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkg3/ClassNoConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkg3;
-
-/**
- * This is an empty class specifically testing for no Constant value.
- */
-
-public class ClassNoConstants {
-}
diff --git a/langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java b/langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java
deleted file mode 100644
index 7f416f50042..00000000000
--- a/langtools/test/com/sun/javadoc/testSearch/pkgfx/C.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015, 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 pkgfx;
-
-public class C {
-
-    /**
-     * @propertySetter Property
-     * @propertyDescription PropertyDescription
-     */
-    public void CC() {}
-
-    /**
-     * @propertyGetter Property
-     *
-     */
-    public void B() {}
-
-    /**
-     * Method A documentation. Test index tag {@index "test treat as private"}.
-     * @treatAsPrivate
-     */
-    public void A() {}
-
-    /**
-     * Field i
-     * @defaultValue 1.0
-     */
-    public int i;
-
-
-    /**
-     * Defines the direction/speed at which the {@code Timeline} is expected to
-     * be played.
-     * @defaultValue 11
-     * @since JavaFX 8.0
-     */
-    private DoubleProperty rate;
-
-    public final void setRate(double value) {}
-
-    public final double getRate() {}
-
-    public final DoubleProperty rateProperty() {}
-
-    private BooleanProperty paused;
-
-    public final void setPaused(boolean value) {}
-
-    public final double isPaused() {}
-
-    class DoubleProperty {}
-
-    class BooleanProperty {}
-
-    public final BooleanProperty setTestMethodProperty() {}
-
-    private class Inner {
-        private BooleanProperty testMethodProperty() {}
-
-        /**
-         * Defines the direction/speed at which the {@code Timeline} is expected to
-         * be played.
-         * @defaultValue 11
-         */
-        private DoubleProperty rate;
-
-        public final void setRate(double value) {}
-
-        public final double getRate() {}
-
-        public final DoubleProperty rateProperty() {}
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java b/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
deleted file mode 100644
index a57bfb88f73..00000000000
--- a/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      8017191
- * @summary  Javadoc is confused by at-link to imported classes outside of the set of generated packages
- * @author   jjg
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSeeTag
- */
-
-public class TestSeeTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSeeTag tester = new TestSeeTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/Test.html", true,
-          "<code>List</code>");
-
-        checkOutput("pkg/Test.html", false,
-          "&lt;code&gt;List&lt;/code&gt;");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSeeTag/pkg/Test.java b/langtools/test/com/sun/javadoc/testSeeTag/pkg/Test.java
deleted file mode 100644
index ee997767132..00000000000
--- a/langtools/test/com/sun/javadoc/testSeeTag/pkg/Test.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg;
-import java.util.List;
-
-/** @see List */
-public class Test { }
-
diff --git a/langtools/test/com/sun/javadoc/testSerialVersionUID/C.java b/langtools/test/com/sun/javadoc/testSerialVersionUID/C.java
deleted file mode 100644
index 209e1657918..00000000000
--- a/langtools/test/com/sun/javadoc/testSerialVersionUID/C.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public class C implements java.io.Serializable {
-    /** use serialVersionUID from JDK 1.0.2 for interoperability */
-    private static final long serialVersionUID = -111111111111111L;
-}
diff --git a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java b/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
deleted file mode 100644
index fe8d6e5d6fb..00000000000
--- a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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      4525039
- * @summary  Test to make sure that the serialVersionUID is properly
- * documented in the serialized form.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSerialVersionUID
- */
-
-public class TestSerialVersionUID extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSerialVersionUID tester = new TestSerialVersionUID();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("serialized-form.html", true,
-                "-111111111111111L");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
deleted file mode 100644
index ed844798819..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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 4341304 4485668 4966728 8032066
- * @summary Test that methods readResolve and writeReplace show
- * up in serialized-form.html the same way that readObject and writeObject do.
- * If the doclet includes readResolve and writeReplace in the serialized-form
- * documentation that same way the it includes readObject and writeObject, the
- * test passes.  This also tests that throws tag information is correctly shown
- * in the serialized form page.
- * Make sure see tags work in serialized form.
- * @author jamieh
- * @library ../lib/
- * @modules jdk.javadoc
- * @build JavadocTester
- * @build TestSerializedForm
- * @run main TestSerializedForm
- */
-
-import java.io.*;
-
-public class TestSerializedForm extends JavadocTester implements Serializable {
-    public static void main(String... args) throws Exception {
-        TestSerializedForm tester = new TestSerializedForm();
-        tester.runTests();
-//        tester.run(ARGS, TEST, NEGATED_TEST);
-//        tester.run(ARGS_PRIVATE, TEST_PRIVATE, NEGATED_TEST_PRIVATE);
-//        tester.printSummary();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-d", "out-default",
-                "-sourcepath", testSrc,
-                testSrc("TestSerializedForm.java"), "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("serialized-form.html", true,
-                "protected&nbsp;java.lang.Object&nbsp;readResolve()",
-                "protected&nbsp;java.lang.Object&nbsp;writeReplace()",
-                "protected&nbsp;java.lang.Object&nbsp;readObjectNoData()",
-                "See Also",
-                "<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass "
-                + "extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class pkg1.PrivateIncludeInnerClass.PriInnerClass extends "
-                + "java.lang.Object implements Serializable</h3>",
-                "<h3>Class pkg1.ProtectedInnerClass.ProInnerClass extends "
-                + "java.lang.Object implements Serializable</h3>");
-
-        checkOutput("serialized-form.html", false,
-                "<h3>Class <a href=\"pkg1/NestedInnerClass.InnerClass.ProNestedInnerClass.html\" "
-                + "title=\"class in pkg1\">pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass</a> "
-                + "extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class <a href=\"pkg1/PrivateInnerClass.PriInnerClass.html\" title=\"class in pkg1\">"
-                + "pkg1.PrivateInnerClass.PriInnerClass</a> extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class <a href=\"pkg1/ProtectedInnerClass.ProInnerClass.html\" title=\"class in pkg1\">"
-                + "pkg1.ProtectedInnerClass.ProInnerClass</a> extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class pkg1.PublicExcludeInnerClass.PubInnerClass extends java.lang.Object implements "
-                + "Serializable</h3>");
-    }
-
-    @Test
-    void testPrivate() {
-        javadoc("-private",
-                "-d", "out-private",
-                "-sourcepath", testSrc,
-                testSrc("TestSerializedForm.java"), "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("serialized-form.html", true,
-                "<h3>Class <a href=\"pkg1/NestedInnerClass.InnerClass.ProNestedInnerClass.html\" "
-                + "title=\"class in pkg1\">pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass</a> "
-                + "extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class <a href=\"pkg1/PrivateIncludeInnerClass.PriInnerClass.html\" title=\"class in pkg1\">"
-                + "pkg1.PrivateIncludeInnerClass.PriInnerClass</a> extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class <a href=\"pkg1/ProtectedInnerClass.ProInnerClass.html\" title=\"class in pkg1\">"
-                + "pkg1.ProtectedInnerClass.ProInnerClass</a> extends java.lang.Object implements Serializable</h3>");
-
-        checkOutput("serialized-form.html", false,
-                "<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass "
-                + "extends java.lang.Object implements Serializable</h3>",
-                "<h3>Class pkg1.PrivateInnerClass.PriInnerClass extends "
-                + "java.lang.Object implements Serializable</h3>",
-                "<h3>Class pkg1.ProtectedInnerClass.ProInnerClass extends "
-                + "java.lang.Object implements Serializable</h3>",
-                "<h3>Class <a href=\"pkg1/PublicExcludeInnerClass.PubInnerClass.html\" "
-                + "title=\"class in pkg1\">pkg1.PublicExcludeInnerClass.PubInnerClass</a> "
-                + "extends java.lang.Object implements Serializable</h3>");
-    }
-
-    /**
-     * @serial
-     * @see TestSerializedForm
-     */
-    public final int SERIALIZABLE_CONSTANT = 1;
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     */
-
-    /**
-     * @param s ObjectInputStream.
-     * @throws IOException when there is an I/O error.
-     * @serial
-     */
-    private void readObject(ObjectInputStream s) throws IOException {}
-
-    /**
-     * @param s ObjectOutputStream.
-     * @throws IOException when there is an I/O error.
-     * @serial
-     */
-    private void writeObject(ObjectOutputStream s) throws IOException {}
-
-    /**
-     * @throws IOException when there is an I/O error.
-     * @serialData This is a serial data comment.
-     * @return an object.
-     */
-    protected Object readResolve() throws IOException {return null;}
-
-    /**
-     * @throws IOException when there is an I/O error.
-     * @serialData This is a serial data comment.
-     * @return an object.
-     */
-    protected Object writeReplace() throws IOException {return null;}
-
-    /**
-     * @throws IOException when there is an I/O error.
-     * @serialData This is a serial data comment.
-     * @return an object.
-     */
-    protected Object readObjectNoData() throws IOException {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java b/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java
deleted file mode 100644
index cd43869833b..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/NestedInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and the inner class is private
- * and a nested inner class is protected.
- *
- * @author      Bhavesh Patel
- */
-
-class NestedInnerClass {
-
-    private static class InnerClass {
-
-        protected static class ProNestedInnerClass implements java.io.Serializable {
-
-            public final int SERIALIZABLE_CONSTANT = 1;
-
-            /**
-             * @param s ObjectInputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void readObject(ObjectInputStream s) throws IOException {
-            }
-
-            /**
-             * @param s ObjectOutputStream.
-             * @throws IOException when there is an I/O error.
-             * @serial
-             */
-            private void writeObject(ObjectOutputStream s) throws IOException {
-            }
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java b/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java
deleted file mode 100644
index a4156e996f6..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PrivateIncludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is private which is included using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PrivateIncludeInnerClass {
-
-    /**
-     * @serial include
-     */
-    private static class PriInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java b/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java
deleted file mode 100644
index 5177765a0f7..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/ProtectedInnerClass.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.io.*;
-
-/**
- * A test class where outer class is package private and the inner class is
- * protected.
- *
- * @author      Bhavesh Patel
- */
-
-class ProtectedInnerClass {
-
-    protected static class ProInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java b/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java
deleted file mode 100644
index 76b69267882..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedForm/pkg1/PublicExcludeInnerClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.io.*;
-
-/**
- * A test class where the outer class is package private and inner class
- * is public which is excluded using the tag.
- *
- * @author      Bhavesh Patel
- */
-
-class PublicExcludeInnerClass {
-
-    /**
-     * @serial exclude
-     */
-    public static class PubInnerClass implements java.io.Serializable {
-
-        public final int SERIALIZABLE_CONSTANT = 1;
-
-        /**
-         * @param s ObjectInputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void readObject(ObjectInputStream s) throws IOException {
-        }
-
-        /**
-         * @param s ObjectOutputStream.
-         * @throws IOException when there is an I/O error.
-         * @serial
-         */
-        private void writeObject(ObjectOutputStream s) throws IOException {
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
deleted file mode 100644
index 3e3d1736a77..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, 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 6802694 8025633 8026567
- * @summary This test verifies deprecation info in serialized-form.html.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSerializedFormDeprecationInfo
- */
-
-public class TestSerializedFormDeprecationInfo extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
-        tester.runTests();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-d", "out-default",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: should be OK
-
-        checkCommentDeprecated(true);
-        checkNoComment(false);
-    }
-
-    @Test
-    void testNoComment() {
-        javadoc("-d", "out-nocmnt",
-                "-nocomment",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: should be OK
-
-        checkNoComment(true);
-        checkCommentDeprecated(false);
-    }
-
-    @Test
-    void testNoDeprecated() {
-        javadoc("-d", "out-nodepr",
-                "-nodeprecated",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: should be OK
-
-        checkNoDeprecated(true);
-        checkNoCommentNoDeprecated(false);
-    }
-
-    @Test
-    void testNoCommentNoDeprecated() {
-        javadoc("-d", "out-nocmnt-nodepr",
-                "-nocomment",
-                "-nodeprecated",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: should be OK
-        checkNoCommentNoDeprecated(true);
-        checkNoDeprecated(false);
-    }
-
-    // Test for normal run of javadoc. The serialized-form.html should
-    // display the inline comments, tags and deprecation information if any.
-    void checkCommentDeprecated(boolean expectFound) {
-        checkOutput("serialized-form.html", expectFound,
-                "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span></dt>\n"
-                + "<dd><code>"
-                + "java.io.IOException</code></dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">This field indicates whether the C1 "
-                + "is undecorated.</div>\n"
-                + "&nbsp;\n"
-                + "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>\n"
-                + "<dt><span class=\"seeLabel\">See Also:</span>"
-                + "</dt>\n"
-                + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "<div class=\"block\">Reads the object stream.</div>\n"
-                + "<dl>\n"
-                + "<dt><span class=\"throwsLabel\">Throws:</span></dt>\n"
-                + "<dd><code>java.io.IOException</code></dd>\n"
-                + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
-                + "&nbsp;</div>\n"
-                + "<div class=\"block\">"
-                + "The name for this class.</div>");
-    }
-
-    // Test with -nocomment option. The serialized-form.html should
-    // not display the inline comments and tags but should display deprecation
-    // information if any.
-    void checkNoComment(boolean expectFound) {
-        checkOutput("serialized-form.html", expectFound,
-                "<pre>boolean undecorated</pre>\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;<span class=\"deprecationComment\">"
-                + "As of JDK version 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>"
-                + "setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "</li>",
-                "<span class=\"deprecatedLabel\">"
-                + "Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version"
-                + " 1.5, replaced by\n"
-                + " <a href=\"pkg1/C1.html#setUndecorated-boolean-\">"
-                + "<code>setUndecorated(boolean)</code></a>.</span></div>\n"
-                + "</li>");
-    }
-
-    // Test with -nodeprecated option. The serialized-form.html should
-    // ignore the -nodeprecated tag and display the deprecation info. This
-    // test is similar to the normal run of javadoc in which inline comment, tags
-    // and deprecation information will be displayed.
-    void checkNoDeprecated(boolean expectFound) {
-        checkCommentDeprecated(expectFound);
-    }
-
-    // Test with -nodeprecated and -nocomment options. The serialized-form.html should
-    // ignore the -nodeprecated tag and display the deprecation info but should not
-    // display the inline comments and tags. This test is similar to the test with
-    // -nocomment option.
-    void checkNoCommentNoDeprecated(boolean expectFound) {
-        checkNoComment(expectFound);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java
deleted file mode 100644
index 60110da8c04..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * A class comment for testing.
- *
- * @author      Bhavesh Patel
- * @see C2
- * @since       JDK1.0
- */
-
-public class C1 implements Serializable {
-
-    /**
-     * This field indicates whether the C1 is undecorated.
-     *
-     * @see #setUndecorated(boolean)
-     * @since 1.4
-     * @serial
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-    public boolean undecorated = false;
-
-    private String title;
-
-    /**
-     * This enum specifies the possible modal exclusion types.
-     *
-     * @since 1.6
-     */
-    public static enum ModalExclusionType {
-        /**
-         * No modal exclusion.
-         */
-        NO_EXCLUDE,
-        /**
-         * <code>APPLICATION_EXCLUDE</code> indicates that a top-level window
-         * won't be blocked by any application-modal dialogs. Also, it isn't
-         * blocked by document-modal dialogs from outside of its child hierarchy.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * Constructor.
-     *
-     * @param title the title
-     * @param test boolean value
-     * @exception IllegalArgumentException if the <code>owner</code>'s
-     *     <code>GraphicsConfiguration</code> is not from a screen device
-     * @exception HeadlessException
-     */
-     public C1(String title, boolean test) {
-
-     }
-
-     public C1(String title) {
-
-     }
-
-    /**
-     * Method comments.
-     * @param  undecorated <code>true</code> if no decorations are
-     *         to be enabled;
-     *         <code>false</code> if decorations are to be enabled.
-     * @see    #readObject()
-     * @since 1.4
-     */
-    public void setUndecorated(boolean undecorated) {
-        /* Make sure we don't run in the middle of peer creation.*/
-    }
-
-    /**
-     * @see #setUndecorated(boolean)
-     */
-    public void readObject() throws IOException {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java
deleted file mode 100644
index 0b67bae0d42..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * A class comment for testing.
- *
- * @author      Bhavesh Patel
- * @see C1
- * @since       JDK1.0
- */
-
-public class C2 implements Serializable {
-
-    /**
-     * This field indicates title.
-     */
-    String title;
-
-    public static enum ModalType {
-        NO_EXCLUDE
-    };
-
-    /**
-     * Constructor.
-     *
-     */
-     public C2() {
-
-     }
-
-     public C2(String title) {
-
-     }
-
-     /**
-     * Set visible.
-     *
-     * @param set boolean
-     * @since 1.4
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-     public void setVisible(boolean set) {
-     }
-
-     /**
-     * Reads the object stream.
-     *
-     * @param s ObjectInputStream
-     * @throws IOException
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-     @Deprecated
-     public void readObject(ObjectInputStream s) throws IOException {
-     }
-}
diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java
deleted file mode 100644
index af9fe3c5993..00000000000
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-
-package pkg1;
-
-import java.io.Serializable;
-
-/**
- * Test for Serializable
- *
- * @author Bhavesh Patel
- * @deprecated This class is no longer used.
- */
-@Deprecated
-public abstract class C3 implements Serializable {
-
-    /**
-     * The name for this class.
-     *
-     * @serial
-     */
-    private String name;
-
-    /**
-     * @serial
-     */
-    private int publicKey;
-
-    /**
-     * Constructor for serialization only.
-     */
-    protected C3() {
-
-    }
-
-    /**
-     * Prints general information.
-     *
-     */
-    public void printInfo() {
-
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTag/C.java b/langtools/test/com/sun/javadoc/testSimpleTag/C.java
deleted file mode 100644
index 1290ccf50e6..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTag/C.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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.
- */
-
-/**
- * @todo This is a comment.
- * @ejb:bean This is a bean.
- * @regular Just a regular simple tag.
- * @back-slash:tag\ a tag that ends with a back slash.
- */
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
deleted file mode 100644
index d452dbca8fa..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4695326 4750173 4920381 8026567
- * @summary Test the declaration of simple tags using -tag. Verify that
- * "-tag name" is a shortcut for "-tag name:a:Name:".  Also verity that
- * you can escape the ":" character with a back slash so that it is not
- * considered a separator when parsing the simple tag argument.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSimpleTag
- */
-
-public class TestSimpleTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSimpleTag tester = new TestSimpleTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-tag", "todo",
-                "-tag", "ejb\\:bean:a:EJB Beans:",
-                "-tag", "regular:a:Regular Tag:",
-                "-tag", "back-slash\\:tag\\\\:a:Back-Slash-Tag:",
-                testSrc("C.java"));
-        // doclint fails because '\' is not allowed in tag name
-        checkExit(Exit.FAILED);
-
-        checkOutput("C.html", true,
-                "<span class=\"simpleTagLabel\">Todo:</span>",
-                "<span class=\"simpleTagLabel\">EJB Beans:</span>",
-                "<span class=\"simpleTagLabel\">Regular Tag:</span>",
-                "<span class=\"simpleTagLabel\">Back-Slash-Tag:</span>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java b/langtools/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java
deleted file mode 100644
index f2b84d9c8c0..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-/******************************
- * @todo Remember to implement
- * this class.
- ******************************/
-public class DummyClass {}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java b/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java
deleted file mode 100644
index 032348f3e70..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4628181
- * @summary Test the parsing of the -tag option.  The user should be able to
- * exclude a simple tag by using -tag tagname:X
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSimpleTagExclude
- */
-
-public class TestSimpleTagExclude extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSimpleTagExclude tester = new TestSimpleTagExclude();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-tag", "todo:X",
-                testSrc("DummyClass.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("DummyClass.html", false,
-                "todo");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java b/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
deleted file mode 100644
index 2071c10a270..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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      8008768 8026567
- * @summary  Using {@inheritDoc} in simple tag defined via -tag fails
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSimpleTagInherit
- */
-
-public class TestSimpleTagInherit extends JavadocTester {
-
-    //Javadoc arguments.
-    private static final String[] ARGS = new String[] {
-
-    };
-
-    //Input for string search tests.
-    private static final String[][] TEST = {
-        {  }
-    };
-
-    public static void main(String... args) throws Exception {
-        TestSimpleTagInherit tester = new TestSimpleTagInherit();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-tag", "custom:optcm:<em>Custom:</em>",
-                "p");
-        checkExit(Exit.OK);
-
-        checkOutput("p/TestClass.html", true,
-                "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>\n"
-                + "<dd>doc for BaseClass class</dd>",
-                "<dt><span class=\"simpleTagLabel\"><em>Custom:</em></span></dt>\n"
-                + "<dd>doc for BaseClass method</dd>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/BaseClass.java b/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/BaseClass.java
deleted file mode 100644
index c7a6e17761b..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/BaseClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013, 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 p;
-
-/**
- * @custom doc for BaseClass class
- */
-public class BaseClass {
-    /**
-     * @custom doc for BaseClass method
-     */
-    public void m() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/TestClass.java b/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/TestClass.java
deleted file mode 100644
index 80c10010db0..00000000000
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/p/TestClass.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2013, 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 p;
-
-/**
- * @custom {@inheritDoc}
- */
-public class TestClass extends BaseClass {
-    /**
-     * @custom {@inheritDoc}
-     */
-    public void m() { }
-}
diff --git a/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java b/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java
deleted file mode 100644
index d71299ef09c..00000000000
--- a/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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      7180906 8026567
- * @summary  Test to make sure that the since tag works correctly
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSinceTag
- */
-
-public class TestSinceTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSinceTag tester = new TestSinceTag();
-        tester.runTests();
-        tester.printSummary();
-    }
-
-    @Test
-    void testSince() {
-        javadoc("-d", "out-since",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: investigate
-
-        checkSince(true);
-    }
-
-    @Test
-    void testNoSince() {
-        javadoc("-d", "out-nosince",
-                "-sourcepath", testSrc,
-                "-nosince",
-                "pkg1");
-        checkExit(Exit.FAILED); // TODO: investigate
-
-        checkSince(false);
-    }
-
-    void checkSince(boolean on) {
-        checkOutput("pkg1/C1.html", on,
-                "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>JDK1.0</dd>");
-
-        checkOutput("serialized-form.html", on,
-                "<dl>\n"
-                + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
-                + "<dd>1.4</dd>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java b/langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java
deleted file mode 100644
index 32cb3bdec49..00000000000
--- a/langtools/test/com/sun/javadoc/testSinceTag/pkg1/C1.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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
- * 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 pkg1;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- * A class comment for testing.
- *
- * @author      Bhavesh Patel
- * @since       JDK1.0
- */
-public class C1 implements Serializable {
-
-    /**
-     * This field indicates whether the C1 is undecorated.
-     *
-     * @see #setUndecorated(boolean)
-     * @since 1.4
-     * @serial
-     * @deprecated As of JDK version 1.5, replaced by
-     * {@link C1#setUndecorated(boolean) setUndecorated(boolean)}.
-     */
-    @Deprecated
-    public boolean undecorated = false;
-
-    /**
-     * This enum specifies the possible modal exclusion types.
-     *
-     * @since 1.6
-     */
-    public static enum ModalExclusionType {
-
-        /**
-         * No modal exclusion.
-         */
-        NO_EXCLUDE,
-        /**
-         * <code>APPLICATION_EXCLUDE</code> indicates that a top-level window
-         * won't be blocked by any application-modal dialogs. Also, it isn't
-         * blocked by document-modal dialogs from outside of its child hierarchy.
-         */
-        APPLICATION_EXCLUDE
-    };
-
-    /**
-     * Constructor.
-     *
-     * @param title the title
-     * @param test boolean value
-     * @exception IllegalArgumentException if the <code>owner</code>'s
-     *     <code>GraphicsConfiguration</code> is not from a screen device
-     * @exception HeadlessException
-     */
-    public C1(String title, boolean test) {
-    }
-
-    public C1(String title) {
-    }
-
-    /**
-     * Method comments.
-     * @param  undecorated <code>true</code> if no decorations are
-     *         to be enabled;
-     *         <code>false</code> if decorations are to be enabled.
-     * @see    #readObject()
-     * @since 1.4
-     */
-    public void setUndecorated(boolean undecorated) {
-        /* Make sure we don't run in the middle of peer creation.*/
-    }
-
-    /**
-     * @see #setUndecorated(boolean)
-     */
-    public void readObject() throws IOException {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java b/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java
deleted file mode 100644
index 78e8d26fdce..00000000000
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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 6457406
- * @summary Verify that a link in single quotes copied to the class-use page as is.
- * @author Yuri Nesterenko
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSingleQuotedLink
- */
-public class TestSingleQuotedLink extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSingleQuotedLink tester = new TestSingleQuotedLink();
-        tester.runTests();
-    }
-
-    @Test
-    void run() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg1");
-        checkExit(Exit.OK);
-
-        // We are testing the redirection algorithm with a known scenario when a
-        // writer is not forced to ignore it: "-use".
-
-        checkOutput("pkg1/class-use/C1.html", true,
-            "<a href=\'http://download.oracle.com/javase/8/docs/technotes/guides/indexC2.html\'>");
-
-        checkOutput("pkg1/class-use/C1.html", false,
-            "pkg1/\'http://download.oracle.com/javase/8/docs/technotes/guides/indexC2.html\'>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java b/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java
deleted file mode 100644
index 7c1faaf4aba..00000000000
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C1.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * Class 1. This is a test.
- */
-public class C1 {}
diff --git a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java b/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java
deleted file mode 100644
index 40a65f2ea8f..00000000000
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/C2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * Class 2 refers to <a href='http://download.oracle.com/javase/8/docs/technotes/guides/indexC2.html'>Here</a>.
- * This is a single quoted link.
- */
-public class C2 extends C1 {}
-
diff --git a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html b/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html
deleted file mode 100644
index ea1a8f38cfd..00000000000
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/pkg1/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>javax.management package</title>
-</head>
-<body bgcolor="white">
-    This is a test.
-    <p id="spec">
-        <a href='http://download.oracle.com/javase/8/docs/technotes/guides/indexdocument.html'>
-            Another Test document 2.</a> Single quotes also but as of now, package-summary writer excluded from redirection algorithm.
-
-        @since 1.5
-
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java b/langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java
deleted file mode 100644
index 0d73ba513ac..00000000000
--- a/langtools/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, 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.
- */
-
-/**
- * <pre>
- * \t\tThis source
- * \t\tis indented
- * \t\twith tabs.
- * </pre>
- */
-public class C {
-
-\t\t//This source
-\t\t//is indented
-\t\t//with tabs.
-
-}
diff --git a/langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java b/langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java
deleted file mode 100644
index 71aaf080eb7..00000000000
--- a/langtools/test/com/sun/javadoc/testSourceTab/SingleTab/C.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, 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.
- */
-
-/**
- * <pre>
- *\tThis source
- * \tis indented
- * \twith tabs.
- * </pre>
- */
-public class C {
-
-\t//This source
-\t//is indented
-\t//with tabs.
-
-}
diff --git a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
deleted file mode 100644
index 43753f03cc5..00000000000
--- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4510979
- * @summary Test to make sure that the source documentation is indented properly
- * when -linksourcetab is used.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSourceTab
- */
-
-import java.io.*;
-
-public class TestSourceTab extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSourceTab tester = new TestSourceTab();
-        tester.runTests();
-    }
-
-    @Test
-    void test() throws Exception {
-        String tmpSrcDir = "tmpSrc";
-        String outdir1 = "out-tabLengthEight";
-        String outdir2 = "out-tabLengthFour";
-        initTabs(new File(testSrc), new File(tmpSrcDir));
-
-        // Run Javadoc on a source file with that is indented with a single tab per line
-        javadoc("-d", outdir1,
-                "-sourcepath", tmpSrcDir,
-                "-notimestamp",
-                "-linksource",
-                tmpSrcDir + "/SingleTab/C.java");
-        checkExit(Exit.OK);
-
-        // Run Javadoc on a source file with that is indented with a two tab per line
-        // If we double the tabs and decrease the tab length by a half, the output should
-        // be the same as the one generated above.
-        javadoc("-d", outdir2,
-                "-sourcepath", tmpSrcDir,
-                "-notimestamp",
-                "-sourcetab", "4",
-                tmpSrcDir + "/DoubleTab/C.java");
-        checkExit(Exit.OK);
-
-        diff(outdir1, outdir2,
-                "src-html/C.html",
-                "C.html");
-    }
-
-    void initTabs(File from, File to) throws IOException {
-        for (File f: from.listFiles()) {
-            File t = new File(to, f.getName());
-            if (f.isDirectory()) {
-                initTabs(f, t);
-            } else if (f.getName().endsWith(".java")) {
-                write(t, read(f).replace("\\t", "\t"));
-            }
-        }
-    }
-
-    String read(File f) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        try (BufferedReader in = new BufferedReader(new FileReader(f))) {
-            String line;
-            while ((line = in.readLine()) != null) {
-                sb.append(line);
-                sb.append(NL);
-            }
-        }
-        return sb.toString();
-    }
-
-    void write(File f, String s) throws IOException {
-        f.getParentFile().mkdirs();
-        try (Writer out = new FileWriter(f)) {
-            out.write(s);
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
deleted file mode 100644
index 23340e5af3f..00000000000
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2005, 2015, 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      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461
- * @summary  Run tests on doclet stylesheet.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestStylesheet
- */
-
-public class TestStylesheet extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestStylesheet tester = new TestStylesheet();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        // TODO: most of this test seems a bit silly, since javadoc is simply
-        // copying in the stylesheet from the source directory
-        checkOutput("stylesheet.css", true,
-                "/* Javadoc style sheet */",
-                "/*\n"
-                + "Overall document style\n"
-                + "*/",
-                "/*\n"
-                + "Heading styles\n"
-                + "*/",
-                "/*\n"
-                + "Navigation bar styles\n"
-                + "*/",
-                "body {\n"
-                + "    background-color:#ffffff;\n"
-                + "    color:#353833;\n"
-                + "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;\n"
-                + "    font-size:14px;\n"
-                + "    margin:0;\n"
-                + "    padding:0;\n"
-                + "    height:100%;\n"
-                + "    width:100%;\n"
-                + "}",
-                "iframe {\n"
-                + "    margin:0;\n"
-                + "    padding:0;\n"
-                + "    height:100%;\n"
-                + "    width:100%;\n"
-                + "    overflow-y:scroll;\n"
-                + "    border:none;\n"
-                + "}",
-                "ul {\n"
-                + "    list-style-type:disc;\n"
-                + "}",
-                ".overviewSummary caption, .memberSummary caption, .typeSummary caption,\n"
-                + ".useSummary caption, .constantsSummary caption, .deprecatedSummary caption {\n"
-                + "    position:relative;\n"
-                + "    text-align:left;\n"
-                + "    background-repeat:no-repeat;\n"
-                + "    color:#253441;\n"
-                + "    font-weight:bold;\n"
-                + "    clear:none;\n"
-                + "    overflow:hidden;\n"
-                + "    padding:0px;\n"
-                + "    padding-top:10px;\n"
-                + "    padding-left:1px;\n"
-                + "    margin:0px;\n"
-                + "    white-space:pre;\n"
-                + "}",
-                ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,\n"
-                + ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {\n"
-                + "    white-space:nowrap;\n"
-                + "    padding-top:5px;\n"
-                + "    padding-left:12px;\n"
-                + "    padding-right:12px;\n"
-                + "    padding-bottom:7px;\n"
-                + "    display:inline-block;\n"
-                + "    float:left;\n"
-                + "    background-color:#F8981D;\n"
-                + "    border: none;\n"
-                + "    height:16px;\n"
-                + "}",
-                ".memberSummary caption span.activeTableTab span {\n"
-                + "    white-space:nowrap;\n"
-                + "    padding-top:5px;\n"
-                + "    padding-left:12px;\n"
-                + "    padding-right:12px;\n"
-                + "    margin-right:3px;\n"
-                + "    display:inline-block;\n"
-                + "    float:left;\n"
-                + "    background-color:#F8981D;\n"
-                + "    height:16px;\n"
-                + "}",
-                ".memberSummary caption span.tableTab span {\n"
-                + "    white-space:nowrap;\n"
-                + "    padding-top:5px;\n"
-                + "    padding-left:12px;\n"
-                + "    padding-right:12px;\n"
-                + "    margin-right:3px;\n"
-                + "    display:inline-block;\n"
-                + "    float:left;\n"
-                + "    background-color:#4D7A97;\n"
-                + "    height:16px;\n"
-                + "}",
-                // Test the formatting styles for proper content display in use and constant values pages.
-                ".overviewSummary td.colFirst, .overviewSummary th.colFirst,\n"
-                + ".useSummary td.colFirst, .useSummary th.colFirst,\n"
-                + ".overviewSummary td.colOne, .overviewSummary th.colOne,\n"
-                + ".memberSummary td.colFirst, .memberSummary th.colFirst,\n"
-                + ".memberSummary td.colOne, .memberSummary th.colOne,\n"
-                + ".typeSummary td.colFirst{\n"
-                + "    width:25%;\n"
-                + "    vertical-align:top;\n"
-                + "}",
-                ".overviewSummary td, .memberSummary td, .typeSummary td,\n"
-                + ".useSummary td, .constantsSummary td, .deprecatedSummary td {\n"
-                + "    text-align:left;\n"
-                + "    padding:0px 0px 12px 10px;\n"
-                + "}",
-                ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {\n"
-                + "    padding-top:0px;\n"
-                + "    padding-left:0px;\n"
-                + "    padding-right:0px;\n"
-                + "    background-image:none;\n"
-                + "    float:none;\n"
-                + "    display:inline;\n"
-                + "}",
-                "@import url('resources/fonts/dejavu.css');");
-
-        // Test whether a link to the stylesheet file is inserted properly
-        // in the class documentation.
-        checkOutput("pkg/A.html", true,
-                "<link rel=\"stylesheet\" type=\"text/css\" "
-                + "href=\"../stylesheet.css\" title=\"Style\">");
-
-        checkOutput("index.html", true,
-                "<link rel=\"stylesheet\" type=\"text/css\" href=\"stylesheet.css\" title=\"Style\">");
-
-        checkOutput("stylesheet.css", false,
-                "* {\n"
-                + "    margin:0;\n"
-                + "    padding:0;\n"
-                + "}");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testStylesheet/pkg/A.java b/langtools/test/com/sun/javadoc/testStylesheet/pkg/A.java
deleted file mode 100644
index 1392ef8c1b1..00000000000
--- a/langtools/test/com/sun/javadoc/testStylesheet/pkg/A.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg;
-
-public class A {}
diff --git a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java
deleted file mode 100644
index f4c535a3030..00000000000
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 7010342
- * @summary Test for correct sub title generation.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSubTitle
- */
-
-public class TestSubTitle extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSubTitle tester = new TestSubTitle();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/package-summary.html", true,
-            "<div class=\"block\">This is the description of package pkg.</div>");
-
-        checkOutput("pkg/C.html", true,
-                "<div class=\"subTitle\"><span class=\"packageLabelInClass\">Package</span>&nbsp;"
-                + "<a href=\"../pkg/package-summary.html\" target=\"classFrame\">pkg</a></div>");
-
-        checkOutput("pkg/package-summary.html", false,
-            "<p class=\"subTitle\">\n" +
-            "<div class=\"block\">This is the " +
-            "description of package pkg.</div>\n" +
-            "</p>");
-
-        checkOutput("pkg/C.html", false,
-            "<p class=\"subTitle\">pkg</p>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSubTitle/pkg/C.java b/langtools/test/com/sun/javadoc/testSubTitle/pkg/C.java
deleted file mode 100644
index d24a6e7b633..00000000000
--- a/langtools/test/com/sun/javadoc/testSubTitle/pkg/C.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 pkg;
-
-/**
- * Source file for C
- */
-public class C {
-}
diff --git a/langtools/test/com/sun/javadoc/testSubTitle/pkg/package.html b/langtools/test/com/sun/javadoc/testSubTitle/pkg/package.html
deleted file mode 100644
index 87866aa7889..00000000000
--- a/langtools/test/com/sun/javadoc/testSubTitle/pkg/package.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html lang="en">
-<head>
-    <title>Package Summary</title>
-</head>
-<body>
-This is the description of package pkg.
-</body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testSummaryHeading/C.java b/langtools/test/com/sun/javadoc/testSummaryHeading/C.java
deleted file mode 100644
index d147801ce46..00000000000
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/C.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
deleted file mode 100644
index 124c1e1d31a..00000000000
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4904036
- * @summary  Document a class that does not have any methods to document.  The
- *           "Method Summary" heading should still show up since the class
- *           inherits methods.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSummaryHeading
- */
-
-public class TestSummaryHeading extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSummaryHeading tester = new TestSummaryHeading();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<h3>Method Summary</h3>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java
deleted file mode 100644
index 6ae60fd5348..00000000000
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4671694
- * @summary Test to make sure link to superclass is generated for
- * each class in serialized form page.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSuperClassInSerialForm
- */
-
-public class TestSuperClassInSerialForm extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSuperClassInSerialForm tester = new TestSuperClassInSerialForm();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("serialized-form.html", true,
-                "<a href=\"pkg/SubClass.html\" title=\"class in pkg\">pkg.SubClass</a>"
-                + " extends <a href=\"pkg/SuperClass.html\" title=\"class in pkg\">SuperClass</a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java
deleted file mode 100644
index d6456d58524..00000000000
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class SubClass extends SuperClass implements java.io.Serializable {}
diff --git a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java
deleted file mode 100644
index 465c230cc27..00000000000
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class SuperClass implements java.io.Serializable {}
diff --git a/langtools/test/com/sun/javadoc/testSupplementary/C.java b/langtools/test/com/sun/javadoc/testSupplementary/C.java
deleted file mode 100644
index 7c90f68238e..00000000000
--- a/langtools/test/com/sun/javadoc/testSupplementary/C.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* /nodynamiccopyright/ */
-
-public class C
-{
-    // U+10400 (\ud801\udc00): DESERET CAPITAL LETTER LONG I (can be start or part)
-    // U+1D17B (\ud834\udd7b): MUSICAL SYMBOL COMBINING ACCENT (can only be part)
-    // U+1D100 (\ud834\udd00): MUSICAL SYMBOL SINGLE BARLINE (can be none of start nor part)
-
-    // valid tags
-
-    /**
-     * @see C#\ud801\udc00method()
-     */
-    public void \ud801\udc00method() {};
-
-    /**
-     * @see C#method\ud801\udc00()
-     */
-    public void method\ud801\udc00() {};
-
-    /**
-     * @see C#method\ud834\udd7b()
-     */
-    public void method\ud834\udd7b() {};
-
-    /**
-     * @serialField \ud801\udc00field int
-     * @serialField field\ud801\udc00 int
-     * @serialField field\ud834\udd7b int
-     */
-    public void method1() {};
-
-    // invalid tags - should generate warnings
-
-    /**
-     * @see C#method\ud834\udd00()
-     */
-    public void method2() {};
-
-    /**
-     * @serialField field\ud801\ud801 int
-     * @serialField \ud834\udd7bfield int
-     */
-    public void method3() {};
-}
diff --git a/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java b/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java
deleted file mode 100644
index 2d327690181..00000000000
--- a/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 4914724
- * @summary Test to make sure that "see" tag and "serialField" tag handle supplementary
- *    characters correctly.  This test case needs to be run in en_US locale.
- * @author Naoto Sato
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestSupplementary
- */
-
-import java.util.Locale;
-
-public class TestSupplementary extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        Locale saveLocale = Locale.getDefault();
-        try {
-            TestSupplementary tester = new TestSupplementary();
-            tester.runTests();
-        } finally {
-            Locale.setDefault(saveLocale);
-        }
-    }
-
-    @Test
-    void test() {
-        javadoc("-locale", "en_US",
-                "-d", "out",
-                testSrc("C.java"));
-        checkExit(Exit.FAILED);
-
-        checkOutput(Output.WARNING, true,
-            "C.java:38: warning - Tag @see:illegal character: \"119040\" in \"C#method\ud834\udd00()",
-            "C.java:44: warning - illegal character \ud801 in @serialField tag: field\ud801\ud801 int.",
-            "C.java:44: warning - illegal character \ud834\udd7b in @serialField tag: \ud834\udd7bfield int.");
-
-        // TODO: do we need to specify the file and line number in these messages?
-        checkOutput(Output.WARNING,  false,
-            "C.java:14: warning - Tag @see:illegal character",
-            "C.java:19: warning - Tag @see:illegal character",
-            "C.java:24: warning - Tag @see:illegal character",
-            "C.java:31: warning - illegal character");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java b/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java
deleted file mode 100644
index 94281f455d6..00000000000
--- a/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4706525
- * @summary Determine if the new Tag.holder() method works properly.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @build TestTagHolderMethod
- * @run main TestTagHolderMethod
- */
-
-import com.sun.javadoc.*;
-
-public class TestTagHolderMethod extends JavadocTester {
-
-    /**
-     * Doclet entry point.
-     */
-    public static boolean start(RootDoc root) throws Exception {
-        ClassDoc[] classes = root.classes();
-        for (int i = 0; i < classes.length; i++) {
-            checkHolders(classes[i].fields());
-            checkHolders(classes[i].constructors());
-            checkHolders(classes[i].methods());
-            checkHolders(classes[i].innerClasses());
-        }
-        return true;
-    }
-
-    private static void checkHolders(Doc[] holders) throws Exception {
-        for (Doc holder : holders) {
-            Tag[] tags = holder.tags();
-            for (Tag tag : tags) {
-                if (!tag.holder().name().equals(holder.name())) {
-                    throw new Exception("The holder method does not return the correct Doc object.");
-                } else {
-                    System.out.println(tag.name() + " is held by " + holder.name());
-                }
-            }
-        }
-    }
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        JavadocTester tester = new TestTagHolderMethod();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-docletpath", testSrc, // unlikely to be effective
-                "-doclet", "TestTagHolderMethod",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java b/langtools/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java
deleted file mode 100644
index a03c77a5e55..00000000000
--- a/langtools/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/**
- * @author Jamie Ho
- */
-
-public class C {
-
-    /**
-     * @see www.yahoo.com
-     */
-    public int field;
-
-    /**
-     * @see www.yahoo.com
-     */
-    public C() {}
-
-    /**
-     * @see www.yahoo.com
-     */
-    public void method(){}
-
-    /**
-     * @see www.yahoo.com
-     */
-    public class innerClass {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
deleted file mode 100644
index 3a1ec3d3fd1..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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     4496223 4496270 4618686 4720974 4812240 6253614 6253604
- * @summary <DESC>
- * @author  jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestTagInheritence
- */
-
-// TODO: Inheritence should be Inheritance!   fix separately as noreg-trivial
-public class TestTagInheritence extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTagInheritence tester = new TestTagInheritence();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                "-sourcepath", testSrc,
-                "pkg", "firstSentence", "firstSentence2");
-        checkExit(Exit.OK);
-
-        //Test bad inheritDoc tag warning.
-        checkOutput(Output.WARNING, true,
-                "warning - @inheritDoc used but testBadInheritDocTag() "
-                + "does not override or implement any method.");
-
-        //Test valid usage of inheritDoc tag.
-        for (int i = 1; i < 40; i++) {
-            checkOutput("pkg/TestTagInheritence.html", true,
-                    "Test " + i + " passes");
-        }
-
-        //First sentence test (6253614)
-        checkOutput("firstSentence/B.html", true,
-                "<div class=\"block\">First sentence.</div>");
-
-        //Another first sentence test (6253604)
-        checkOutput("firstSentence2/C.html", true,
-                "<div class=\"block\">First sentence.</div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java b/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java
deleted file mode 100644
index 4a061174f03..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 firstSentence;
-
-public class A {
-    /**
-     * First sentence.  Second sentence.
-     */
-    public void m() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java b/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java
deleted file mode 100644
index 9401993ee9a..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 firstSentence;
-
-public class B extends A {
-    /**
-     * {@inheritDoc} Third sentence.  Fourth sentence.
-     */
-    public void m() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java b/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java
deleted file mode 100644
index c8d5b9a5b12..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 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 firstSentence2;
-
-public class A {
-    /**
-     * First sentence.  Second sentence.
-     */
-    public void m() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java b/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java
deleted file mode 100644
index a4dfac78006..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2005, 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 firstSentence2 ;
-
-public class B extends A {
-    /**
-     * {@inheritDoc}
-     *
-     * <p>Third sentence.  Fourth sentence.
-     */
-    public void m() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java b/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java
deleted file mode 100644
index ccd97439453..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2005, 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 firstSentence2;
-
-public class C extends B {
-    /**
-     * {@inheritDoc}
-     *
-     * <p>Fifth sentence.  Sixth sentence.
-     */
-    public void m() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java
deleted file mode 100644
index 257057ead35..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, 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 pkg;
-
-import java.util.*;
-import java.lang.*;
-import java.io.*;
-import java.util.zip.*;
-
-public abstract class TestAbstractClass extends TestSuperSuperClass
-    implements TestInterfaceForAbstractClass {
-
-  /**
-   * Test 1 passes.
-   * @param p1 Test 2 passes.
-   * @param p2 Test 3 passes.
-   * @return a string.
-   * @throws java.io.IOException Test 4 passes.
-   * @throws java.lang.NullPointerException Test 5 passes.
-   * @see java.lang.String
-   * @see java.util.Vector
-   */
-  public String testAbstractClass_method1(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException {
-      return null;
-  }
-
-  /**
-   * Test 6 passes.
-   * @param p1 Test 7 passes.
-   * @param p2 Test 8 passes.
-   * @return a string.
-   * @throws java.io.IOException Test 9 passes.
-   * @throws java.lang.NullPointerException Test 10 passes
-   * @see java.lang.String
-   * @see java.util.Vector
-   */
-  public String testAbstractClass_method2(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException {
-      return null;
-  }
-
-    /**
-     * Test 31 passes.
-     * @param <Q> Test 33 passes.
-     * @param x2 Test 35 passes.
-     * @throws java.io.IOException Test 37 passes.
-     * @throws java.util.zip.ZipException Test 39 passes.
-     */
-    public <P,Q> String testSuperSuperMethod2(int x1, int x2) {
-        return null;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java
deleted file mode 100644
index e017df03995..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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 pkg;
-
-import java.util.*;
-import java.lang.*;
-import java.io.*;
-
-public interface TestInterface {
-
-  /**
-   * Test 11 passes.
-   * @param p1 Test 12 passes.
-   * @param p2 Test 13 passes.
-   * @return a string.
-   * @throws java.io.IOException Test 14 passes.
-   * @throws java.lang.NullPointerException Test 15 passes.
-   * @see java.lang.String
-   * @see java.util.Vector
-   */
-  public String testInterface_method1(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException;
-
-  /**
-   * Test 16 passes.
-   * @param p1 Test 17 passes.
-   * @param p2 Test 18 passes.
-   * @return a string.
-   * @throws java.io.IOException Test 19 passes.
-   * @throws java.lang.NullPointerException Test 20 passes.
-   * @see java.lang.String
-   * @see java.util.Vector
-   */
-  public String testInterface_method2(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java
deleted file mode 100644
index a8e4f0c0de5..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, 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 pkg;
-
-public interface TestInterfaceForAbstractClass extends TestSuperSuperInterface {
-    /**
-     * Test 21 passes.
-     */
-    public void methodInTestInterfaceForAbstractClass();
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java
deleted file mode 100644
index 3d886df03a3..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class TestSuperSuperClass {
-
-    /**
-     * Test 23 passes.
-     * @param <P> Test 24 passes.
-     * @param <Q> Test 25 passes.
-     * @param x1 Test 26 passes.
-     * @param x2 Test 27 passes.
-     * @return Test 28 passes.
-     * @throws java.io.IOException Test 29 passes.
-     * @throws java.lang.NullPointerException Test 30 passes.
-     */
-    public <P,Q> String testSuperSuperMethod(int x1, int x2) {
-        return null;
-    }
-
-    /**
-     * @param <P> Test 32 passes.
-     * @param x1 Test 34 passes.
-     * @return Test 36 passes.
-     * @throws java.lang.NullPointerException Test 38 passes.
-     */
-    public <P,Q> String testSuperSuperMethod2(int x1, int x2) {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java
deleted file mode 100644
index 12597681db0..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public interface TestSuperSuperInterface {
-
-    /**
-     * Test 22 passes.
-     */
-    public void testSuperSuperMethod();
-}
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java b/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java
deleted file mode 100644
index c2accc04b81..00000000000
--- a/langtools/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2001, 2003, 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 pkg;
-
-import java.lang.*;
-import java.io.*;
-
-public class TestTagInheritence extends TestAbstractClass implements TestInterface{
-
-  //This method below tests tag inheritence from a class.
-
-
-  public String testAbstractClass_method1(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException {
-      return null;
-  }
-
-  /**
-   * This method tests @inheritDoc with a class.  Here is the inherited comment:<br>
-   * {@inheritDoc}
-   * @param p1 {@inheritDoc}
-   * @param p2 {@inheritDoc}
-   * @return {@inheritDoc}
-   * @throws java.io.IOException {@inheritDoc}
-   * @throws java.lang.NullPointerException {@inheritDoc}
-   */
-  public String testAbstractClass_method2(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException {
-      return null;
-  }
-
-  public String testInterface_method1(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException
-  {
-      return null;
-  }
-
-  /**
-   * This method tests @inheritDoc with an inteface.  Here is the inherited comment:<br>
-   * {@inheritDoc}
-   * @param p1 {@inheritDoc}
-   * @param p2 {@inheritDoc}
-   * @return {@inheritDoc}
-   * @throws java.io.IOException {@inheritDoc}
-   * @throws java.lang.NullPointerException {@inheritDoc}
-   */
-  public String testInterface_method2(int p1, int p2) throws java.io.IOException,
-java.lang.NullPointerException {
-      return null;
-  }
-
-    /**
-     * Here is the documentation that I should inherit from
-     * the interface implemented by my superclass.
-     * {@inheritDoc}
-     */
-    public void methodInTestInterfaceForAbstractClass() {}
-
-    /**
-     * {@inheritDoc}
-     */
-    public void testSuperSuperMethod() {}
-
-    /**
-     * Test inheritDoc warning message:
-     * {@inheritDoc}
-     */
-    public void testBadInheritDocTag () {}
-
-    /**
-     * {@inheritDoc}
-     * @param <X> {@inheritDoc}
-     * @param <Y> {@inheritDoc}
-     * @param p1 {@inheritDoc}
-     * @param p2 {@inheritDoc}
-     * @return {@inheritDoc}
-     * @throws java.io.IOException {@inheritDoc}
-     * @throws java.lang.NullPointerException {@inheritDoc}
-     */
-    public <X,Y> String testSuperSuperMethod(int p1, int p2) {
-        return null;
-    }
-
-    public <X,Y> String testSuperSuperMethod2(int p1, int p2)
-    throws java.io.IOException, java.lang.NullPointerException {
-        return null;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java
deleted file mode 100644
index 09138a509e7..00000000000
--- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2001, 2015, 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 Determine if proper warning messages are printed when know.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @build TestTagMisuse
- * @run main TestTagMisuse
- */
-public class TestTagMisuse extends JavadocTester {
-
-    /**
-     * The entry point of the test.
-     * @param args the array of command line arguments.
-     * @throws Exception if the test fails
-     */
-    public static void main(String... args) throws Exception {
-        TestTagMisuse tester = new TestTagMisuse();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                testSrc("TestTagMisuse.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, true,
-                "warning - Tag @param cannot be used in field documentation.",
-                "warning - Tag @throws cannot be used in field documentation.",
-                "warning - Tag @return cannot be used in constructor documentation.",
-                "warning - Tag @throws cannot be used in inline documentation.");
-    }
-
-    /**
-     * {@throws blah}
-     * Here is a bad field tag:
-     * @throws foo
-     * @param foo.
-     */
-    public int field;
-
-    /**
-     * Here is a bad constructor tag:
-     * @return blah
-     */
-    public TestTagMisuse(){}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java b/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java
deleted file mode 100644
index 9c33514f864..00000000000
--- a/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8026370 8026567
- * @summary This test checks the generated tag output.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestTagOutput
- */
-
-public class TestTagOutput extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTagOutput tester = new TestTagOutput();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg1");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg1/DeprecatedTag.html", true,
-            "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>",
-            "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;" +
-            "<span class=\"deprecationComment\">Do not use this.</span></div>");
-
-        checkOutput("pkg1/DeprecatedTag.html", false,
-            "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated." +
-            "</span>&nbsp;<span class=\"deprecationComment\"></span></div>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTagOutput/pkg1/DeprecatedTag.java b/langtools/test/com/sun/javadoc/testTagOutput/pkg1/DeprecatedTag.java
deleted file mode 100644
index cfb6d2348d7..00000000000
--- a/langtools/test/com/sun/javadoc/testTagOutput/pkg1/DeprecatedTag.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2013, 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 pkg1;
-
-public class DeprecatedTag {
-
-    /**
-     * This method is deprecated.
-     *
-     * @deprecated
-     */
-    public void deprecatedMethod() {
-    }
-
-    /**
-     * This method is also deprecated.
-     *
-     * @deprecated Do not use this.
-     */
-    public void deprecatedMethodWithDesc() {
-    }
-}
-
diff --git a/langtools/test/com/sun/javadoc/testTaglets/C.java b/langtools/test/com/sun/javadoc/testTaglets/C.java
deleted file mode 100644
index 6f755db3c04..00000000000
--- a/langtools/test/com/sun/javadoc/testTaglets/C.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-/**
- * @foo my only method is {@link #method here}
- */
-public class C {
-
-    public void method(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testTaglets/Child.java b/langtools/test/com/sun/javadoc/testTaglets/Child.java
deleted file mode 100644
index 8a947662f9d..00000000000
--- a/langtools/test/com/sun/javadoc/testTaglets/Child.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class Child extends Parent {
-
-    /**
-     * {@inheritDoc}
-     */
-    public void method(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testTaglets/Parent.java b/langtools/test/com/sun/javadoc/testTaglets/Parent.java
deleted file mode 100644
index 7e95874ce26..00000000000
--- a/langtools/test/com/sun/javadoc/testTaglets/Parent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-public class Parent {
-
-    /**
-     * This is the first sentence.  This is the second sentence.
-     */
-    public void method(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
deleted file mode 100644
index c309e8cb891..00000000000
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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      4654308 4767038 8025633
- * @summary  Use a Taglet and include some inline tags such as {@link}.  The
- *           inline tags should be interpreted properly.
- *           Run Javadoc on some sample source that uses {@inheritDoc}.  Make
- *           sure that only the first sentence shows up in the summary table.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
- * @build    JavadocTester taglets.Foo
- * @run main TestTaglets
- */
-
-public class TestTaglets extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTaglets tester = new TestTaglets();
-        tester.runTests();
-    }
-
-    @Test
-    void test_4654308() {
-        javadoc("-d", "out-4654308",
-                "-tagletpath", testSrc, // TODO: probably does no good
-                "-taglet", "taglets.Foo",
-                "-sourcepath", testSrc,
-                "-XDaccessInternalAPI",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<span class=\"simpleTagLabel\">Foo:</span></dt>"
-                + "<dd>my only method is <a href=\"C.html#method--\"><code>here"
-                + "</code></a></dd></dl>");
-    }
-
-    @Test
-    void test_4767038() {
-        javadoc("-d", "out-4767038",
-                "-sourcepath", testSrc,
-                testSrc("Parent.java"), testSrc("Child.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("Child.html", true,
-                "This is the first sentence.");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java b/langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java
deleted file mode 100644
index 731f253dd49..00000000000
--- a/langtools/test/com/sun/javadoc/testTaglets/taglets/Foo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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 taglets;
-
-import java.util.*;
-
-import com.sun.javadoc.*;
-
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
-
-public class Foo extends BaseTaglet {
-
-    public Foo() {
-        name = "foo";
-    }
-
-    public static void register(Map tagletMap) {
-       Foo tag = new Foo();
-       Taglet t = (Taglet) tagletMap.get(tag.getName());
-       if (t != null) {
-           tagletMap.remove(tag.getName());
-       }
-       tagletMap.put(tag.getName(), tag);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Content getTagletOutput(Tag tag, TagletWriter writer) {
-        ArrayList inlineTags = new ArrayList();
-        inlineTags.add(new TextTag(tag.holder(), "<dt><span class=\"simpleTagLabel\">Foo:</span></dt><dd>"));
-        inlineTags.addAll(Arrays.asList(tag.inlineTags()));
-        inlineTags.add(new TextTag(tag.holder(), "</dd>"));
-        return writer.commentTagsToOutput(tag,
-                (Tag[]) inlineTags.toArray(new Tag[] {}));
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsHead/C.java b/langtools/test/com/sun/javadoc/testThrowsHead/C.java
deleted file mode 100644
index 48bf07d7beb..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsHead/C.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public class C {
-    public void method() throws IllegalArgumentException {}
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
deleted file mode 100644
index 950ae0568f0..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4530727 8026567
- * @summary When an exception is declared in the method signature but
- * not documented with a throws tag, we generate a link to it in the
- * throws section.  Make sure that the link is below a Throws heading.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestThrowsHead
- */
-
-public class TestThrowsHead extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestThrowsHead tester = new TestThrowsHead();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("C.html", true,
-                "<dt><span class=\"throwsLabel\">Throws:</span>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsInheritence/C.java b/langtools/test/com/sun/javadoc/testThrowsInheritence/C.java
deleted file mode 100644
index a308da62da5..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/C.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public class C implements I {
-
-    /**
-     * @throws NullPointerException Test 1 passes.
-     */
-    public void method() throws NullPointerException {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsInheritence/Foo.java b/langtools/test/com/sun/javadoc/testThrowsInheritence/Foo.java
deleted file mode 100644
index 5b5260e00e8..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/Foo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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.io.*;
-
-public class Foo implements Iface {
-    /**
-     * Foo doc.
-     *
-     * @throws EOFException {@inheritDoc}
-     */
-    public void foo() throws IOException {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsInheritence/I.java b/langtools/test/com/sun/javadoc/testThrowsInheritence/I.java
deleted file mode 100644
index 2db7dbaa724..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/I.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public interface I {
-    /**
-     * @throws java.lang.NullPointerException Test 1 fails
-     */
-    public void method() throws NullPointerException;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsInheritence/Iface.java b/langtools/test/com/sun/javadoc/testThrowsInheritence/Iface.java
deleted file mode 100644
index 349eab38d85..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/Iface.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002, 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.io.IOException;
-
-public interface Iface {
-    /**
-     * Iface doc.
-     *
-     * @throws java.io.EOFException Test 1 passes.
-     * @throws IOException if I/O exception occurs
-     */
-    void foo() throws IOException;
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java b/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java
deleted file mode 100644
index 38340c69dc3..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4684827 4633969
- * @summary This test verifies that throws tags in implementing class
- * override the throws tags in interface. This test also verifies that throws tags are inherited properly
- * the case where the name of one exception is not fully qualified.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestThrowsTagInheritence
- */
-
-// TODO: should be TestThrowsInheritance!
-public class TestThrowsTagInheritence extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestThrowsTagInheritence tester = new TestThrowsTagInheritence();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"),
-                testSrc("I.java"),
-                testSrc("Foo.java"),
-                testSrc("Iface.java"));
-        checkExit(Exit.OK);
-
-        // The class should not inherit the tag from the interface.
-        checkOutput("Foo.html", true,
-                "Test 1 passes.");
-
-        //The class should not inherit the tag from the interface.
-        checkOutput("C.html", false,
-                "Test 1 fails.");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java
deleted file mode 100644
index c33fb926836..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4985072
- * @summary  Test to make sure that exceptions always show up in the
- *           correct order.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestThrowsTag
- */
-
-public class TestThrowsTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestThrowsTag tester = new TestThrowsTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.FAILED);  // TODO: investigate why failed
-
-        checkOutput("pkg/C.html", true,
-            "<dd><code><a href=\"../pkg/T1.html\" title=\"class in pkg\">T1</a></code> - the first throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T2.html\" title=\"class in pkg\">T2</a></code> - the second throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T3.html\" title=\"class in pkg\">T3</a></code> - the third throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T4.html\" title=\"class in pkg\">T4</a></code> - the fourth throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T5.html\" title=\"class in pkg\">T5</a></code> - the first inherited throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T6.html\" title=\"class in pkg\">T6</a></code> - the second inherited throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T7.html\" title=\"class in pkg\">T7</a></code> - the third inherited throws tag.</dd>\n" +
-            "<dd><code><a href=\"../pkg/T8.html\" title=\"class in pkg\">T8</a></code> - the fourth inherited throws tag.</dd>"
-        );
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/C.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/C.java
deleted file mode 100644
index 7244c75bce6..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/C.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class C extends P {
-
-    /**
-     * @throws T1 the first throws tag.
-     * @throws T2 the second throws tag.
-     * @throws T3 the third throws tag.
-     * @throws T4 the fourth throws tag.
-     */
-    public void method() throws T5, T6, T7, T8 {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/P.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/P.java
deleted file mode 100644
index 81f53fcf8e0..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/P.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class P {
-
-    /**
-     * @throws T5 the first inherited throws tag.
-     * @throws T6 the second inherited throws tag.
-     * @throws T7 the third inherited throws tag.
-     * @throws T8 the fourth inherited throws tag.
-     */
-    public void method() throws T5, T6, T7, T8 {}
-
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T1.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T1.java
deleted file mode 100644
index c2f4bb772ad..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T1 extends Exception {}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T2.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T2.java
deleted file mode 100644
index 561f65b0db1..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T2.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T2 extends Exception {}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T3.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T3.java
deleted file mode 100644
index ea2539837ef..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T3 extends Exception {}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T4.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T4.java
deleted file mode 100644
index c48754577a7..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T4 extends Exception {}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T5.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T5.java
deleted file mode 100644
index 5f0db1a50b6..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T5.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T5 extends Exception
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T6.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T6.java
deleted file mode 100644
index db5670bc15b..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T6.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T6 extends Exception
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T7.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T7.java
deleted file mode 100644
index ddbbbee7761..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T7.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T7 extends Exception
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T8.java b/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T8.java
deleted file mode 100644
index 353ac6e1f7a..00000000000
--- a/langtools/test/com/sun/javadoc/testThrowsTag/pkg/T8.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg;
-
-public class T8 extends Exception
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java
deleted file mode 100644
index 169a2f3e1e2..00000000000
--- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4714257
- * @summary Test to make sure that the title attribute shows up in links.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestTitleInHref
- */
-
-public class TestTitleInHref extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTitleInHref tester = new TestTitleInHref();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        String uri = "http://java.sun.com/j2se/1.4/docs/api";
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-linkoffline", uri, testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/Links.html", true,
-                //Test to make sure that the title shows up in a class link.
-                "<a href=\"../pkg/Class.html\" title=\"class in pkg\">",
-                //Test to make sure that the title shows up in an interface link.
-                "<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">",
-                //Test to make sure that the title shows up in cross link shows up
-                "<a href=\"" + uri + "/java/io/File.html?is-external=true\" "
-                + "title=\"class or interface in java.io\">"
-                + "<code>This is a cross link to class File</code></a>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTitleInHref/package-list b/langtools/test/com/sun/javadoc/testTitleInHref/package-list
deleted file mode 100644
index 43f52389204..00000000000
--- a/langtools/test/com/sun/javadoc/testTitleInHref/package-list
+++ /dev/null
@@ -1 +0,0 @@
-java.io
diff --git a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Class.java b/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Class.java
deleted file mode 100644
index d2139c9f01a..00000000000
--- a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Class.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public class Class {}
diff --git a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java b/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java
deleted file mode 100644
index da5b0cb1765..00000000000
--- a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-public interface Interface {}
diff --git a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Links.java b/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Links.java
deleted file mode 100644
index ce3ce9963ae..00000000000
--- a/langtools/test/com/sun/javadoc/testTitleInHref/pkg/Links.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg;
-
-/**
- * {@link Class This is a link to a class}.<br>
- * {@link Interface This is a link to an interface}.
- * {@link java.io.File This is a cross link to class File}.
- */
-
-public class Links{}
diff --git a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java b/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java
deleted file mode 100644
index df9f69a0434..00000000000
--- a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2005, 2015, 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      6227616 8043186
- * @summary  Test the new -top option.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestTopOption
- */
-
-public class TestTopOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTopOption tester = new TestTopOption();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-overview", testSrc("overview.html"),
-                "-use",
-                "-top", "TOP TEXT",
-                "-d", "out-1",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkTopText(
-                "pkg/AnnotationType.html",
-                "pkg/class-use/AnnotationType.html",
-                "pkg/Cl.html",
-                "pkg/class-use/Cl.html",
-                "pkg/package-summary.html",
-                "pkg/package-use.html",
-                "overview-summary.html",
-                "overview-tree.html",
-                "constant-values.html",
-                "help-doc.html");
-    }
-
-    @Test
-    void testDocRootRewrite() {
-        javadoc("-overview", testSrc("overview.html"),
-                "-use",
-                "-top", "\u0130{@docroot}TOP TEXT",
-                "-d", "out-2",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkTopText(
-                "pkg/AnnotationType.html",
-                "pkg/class-use/AnnotationType.html",
-                "pkg/Cl.html",
-                "pkg/class-use/Cl.html",
-                "pkg/package-summary.html",
-                "pkg/package-use.html",
-                "overview-summary.html",
-                "overview-tree.html",
-                "constant-values.html",
-                "help-doc.html");
-    }
-
-    void checkTopText(String... files) {
-        for (String file : files) {
-            checkOutput(file, true, "TOP TEXT");
-        }
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTopOption/overview.html b/langtools/test/com/sun/javadoc/testTopOption/overview.html
deleted file mode 100644
index 79c47708a70..00000000000
--- a/langtools/test/com/sun/javadoc/testTopOption/overview.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-  <BODY>
-    This is a sample overview.
-  </BODY>
-<HTML>
diff --git a/langtools/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java b/langtools/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java
deleted file mode 100644
index 36b38a69d49..00000000000
--- a/langtools/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg;
-
-import java.lang.annotation.*;
-
-@Documented public @interface AnnotationType {
-}
diff --git a/langtools/test/com/sun/javadoc/testTopOption/pkg/Cl.java b/langtools/test/com/sun/javadoc/testTopOption/pkg/Cl.java
deleted file mode 100644
index 4fe9e4308a8..00000000000
--- a/langtools/test/com/sun/javadoc/testTopOption/pkg/Cl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2005, 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 pkg;
-
-
-public class Cl {
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
deleted file mode 100644
index abf9c6992f5..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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      8005091 8009686 8025633 8026567
- * @summary  Make sure that type annotations are displayed correctly
- * @author   Bhavesh Patel
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestTypeAnnotations
- */
-
-public class TestTypeAnnotations extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTypeAnnotations tester = new TestTypeAnnotations();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                "-private",
-                "typeannos");
-        checkExit(Exit.OK);
-
-        // Test for type annotations on Class Extends (ClassExtends.java).
-        checkOutput("typeannos/MyClass.html", true,
-                "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation "
-                + "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedClass.html\" "
-                + "title=\"class in typeannos\">ParameterizedClass</a>&lt;<a href=\""
-                + "../typeannos/ClassExtB.html\" title=\"annotation in typeannos\">"
-                + "@ClassExtB</a> java.lang.String&gt;",
-
-                "implements <a href=\"../typeannos/ClassExtB.html\" title=\""
-                + "annotation in typeannos\">@ClassExtB</a> java.lang.CharSequence, "
-                + "<a href=\"../typeannos/ClassExtA.html\" title=\"annotation in "
-                + "typeannos\">@ClassExtA</a> <a href=\"../typeannos/ParameterizedInterface.html\" "
-                + "title=\"interface in typeannos\">ParameterizedInterface</a>&lt;"
-                + "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in "
-                + "typeannos\">@ClassExtB</a> java.lang.String&gt;</pre>");
-
-        checkOutput("typeannos/MyInterface.html", true,
-                "extends <a href=\"../typeannos/ClassExtA.html\" title=\"annotation "
-                + "in typeannos\">@ClassExtA</a> <a href=\"../typeannos/"
-                + "ParameterizedInterface.html\" title=\"interface in typeannos\">"
-                + "ParameterizedInterface</a>&lt;<a href=\"../typeannos/ClassExtA.html\" "
-                + "title=\"annotation in typeannos\">@ClassExtA</a> java.lang.String&gt;, "
-                + "<a href=\"../typeannos/ClassExtB.html\" title=\"annotation in "
-                + "typeannos\">@ClassExtB</a> java.lang.CharSequence</pre>");
-
-        // Test for type annotations on Class Parameters (ClassParameters.java).
-        checkOutput("typeannos/ExtendsBound.html", true,
-                "class <span class=\"typeNameLabel\">ExtendsBound&lt;K extends <a "
-                + "href=\"../typeannos/ClassParamA.html\" title=\"annotation in "
-                + "typeannos\">@ClassParamA</a> java.lang.String&gt;</span>");
-
-        checkOutput("typeannos/ExtendsGeneric.html", true,
-                "<pre>class <span class=\"typeNameLabel\">ExtendsGeneric&lt;K extends "
-                + "<a href=\"../typeannos/ClassParamA.html\" title=\"annotation in "
-                + "typeannos\">@ClassParamA</a> <a href=\"../typeannos/Unannotated.html\" "
-                + "title=\"class in typeannos\">Unannotated</a>&lt;<a href=\""
-                + "../typeannos/ClassParamB.html\" title=\"annotation in typeannos\">"
-                + "@ClassParamB</a> java.lang.String&gt;&gt;</span>");
-
-        checkOutput("typeannos/TwoBounds.html", true,
-                "<pre>class <span class=\"typeNameLabel\">TwoBounds&lt;K extends <a href=\""
-                + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\">"
-                + "@ClassParamA</a> java.lang.String,V extends <a href=\"../typeannos/"
-                + "ClassParamB.html\" title=\"annotation in typeannos\">@ClassParamB"
-                + "</a> java.lang.String&gt;</span>");
-
-        checkOutput("typeannos/Complex1.html", true,
-                "class <span class=\"typeNameLabel\">Complex1&lt;K extends <a href=\"../"
-                + "typeannos/ClassParamA.html\" title=\"annotation in typeannos\">"
-                + "@ClassParamA</a> java.lang.String &amp; java.lang.Runnable&gt;</span>");
-
-        checkOutput("typeannos/Complex2.html", true,
-                "class <span class=\"typeNameLabel\">Complex2&lt;K extends java.lang."
-                + "String &amp; <a href=\"../typeannos/ClassParamB.html\" title=\""
-                + "annotation in typeannos\">@ClassParamB</a> java.lang.Runnable&gt;</span>");
-
-        checkOutput("typeannos/ComplexBoth.html", true,
-                "class <span class=\"typeNameLabel\">ComplexBoth&lt;K extends <a href=\""
-                + "../typeannos/ClassParamA.html\" title=\"annotation in typeannos\""
-                + ">@ClassParamA</a> java.lang.String &amp; <a href=\"../typeannos/"
-                + "ClassParamA.html\" title=\"annotation in typeannos\">@ClassParamA"
-                + "</a> java.lang.Runnable&gt;</span>");
-
-        // Test for type annotations on fields (Fields.java).
-        checkOutput("typeannos/DefaultScope.html", true,
-                "<pre><a href=\"../typeannos/Parameterized.html\" title=\"class in "
-                + "typeannos\">Parameterized</a>&lt;<a href=\"../typeannos/FldA.html\" "
-                + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a "
-                + "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">"
-                + "@FldB</a> java.lang.String&gt; bothTypeArgs</pre>",
-
-                "<pre><a href=\"../typeannos/FldA.html\" title=\"annotation in "
-                + "typeannos\">@FldA</a> java.lang.String <a href=\"../typeannos/"
-                + "FldB.html\" title=\"annotation in typeannos\">@FldB</a> [] "
-                + "array1Deep</pre>",
-
-                "<pre>java.lang.String[] <a href=\"../typeannos/FldB.html\" "
-                + "title=\"annotation in typeannos\">@FldB</a> [] array2SecondOld</pre>",
-
-                "<pre><a href=\"../typeannos/FldD.html\" title=\"annotation in "
-                + "typeannos\">@FldD</a> java.lang.String <a href=\"../typeannos/"
-                + "FldC.html\" title=\"annotation in typeannos\">@FldC</a> <a href=\""
-                + "../typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA"
-                + "</a> [] <a href=\"../typeannos/FldC.html\" title=\"annotation in "
-                + "typeannos\">@FldC</a> <a href=\"../typeannos/FldB.html\" title=\""
-                + "annotation in typeannos\">@FldB</a> [] array2Deep</pre>");
-
-        checkOutput("typeannos/ModifiedScoped.html", true,
-                "<pre>public final&nbsp;<a href=\"../typeannos/Parameterized.html\" "
-                + "title=\"class in typeannos\">Parameterized</a>&lt;<a href=\"../"
-                + "typeannos/FldA.html\" title=\"annotation in typeannos\">@FldA</a> "
-                + "<a href=\"../typeannos/Parameterized.html\" title=\"class in "
-                + "typeannos\">Parameterized</a>&lt;<a href=\"../typeannos/FldA.html\" "
-                + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,<a "
-                + "href=\"../typeannos/FldB.html\" title=\"annotation in typeannos\">"
-                + "@FldB</a> java.lang.String&gt;,<a href=\"../typeannos/FldB.html\" "
-                + "title=\"annotation in typeannos\">@FldB</a> java.lang.String&gt; "
-                + "nestedParameterized</pre>",
-
-                "<pre>public final&nbsp;<a href=\"../typeannos/FldA.html\" "
-                + "title=\"annotation in typeannos\">@FldA</a> java.lang.String[][] "
-                + "array2</pre>");
-
-        // Test for type annotations on method return types (MethodReturnType.java).
-        checkOutput("typeannos/MtdDefaultScope.html", true,
-                "<pre>public&nbsp;&lt;T&gt;&nbsp;<a href=\"../typeannos/MRtnA.html\" "
-                + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String"
-                + "&nbsp;method()</pre>",
-
-                "<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in "
-                + "typeannos\">@MRtnA</a> java.lang.String <a href=\"../typeannos/"
-                + "MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> [] <a "
-                + "href=\"../typeannos/MRtnB.html\" title=\"annotation in typeannos\">"
-                + "@MRtnB</a> []&nbsp;array2Deep()</pre>",
-
-                "<pre><a href=\"../typeannos/MRtnA.html\" title=\"annotation in "
-                + "typeannos\">@MRtnA</a> java.lang.String[][]&nbsp;array2()</pre>");
-
-        checkOutput("typeannos/MtdModifiedScoped.html", true,
-                "<pre>public final&nbsp;<a href=\"../typeannos/MtdParameterized.html\" "
-                + "title=\"class in typeannos\">MtdParameterized</a>&lt;<a href=\"../"
-                + "typeannos/MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> "
-                + "<a href=\"../typeannos/MtdParameterized.html\" title=\"class in "
-                + "typeannos\">MtdParameterized</a>&lt;<a href=\"../typeannos/MRtnA."
-                + "html\" title=\"annotation in typeannos\">@MRtnA</a> java.lang."
-                + "String,<a href=\"../typeannos/MRtnB.html\" title=\"annotation in "
-                + "typeannos\">@MRtnB</a> java.lang.String&gt;,<a href=\"../typeannos/"
-                + "MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> java."
-                + "lang.String&gt;&nbsp;nestedMtdParameterized()</pre>");
-
-        // Test for type annotations on method type parameters (MethodTypeParameters.java).
-        checkOutput("typeannos/UnscopedUnmodified.html", true,
-                "<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\""
-                + "annotation in typeannos\">@MTyParamA</a> java.lang.String&gt;"
-                + "&nbsp;void&nbsp;methodExtends()</pre>",
-
-                "<pre>&lt;K extends <a href=\"../typeannos/MTyParamA.html\" title=\""
-                + "annotation in typeannos\">@MTyParamA</a> <a href=\"../typeannos/"
-                + "MtdTyParameterized.html\" title=\"class in typeannos\">"
-                + "MtdTyParameterized</a>&lt;<a href=\"../typeannos/MTyParamB.html\" "
-                + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
-                + "&gt;&gt;&nbsp;void&nbsp;nestedExtends()</pre>");
-
-        checkOutput("typeannos/PublicModifiedMethods.html", true,
-                "<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/"
-                + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
-                + "java.lang.String&gt;&nbsp;void&nbsp;methodExtends()</pre>",
-
-                "<pre>public final&nbsp;&lt;K extends <a href=\"../typeannos/"
-                + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
-                + "java.lang.String,V extends <a href=\"../typeannos/MTyParamA.html\" "
-                + "title=\"annotation in typeannos\">@MTyParamA</a> <a href=\"../"
-                + "typeannos/MtdTyParameterized.html\" title=\"class in typeannos\">"
-                + "MtdTyParameterized</a>&lt;<a href=\"../typeannos/MTyParamB.html\" "
-                + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
-                + "&gt;&gt;&nbsp;void&nbsp;dual()</pre>");
-
-        // Test for type annotations on parameters (Parameters.java).
-        checkOutput("typeannos/Parameters.html", true,
-                "<pre>void&nbsp;unannotated(<a href=\"../typeannos/"
-                + "ParaParameterized.html\" title=\"class in typeannos\">"
-                + "ParaParameterized</a>&lt;java.lang.String,java.lang.String&gt;"
-                + "&nbsp;a)</pre>",
-
-                "<pre>void&nbsp;nestedParaParameterized(<a href=\"../typeannos/"
-                + "ParaParameterized.html\" title=\"class in typeannos\">"
-                + "ParaParameterized</a>&lt;<a href=\"../typeannos/ParamA.html\" "
-                + "title=\"annotation in typeannos\">@ParamA</a> <a href=\"../"
-                + "typeannos/ParaParameterized.html\" title=\"class in typeannos\">"
-                + "ParaParameterized</a>&lt;<a href=\"../typeannos/ParamA.html\" "
-                + "title=\"annotation in typeannos\">@ParamA</a> java.lang.String,"
-                + "<a href=\"../typeannos/ParamB.html\" title=\"annotation in "
-                + "typeannos\">@ParamB</a> java.lang.String&gt;,<a href=\"../"
-                + "typeannos/ParamB.html\" title=\"annotation in typeannos\">@ParamB"
-                + "</a> java.lang.String&gt;&nbsp;a)</pre>",
-
-                "<pre>void&nbsp;array2Deep(<a href=\"../typeannos/ParamA.html\" "
-                + "title=\"annotation in typeannos\">@ParamA</a> java.lang.String "
-                + "<a href=\"../typeannos/ParamA.html\" title=\"annotation in "
-                + "typeannos\">@ParamA</a> [] <a href=\"../typeannos/ParamB.html\" "
-                + "title=\"annotation in typeannos\">@ParamB</a> []&nbsp;a)</pre>");
-
-        // Test for type annotations on throws (Throws.java).
-        checkOutput("typeannos/ThrDefaultUnmodified.html", true,
-                "<pre>void&nbsp;oneException()\n"
-                + "           throws <a href=\"../typeannos/ThrA.html\" title=\""
-                + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>",
-
-                "<pre>void&nbsp;twoExceptions()\n"
-                + "            throws <a href=\"../typeannos/ThrA.html\" title=\""
-                + "annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
-                + "                   <a href=\"../typeannos/ThrA.html\" title=\""
-                + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
-
-        checkOutput("typeannos/ThrPublicModified.html", true,
-                "<pre>public final&nbsp;void&nbsp;oneException(java.lang.String&nbsp;a)\n"
-                + "                        throws <a href=\"../typeannos/ThrA.html\" "
-                + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>",
-
-                "<pre>public final&nbsp;void&nbsp;twoExceptions(java.lang.String&nbsp;a)\n"
-                + "                         throws <a href=\"../typeannos/ThrA.html\" "
-                + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
-                + "                                <a href=\"../typeannos/ThrA.html\" "
-                + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
-
-        checkOutput("typeannos/ThrWithValue.html", true,
-                "<pre>void&nbsp;oneException()\n"
-                + "           throws <a href=\"../typeannos/ThrB.html\" title=\""
-                + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/"
-                + "ThrB.html#value--\">value</a>=\"m\") java.lang.Exception</pre>",
-
-                "<pre>void&nbsp;twoExceptions()\n"
-                + "            throws <a href=\"../typeannos/ThrB.html\" title=\""
-                + "annotation in typeannos\">@ThrB</a>(<a href=\"../typeannos/"
-                + "ThrB.html#value--\">value</a>=\"m\") java.lang.RuntimeException,\n"
-                + "                   <a href=\"../typeannos/ThrA.html\" title=\""
-                + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
-
-        // Test for type annotations on type parameters (TypeParameters.java).
-        checkOutput("typeannos/TestMethods.html", true,
-                "<pre>&lt;K,V extends <a href=\"../typeannos/TyParaA.html\" title=\""
-                + "annotation in typeannos\">@TyParaA</a> java.lang.String&gt;&nbsp;"
-                + "void&nbsp;secondAnnotated()</pre>");
-
-        // Test for type annotations on wildcard type (Wildcards.java).
-        checkOutput("typeannos/BoundTest.html", true,
-                "<pre>void&nbsp;wcExtends(<a href=\"../typeannos/MyList.html\" "
-                + "title=\"class in typeannos\">MyList</a>&lt;? extends <a href=\""
-                + "../typeannos/WldA.html\" title=\"annotation in typeannos\">@WldA"
-                + "</a> java.lang.String&gt;&nbsp;l)</pre>",
-
-                "<pre><a href=\"../typeannos/MyList.html\" title=\"class in "
-                + "typeannos\">MyList</a>&lt;? super <a href=\"../typeannos/WldA.html\" "
-                + "title=\"annotation in typeannos\">@WldA</a> java.lang.String&gt;"
-                + "&nbsp;returnWcSuper()</pre>");
-
-        checkOutput("typeannos/BoundWithValue.html", true,
-                "<pre>void&nbsp;wcSuper(<a href=\"../typeannos/MyList.html\" title=\""
-                + "class in typeannos\">MyList</a>&lt;? super <a href=\"../typeannos/"
-                + "WldB.html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\""
-                + "../typeannos/WldB.html#value--\">value</a>=\"m\") java.lang."
-                + "String&gt;&nbsp;l)</pre>",
-
-                "<pre><a href=\"../typeannos/MyList.html\" title=\"class in "
-                + "typeannos\">MyList</a>&lt;? extends <a href=\"../typeannos/WldB."
-                + "html\" title=\"annotation in typeannos\">@WldB</a>(<a href=\"../"
-                + "typeannos/WldB.html#value--\">value</a>=\"m\") java.lang.String"
-                + "&gt;&nbsp;returnWcExtends()</pre>");
-
-        // Test for receiver annotations (Receivers.java).
-        checkOutput("typeannos/DefaultUnmodified.html", true,
-                "<pre>void&nbsp;withException(<a href=\"../typeannos/RcvrA.html\" "
-                + "title=\"annotation in typeannos\">@RcvrA</a>&nbsp;"
-                + "DefaultUnmodified&nbsp;this)\n"
-                + "            throws java."
-                + "lang.Exception</pre>",
-
-                "<pre>java.lang.String&nbsp;nonVoid(<a href=\"../typeannos/RcvrA."
-                + "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\"../"
-                + "typeannos/RcvrB.html\" title=\"annotation in typeannos\">@RcvrB"
-                + "</a>(<a href=\"../typeannos/RcvrB.html#value--\">value</a>=\"m\")"
-                + "&nbsp;DefaultUnmodified&nbsp;this)</pre>",
-
-                "<pre>&lt;T extends java.lang.Runnable&gt;&nbsp;void&nbsp;accept("
-                + "<a href=\"../typeannos/RcvrA.html\" title=\"annotation in "
-                + "typeannos\">@RcvrA</a>&nbsp;DefaultUnmodified&nbsp;this,\n"
-                + "                                           T&nbsp;r)\n"
-                + "                                    throws java.lang.Exception</pre>");
-
-        checkOutput("typeannos/PublicModified.html", true,
-                "<pre>public final&nbsp;java.lang.String&nbsp;nonVoid(<a href=\""
-                + "../typeannos/RcvrA.html\" title=\"annotation in typeannos\">"
-                + "@RcvrA</a>&nbsp;PublicModified&nbsp;this)</pre>",
-
-                "<pre>public final&nbsp;&lt;T extends java.lang.Runnable&gt;&nbsp;"
-                + "void&nbsp;accept(<a href=\"../typeannos/RcvrA.html\" title=\""
-                + "annotation in typeannos\">@RcvrA</a>&nbsp;PublicModified&nbsp;this,\n"
-                + "                                                        T&nbsp;r)\n"
-                + "                                                 throws java.lang.Exception</pre>");
-
-        checkOutput("typeannos/WithValue.html", true,
-                "<pre>&lt;T extends java.lang.Runnable&gt;&nbsp;void&nbsp;accept("
-                + "<a href=\"../typeannos/RcvrB.html\" title=\"annotation in "
-                + "typeannos\">@RcvrB</a>(<a href=\"../typeannos/RcvrB.html#value--\">"
-                + "value</a>=\"m\")&nbsp;WithValue&nbsp;this,\n"
-                + "                                           T&nbsp;r)\n"
-                + "                                    throws java.lang.Exception</pre>");
-
-        checkOutput("typeannos/WithFinal.html", true,
-                "<pre>java.lang.String&nbsp;nonVoid(<a href=\"../typeannos/RcvrB."
-                + "html\" title=\"annotation in typeannos\">@RcvrB</a>(<a href=\"../"
-                + "typeannos/RcvrB.html#value--\">value</a>=\"m\")&nbsp;WithFinal"
-                + "&nbsp;this)</pre>");
-
-        checkOutput("typeannos/WithBody.html", true,
-                "<pre>void&nbsp;field(<a href=\"../typeannos/RcvrA.html\" title=\""
-                + "annotation in typeannos\">@RcvrA</a>&nbsp;WithBody&nbsp;this)</pre>");
-
-        checkOutput("typeannos/Generic2.html", true,
-                "<pre>void&nbsp;test2(<a href=\"../typeannos/RcvrA.html\" title=\""
-                + "annotation in typeannos\">@RcvrA</a>&nbsp;Generic2&lt;X&gt;&nbsp;this)</pre>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java
deleted file mode 100644
index 995c6256b9c..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassExtends.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-abstract class MyClass extends @ClassExtA ParameterizedClass<@ClassExtB String>
-  implements @ClassExtB CharSequence, @ClassExtA ParameterizedInterface<@ClassExtB String> { }
-
-interface MyInterface extends @ClassExtA ParameterizedInterface<@ClassExtA String>,
-                              @ClassExtB CharSequence { }
-
-class ParameterizedClass<K> {}
-interface ParameterizedInterface<K> {}
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ClassExtA {}
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ClassExtB {}
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java
deleted file mode 100644
index d3b556a3ad3..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/ClassParameters.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class Unannotated<K> { }
-
-class ExtendsBound<K extends @ClassParamA String> { }
-class ExtendsGeneric<K extends @ClassParamA Unannotated<@ClassParamB String>> { }
-class TwoBounds<K extends @ClassParamA String, V extends @ClassParamB String> { }
-
-class Complex1<K extends @ClassParamA String&Runnable> { }
-class Complex2<K extends String & @ClassParamB Runnable> { }
-class ComplexBoth<K extends @ClassParamA String & @ClassParamA Runnable> { }
-
-class ClassParamOuter {
-    void inner() {
-        class LUnannotated<K> { }
-
-        class LExtendsBound<K extends @ClassParamA String> { }
-        class LExtendsGeneric<K extends @ClassParamA LUnannotated<@ClassParamB String>> { }
-        class LTwoBounds<K extends @ClassParamA String, V extends @ClassParamB String> { }
-
-        class LComplex1<K extends @ClassParamA String&Runnable> { }
-        class LComplex2<K extends String & @ClassParamB Runnable> { }
-        class LComplexBoth<K extends @ClassParamA String & @ClassParamA Runnable> { }
-    }
-}
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ClassParamA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ClassParamB { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java
deleted file mode 100644
index 359562c94f6..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Fields.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class DefaultScope {
-    Parameterized<String, String> unannotated;
-    Parameterized<@FldA String, String> firstTypeArg;
-    Parameterized<String, @FldA String> secondTypeArg;
-    Parameterized<@FldA String, @FldB String> bothTypeArgs;
-
-    Parameterized<@FldA Parameterized<@FldA String, @FldB String>, @FldB String>
-    nestedParameterized;
-
-    @FldA String [] array1;
-    @FldA String @FldB [] array1Deep;
-    @FldA String [] [] array2;
-    @FldD String @FldC @FldA [] @FldC @FldB [] array2Deep;
-    String @FldA [] [] array2First;
-    String [] @FldB [] array2Second;
-
-    // Old-style array syntax
-    String array2FirstOld @FldA [];
-    String array2SecondOld [] @FldB [];
-}
-
-class ModifiedScoped {
-    public final Parameterized<String, String> unannotated = null;
-    public final Parameterized<@FldA String, String> firstTypeArg = null;
-    public final Parameterized<String, @FldA String> secondTypeArg = null;
-    public final Parameterized<@FldA String, @FldB String> bothTypeArgs = null;
-
-    public final Parameterized<@FldA Parameterized<@FldA String, @FldB String>, @FldB String>
-    nestedParameterized = null;
-
-    public final @FldA String [] array1 = null;
-    public final @FldA String @FldB [] array1Deep = null;
-    public final @FldA String [] [] array2 = null;
-    public final @FldA String @FldA [] @FldB [] array2Deep = null;
-    public final String @FldA [] [] array2First = null;
-    public final String [] @FldB [] array2Second = null;
-}
-
-class Parameterized<K, V> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface FldA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface FldB { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface FldC { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface FldD { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java
deleted file mode 100644
index fbfb9789199..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodReturnType.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class MtdDefaultScope {
-    MtdParameterized<String, String> unannotated() { return null; }
-    MtdParameterized<@MRtnA String, String> firstTypeArg() { return null; }
-    MtdParameterized<String, @MRtnA String> secondTypeArg() { return null; }
-    MtdParameterized<@MRtnA String, @MRtnB String> bothTypeArgs() { return null; }
-
-    MtdParameterized<@MRtnA MtdParameterized<@MRtnA String, @MRtnB String>, @MRtnB String>
-    nestedMtdParameterized() { return null; }
-
-    public <T> @MRtnA String method() { return null; }
-
-    @MRtnA String [] array1() { return null; }
-    @MRtnA String @MRtnB [] array1Deep() { return null; }
-    @MRtnA String [] [] array2() { return null; }
-    @MRtnA String @MRtnA [] @MRtnB [] array2Deep() { return null; }
-    String @MRtnA [] [] array2First() { return null; }
-    String [] @MRtnB [] array2Second() { return null; }
-
-    // Old-style array syntax
-    String array2FirstOld() @MRtnA [] { return null; }
-    String array2SecondOld() [] @MRtnB [] { return null; }
-}
-
-class MtdModifiedScoped {
-    public final MtdParameterized<String, String> unannotated() { return null; }
-    public final MtdParameterized<@MRtnA String, String> firstTypeArg() { return null; }
-    public final MtdParameterized<String, @MRtnA String> secondTypeArg() { return null; }
-    public final MtdParameterized<@MRtnA String, @MRtnB String> bothTypeArgs() { return null; }
-
-    public final MtdParameterized<@MRtnA MtdParameterized<@MRtnA String, @MRtnB String>, @MRtnB String>
-    nestedMtdParameterized() { return null; }
-
-    public final @MRtnA String [] array1() { return null; }
-    public final @MRtnA String @MRtnB [] array1Deep() { return null; }
-    public final @MRtnA String [] [] array2() { return null; }
-    public final @MRtnA String @MRtnA [] @MRtnB [] array2Deep() { return null; }
-    public final String @MRtnA [] [] array2First() { return null; }
-    public final String [] @MRtnB [] array2Second() { return null; }
-}
-
-class MtdParameterized<K, V> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface MRtnA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface MRtnB { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java
deleted file mode 100644
index dbfe2862db4..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/MethodTypeParameters.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class UnscopedUnmodified {
-    <K extends @MTyParamA String> void methodExtends() {}
-    <K extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void nestedExtends() {}
-    <K extends @MTyParamA String, V extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void dual() {}
-    <K extends String, V extends MtdTyParameterized<@MTyParamB String>> void dualOneAnno() {}
-}
-
-class PublicModifiedMethods {
-    public final <K extends @MTyParamA String> void methodExtends() {}
-    public final <K extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void nestedExtends() {}
-    public final <K extends @MTyParamA String, V extends @MTyParamA MtdTyParameterized<@MTyParamB String>> void dual() {}
-    public final <K extends String, V extends MtdTyParameterized<@MTyParamB String>> void dualOneAnno() {}
-}
-
-class MtdTyParameterized<K> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface MTyParamA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface MTyParamB { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java
deleted file mode 100644
index 6fe8dfcd108..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Parameters.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class Parameters {
-    void unannotated(ParaParameterized<String, String> a) {}
-    void firstTypeArg(ParaParameterized<@ParamA String, String> a) {}
-    void secondTypeArg(ParaParameterized<String, @ParamA String> a) {}
-    void bothTypeArgs(ParaParameterized<@ParamA String, @ParamB String> both) {}
-
-    void nestedParaParameterized(ParaParameterized<@ParamA ParaParameterized<@ParamA String, @ParamB String>, @ParamB String> a) {}
-
-    void array1(@ParamA String [] a) {}
-    void array1Deep(@ParamA String @ParamB [] a) {}
-    void array2(@ParamA String [] [] a) {}
-    void array2Deep(@ParamA String @ParamA [] @ParamB [] a) {}
-    void array2First(String @ParamA [] [] a) {}
-    void array2Second(String [] @ParamB [] a) {}
-}
-
-class ParaParameterized<K, V> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ParamA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ParamB { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java
deleted file mode 100644
index a46dd39f7de..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Receivers.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class DefaultUnmodified {
-    void plain(@RcvrA DefaultUnmodified this) { }
-    <T> void generic(@RcvrA DefaultUnmodified this) { }
-    void withException(@RcvrA DefaultUnmodified this) throws Exception { }
-    String nonVoid(@RcvrA @RcvrB("m") DefaultUnmodified this) { return null; }
-    <T extends Runnable> void accept(@RcvrA DefaultUnmodified this, T r) throws Exception { }
-}
-
-class PublicModified {
-    public final void plain(@RcvrA PublicModified this) { }
-    public final <T> void generic(@RcvrA PublicModified this) { }
-    public final void withException(@RcvrA PublicModified this) throws Exception { }
-    public final String nonVoid(@RcvrA PublicModified this) { return null; }
-    public final <T extends Runnable> void accept(@RcvrA PublicModified this, T r) throws Exception { }
-}
-
-class WithValue {
-    void plain(@RcvrB("m") WithValue this) { }
-    <T> void generic(@RcvrB("m") WithValue this) { }
-    void withException(@RcvrB("m") WithValue this) throws Exception { }
-    String nonVoid(@RcvrB("m") WithValue this) { return null; }
-    <T extends Runnable> void accept(@RcvrB("m") WithValue this, T r) throws Exception { }
-}
-
-class WithFinal {
-    void plain(final @RcvrB("m") WithFinal this) { }
-    <T> void generic(final @RcvrB("m") WithFinal this) { }
-    void withException(final @RcvrB("m") WithFinal this) throws Exception { }
-    String nonVoid(final @RcvrB("m") WithFinal this) { return null; }
-    <T extends Runnable> void accept(final @RcvrB("m") WithFinal this, T r) throws Exception { }
-}
-
-class WithBody {
-    Object f;
-
-    void field(@RcvrA WithBody this) {
-        this.f = null;
-    }
-    void meth(@RcvrA WithBody this) {
-        this.toString();
-    }
-}
-
-class Generic1<X> {
-    void test1(Generic1<X> this) {}
-    void test2(@RcvrA Generic1<X> this) {}
-    void test3(Generic1<@RcvrA X> this) {}
-    void test4(@RcvrA Generic1<@RcvrA X> this) {}
-}
-
-class Generic2<@RcvrA X> {
-    void test1(Generic2<X> this) {}
-    void test2(@RcvrA Generic2<X> this) {}
-    void test3(Generic2<@RcvrA X> this) {}
-    void test4(@RcvrA Generic2<@RcvrA X> this) {}
-}
-
-class Generic3<X extends @RcvrA Object> {
-    void test1(Generic3<X> this) {}
-    void test2(@RcvrA Generic3<X> this) {}
-    void test3(Generic3<@RcvrA X> this) {}
-    void test4(@RcvrA Generic3<@RcvrA X> this) {}
-}
-
-class Generic4<X extends @RcvrA Object> {
-    <Y> void test1(Generic4<X> this) {}
-    <Y> void test2(@RcvrA Generic4<X> this) {}
-    <Y> void test3(Generic4<@RcvrA X> this) {}
-    <Y> void test4(@RcvrA Generic4<@RcvrA X> this) {}
-}
-
-class Outer {
-    class Inner {
-        void none(Outer.Inner this) {}
-        void outer(@RcvrA Outer.Inner this) {}
-        void inner(Outer. @RcvrB("i") Inner this) {}
-        void both(@RcvrA Outer.@RcvrB("i") Inner this) {}
-
-        void innerOnlyNone(Inner this) {}
-        void innerOnly(@RcvrA Inner this) {}
-    }
-}
-
-class GenericOuter<S, T> {
-    class GenericInner<U, V> {
-        void none(GenericOuter<S, T>.GenericInner<U, V> this) {}
-        void outer(@RcvrA GenericOuter<S, T>.GenericInner<U, V> this) {}
-        void inner(GenericOuter<S, T>. @RcvrB("i") GenericInner<U, V> this) {}
-        void both(@RcvrA GenericOuter<S, T>.@RcvrB("i") GenericInner<U, V> this) {}
-
-        void innerOnlyNone(GenericInner<U, V> this) {}
-        void innerOnly(@RcvrA GenericInner<U, V> this) {}
-    }
-}
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface RcvrA {}
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface RcvrB { String value(); }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java
deleted file mode 100644
index 75a31dd3ecf..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Throws.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class ThrDefaultUnmodified {
-    void oneException() throws @ThrA Exception {}
-    void twoExceptions() throws @ThrA RuntimeException, @ThrA Exception {}
-}
-
-class ThrPublicModified {
-    public final void oneException(String a) throws @ThrA Exception {}
-    public final void twoExceptions(String a) throws @ThrA RuntimeException, @ThrA Exception {}
-}
-
-class ThrWithValue {
-    void oneException() throws @ThrB("m") Exception {}
-    void twoExceptions() throws @ThrB(value="m") RuntimeException, @ThrA Exception {}
-}
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ThrA {}
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface ThrB { String value(); }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java
deleted file mode 100644
index 057bfad3bf3..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class TypUnannotated<K> { }
-class OneAnnotated<@TyParaA K> { }
-class TwoAnnotated<@TyParaA K, @TyParaA V> { }
-class SecondAnnotated<K, @TyParaA V extends String> { }
-
-class TestMethods {
-    <K> void unannotated() { }
-    <@TyParaA K> void oneAnnotated() { }
-    <@TyParaA K, @TyParaB("m") V> void twoAnnotated() { }
-    <K, @TyParaA V extends @TyParaA String> void secondAnnotated() { }
-}
-
-class UnannotatedB<K> { }
-class OneAnnotatedB<@TyParaB("m") K> { }
-class TwoAnnotatedB<@TyParaB("m") K, @TyParaB("m") V> { }
-class SecondAnnotatedB<K, @TyParaB("m") V extends @TyParaB("m") String> { }
-
-class OneAnnotatedC<@TyParaC K> { }
-class TwoAnnotatedC<@TyParaC K, @TyParaC V> { }
-class SecondAnnotatedC<K, @TyParaC V extends String> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface TyParaA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface TyParaB { String value(); }
-@Target(ElementType.TYPE_USE)
-@Documented
-@interface TyParaC { }
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java
deleted file mode 100644
index 37f79f00d76..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Varargs.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface VarArgA {}
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class Varargs {
-
-    // Handle annotations on a varargs element type
-    void varargPlain(Object @VarArgA... objs) {
-    }
-
-    void varargGeneric(Class<?> @VarArgA ... clz) {
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java b/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java
deleted file mode 100644
index 593115c37f1..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/typeannos/Wildcards.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2013, 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 typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class BoundTest {
-    void wcExtends(MyList<? extends @WldA String> l) { }
-    void wcSuper(MyList<? super @WldA String> l) { }
-
-    MyList<? extends @WldA String> returnWcExtends() { return null; }
-    MyList<? super @WldA String> returnWcSuper() { return null; }
-    MyList<? extends @WldA MyList<? super @WldB("m") String>> complex() { return null; }
-}
-
-class BoundWithValue {
-    void wcExtends(MyList<? extends @WldB("m") String> l) { }
-    void wcSuper(MyList<? super @WldB(value="m") String> l) { }
-
-    MyList<? extends @WldB("m") String> returnWcExtends() { return null; }
-    MyList<? super @WldB(value="m") String> returnWcSuper() { return null; }
-    MyList<? extends @WldB("m") MyList<? super @WldB("m") String>> complex() { return null; }
-}
-
-class SelfTest {
-    void wcExtends(MyList<@WldA ?> l) { }
-    void wcSuper(MyList<@WldA ?> l) { }
-
-    MyList<@WldA ?> returnWcExtends() { return null; }
-    MyList<@WldA ?> returnWcSuper() { return null; }
-    MyList<@WldA ? extends @WldA MyList<@WldB("m") ?>> complex() { return null; }
-}
-
-class SelfWithValue {
-    void wcExtends(MyList<@WldB("m") ?> l) { }
-    void wcSuper(MyList<@WldB(value="m") ?> l) { }
-
-    MyList<@WldB("m") ?> returnWcExtends() { return null; }
-    MyList<@WldB(value="m") ?> returnWcSuper() { return null; }
-    MyList<@WldB("m") ? extends MyList<@WldB("m") ? super String>> complex() { return null; }
-}
-
-class MyList<K> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface WldA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface WldB { String value(); }
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java
deleted file mode 100644
index 4c6c8ccf484..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4927167 4974929 7010344 8025633 8081854
- * @summary  When the type parameters are more than 10 characters in length,
- *           make sure there is a line break between type params and return type
- *           in member summary. Also, test for type parameter links in package-summary and
- *           class-use pages. The class/annotation pages should check for type
- *           parameter links in the class/annotation signature section when -linksource is set.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestTypeParameters
- */
-
-public class TestTypeParameters extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestTypeParameters tester = new TestTypeParameters();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1",
-                "-use",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/C.html", true,
-                "<td class=\"colFirst\"><code>&lt;W extends java.lang.String,V extends "
-                + "java.util.List&gt;<br>java.lang.Object</code></td>",
-                "<code>&lt;T&gt;&nbsp;java.lang.Object</code>");
-
-        checkOutput("pkg/package-summary.html", true,
-                "C</a>&lt;E extends <a href=\"../pkg/Parent.html\" "
-                + "title=\"class in pkg\">Parent</a>&gt;");
-
-        checkOutput("pkg/class-use/Foo4.html", true,
-                "<a href=\"../../pkg/ClassUseTest3.html\" title=\"class in pkg\">"
-                + "ClassUseTest3</a>&lt;T extends <a href=\"../../pkg/ParamTest2.html\" "
-                + "title=\"class in pkg\">ParamTest2</a>&lt;java.util.List&lt;? extends "
-                + "<a href=\"../../pkg/Foo4.html\" title=\"class in pkg\">Foo4</a>&gt;&gt;&gt;");
-
-        // Nested type parameters
-        checkOutput("pkg/C.html", true,
-                "<a name=\"formatDetails-java.util.Collection-java.util.Collection-\">\n"
-                + "<!--   -->\n"
-                + "</a>");
-    }
-
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2",
-                "-linksource",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/ClassUseTest3.html", true,
-            "public class <a href=\"../src-html/pkg/ClassUseTest3.html#line.28\">" +
-            "ClassUseTest3</a>&lt;T extends <a href=\"../pkg/ParamTest2.html\" " +
-            "title=\"class in pkg\">ParamTest2</a>&lt;java.util.List&lt;? extends " +
-            "<a href=\"../pkg/Foo4.html\" title=\"class in pkg\">Foo4</a>&gt;&gt;&gt;");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/pkg/C.java b/langtools/test/com/sun/javadoc/testTypeParams/pkg/C.java
deleted file mode 100644
index 2e3156d54eb..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/pkg/C.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003, 2004, 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 pkg;
-
-import java.util.*;
-
-public class C <E extends Parent> {
-
-    /**
-     * Test case one.  This should not cause a line break in the member summary.
-     */
-    public <T> Object shortTypeParamList(T param){ return null; }
-
-    /**
-     * Test case two.  This should cause a line break in the member summary.
-     */
-    public <W extends String, V extends List> Object longTypeParamList(W param1,
-        V param2){ return null; }
-
-    public static void formatDetails(Collection<Map<String,String>> job,
-        Collection<String> include) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java b/langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java
deleted file mode 100644
index d7a06ec8118..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 pkg;
-
-import java.util.*;
-
-public class ClassUseTest3 <T extends ParamTest2<List<? extends Foo4>>> {
-
-    public ClassUseTest3(Set<Foo4> p) {}
-
-    public <T extends ParamTest2<List<? extends Foo4>>> ParamTest2<List<? extends Foo4>> method(T t) {
-        return null;
-    }
-
-    public void method(Set<Foo4> p) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java b/langtools/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java
deleted file mode 100644
index fdf1ea38076..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 pkg;
-
-public class Foo4 {}
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java b/langtools/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java
deleted file mode 100644
index 597c49e6d0a..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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 pkg;
-
-public class ParamTest2<E> {
-}
diff --git a/langtools/test/com/sun/javadoc/testTypeParams/pkg/Parent.java b/langtools/test/com/sun/javadoc/testTypeParams/pkg/Parent.java
deleted file mode 100644
index c6479c1a1c2..00000000000
--- a/langtools/test/com/sun/javadoc/testTypeParams/pkg/Parent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg;
-
-public class Parent {}
diff --git a/langtools/test/com/sun/javadoc/testUnnamedPackage/BadSource.java b/langtools/test/com/sun/javadoc/testUnnamedPackage/BadSource.java
deleted file mode 100644
index 29d3d3a6a7c..00000000000
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/BadSource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2004, 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.
- */
-
-Just a dummy file that should not cause an error.
diff --git a/langtools/test/com/sun/javadoc/testUnnamedPackage/C.java b/langtools/test/com/sun/javadoc/testUnnamedPackage/C.java
deleted file mode 100644
index 941dc7145f3..00000000000
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/C.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- */
-
-/**
- * This is a class in the unnamed package.
- */
-public class C {}
diff --git a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java b/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java
deleted file mode 100644
index 23e413e5cd8..00000000000
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4904075 4774450 5015144 8043698
- * @summary  Reference unnamed package as "Unnamed", not empty string.
- *           Generate a package summary for the unnamed package.
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestUnnamedPackage
- */
-
-public class TestUnnamedPackage extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestUnnamedPackage tester = new TestUnnamedPackage();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-sourcepath", testSrc,
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("package-summary.html", true,
-                "<h1 title=\"Package\" class=\"title\">Package&nbsp;&lt;Unnamed&gt;</h1>",
-                "This is a package comment for the unnamed package.",
-                "This is a class in the unnamed package.");
-
-        checkOutput("package-summary.html", true,
-                "<title>&lt;Unnamed&gt;</title>");
-
-        checkOutput("package-tree.html", true,
-                "<h1 class=\"title\">Hierarchy For Package &lt;Unnamed&gt;</h1>");
-
-        checkOutput("index-all.html", true,
-                "title=\"class in &lt;Unnamed&gt;\"");
-
-        checkOutput("C.html", true,
-                "<a href=\"package-summary.html\">");
-
-        checkOutput(Output.ERROR, false,
-                "BadSource");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testUnnamedPackage/package.html b/langtools/test/com/sun/javadoc/testUnnamedPackage/package.html
deleted file mode 100644
index 5ccf328c289..00000000000
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-    <body>
-        This is a package comment for the unnamed package.
-    </body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testUseOption/C.java b/langtools/test/com/sun/javadoc/testUseOption/C.java
deleted file mode 100644
index 419d36ba73c..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/C.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Class in an unnamed package.
- */
-
-public class C {
-
-    /**
-     * Field in C.
-     */
-    public UsedInC fieldInC;
-
-    /**
-     * Method in C.
-     */
-    public UsedInC methodInC(UsedInC p) {
-        return p;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java b/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java
deleted file mode 100644
index 2955df39604..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4496290 4985072 7006178 7068595 8016328 8050031 8048351 8081854
- * @summary A simple test to ensure class-use files are correct.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestUseOption
- */
-
-public class TestUseOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestUseOption tester = new TestUseOption();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out-1",
-                "-sourcepath", testSrc,
-                "-use",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-
-        // Eight tests for class use.
-        for (int i = 1; i <= 8; i++) {
-            checkOutput("pkg1/class-use/C1.html", true,
-                    "Test " + i + " passes");
-        }
-
-        // Three more tests for package use.
-        for (int i = 1; i <= 3; i++) {
-            checkOutput("pkg1/package-use.html", true,
-                    "Test " + i + " passes");
-        }
-
-        checkOrder("pkg1/class-use/UsedClass.html",
-                "Field in C1.",
-                "Field in C2.",
-                "Field in C4.",
-                "Field in C5.",
-                "Field in C6.",
-                "Field in C7.",
-                "Field in C8.",
-                "Method in C1.",
-                "Method in C2.",
-                "Method in C4.",
-                "Method in C5.",
-                "Method in C6.",
-                "Method in C7.",
-                "Method in C8."
-        );
-
-        checkOutput("pkg2/class-use/C3.html", true,
-                "<a href=\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">"
-                + "Frames</a></li>"
-        );
-        checkOutput("pkg1/class-use/UsedClass.html", true,
-          "that return types with arguments of type"
-        );
-        checkOutput("pkg1/class-use/UsedClass.html", true,
-          "<a href=\"../../pkg1/C1.html#methodInC1ReturningType--\">methodInC1ReturningType</a>"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-          "Classes in <a href=\"../../pkg1/package-summary.html\">pkg1</a> that implement " +
-          "<a href=\"../../pkg1/UsedInterface.html\" title=\"interface in pkg1\">UsedInterface</a>"
-        );
-        checkOutput("pkg1/class-use/UsedInterfaceA.html", true,
-          "Classes in <a href=\"../../pkg1/package-summary.html\">pkg1</a> that implement " +
-          "<a href=\"../../pkg1/UsedInterfaceA.html\" title=\"interface in pkg1\">UsedInterfaceA</a>"
-        );
-        checkOutput("pkg1/class-use/UsedClass.html", false,
-           "methodInC1Protected"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-           "<a href=\"../../pkg1/AnAbstract.html\" title=\"class in pkg1\">AnAbstract</a>"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "../../pkg1/C10.html#withReturningTypeParameters--"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "../../pkg1/C10.html#withTypeParametersOfType-java.lang.Class-"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "\"../../pkg1/package-summary.html\">pkg1</a> that return " +
-            "<a href=\"../../pkg1/UsedInterface.html\" title=\"interface in pkg1\""
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "<a href=\"../../pkg1/C10.html#addAll-pkg1.UsedInterface...-\">addAll</a>"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "<a href=\"../../pkg1/C10.html#create-pkg1.UsedInterfaceA-pkg1." +
-            "UsedInterface-java.lang.String-\">"
-        );
-        checkOutput("pkg1/class-use/UsedInterface.html", true,
-            "<a href=\"../../pkg1/C10.html#withTypeParametersOfType-java.lang.Class-\">" +
-            "withTypeParametersOfType</a>"
-        );
-    }
-
-    @Test
-    void test2() {
-        javadoc("-d", "out-2",
-                "-sourcepath", testSrc,
-                "-use",
-                testSrc("C.java"), testSrc("UsedInC.java"));
-        checkExit(Exit.OK);
-
-        checkOutput("class-use/UsedInC.html", true,
-                "Uses of <a href=\"../UsedInC.html\" title=\"class in &lt;Unnamed&gt;\">"
-                + "UsedInC</a> in <a href=\"../package-summary.html\">&lt;Unnamed&gt;</a>"
-        );
-        checkOutput("class-use/UsedInC.html", true,
-                "<li class=\"blockList\"><a name=\"unnamed.package\">"
-        );
-        checkOutput("package-use.html", true,
-                "<td class=\"colOne\">"
-                + "<a href=\"class-use/UsedInC.html#unnamed.package\">UsedInC</a>&nbsp;</td>"
-        );
-    }
-
-    @Test
-    void test3() {
-        javadoc("-d", "out-3",
-                "-sourcepath", testSrc,
-                "-use",
-                "-package", "unique");
-        checkExit(Exit.OK);
-        checkUnique("unique/class-use/UseMe.html",
-                "<a href=\"../../unique/C1.html#umethod1-unique.UseMe-unique.UseMe:A-\">",
-                "<a href=\"../../unique/C1.html#umethod2-unique.UseMe-unique.UseMe-\">",
-                "<a href=\"../../unique/C1.html#umethod3-unique.UseMe-unique.UseMe-\">",
-                "<a href=\"../../unique/C1.html#C1-unique.UseMe-unique.UseMe-\">");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/UsedInC.java b/langtools/test/com/sun/javadoc/testUseOption/UsedInC.java
deleted file mode 100644
index 61b43eda51d..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/UsedInC.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-public class UsedInC
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java
deleted file mode 100644
index 4d31c6f36bd..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/AnAbstract.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-public abstract class AnAbstract implements UsedInterface {}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C1.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C1.java
deleted file mode 100644
index 57860948771..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C1.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.util.List;
-
-/**
- * Test 3 passes.
- */
-
-public class C1 {
-
-    /**
-     * Field in C1.
-     */
-    public UsedClass fieldInC1;
-
-    /**
-     * Method in C1.
-     */
-    public UsedClass methodInC1(UsedClass p) {
-        return p;
-    }
-
-    public List<UsedClass> methodInC1ReturningType() {
-        return null;
-    }
-
-    /*
-     * this must not appear anywhere.
-     */
-    UsedClass methodInC1Protected(List<UsedClass> p){
-        return p;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C10.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C10.java
deleted file mode 100644
index c920adf798f..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C10.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-import java.util.List;
-
-/**
- * An implementor
- *
- */
-public class C10 extends UsedClass implements UsedInterface, UsedInterfaceA {
-
-    /**
-     * Nothing
-     */
-    public void doNothing() {}
-
-    /**
-     * Me too
-     */
-    public void doNothingA() {}
-
-    /**
-     * returns a collection with type param
-     * @return something
-     */
-    public List<? extends UsedClass> foo(){return null;}
-
-    /**
-     * returns and takes type param variants
-     * @param <T> yeah
-     * @return returns a type param
-     */
-    public <T extends UsedInterface<? super T>> UsedInterfaceA<T> withTypeParametersOfType(Class<? extends UsedInterface> c){return null;}
-
-    /**
-     * returns a type param
-     * @param <T> a param
-     * @return something
-     */
-    public <T extends UsedInterface>T[] withReturningTypeParameters(){return null;}
-
-    /**
-     * a return a type parameter, as a static method
-     * @param <T> a type param
-     * @param enumType something
-     * @param name something
-     * @return a trype param
-     */
-    public static <T extends UsedInterface<T>> T withReturnVariant(Class<T> enumType, String name){return null;}
-
-    /**
-     * another variant of a method returning type parameters
-     * @param <T> something
-     * @param listenerInterface something
-     * @param target something
-     * @param action something
-     * @return a type param
-     */
-    public <T> T create(UsedInterfaceA<T> listenerInterface, UsedInterface target, String action){return null;}
-
-    /**
-     * input is an array
-     * @param elements a vararg
-     */
-    public void addAll(UsedInterface... elements) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C2.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C2.java
deleted file mode 100644
index 83f5913650b..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C2.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2002, 2004, 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 pkg1;
-
-public class C2 {
-
-    /**
-     * Field in C2.
-     */
-    public UsedClass fieldInC2;
-
-    /**
-     * Test 3 passes.
-     */
-    public C1 field = null;
-
-    /**
-     * Test 4 passes.
-     */
-    public C1 method2() {
-        return null;
-    }
-
-    /**
-     * Test 5 passes.
-     */
-    public void method(pkg1.C1 c1) {}
-
-    /**
-     * Method in C2.
-     */
-    public UsedClass methodInC2(UsedClass p) {
-        return p;
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C4.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C4.java
deleted file mode 100644
index 32974b5a9fc..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C4.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class C4
-{
-    /**
-     * Field in C4.
-     */
-    public UsedClass fieldInC4;
-
-    /**
-     * Method in C4.
-     */
-    public UsedClass methodInC4(UsedClass p) {
-        return p;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C5.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C5.java
deleted file mode 100644
index 15bf9747742..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C5.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class C5
-{
-    /**
-     * Field in C5.
-     */
-    public UsedClass fieldInC5;
-
-    /**
-     * Method in C5.
-     */
-    public UsedClass methodInC5(UsedClass p) {
-        return p;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C6.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C6.java
deleted file mode 100644
index fafe89a4301..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C6.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class C6
-{
-    /**
-     * Field in C6.
-     */
-    public UsedClass fieldInC6;
-
-    /**
-     * Method in C6.
-     */
-    public UsedClass methodInC6(UsedClass p) {
-        return p;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C7.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C7.java
deleted file mode 100644
index f54c663f9eb..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C7.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class C7
-{
-    /**
-     * Field in C7.
-     */
-    public UsedClass fieldInC7;
-
-    /**
-     * Method in C7.
-     */
-    public UsedClass methodInC7(UsedClass p) {
-        return p;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C8.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C8.java
deleted file mode 100644
index ebe66c3292f..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C8.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class C8
-{
-    /**
-     * Field in C8.
-     */
-    public UsedClass fieldInC8;
-
-    /**
-     * Method in C8.
-     */
-    public UsedClass methodInC8(UsedClass p) {
-        return p;
-    }
-
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C9.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/C9.java
deleted file mode 100644
index 4b86c8908bd..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/C9.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package pkg1;
-
-/**
- * An implementor
- *
- */
-public class C9 implements UsedInterface, UsedInterfaceA {
-    public void doNothing(){}
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java
deleted file mode 100644
index e2569095b0a..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 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 pkg1;
-
-public class UsedClass
-{
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterface.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterface.java
deleted file mode 100644
index 2d626059727..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterface.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * An interface
- *
- */
-
-package pkg1;
-
-public interface UsedInterface<T> {
-
-    /**
-     * Does nothing
-     */
-    void doNothing();
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterfaceA.java b/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterfaceA.java
deleted file mode 100644
index c41885c7266..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/UsedInterfaceA.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * An interface
- *
- */
-
-package pkg1;
-
-public interface UsedInterfaceA<T> {
-
-    /**
-     * Does nothing
-     */
-    void doNothingA();
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg1/package.html b/langtools/test/com/sun/javadoc/testUseOption/pkg1/package.html
deleted file mode 100644
index d0d56a3d52e..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg1/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<BODY>
-    Test 1 passes.
-</BODY>
-</HTML>
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg2/C3.java b/langtools/test/com/sun/javadoc/testUseOption/pkg2/C3.java
deleted file mode 100644
index e5e787fd3ec..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg2/C3.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002, 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 pkg2;
-
-import pkg1.*;
-
-public class C3 {
-
-    /**
-     * Test 6 passes.
-     */
-    public C1 field = null;
-
-    /**
-     * Test 7 passes.
-     */
-    public C1 method2() {
-        return null;
-    }
-
-    /**
-     * Test 8 passes.
-     */
-    public void method(pkg1.C1 c1) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/pkg2/package.html b/langtools/test/com/sun/javadoc/testUseOption/pkg2/package.html
deleted file mode 100644
index 5a42460e03f..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/pkg2/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<BODY>
-    Test 2 passes.
-</BODY>
-</HTML>
diff --git a/langtools/test/com/sun/javadoc/testUseOption/unique/C1.java b/langtools/test/com/sun/javadoc/testUseOption/unique/C1.java
deleted file mode 100644
index 814405dedc8..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/unique/C1.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package unique;
-
-/**
- * A class to ensure we get unique entries in class-use for each of these,
- * so make sure each method is uniquely named to avoid false positives
- */
-
-public class C1 {
-
-    /**
-     * Ctor C1 to test uniqueness
-     * @param a param
-     * @param b param
-     */
-    public C1(UseMe a, UseMe b){}
-
-    /**
-     * umethod1 to test uniqueness
-     * @param one param
-     * @param uarray param
-     */
-    public void umethod1(UseMe<?> one, UseMe<?>[] uarray){}
-
-    /**
-     * umethod1 to test uniqueness
-     * @param one param
-     * @param two param
-     */
-    public void umethod2(UseMe<?> one, UseMe<?> two){}
-
-    /**
-     * umethod1 to test uniqueness
-     * @param a param
-     * @param b param
-     */
-    public void umethod3(UseMe a, UseMe b){}
-}
diff --git a/langtools/test/com/sun/javadoc/testUseOption/unique/UseMe.java b/langtools/test/com/sun/javadoc/testUseOption/unique/UseMe.java
deleted file mode 100644
index 1af5654af4f..00000000000
--- a/langtools/test/com/sun/javadoc/testUseOption/unique/UseMe.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package unique;
-
-public class UseMe<T> {}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
deleted file mode 100644
index 57c5852c3d8..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      4764045 8004825 8026567
- * @summary  This test ensures that the value tag works in all
- * use cases. The explainations for each test case are written below.
- * @author   jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestValueTag
- */
-
-public class TestValueTag extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestValueTag tester = new TestValueTag();
-        tester.runTests();
-    }
-
-    @Test
-    void test1() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                "-tag", "todo",
-                "pkg1", "pkg2");
-        checkExit(Exit.FAILED);
-
-        checkOutput("pkg1/Class1.html", true,
-                // Base case:  using @value on a constant.
-                "Result:  \"Test 1 passes\"",
-                // Retrieve value of constant in same class.
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_2_PASSES\">\"Test 2 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_3_PASSES\">\"Test 3 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_4_PASSES\">\"Test 4 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_5_PASSES\">\"Test 5 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_6_PASSES\">\"Test 6 passes\"</a>");
-
-        checkOutput("pkg1/Class2.html", true,
-                // Retrieve value of constant in different class.
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_7_PASSES\">\"Test 7 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_8_PASSES\">\"Test 8 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_9_PASSES\">\"Test 9 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_10_PASSES\">\"Test 10 passes\"</a>",
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_11_PASSES\">\"Test 11 passes\"</a>",
-                // Retrieve value of constant in different package
-                "Result:  <a href=\"../pkg2/Class3.html#TEST_12_PASSES\">\"Test 12 passes\"</a>",
-                "Result:  <a href=\"../pkg2/Class3.html#TEST_13_PASSES\">\"Test 13 passes\"</a>",
-                "Result:  <a href=\"../pkg2/Class3.html#TEST_14_PASSES\">\"Test 14 passes\"</a>",
-                "Result:  <a href=\"../pkg2/Class3.html#TEST_15_PASSES\">\"Test 15 passes\"</a>",
-                "Result:  <a href=\"../pkg2/Class3.html#TEST_16_PASSES\">\"Test 16 passes\"</a>");
-
-        checkOutput("pkg2/package-summary.html", true,
-                // Retrieve value of constant from a package page
-                "Result: <a href=\"../pkg2/Class3.html#TEST_17_PASSES\">\"Test 17 passes\"</a>");
-
-        checkOutput("pkg1/CustomTagUsage.html", true,
-                // Test @value tag used with custom tag.
-                "<dt><span class=\"simpleTagLabel\">Todo:</span></dt>\n" +
-                "<dd>the value of this constant is 55.</dd>");
-
-        checkOutput(Output.ERROR, true,
-                // Test @value errors printed due to invalid use or when used with
-                // non-constant or with bad references.
-                "error: value does not refer to a constant\n"
-                + "     * Result:  {@value TEST_12_ERROR}",
-                "error: {@value} not allowed here\n"
-                + "     * Result:  {@value}",
-                "error: value does not refer to a constant\n"
-                + "     * Result:  {@value NULL}",
-                "error: {@value} not allowed here\n"
-                + "     * Invalid (null): {@value}",
-                "error: {@value} not allowed here\n"
-                + "     * Invalid (non-constant field): {@value}",
-                "error: value does not refer to a constant\n"
-                + "     * Here is a bad value reference: {@value UnknownClass#unknownConstant}",
-                "error: reference not found\n"
-                + "     * Here is a bad value reference: {@value UnknownClass#unknownConstant}",
-                "error: {@value} not allowed here\n"
-                + "     * @todo the value of this constant is {@value}"
-        );
-
-        checkOutput("pkg1/Class1.html", false,
-                //Base case:  using @value on a constant.
-                "Result:  <a href=\"../pkg1/Class1.html#TEST_12_ERROR\">\"Test 12 "
-                + "generates an error message\"</a>");
-
-        checkForException();
-    }
-
-    @Test()
-    void test2() {
-        javadoc("-Xdoclint:none",
-                "-d", "out2",
-                "-sourcepath", testSrc,
-                "-tag", "todo",
-                "pkg1", "pkg2");
-        checkExit(Exit.OK);
-        checkOutput(Output.WARNING, true,
-                //Test @value warning printed when used with non-constant.
-                "warning - @value tag (which references nonConstant) "
-                + "can only be used in constants.",
-                "warning - @value tag (which references NULL) "
-                + "can only be used in constants.",
-                "warning - @value tag (which references TEST_12_ERROR) "
-                + "can only be used in constants.",
-                //Test warning printed for bad reference.
-                "warning - UnknownClass#unknownConstant (referenced by "
-                + "@value tag) is an unknown reference.",
-                //Test warning printed for invalid use of @value.
-                "warning - @value tag cannot be used here."
-        );
-        checkForException();
-    }
-
-    void checkForException() {
-        checkOutput(Output.STDERR, false, "DocletAbortException");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class1.java b/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class1.java
deleted file mode 100644
index 3b03881c7f9..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class1.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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 pkg1;
-
-/**
- * Result:  {@value TEST_2_PASSES}
- */
-public class Class1 {
-
-    /**
-     * Result:  {@value}
-     */
-    public static final String TEST_1_PASSES = "Test 1 passes";
-
-    public static final String TEST_2_PASSES  = "Test 2 passes";
-    public static final String TEST_3_PASSES  = "Test 3 passes";
-    public static final String TEST_4_PASSES  = "Test 4 passes";
-    public static final String TEST_5_PASSES  = "Test 5 passes";
-    public static final String TEST_6_PASSES  = "Test 6 passes";
-    public static final String TEST_7_PASSES  = "Test 7 passes";
-    public static final String TEST_8_PASSES  = "Test 8 passes";
-    public static final String TEST_9_PASSES  = "Test 9 passes";
-    public static final String TEST_10_PASSES = "Test 10 passes";
-    public static final String TEST_11_PASSES = "Test 11 passes";
-
-    /**
-     * Invalid (non-constant field): {@value}
-     */
-    public static String TEST_12_ERROR = "Test 12 generates an error message";
-
-    /**
-     * Invalid (null): {@value}
-     */
-    public static final String NULL = null;
-
-    /**
-     * Result:  {@value TEST_3_PASSES}
-     */
-    public int field;
-
-    /**
-     * Result:  {@value TEST_4_PASSES}
-     */
-    public Class1() {}
-
-    /**
-     * Result:  {@value TEST_5_PASSES}
-     */
-    public void method() {}
-
-    /**
-     * Result:  {@value TEST_12_ERROR}
-     */
-    public void invalidValueTag1() {}
-
-    /**
-     * Result:  {@value}
-     */
-    public void invalidValueTag2() {}
-
-    /**
-     * Result:  {@value NULL}
-     */
-    public void testNullConstant() {}
-
-    /**
-     * Result:  {@value pkg1.Class1#TEST_6_PASSES}
-     */
-    public class NestedClass{}
-}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class2.java b/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class2.java
deleted file mode 100644
index 2d5d0d57a57..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/pkg1/Class2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg1;
-
-/**
- * <pre>
- *  Result:  {@value pkg1.Class1#TEST_7_PASSES}
- *  Result:  {@value pkg2.Class3#TEST_12_PASSES}
- * </pre>
- */
-public class Class2 {
-
-    /**
-     * <pre>
-     * Result:  {@value pkg1.Class1#TEST_8_PASSES}
-     * Result:  {@value pkg2.Class3#TEST_13_PASSES}
-     * </pre>
-     */
-    public int field;
-
-    /**
-     * <pre>
-     * Result:  {@value pkg1.Class1#TEST_9_PASSES}
-     * Result:  {@value pkg2.Class3#TEST_14_PASSES}
-     * </pre>
-     */
-    public Class2() {}
-
-    /**
-     * <pre>
-     * Result:  {@value pkg1.Class1#TEST_10_PASSES}
-     * Result:  {@value pkg2.Class3#TEST_15_PASSES}
-     * </pre>
-     */
-    public void method() {}
-
-    /**
-     * <pre>
-     * Result:  {@value pkg1.Class1#TEST_11_PASSES}
-     * Result:  {@value pkg2.Class3#TEST_16_PASSES}
-     * </pre>
-     */
-    public class NestedClass{}
-}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java b/langtools/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java
deleted file mode 100644
index 186c068cff5..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg1;
-
-public class CustomTagUsage {
-
-    /**
-     * @todo the value of this constant is {@value}.
-     */
-    public static final int CONSTANT_INT = 55;
-
-    /**
-     * @todo the value of this constant is {@value}.
-     */
-    public int nonConstant = 55;
-
-    /**
-     * Here is a bad value reference: {@value UnknownClass#unknownConstant}.
-     */
-    public int badReference = 55;
-
-}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/pkg2/Class3.java b/langtools/test/com/sun/javadoc/testValueTag/pkg2/Class3.java
deleted file mode 100644
index c31b121b44c..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/pkg2/Class3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2003, 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 pkg2;
-
-public class Class3 {
-
-    public static final String TEST_12_PASSES  = "Test 12 passes";
-    public static final String TEST_13_PASSES  = "Test 13 passes";
-    public static final String TEST_14_PASSES  = "Test 14 passes";
-    public static final String TEST_15_PASSES  = "Test 15 passes";
-    public static final String TEST_16_PASSES  = "Test 16 passes";
-    public static final String TEST_17_PASSES  = "Test 17 passes";
-}
diff --git a/langtools/test/com/sun/javadoc/testValueTag/pkg2/package.html b/langtools/test/com/sun/javadoc/testValueTag/pkg2/package.html
deleted file mode 100644
index 13992d83177..00000000000
--- a/langtools/test/com/sun/javadoc/testValueTag/pkg2/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-    <body>
-        Result: {@value pkg2.Class3#TEST_17_PASSES}
-    </body>
-</html>
diff --git a/langtools/test/com/sun/javadoc/testWarnBadParamNames/C.java b/langtools/test/com/sun/javadoc/testWarnBadParamNames/C.java
deleted file mode 100644
index ac9db0656e3..00000000000
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/C.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2002, 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.
- */
-
-public class C {
-    /**
-     * @param int arg
-     * @param IDontExist
-     * @param arg this is a valid comment for parameter arg.
-     * @param arg this is an invalid comment for a parameter arg
-     *            because it has already been documented above.
-     */
-    public void method(int arg) {}
-}
diff --git a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java
deleted file mode 100644
index 31686f3f247..00000000000
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2002, 2015, 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 4693440
- * @summary Test to make sure that warning is printed when bad parameter
- * name is used with param.
- * @author jamieh
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestWarnBadParamNames
- */
-
-public class TestWarnBadParamNames extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestWarnBadParamNames tester = new TestWarnBadParamNames();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-Xdoclint:none",
-                "-d", "out",
-                testSrc("C.java"));
-        checkExit(Exit.OK);
-
-        checkOutput(Output.WARNING, true,
-                "warning - @param argument \"int\" is not a parameter name.",
-                "warning - @param argument \"IDontExist\" is not a parameter name.",
-                "warning - Parameter \"arg\" is documented more than once.");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java
deleted file mode 100644
index 9f5c46d6ebe..00000000000
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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      4515705 4804296 4702454 4697036 8025633
- * @summary  Make sure that first sentence warning only appears once.
- *           Make sure that only warnings/errors are printed when quiet is used.
- *           Make sure that links to private/unincluded methods do not cause
- *           a "link unresolved" warning.
- *           Make sure error message starts with "error -".
- * @author   jamieh
- * @library  ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestWarnings
- */
-
-public class TestWarnings extends JavadocTester {
-    public static void main(String... args) throws Exception  {
-        TestWarnings tester = new TestWarnings();
-        tester.runTests();
-    }
-
-    @Test
-    void testDefault() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-default",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.FAILED);  // TODO: investigate; suspect bad input HTML
-
-        checkOutput(Output.WARNING, true,
-                "X.java:11: warning - Missing closing '}' character for inline tag");
-        checkOutput(Output.ERROR, true,
-                "package.html: error - Body tag missing from HTML");
-
-        checkOutput("pkg/X.html", false,
-                "can't find m()");
-        checkOutput("pkg/X.html", false,
-                "can't find X()");
-        checkOutput("pkg/X.html", false,
-                "can't find f");
-    }
-
-    @Test
-    void testPrivate() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-private",
-                "-private",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.FAILED);  // TODO: investigate; suspect bad input HTML
-
-        checkOutput("pkg/X.html", true,
-            "<a href=\"../pkg/X.html#m--\"><code>m()</code></a><br/>",
-            "<a href=\"../pkg/X.html#X--\"><code>X()</code></a><br/>",
-            "<a href=\"../pkg/X.html#f\"><code>f</code></a><br/>");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testWarnings/pkg/X.java b/langtools/test/com/sun/javadoc/testWarnings/pkg/X.java
deleted file mode 100644
index 74939978d07..00000000000
--- a/langtools/test/com/sun/javadoc/testWarnings/pkg/X.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/* /nodynamiccopyright/ */
-
-package pkg;
-
-import java.io.Serializable;
-
-/**
- * {@link com.package1.Class1#publicStaticMethod().
- * Any label would be ignored.
- */
-public class X implements Serializable {
-
-    private int f;
-
-    private X(){}
-
-    private void m() {}
-
-    /** @see X#m() */
-    private static class P implements Serializable {}
-
-    /**
-     * {@link #X()}<br/>
-     * {@link #m()}<br/>
-     * {@link #f}<br/>
-     * {@link java.lang.String#toString()}<br/>
-     */
-    public void foo() {}
-}
diff --git a/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html b/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
deleted file mode 100644
index 6fe786d606a..00000000000
--- a/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<HTML>
-   Testing.
-<HTML>
-
diff --git a/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java b/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
deleted file mode 100644
index 2894a02f5a4..00000000000
--- a/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 8016675 8026736
- * @summary Test for window title.
- * @author Bhavesh Patel
- * @library ../lib
- * @modules jdk.javadoc
- * @build JavadocTester
- * @run main TestWindowTitle
- */
-public class TestWindowTitle extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestWindowTitle tester = new TestWindowTitle();
-        tester.runTests();
-        tester.printSummary();
-    }
-
-    @Test
-    void testJavaScriptChars() {
-        // Window title with JavaScript special characters.
-        String title = "Testing \"Window 'Title'\" with a \\ backslash and a / "
-                + "forward slash and a \u00e8 unicode char also a    tab and also a "
-                + "\t special character another \u0002 unicode)";
-
-        javadoc("-d", "out-js-chars",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", true,
-                "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" "
-                + "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char "
-                + "also a    tab and also a \\t special character another \\u0002 unicode))\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-                "parent.document.title=\"Overview (Testing \"Window \'Title\'\" "
-                + "with a \\ backslash and a / forward slash and a \u00E8 unicode char "
-                + "also a    tab and also a \t special character another \u0002 unicode))\";"
-        );
-    }
-
-    @Test
-    void testScriptTag() {
-        // Window title with a script tag.
-        String title = "Testing script tag in title </title><script>alert(\"Should not pop up\")</script>.";
-
-        javadoc("-d", "out-script",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", true,
-                "parent.document.title=\"Overview (Testing script tag in title alert"
-                + "(\\\"Should not pop up\\\").)\";"
-        );
-
-        checkOutput("p2/C2.html", true,
-                "parent.document.title=\"C2 (Testing script tag in title alert"
-                + "(\\\"Should not pop up\\\").)\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-                "parent.document.title=\"Overview (Testing script tag in title </title><script>"
-                + "alert(\\\"Should not pop up\\\")</script>.)\";"
-        );
-
-        checkOutput("p2/C2.html", false,
-                "parent.document.title=\"C2 (Testing script tag in title </title><script>"
-                + "alert(\\\"Should not pop up\\\")</script>.)\";"
-        );
-    }
-
-    @Test
-    void testHtmlTags() {
-        // Window title with other HTML tags.
-        String title = "Testing another <p>HTML</p> tag. Another <h1>tag</h1>. A "
-                + "<span id=\"testTag\">tag with attributes</span>. <script and </p are not tags.";
-
-        javadoc("-d", "out-html-tags",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", true,
-            "parent.document.title=\"Overview (Testing another HTML tag. Another tag. A "
-            + "tag with attributes. <script and </p are not tags.)\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-            "parent.document.title=\"Overview (Testing another <p>HTML</p> tag. Another "
-            + "<h1>tag</h1>. A <span id=\"testTag\">tag with attributes</span>. <script and "
-            + "</p are not tags.)\";"
-        );
-    }
-
-    @Test
-    void testHtmlEntities() {
-        // Window title using entities.
-        String title = "Testing entities &lt;script&gt;alert(\"Should not pop up\")&lt;/script&gt;.";
-
-        javadoc("-d", "out-html-entities",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-
-        checkOutput("overview-summary.html", true,
-            "parent.document.title=\"Overview (Testing entities &lt;script&gt;alert(\\\"Should "
-            + "not pop up\\\")&lt;/script&gt;.)\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-            "parent.document.title=\"Overview (Testing entities alert(\\\"Should not pop up\\\").)\";"
-        );
-    }
-
-    @Test
-    void testEmptyTags() {
-        // Window title with just empty HTML tags.
-        String title = "</title><script></script>";
-
-        javadoc("-d", "out-empty-tags",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-
-        checkOutput("overview-summary.html", true,
-            "parent.document.title=\"Overview\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-            "parent.document.title=\"Overview (</title><script></script>)\";"
-        );
-    }
-
-    @Test
-    void testUnicode() {
-        //Window title with unicode characters.
-        String title = "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e.";
-
-        javadoc("-d", "out-unicode",
-                "-windowtitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", true,
-            "parent.document.title=\"Overview (Testing unicode alert(\\\"Should "
-            + "not pop up\\\").)\";"
-        );
-
-        checkOutput("overview-summary.html", false,
-            "parent.document.title=\"Overview (Testing unicode <script>alert(\\\"Should not pop up\\\")"
-            + "</script>.)\";"
-        );
-    }
-
-    @Test
-    void testEmpty() {
-        // An empty window title.
-        String title = "";
-        javadoc("-d", "out-empty",
-                "-windowtitle", title,
-                "-sourcepath", testSrc, "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", true,
-                "parent.document.title=\"Overview\";"
-        );
-    }
-
-    @Test
-    void testDocTitle() {
-        // Window title with JavaScript special characters, specified with -doctitle
-        String title = "Testing \"Window 'Title'\" with a \\ backslash and a / "
-                + "forward slash and a \u00e8 unicode char also a    tab and also a "
-                + "\t special character another \u0002 unicode)";
-
-        javadoc("-d", "out-doctitle",
-                "-doctitle", title,
-                "-sourcepath", testSrc,
-                "p1", "p2");
-        checkExit(Exit.OK);
-
-        checkOutput("overview-summary.html", false,
-            "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" "
-            + "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char "
-            + "also a    tab and also a \\t special character another \\u0002 unicode)\";"
-        );
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java b/langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java
deleted file mode 100644
index 239d7a63de0..00000000000
--- a/langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, 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 p1;
-
-public class C1 {
-}
diff --git a/langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java b/langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java
deleted file mode 100644
index 7d075a6fd9f..00000000000
--- a/langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, 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 p2;
-
-public class C2 {
-}
diff --git a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java b/langtools/test/com/sun/javadoc/testXOption/TestXOption.java
deleted file mode 100644
index 1b7b323fb24..00000000000
--- a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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      8007687
- * @summary  Make sure that the -X option works properly.
- * @library ../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestXOption
- */
-
-public class TestXOption extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestXOption tester = new TestXOption();
-        tester.runTests();
-    }
-
-    @Test
-    void testWithOption() {
-        javadoc("-d", "out1",
-                "-sourcepath", testSrc,
-                "-X",
-                testSrc("TestXOption.java"));
-        checkExit(Exit.OK);
-        checkOutput(true);
-    }
-
-    @Test
-    void testWithoutOption() {
-        javadoc("-d", "out2",
-                "-sourcepath", testSrc,
-                testSrc("TestXOption.java"));
-        checkExit(Exit.OK);
-        checkOutput(false);
-    }
-
-    private void checkOutput(boolean expectFound) {
-        // TODO: It's an ugly hidden side-effect of the current doclet API
-        // that the -X output from the tool and the -X output from the doclet
-        // come out on different streams!
-        // When we clean up the doclet API, this should be rationalized.
-        checkOutput(Output.NOTICE, expectFound,
-                "-Xmaxerrs ",
-                "-Xmaxwarns ");
-        checkOutput(Output.STDOUT, expectFound,
-                "-Xdocrootparent ",
-                "-Xdoclint ",
-                "-Xdoclint:");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
deleted file mode 100644
index 3ae32570e38..00000000000
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 8006735
- * @summary  Smoke test for ensuring that annotations are emitted to javadoc
- *
- * @author   Mahmood Ali <mali>
- * @library  ../../lib
- * @modules jdk.javadoc
- * @build    JavadocTester
- * @run main TestSmoke
- */
-
-public class TestSmoke extends JavadocTester {
-
-    public static void main(String... args) throws Exception {
-        TestSmoke tester = new TestSmoke();
-        tester.runTests();
-    }
-
-    @Test
-    void test() {
-        javadoc("-d", "out",
-                "-private",
-                "-sourcepath", testSrc,
-                "pkg");
-        checkExit(Exit.OK);
-
-        checkOutput("pkg/T0x1C.html", true, "@DA");
-        checkOutput("pkg/T0x1D.html", true, "@DA");
-        checkOutput("pkg/T0x0D.html", true, "@DA");
-        checkOutput("pkg/T0x06.html", true, "@DA");
-        checkOutput("pkg/T0x0B.html", true, "@DA");
-        checkOutput("pkg/T0x0F.html", true, "@DA");
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x20.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x20A.html", true, "@DTPA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x20B.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x22.html", true, "@DA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x22A.html", true, "@DTPA");
-        */
-        /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        checkOutput("pkg/T0x22B.html", true, "@DA");
-        */
-        checkOutput("pkg/T0x10.html", true, "@DA");
-        checkOutput("pkg/T0x10A.html", true, "@DA");
-        checkOutput("pkg/T0x12.html", true, "@DA");
-        checkOutput("pkg/T0x11.html", true, "@DA");
-        checkOutput("pkg/T0x13.html", true, "@DA");
-        checkOutput("pkg/T0x15.html", true, "@DA");
-        checkOutput("pkg/T0x14.html", true, "@DA");
-        checkOutput("pkg/T0x16.html", true, "@DA");
-
-        checkOutput("pkg/T0x1C.html", false, "@A");
-        checkOutput("pkg/T0x1D.html", false, "@A");
-        checkOutput("pkg/T0x00.html", false, "@A");
-        checkOutput("pkg/T0x01.html", false, "@A");
-        checkOutput("pkg/T0x02.html", false, "@A");
-        checkOutput("pkg/T0x04.html", false, "@A");
-        checkOutput("pkg/T0x08.html", false, "@A");
-        checkOutput("pkg/T0x0D.html", false, "@A");
-        checkOutput("pkg/T0x06.html", false, "@A");
-        checkOutput("pkg/T0x0B.html", false, "@A");
-        checkOutput("pkg/T0x0F.html", false, "@A");
-        checkOutput("pkg/T0x20.html", false, "@A");
-        checkOutput("pkg/T0x20A.html", false, "@A");
-        checkOutput("pkg/T0x20B.html", false, "@A");
-        checkOutput("pkg/T0x22.html", false, "@A");
-        checkOutput("pkg/T0x22A.html", false, "@A");
-        checkOutput("pkg/T0x22B.html", false, "@A");
-        checkOutput("pkg/T0x10.html", false, "@A");
-        checkOutput("pkg/T0x10A.html", false, "@A");
-        checkOutput("pkg/T0x12.html", false, "@A");
-        checkOutput("pkg/T0x11.html", false, "@A");
-        checkOutput("pkg/T0x13.html", false, "@A");
-        checkOutput("pkg/T0x15.html", false, "@A");
-        checkOutput("pkg/T0x14.html", false, "@A");
-        checkOutput("pkg/T0x16.html", false, "@A");
-    }
-}
diff --git a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
deleted file mode 100644
index 104b74a717b..00000000000
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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 pkg;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.*;
-
-import java.util.*;
-import java.io.*;
-
-/*
- * @summary compiler accepts all values
- * @author Mahmood Ali
- * @author Yuri Gaevsky
- */
-
-@Target(TYPE_USE)
-@Retention(RetentionPolicy.RUNTIME)
-@interface A {}
-
-@Target(TYPE_USE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@interface DA {}
-
-@Target(TYPE_PARAMETER)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@interface DTPA {}
-
-/** typecast */
-class T0x00 {
-    void m0x00(Long l1) {
-        Object l2 = (@A @DA Long) l1;
-    }
-}
-
-/** typecast generic/array */
-class T0x01<T> {
-    void m0x01(List<T> list) {
-        List<T> l = (List<@A @DA T>) list;
-    }
-}
-
-/** instanceof */
-class T0x02 {
-    boolean m0x02(String s) {
-        return (s instanceof @A @DA String);
-    }
-}
-
-/** type test (instanceof) generic/array */
-class T0x03<T> {
-    void m0x03(T typeObj, Object obj) {
-        boolean ok = obj instanceof String @A @DA [];
-    }
-}
-
-/** object creation (new) */
-class T0x04 {
-    void m0x04() {
-        new @A @DA ArrayList<String>();
-    }
-}
-
-/** object creation (new) generic/array */
-class T0x05<T> {
-    void m0x05() {
-        new ArrayList<@A @DA T>();
-    }
-}
-
-/** method receiver */
-class T0x06 {
-    void m0x06(@A @DA T0x06 this) {}
-}
-
-/** local variable */
-class T0x08 {
-    void m0x08() {
-      @A @DA String s = null;
-    }
-}
-
-/** local variable generic/array */
-class T0x09<T> {
-    void g() {
-        List<@A @DA String> l = null;
-    }
-
-    void a() {
-        String @A @DA [] as = null;
-    }
-}
-
-/** method return type generic/array */
-class T0x0B {
-    Class<@A @DA Object> m0x0B() { return null; }
-}
-
-/** method parameter generic/array */
-class T0x0D {
-    void m0x0D(HashMap<@A @DA Object, List<@A @DA List<@A @DA Class>>> s1) {}
-}
-
-/** field generic/array */
-class T0x0F {
-    HashMap<@A @DA Object, @A @DA Object> c1;
-}
-
-/** class type parameter bound */
-class T0x10<T extends @A @DA Cloneable> {
-}
-
-class T0x10A<T extends @A @DA Object> {
-}
-
-/** class type parameter bound generic/array */
-class T0x11<T extends List<@A @DA T>> {
-}
-
-/** method type parameter bound */
-class T0x12<T> {
-    <T extends @A @DA Cloneable> void m0x12() {}
-}
-
-/** method type parameter bound generic/array */
-class T0x13 {
-    static <T extends Comparable<@A @DA T>> T m0x13() {
-        return null;
-    }
-}
-
-/** class extends/implements */
-class T0x14 extends @A @DA Thread implements @A @DA Serializable, @A @DA Cloneable {
-}
-
-/** class extends/implements generic/array */
-class T0x15<T> extends ArrayList<@A @DA T> {
-}
-
-/** exception type in throws */
-class T0x16 {
-    void m0x16() throws @A @DA Exception {}
-}
-
-/** type argument in constructor call */
-class T0x18<T> {
-    <T> T0x18() {}
-
-    void m() {
-        new <@A @DA Integer> T0x18();
-    }
-}
-
-/** type argument in constructor call generic/array */
-class T0x19 {
-    <T> T0x19() {}
-
-    void g() {
-       new <List<@A @DA String>> T0x19();
-    }
-}
-
-/** type argument in method call */
-class T0x1A<T,U> {
-    public static <T, U> T m() { return null; }
-    static void m0x1A() {
-        T0x1A.<@A @DA Integer, @A @DA Short>m();
-    }
-}
-
-/** type argument in method call generic/array */
-class T0x1B<T> {
-    void m0x1B() {
-        Collections.<T @A @DA []>emptyList();
-    }
-}
-
-/** wildcard bound */
-class T0x1C {
-    void m0x1C(List<? extends @A @DA String> lst) {}
-}
-
-/** wildcard bound generic/array */
-class T0x1D<T> {
-    void m0x1D(List<? extends @A @DA List<int[]>> lst) {}
-}
-
-/** method type parameter */
-class T0x20 {
-    <@A @DA T> void m0x20() {}
-}
-
-class T0x20A {
-    <@A @DTPA T> void m0x20A() {}
-}
-
-class T0x20B {
-    <T> void m0x20B(@A @DA T p) {}
-}
-
-/** class type parameter */
-class T0x22<@A @DA T> {
-}
-
-class T0x22A<@A @DTPA T> {
-}
-
-class T0x22B<T> {
-    @A @DA T f;
-}
diff --git a/langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java b/langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java
index 1dfc19fcd12..36dc5a3e76c 100644
--- a/langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java
+++ b/langtools/test/jdk/javadoc/tool/EnsureNewOldDoclet.java
@@ -23,9 +23,9 @@
 
 /*
  * @test
- * @bug 8035473 8154482 8154399 8159096 8176131 8176331
- * @summary make sure the javadoc tool responds correctly to Xold,
- *          old doclets and taglets.
+ * @bug 8035473 8154482 8154399 8159096 8176131 8176331 8177511
+ * @summary make sure the javadoc tool responds correctly,
+ *          to old and new doclet implementations.
  * @library /tools/lib
  * @build toolbox.ToolBox toolbox.TestRunner
  * @run main EnsureNewOldDoclet
@@ -51,9 +51,7 @@ import toolbox.*;
 /**
  * This test ensures the doclet responds correctly when given
  * various conditions that force a fall back to the old javadoc
- * tool. The following condition in the order described will
- * force a dispatch to the old tool, -Xold, old doclet and old taglet.
- *
+ * tool.
  */
 public class EnsureNewOldDoclet extends TestRunner {
 
@@ -67,27 +65,20 @@ public class EnsureNewOldDoclet extends TestRunner {
     final static String CLASS_NAME = "EnsureNewOldDoclet";
     final static String OLD_DOCLET_CLASS_NAME = CLASS_NAME + "$OldDoclet";
     final static String NEW_DOCLET_CLASS_NAME = CLASS_NAME + "$NewDoclet"; //unused
-    final static String OLD_TAGLET_CLASS_NAME = CLASS_NAME + "$OldTaglet";
     final static String NEW_TAGLET_CLASS_NAME = CLASS_NAME + "$NewTaglet";
 
-    final static Pattern OLD_HEADER = Pattern.compile("^Standard Doclet \\(Old\\) version.*");
+    final static Pattern OLD_HEADER = Pattern.compile(".*This is not the Standard Doclet.*");
     final static Pattern NEW_HEADER = Pattern.compile("^Standard Doclet version.*");
 
 
     final static String OLD_DOCLET_MARKER = "OLD_DOCLET_MARKER";
-    final static String OLD_TAGLET_MARKER = "Registered: OldTaglet";
 
     final static String NEW_DOCLET_MARKER = "NEW_DOCLET_MARKER";
     final static String NEW_TAGLET_MARKER = "Registered Taglet " + CLASS_NAME + "\\$NewTaglet";
 
     final static Pattern WARN_TEXT = Pattern.compile("Users are strongly recommended to migrate" +
                                                     " to the new APIs.");
-    final static String OLD_DOCLET_ERROR = "java.lang.NoSuchMethodException: " +
-            CLASS_NAME +"\\$NewTaglet";
-    final static Pattern NEW_DOCLET_ERROR = Pattern.compile(".*java.lang.ClassCastException.*Taglet " +
-            CLASS_NAME + "\\$OldTaglet.*");
 
-    final static String OLD_STDDOCLET = "com.sun.tools.doclets.standard.Standard";
     final static String NEW_STDDOCLET = "jdk.javadoc.doclet.StandardDoclet";
 
 
@@ -127,20 +118,6 @@ public class EnsureNewOldDoclet extends TestRunner {
         checkOutput(testName, out, NEW_HEADER);
     }
 
-    // input: -Xold
-    // outcome: old tool
-    @Test
-    public void testXold() throws Exception {
-        setArgs("-Xold",
-                "-classpath", ".", // ambient classpath insulation
-                testSrc.toString());
-        Task.Result tr = task.run(Task.Expect.SUCCESS);
-        List<String> out = tr.getOutputLines(Task.OutputKind.STDOUT);
-        List<String> err = tr.getOutputLines(Task.OutputKind.STDERR);
-        checkOutput(testName, out, OLD_HEADER);
-        checkOutput(testName, err, WARN_TEXT);
-    }
-
     // input: old doclet
     // outcome: old tool
     @Test
@@ -158,63 +135,6 @@ public class EnsureNewOldDoclet extends TestRunner {
         checkOutput(testName, err, WARN_TEXT);
     }
 
-    // input: old taglet
-    // outcome: old tool
-    @Test
-    public void testOldTaglet() throws Exception {
-        setArgs("-classpath", ".", // ambient classpath insulation
-            "-taglet",
-            OLD_TAGLET_CLASS_NAME,
-            "-tagletpath",
-            testClasses,
-            testSrc.toString());
-        Task.Result tr = task.run(Task.Expect.SUCCESS);
-        List<String> out = tr.getOutputLines(Task.OutputKind.STDOUT);
-        List<String> err = tr.getOutputLines(Task.OutputKind.STDERR);
-        checkOutput(testName, out, OLD_TAGLET_MARKER);
-        checkOutput(testName, err, WARN_TEXT);
-    }
-
-    // input: new doclet and old taglet
-    // outcome: new doclet with failure
-    @Test
-    public void testNewDocletOldTaglet() throws Exception {
-        setArgs("-classpath", ".", // ambient classpath insulation
-                "-doclet",
-                NEW_STDDOCLET,
-                "-taglet",
-                OLD_TAGLET_CLASS_NAME,
-                "-tagletpath",
-                testClasses,
-                testSrc.toString());
-        Task.Result tr = task.run(Task.Expect.FAIL, 1).writeAll();
-        //Task.Result tr = task.run();
-        List<String> out = tr.getOutputLines(Task.OutputKind.STDOUT);
-        List<String> err = tr.getOutputLines(Task.OutputKind.STDERR);
-        checkOutput(testName, out, NEW_HEADER);
-        checkOutput(testName, err, NEW_DOCLET_ERROR);
-    }
-
-    // input: old doclet and old taglet
-    // outcome: old doclet and old taglet should register
-    @Test
-    public void testOldDocletOldTaglet() throws Exception {
-        setArgs("-classpath", ".", // ambient classpath insulation
-                "-doclet",
-                OLD_STDDOCLET,
-                "-taglet",
-                OLD_TAGLET_CLASS_NAME,
-                "-tagletpath",
-                testClasses,
-                testSrc.toString());
-        Task.Result tr = task.run(Task.Expect.SUCCESS);
-        List<String> out = tr.getOutputLines(Task.OutputKind.STDOUT);
-        List<String> err = tr.getOutputLines(Task.OutputKind.STDERR);
-        checkOutput(testName, out, OLD_HEADER);
-        checkOutput(testName, out, OLD_TAGLET_MARKER);
-        checkOutput(testName, err, WARN_TEXT);
-    }
-
     // input: new doclet and new taglet
     // outcome: new doclet and new taglet should register
     @Test
@@ -234,26 +154,6 @@ public class EnsureNewOldDoclet extends TestRunner {
         checkOutput(testName, out, NEW_TAGLET_MARKER);
     }
 
-    // input: old doclet and new taglet
-    // outcome: old doclet and error
-    @Test
-    public void testOldDocletNewTaglet() throws Exception {
-        setArgs("-classpath", ".", // ambient classpath insulation
-                "-doclet",
-                OLD_STDDOCLET,
-                "-taglet",
-                NEW_TAGLET_CLASS_NAME,
-                "-tagletpath",
-                testClasses,
-                testSrc.toString());
-        Task.Result tr = task.run(Task.Expect.FAIL, 1);
-        List<String> out = tr.getOutputLines(Task.OutputKind.STDOUT);
-        List<String> err = tr.getOutputLines(Task.OutputKind.STDERR);
-        checkOutput(testName, out, OLD_HEADER);
-        checkOutput(testName, err, WARN_TEXT);
-        checkOutput(testName, err, OLD_DOCLET_ERROR);
-    }
-
     void setArgs(String... args) {
         ostream.println("cmds: " + Arrays.asList(args));
         task.args(args);
@@ -282,65 +182,6 @@ public class EnsureNewOldDoclet extends TestRunner {
         }
     }
 
-    public static class OldTaglet implements com.sun.tools.doclets.Taglet {
-
-        public static void register(Map map) {
-            EnsureNewOldDoclet.OldTaglet tag = new OldTaglet();
-            com.sun.tools.doclets.Taglet t = (com.sun.tools.doclets.Taglet) map.get(tag.getName());
-            System.out.println(OLD_TAGLET_MARKER);
-        }
-
-        @Override
-        public boolean inField() {
-            return true;
-        }
-
-        @Override
-        public boolean inConstructor() {
-            return true;
-        }
-
-        @Override
-        public boolean inMethod() {
-            return true;
-        }
-
-        @Override
-        public boolean inOverview() {
-            return true;
-        }
-
-        @Override
-        public boolean inPackage() {
-            return true;
-        }
-
-        @Override
-        public boolean inType() {
-            return true;
-        }
-
-        @Override
-        public boolean isInlineTag() {
-            return true;
-        }
-
-        @Override
-        public String getName() {
-            return "OldTaglet";
-        }
-
-        @Override
-        public String toString(Tag tag) {
-            return getName();
-        }
-
-        @Override
-        public String toString(Tag[] tags) {
-            return getName();
-        }
-    }
-
     public static class NewTaglet implements jdk.javadoc.doclet.Taglet {
 
         @Override
diff --git a/langtools/test/tools/javadoc/6942366/T6942366.java b/langtools/test/tools/javadoc/6942366/T6942366.java
index 3781af57454..af2222873bb 100644
--- a/langtools/test/tools/javadoc/6942366/T6942366.java
+++ b/langtools/test/tools/javadoc/6942366/T6942366.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -26,7 +26,8 @@
  * @bug 6942366
  * @summary javadoc no longer inherits doc from sourcepath
  * @modules jdk.javadoc
- * @build p.Base Test
+ * @library /tools/javadoc/lib
+ * @build p.Base Test ToyDoclet
  * @run main T6942366
  */
 
@@ -61,9 +62,8 @@ public class T6942366 {
         testDir.mkdirs();
 
         List<String> args = new ArrayList<String>();
-        //args.add("-verbose");
-        args.add("-d");
-        args.add(testDir.getPath());
+        args.add("-doclet");
+        args.add("ToyDoclet");
         if (useSourcePath) {
             args.add("-sourcepath");
             args.add(testSrc.getPath());
@@ -78,9 +78,15 @@ public class T6942366 {
         }
 
         args.add(new File(testSrc, "Test.java").getPath());
-        System.out.println("javadoc: " + args);
+        System.out.println("ToyDoclet: " + args);
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+
+        int rc = com.sun.tools.javadoc.Main.execute("ToyDoclet", pw, pw, pw,
+                "ToyDoclet", getClass().getClassLoader(),
+                args.toArray(new String[args.size()]));
 
-        int rc = com.sun.tools.javadoc.Main.execute(args.toArray(new String[args.size()]));
         if (rc != 0)
             throw new Exception("unexpected exit from javadoc, rc=" + rc);
 
@@ -94,7 +100,7 @@ public class T6942366 {
 
         String s = "javadoc-for-Base.m";
         boolean expect = useSourcePath;
-        boolean found = contains(new File(testDir, "Test.html"), s);
+        boolean found = sw.toString().contains(s);
         if (found) {
             if (expect)
                 System.out.println("javadoc content \"" + s + "\" found, as expected");
diff --git a/langtools/test/tools/javadoc/6958836/Test.java b/langtools/test/tools/javadoc/6958836/Test.java
index ee052d6636b..9237f95d3ff 100644
--- a/langtools/test/tools/javadoc/6958836/Test.java
+++ b/langtools/test/tools/javadoc/6958836/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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,42 +31,49 @@
 import java.io.*;
 import java.util.*;
 
+import com.sun.javadoc.DocErrorReporter;
+import com.sun.javadoc.RootDoc;
+
+
+
 public class Test {
+    private static final String ERROR_MARKER = "Error-count";
+    private static final String WARNING_MARKER = "Warning-count";
+
     public static void main(String... args) throws Exception {
         new Test().run();
     }
 
     void run() throws Exception {
-        javadoc("errs",  list(),                   10,  0);
-        javadoc("errs",  list("-Xmaxerrs",   "0"), 10,  0);
-        javadoc("errs",  list("-Xmaxerrs",   "2"),  2,  0);
-        javadoc("errs",  list("-Xmaxerrs",   "4"),  4,  0);
-        javadoc("errs",  list("-Xmaxerrs",  "20"), 10,  0);
+        javadoc("Errors",  list(),                   10,  0);
+        javadoc("Errors",  list("-Xmaxerrs",   "0"), 10,  0);
+        javadoc("Errors",  list("-Xmaxerrs",   "2"),  2,  0);
+        javadoc("Errors",  list("-Xmaxerrs",   "4"),  4,  0);
+        javadoc("Errors",  list("-Xmaxerrs",  "20"), 10,  0);
 
-        javadoc("warns", list(),                    0, 10);
-        javadoc("warns", list("-Xmaxwarns",  "0"),  0, 10);
-        javadoc("warns", list("-Xmaxwarns",  "2"),  0,  2);
-        javadoc("warns", list("-Xmaxwarns",  "4"),  0,  4);
-        javadoc("warns", list("-Xmaxwarns", "20"),  0, 10);
+        javadoc("Warnings", list(),                    0, 10);
+        javadoc("Warnings", list("-Xmaxwarns",  "0"),  0, 10);
+        javadoc("Warnings", list("-Xmaxwarns",  "2"),  0,  2);
+        javadoc("Warnings", list("-Xmaxwarns",  "4"),  0,  4);
+        javadoc("Warnings", list("-Xmaxwarns", "20"),  0, 10);
 
         if (errors > 0)
             throw new Exception(errors + " errors occurred.");
     }
 
-    void javadoc(String pkg, List<String> testOpts,
+    void javadoc(String selector, List<String> testOpts,
                 int expectErrs, int expectWarns) {
-        System.err.println("Test " + (++count) + ": " + pkg + " " + testOpts);
+        System.err.println("Test " + (++count) + ": " + selector + " " + testOpts);
         File testOutDir = new File("test" + count);
 
         List<String> opts = new ArrayList<String>();
         // Force en_US locale in lieu of something like -XDrawDiagnostics.
         // For some reason, this must be the first option when used.
         opts.addAll(list("-locale", "en_US"));
-        opts.add("-Xdoclint:none");
-        opts.addAll(list("-classpath", System.getProperty("test.src")));
-        opts.addAll(list("-d", testOutDir.getPath()));
+        opts.add(new File(System.getProperty("test.src"),
+                Test.class.getSimpleName() + ".java").getPath());
         opts.addAll(testOpts);
-        opts.add(pkg);
+        opts.add("-gen" + selector);
 
         StringWriter errSW = new StringWriter();
         PrintWriter errPW = new PrintWriter(errSW);
@@ -77,7 +84,7 @@ public class Test {
 
         int rc = com.sun.tools.javadoc.Main.execute("javadoc",
                               errPW, warnPW, notePW,
-                              "com.sun.tools.doclets.standard.Standard",
+                              "Test$TestDoclet",
                               getClass().getClassLoader(),
                               opts.toArray(new String[opts.size()]));
         System.err.println("rc: " + rc);
@@ -92,8 +99,8 @@ public class Test {
         String noteOut = noteSW.toString();
         System.err.println("Notes:\n" + noteOut);
 
-        check(errOut, "Errors.java", expectErrs);
-        check(warnOut, " warning ", expectWarns); // requires -locale en_US
+        check(errOut, ERROR_MARKER, expectErrs);
+        check(warnOut, WARNING_MARKER, expectWarns); // requires -locale en_US
     }
 
     void check(String text, String expectText, int expectCount) {
@@ -119,4 +126,52 @@ public class Test {
 
     int count;
     int errors;
+
+    public static class TestDoclet {
+        static boolean genErrors = false;
+        static boolean genWarnings = false;
+
+        public static boolean start(RootDoc root) {
+            // generate 10 errors or warnings
+            for (int i = 1 ; i <= 10 ; i++) {
+                if (genErrors)
+                    root.printError(ERROR_MARKER + " " + i);
+                if (genWarnings)
+                    root.printWarning(WARNING_MARKER + " " + i);
+            }
+            return true;
+        }
+
+        public static int optionLength(String option) {
+            if (option == null) {
+                throw new Error("invalid usage: ");
+            }
+            System.out.println("option: " + option);
+            switch (option.trim()) {
+                case "-genErrors":
+                    return 1;
+                case "-genWarnings":
+                    return 1;
+                default:
+                    return 0;
+            }
+        }
+
+        public static boolean validOptions(String[][] options, DocErrorReporter reporter) {
+            for (int i = 0 ; i < options.length; i++) {
+               String opt = options[i][0].trim();
+               switch (opt) {
+                   case "-genErrors":
+                       genErrors = true;
+                       genWarnings = false;
+                       break;
+                   case "-genWarnings":
+                       genErrors = false;
+                       genWarnings = true;
+                       break;
+               }
+            }
+            return true;
+        }
+    }
 }
diff --git a/langtools/test/tools/javadoc/6958836/errs/Errors.java b/langtools/test/tools/javadoc/6958836/errs/Errors.java
deleted file mode 100644
index e68d01b1a55..00000000000
--- a/langtools/test/tools/javadoc/6958836/errs/Errors.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package errs;
-
-// class with 10 errors
-class Errors {
-    X m0() { }
-    X m1() { }
-    X m2() { }
-    X m3() { }
-    X m4() { }
-    X m5() { }
-    X m6() { }
-    X m7() { }
-    X m8() { }
-    X m9() { }
-}
diff --git a/langtools/test/tools/javadoc/6958836/warns/Warnings.java b/langtools/test/tools/javadoc/6958836/warns/Warnings.java
deleted file mode 100644
index cf94711683b..00000000000
--- a/langtools/test/tools/javadoc/6958836/warns/Warnings.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package warns;
-
-// class with 10 warnings
-public class Warnings {
-    /** @param x */
-    public void m0() { }
-
-    /** @param x */
-    public void m1() { }
-
-    /** @param x */
-    public void m2() { }
-
-    /** @param x */
-    public void m3() { }
-
-    /** @param x */
-    public void m4() { }
-
-    /** @param x */
-    public void m5() { }
-
-    /** @param x */
-    public void m6() { }
-
-    /** @param x */
-    public void m7() { }
-
-    /** @param x */
-    public void m8() { }
-
-    /** @param x */
-    public void m9() { }
-}
diff --git a/langtools/test/tools/javadoc/6964914/Test.java b/langtools/test/tools/javadoc/6964914/Test.java
index 307b5c13c26..bf3f508cf49 100644
--- a/langtools/test/tools/javadoc/6964914/Test.java
+++ b/langtools/test/tools/javadoc/6964914/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -38,7 +38,6 @@ public class Test {
     public void run() throws Exception {
         javadoc("Error.java", "1 error");
         javadoc("JavacWarning.java", "1 warning");
-        javadoc("JavadocWarning.java", "1 warning");
         if (errors > 0)
             throw new Exception(errors + " errors found");
     }
@@ -46,7 +45,6 @@ public class Test {
     void javadoc(String path, String expect) {
         File testSrc = new File(System.getProperty("test.src"));
         String[] args = {
-            "-Xdoclint:none",
             "-source", "8",
             "-classpath", ".",
             "-package",
diff --git a/langtools/test/tools/javadoc/BadOptionsTest.java b/langtools/test/tools/javadoc/BadOptionsTest.java
index 4a3bb47f1ee..54ce232df83 100644
--- a/langtools/test/tools/javadoc/BadOptionsTest.java
+++ b/langtools/test/tools/javadoc/BadOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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,8 +29,8 @@
  * @modules jdk.compiler/com.sun.tools.javac.main
  * @modules jdk.javadoc/jdk.javadoc.internal.api
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @library /tools/lib
- * @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox
+ * @library /tools/lib /tools/javadoc/lib
+ * @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox ToyDoclet
  * @run main BadOptionsTest
  */
 
@@ -73,9 +73,11 @@ public class BadOptionsTest extends TestRunner {
 
     private final ToolBox tb = new ToolBox();
     private final Path src = Paths.get("src");
+    private final Class<?> docletClass;
 
-    BadOptionsTest() throws IOException {
+    BadOptionsTest() throws Exception {
         super(System.err);
+        docletClass = getClass().getClassLoader().loadClass("ToyDoclet");
         init();
     }
 
@@ -87,9 +89,9 @@ public class BadOptionsTest extends TestRunner {
 
     @Test
     public void testAddModulesEmptyArg() {
-        Task.Result result = new JavadocTask(tb, Task.Mode.CMDLINE)
-                .options("-Xold",
-                        "--add-modules", "")
+        Task.Result result = new JavadocTask(tb, Task.Mode.API)
+                .docletClass(docletClass)
+                .options("--add-modules", "")
                 .files(src.resolve("C.java"))
                 .run(Task.Expect.FAIL)
                 .writeAll();
@@ -100,9 +102,9 @@ public class BadOptionsTest extends TestRunner {
 
     @Test
     public void testAddModulesBadName() {
-        Task.Result result = new JavadocTask(tb, Task.Mode.CMDLINE)
-                .options("-Xold", "-quiet",
-                        "--add-modules", "123")
+        Task.Result result = new JavadocTask(tb, Task.Mode.API)
+                .docletClass(docletClass)
+                .options("--add-modules", "123")
                 .files(src.resolve("C.java"))
                 .run(Task.Expect.FAIL)
                 .writeAll();
@@ -113,9 +115,9 @@ public class BadOptionsTest extends TestRunner {
 
     @Test
     public void testAddExportsEmptyArg() {
-        Task.Result result = new JavadocTask(tb, Task.Mode.CMDLINE)
-                .options("-Xold",
-                        "--add-exports", "")
+        Task.Result result = new JavadocTask(tb, Task.Mode.API)
+                .docletClass(docletClass)
+                .options("--add-exports", "")
                 .files(src.resolve("C.java"))
                 .run(Task.Expect.FAIL)
                 .writeAll();
@@ -126,9 +128,9 @@ public class BadOptionsTest extends TestRunner {
 
     @Test
     public void testAddExportsBadArg() {
-        Task.Result result = new JavadocTask(tb, Task.Mode.CMDLINE)
-                .options("-Xold",
-                        "--add-exports", "m/p")
+        Task.Result result = new JavadocTask(tb, Task.Mode.API)
+                .docletClass(docletClass)
+                .options("--add-exports", "m/p")
                 .files(src.resolve("C.java"))
                 .run(Task.Expect.FAIL)
                 .writeAll();
@@ -139,9 +141,9 @@ public class BadOptionsTest extends TestRunner {
 
     @Test
     public void testAddExportsBadName() {
-        Task.Result result = new JavadocTask(tb, Task.Mode.CMDLINE)
-                .options("-Xold",
-                        "--add-exports", "m!/p1=m2")
+        Task.Result result = new JavadocTask(tb, Task.Mode.API)
+                .docletClass(docletClass)
+                .options("--add-exports", "m!/p1=m2")
                 .files(src.resolve("C.java"))
                 .run()
                 .writeAll();
diff --git a/langtools/test/tools/javadoc/CheckResourceKeys.java b/langtools/test/tools/javadoc/CheckResourceKeys.java
index aafd039487a..95237924d00 100644
--- a/langtools/test/tools/javadoc/CheckResourceKeys.java
+++ b/langtools/test/tools/javadoc/CheckResourceKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
  * @test
  * @bug 8000612
  * @summary need test program to validate javadoc resource bundles
- * @modules jdk.javadoc/com.sun.tools.doclets.formats.html.resources:open
- *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.resources:open
- *          jdk.javadoc/com.sun.tools.javadoc.resources:open
+ * @modules jdk.javadoc/com.sun.tools.javadoc.resources:open
  *          jdk.jdeps/com.sun.tools.classfile
  */
 
@@ -147,7 +145,6 @@ public class CheckResourceKeys {
         try (JavaFileManager fm = c.getStandardFileManager(null, null, null)) {
             JavaFileManager.Location javadocLoc = findJavadocLocation(fm);
             String[] pkgs = {
-                "com.sun.tools.doclets",
                 "com.sun.tools.javadoc"
             };
             for (String pkg: pkgs) {
@@ -229,8 +226,6 @@ public class CheckResourceKeys {
     Set<String> getResourceKeys() {
         Module jdk_javadoc = ModuleLayer.boot().findModule("jdk.javadoc").get();
         String[] names = {
-                "com.sun.tools.doclets.formats.html.resources.standard",
-                "com.sun.tools.doclets.internal.toolkit.resources.doclets",
                 "com.sun.tools.javadoc.resources.javadoc",
         };
         Set<String> results = new TreeSet<String>();
diff --git a/langtools/test/tools/javadoc/MaxWarns.java b/langtools/test/tools/javadoc/MaxWarns.java
index 892754b8d78..07ef6b7b83e 100644
--- a/langtools/test/tools/javadoc/MaxWarns.java
+++ b/langtools/test/tools/javadoc/MaxWarns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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,13 +29,13 @@
  */
 
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.sun.javadoc.DocErrorReporter;
+import com.sun.javadoc.RootDoc;
 
 public class MaxWarns {
     public static void main(String... args) throws Exception {
@@ -44,8 +44,7 @@ public class MaxWarns {
 
     void run() throws Exception {
         final int defaultMaxWarns = 100;
-        final int genWarns = 150;
-        File f = genSrc(genWarns);
+        File f = new File(System.getProperty("test.src"), "MaxWarns.java");
         String out = javadoc(f);
         check(out, defaultMaxWarns);
 
@@ -53,38 +52,22 @@ public class MaxWarns {
             throw new Exception(errors + " errors occurred");
     }
 
-    File genSrc(int count) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        sb.append("package p;\n")
-            .append("public class C {\n")
-            .append("    /**\n");
-        for (int i = 0; i < count; i++)
-            sb.append("     * @param i").append(i).append(" does not exist!\n");
-        sb.append("     */\n")
-            .append("    public void m() { }\n")
-            .append("}\n");
-        File srcDir = new File("src");
-        srcDir.mkdirs();
-        File f = new File(srcDir, "C.java");
-        try (FileWriter fw = new FileWriter(f)) {
-            fw.write(sb.toString());
-        }
-        return f;
-    }
-
     String javadoc(File f) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        String[] args = { "-Xdoclint:none", "-d", "api", f.getPath() };
+        String[] args = { f.getPath() };
         int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw,
-                com.sun.tools.doclets.standard.Standard.class.getName(), args);
+                "MaxWarns$TestDoclet",
+                getClass().getClassLoader(), args);
         pw.flush();
         return sw.toString();
     }
 
+    private static final String WARNING_TEXT = "count ";
+
     void check(String out, int count) {
         System.err.println(out);
-        Pattern warn = Pattern.compile("warning - @param argument \"i[0-9]+\" is not a parameter name");
+        Pattern warn = Pattern.compile("warning - " + WARNING_TEXT + "[0-9]+");
         Matcher m = warn.matcher(out);
         int n = 0;
         for (int start = 0; m.find(start); start = m.start() + 1) {
@@ -109,5 +92,24 @@ public class MaxWarns {
     }
 
     int errors;
+
+    public static class TestDoclet {
+
+        public static boolean start(RootDoc root) {
+            // generate 150 warnings
+            for (int i = 1 ; i <= 150 ; i++) {
+                root.printWarning(WARNING_TEXT + i);
+            }
+            return true;
+        }
+
+        public static int optionLength(String option) {
+            return 0;
+        }
+
+        public static boolean validOptions(String[][] options, DocErrorReporter reporter) {
+            return true;
+        }
+    }
 }
 
diff --git a/langtools/test/tools/javadoc/ReleaseOption.java b/langtools/test/tools/javadoc/ReleaseOption.java
index 54e505c3bf1..d3c5bd54554 100644
--- a/langtools/test/tools/javadoc/ReleaseOption.java
+++ b/langtools/test/tools/javadoc/ReleaseOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -57,7 +57,7 @@ public class ReleaseOption {
         options.add(new File(System.getProperty("test.src", "."), "ReleaseOptionSource.java").getPath());
         StringWriter out = new StringWriter();
         PrintWriter pw = new PrintWriter(out);
-        int actualResult = Main.execute("javadoc", pw, pw, pw, "com.sun.tools.doclets.formats.html.HtmlDoclet", options.toArray(new String[0]));
+        int actualResult = Main.execute("javadoc", pw, pw, pw, "com.sun.tools.doclets.standard.Standard", options.toArray(new String[0]));
         System.err.println("actual result=" + actualResult);
         System.err.println("actual output=" + out.toString());
         if (actualResult != expectedResult)
diff --git a/langtools/test/tools/javadoc/T4696488.java b/langtools/test/tools/javadoc/T4696488.java
deleted file mode 100644
index 220244b833c..00000000000
--- a/langtools/test/tools/javadoc/T4696488.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 com.sun.tools.doclets.internal.toolkit.Configuration;
-
-/**
- * @test
- * @bug     4696488
- * @summary javadoc doesn't handle UNC paths for destination directory
- * @author  Jesse Glick
- * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
- * @run main T4696488 T4696488.java
- */
-public class T4696488 {
-
-    public static void main(String... args) {
-        System.setProperty("file.separator", "/");
-        assertAddTrailingFileSep("/path/to/dir", "/path/to/dir/");
-        assertAddTrailingFileSep("/path/to/dir/", "/path/to/dir/");
-        assertAddTrailingFileSep("/path/to/dir//", "/path/to/dir/");
-        System.setProperty("file.separator", "\\");
-        assertAddTrailingFileSep("C:\\path\\to\\dir", "C:\\path\\to\\dir\\");
-        assertAddTrailingFileSep("C:\\path\\to\\dir\\", "C:\\path\\to\\dir\\");
-        assertAddTrailingFileSep("C:\\path\\to\\dir\\\\", "C:\\path\\to\\dir\\");
-        assertAddTrailingFileSep("\\\\server\\share\\path\\to\\dir", "\\\\server\\share\\path\\to\\dir\\");
-        assertAddTrailingFileSep("\\\\server\\share\\path\\to\\dir\\", "\\\\server\\share\\path\\to\\dir\\");
-        assertAddTrailingFileSep("\\\\server\\share\\path\\to\\dir\\\\", "\\\\server\\share\\path\\to\\dir\\");
-    }
-
-    private static void assertAddTrailingFileSep(String input, String expectedOutput) {
-        String output = Configuration.addTrailingFileSep(input);
-        if (!expectedOutput.equals(output)) {
-            throw new Error("expected " + expectedOutput + " but was " + output);
-        }
-    }
-
-}
diff --git a/langtools/test/tools/javadoc/T6551367.java b/langtools/test/tools/javadoc/T6551367.java
deleted file mode 100644
index 597f2340696..00000000000
--- a/langtools/test/tools/javadoc/T6551367.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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     6551367
- * @summary javadoc throws ClassCastException when an link tag tries to reference constructor.
- * @author  A. Sundararajan
- * @modules jdk.javadoc/com.sun.tools.doclets.standard
- * @run main T6551367 T6551367.java
- */
-
-import com.sun.javadoc.*;
-import java.io.File;
-import static com.sun.tools.javadoc.Main.execute;
-
-public class T6551367 extends com.sun.tools.doclets.standard.Standard {
-    public T6551367() {}
-
-    /** Here, in the javadoc for this method, I try to link to
-     *  {@link #<init> a constructor}.
-     */
-    public static void main(String... args) {
-        File testSrc = new File(System.getProperty("test.src", "."));
-        File destDir = new File(System.getProperty("user.dir", "."));
-        for (String file : args) {
-            File source = new File(testSrc, file);
-            int rc = execute("javadoc", "T6551367",
-              T6551367.class.getClassLoader(),
-              new String[]{"-Xdoclint:none", source.getPath(), "-d", destDir.getAbsolutePath()});
-            if (rc != 0)
-                throw new Error("unexpected exit from javadoc: " + rc);
-        }
-    }
-}
diff --git a/langtools/test/tools/javadoc/T6968833.java b/langtools/test/tools/javadoc/T6968833.java
index 6b0e874a6b7..afb6f969f17 100644
--- a/langtools/test/tools/javadoc/T6968833.java
+++ b/langtools/test/tools/javadoc/T6968833.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, 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
@@ -26,6 +26,9 @@
  * @bug 6968833
  * @summary javadoc reports error but still returns 0
  * @modules jdk.javadoc
+ * @library lib
+ * @build ToyDoclet
+ * @run main T6968833
  */
 
 import java.io.*;
@@ -36,10 +39,14 @@ public class T6968833 {
     }
 
     void run() throws IOException {
+        String testClasses = System.getProperty("test.classes");
+
         File srcDir = new File("src");
-        // following file causes error: No public or protected classes found to document.
+        // following file cause a doclet error, as there is nothing to document
         File f = writeFile(srcDir, "Foo.java", "class Foo { }");
-        String[] args = { f.getPath() };
+        String[] args = { "-docletpath", testClasses,
+                "-doclet", "ToyDoclet",
+                f.getPath() };
         int rc = com.sun.tools.javadoc.Main.execute(args);
         if (rc == 0)
             throw new Error("Unexpected exit from javadoc: " + rc);
diff --git a/langtools/test/tools/javadoc/TestScriptInComment.java b/langtools/test/tools/javadoc/TestScriptInComment.java
deleted file mode 100644
index 761887e573b..00000000000
--- a/langtools/test/tools/javadoc/TestScriptInComment.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2016, 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.
- */
-
-/**
- * @test
- * @bug 8138725
- * @summary test --allow-script-in-comments
- * @modules jdk.javadoc/com.sun.tools.javadoc
- */
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Combo-style test, exercising combinations of different HTML fragments that may contain
- * JavaScript, different places to place those fragments, and whether or not to allow the use
- * of JavaScript.
- */
-public class TestScriptInComment {
-    public static void main(String... args) throws Exception {
-        new TestScriptInComment().run();
-    }
-
-    /**
-     * Representative samples of different fragments of HTML that may contain JavaScript.
-     * To facilitate checking the output manually in a browser, the text "#ALERT" will be
-     * replaced by a JavaScript call of "alert(msg)", using a message string that is specific
-     * to the test case.
-     */
-    enum Comment {
-        LC("<script>#ALERT</script>", true), // script tag in Lower Case
-        UC("<SCRIPT>#ALERT</script>", true), // script tag in Upper Case
-        WS("< script >#ALERT</script>", false, "-Xdoclint:none"), // script tag with invalid white space
-        SA("<script src=\"file\"> #ALERT </script>", true), // script tag with an attribute
-        ON("<a onclick='#ALERT'>x</a>", true), // event handler attribute
-        URI("<a href='javascript:#ALERT'>x</a>", true); // javadcript URI
-
-        /**
-         * Creates an HTML fragment to be injected into a template.
-         * @param text the HTML fragment to put into a doc comment or option.
-         * @param hasScript whether or not this fragment does contain legal JavaScript
-         * @param opts any additional options to be specified when javadoc is run
-         */
-        Comment(String text, boolean hasScript, String... opts) {
-            this.text = text;
-            this.hasScript = hasScript;
-            this.opts = Arrays.asList(opts);
-        }
-
-        final String text;
-        final boolean hasScript;
-        final List<String> opts;
-    };
-
-    /**
-     * Representative samples of positions in which javadoc may find JavaScript.
-     * Each template contains a series of strings, which are written to files or inferred as options.
-     * The first source file implies a corresponding output file which should not be written
-     * if the comment contains JavaScript and JavaScript is not allowed.
-     */
-    enum Template {
-        OVR("<html><body> overview #COMMENT </body></html>", "package p; public class C { }"),
-        PKGINFO("#COMMENT package p;", "package p; public class C { }"),
-        PKGHTML("<html><body>#COMMENT package p;</body></html>", "package p; public class C { }"),
-        CLS("package p; #COMMENT public class C { }"),
-        CON("package p; public class C { #COMMENT public C() { } }"),
-        FLD("package p; public class C { #COMMENT public int f; }"),
-        MTH("package p; public class C { #COMMENT public void m() { } }"),
-        TOP("-top", "lorem #COMMENT ipsum", "package p; public class C { }"),
-        HDR("-header", "lorem #COMMENT ipsum", "package p; public class C { }"),
-        FTR("-footer", "lorem #COMMENT ipsum", "package p; public class C { }"),
-        BTM("-bottom", "lorem #COMMENT ipsum", "package p; public class C { }"),
-        DTTL("-doctitle", "lorem #COMMENT ipsum", "package p; public class C { }"),
-        PHDR("-packagesheader", "lorem #COMMENT ipsum", "package p; public class C { }");
-
-        Template(String... args) {
-            opts = new ArrayList<String>();
-            sources = new ArrayList<String>();
-            int i = 0;
-            while (args[i].startsWith("-")) {
-                // all options being tested have a single argument that follow the option
-                opts.add(args[i++]);
-                opts.add(args[i++]);
-            }
-            while(i < args.length) {
-                sources.add(args[i++]);
-            }
-        }
-
-        // groups: 1 <html> or not;  2: package name;  3: class name
-        private final Pattern pat =
-                Pattern.compile("(?i)(<html>)?.*?(?:package ([a-z]+);.*?(?:class ([a-z]+).*)?)?");
-
-        /**
-         * Infer the file in which to write the given source.
-         * @param dir the base source directory
-         * @param src the source text
-         * @return the file in which the source should be written
-         */
-        File getSrcFile(File srcDir, String src) {
-            String f;
-            Matcher m = pat.matcher(src);
-            if (!m.matches())
-                throw new Error("match failed");
-            if (m.group(3) != null) {
-                f = m.group(2) + "/" + m.group(3) + ".java";
-            } else if (m.group(2) != null) {
-                f = m.group(2) + "/" + (m.group(1) == null ? "package-info.java" : "package.html");
-            } else {
-                f = "overview.html";
-            }
-            return new File(srcDir, f);
-        }
-
-        /**
-         * Get the options to give to javadoc.
-         * @param srcDir the srcDir to use -overview is needed
-         * @return
-         */
-        List<String> getOpts(File srcDir) {
-            if (!opts.isEmpty()) {
-                return opts;
-            } else if (sources.get(0).contains("overview")) {
-                return Arrays.asList("-overview", getSrcFile(srcDir, sources.get(0)).getPath());
-            } else {
-                return Collections.emptyList();
-            }
-        }
-
-        /**
-         * Gets the output file corresponding to the first source file.
-         * This file should not be written if the comment contains JavaScript and JavaScripot is
-         * not allowed.
-         * @param dir the base output directory
-         * @return the output file
-         */
-        File getOutFile(File outDir) {
-            String f;
-            Matcher m = pat.matcher(sources.get(0));
-            if (!m.matches())
-                throw new Error("match failed");
-            if (m.group(3) != null) {
-                f = m.group(2) + "/" + m.group(3) + ".html";
-            } else if (m.group(2) != null) {
-                f = m.group(2) + "/package-summary.html";
-            } else {
-                f = "overview-summary.html";
-            }
-            return new File(outDir, f);
-        }
-
-        final List<String> opts;
-        final List<String> sources;
-    };
-
-    enum Option {
-        OFF(null),
-        ON("--allow-script-in-comments");
-
-        Option(String text) {
-            this.text = text;
-        }
-
-        final String text;
-    };
-
-    private PrintStream out = System.err;
-
-    public void run() throws Exception {
-        int count = 0;
-        for (Template template: Template.values()) {
-            for (Comment comment: Comment.values()) {
-                for (Option option: Option.values()) {
-                    if (test(template, comment, option)) {
-                        count++;
-                    }
-                }
-            }
-        }
-
-        out.println(count + " test cases run");
-        if (errors > 0) {
-            throw new Exception(errors + " errors occurred");
-        }
-    }
-
-    boolean test(Template template, Comment comment, Option option) throws IOException {
-        if (option == Option.ON && !comment.hasScript) {
-            // skip --allowScriptInComments if comment does not contain JavaScript
-            return false;
-        }
-
-        String test = template + "-" + comment + "-" + option;
-        out.println("Test: " + test);
-
-        File dir = new File(test);
-        dir.mkdirs();
-        File srcDir = new File(dir, "src");
-        File outDir = new File(dir, "out");
-
-        String alert = "alert(\"" + test + "\");";
-        for (String src: template.sources) {
-            writeFile(template.getSrcFile(srcDir, src),
-                src.replace("#COMMENT",
-                        "/** " + comment.text.replace("#ALERT", alert) + " **/"));
-        }
-
-        List<String> opts = new ArrayList<String>();
-        opts.add("-sourcepath");
-        opts.add(srcDir.getPath());
-        opts.add("-d");
-        opts.add(outDir.getPath());
-        if (option.text != null)
-            opts.add(option.text);
-        for (String opt: template.getOpts(srcDir)) {
-            opts.add(opt.replace("#COMMENT", comment.text.replace("#ALERT", alert)));
-        }
-        opts.addAll(comment.opts);
-        opts.add("-noindex");   // index not required; save time/space writing files
-        opts.add("p");
-
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        int rc = javadoc(opts, pw);
-        pw.close();
-        String log = sw.toString();
-        writeFile(new File(dir, "log.txt"), log);
-
-        out.println("opts: " + opts);
-        out.println("  rc: " + rc);
-        out.println(" log:");
-        out.println(log);
-
-        String ERROR = "Use --allow-script-in-comment";
-        File outFile = template.getOutFile(outDir);
-
-        boolean expectErrors = comment.hasScript && (option == Option.OFF);
-
-        if (expectErrors) {
-            check(rc != 0, "unexpected exit code: " + rc);
-            check(log.contains(ERROR), "expected error message not found");
-            check(!outFile.exists(), "output file found unexpectedly");
-        } else {
-            check(rc == 0, "unexpected exit code: " + rc);
-            check(!log.contains(ERROR), "error message found");
-            check(outFile.exists(), "output file not found");
-        }
-
-        out.println();
-        return true;
-    }
-
-    int javadoc(List<String> opts, PrintWriter pw) {
-        return com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw,
-                "com.sun.tools.doclets.standard.Standard", opts.toArray(new String[opts.size()]));
-    }
-
-    File writeFile(File f, String text) throws IOException {
-        f.getParentFile().mkdirs();
-        FileWriter fw = new FileWriter(f);
-        try {
-            fw.write(text);
-        } finally {
-            fw.close();
-        }
-        return f;
-    }
-
-    void check(boolean cond, String errMessage) {
-        if (!cond) {
-            error(errMessage);
-        }
-    }
-
-    void error(String message) {
-        out.println("Error: " + message);
-        errors++;
-    }
-
-    int errors = 0;
-}
-
diff --git a/langtools/test/tools/javadoc/api/basic/TagletPathTest.java b/langtools/test/tools/javadoc/api/basic/TagletPathTest.java
deleted file mode 100644
index 54d26e74f8e..00000000000
--- a/langtools/test/tools/javadoc/api/basic/TagletPathTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, 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 6493690
- * @summary javadoc should have a javax.tools.Tool service provider
- * @modules java.compiler
- *          jdk.compiler
- *          jdk.javadoc/com.sun.tools.doclets.standard
- * @build APITest
- * @run main TagletPathTest
- */
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.List;
-import javax.tools.DocumentationTool;
-import javax.tools.DocumentationTool.DocumentationTask;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
-
-/**
- * Tests for locating a doclet via the file manager's DOCLET_PATH.
- */
-public class TagletPathTest extends APITest {
-    public static void main(String... args) throws Exception {
-        new TagletPathTest().run();
-    }
-
-    /**
-     * Verify that a taglet can be specified, and located via
-     * the file manager's TAGLET_PATH.
-     */
-    @Test
-    public void testTagletPath() throws Exception {
-        File testSrc = new File(System.getProperty("test.src"));
-        File tagletSrcFile = new File(testSrc, "taglets/UnderlineTaglet.java");
-        File tagletDir = getOutDir("classes");
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        try (StandardJavaFileManager cfm = compiler.getStandardFileManager(null, null, null)) {
-            cfm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(tagletDir));
-            Iterable<? extends JavaFileObject> cfiles = cfm.getJavaFileObjects(tagletSrcFile);
-            if (!compiler.getTask(null, cfm, null, null, null, cfiles).call())
-                throw new Exception("cannot compile taglet");
-        }
-
-        JavaFileObject srcFile = createSimpleJavaFileObject("pkg/C", testSrcText);
-        DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
-        try (StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null)) {
-            File outDir = getOutDir("api");
-            fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir));
-            fm.setLocation(DocumentationTool.Location.TAGLET_PATH, Arrays.asList(tagletDir));
-            Iterable<? extends JavaFileObject> files = Arrays.asList(srcFile);
-            Iterable<String> options = Arrays.asList("-taglet", "UnderlineTaglet");
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            DocumentationTask t = tool.getTask(pw, fm, null, com.sun.tools.doclets.standard.Standard.class, options, files);
-            boolean ok = t.call();
-            String out = sw.toString();
-            System.err.println(">>" + out + "<<");
-            if (ok) {
-                File f = new File(outDir, "pkg/C.html");
-                List<String> doc = Files.readAllLines(f.toPath(), Charset.defaultCharset());
-                for (String line: doc) {
-                    if (line.contains("<u>" + TEST_STRING + "</u>")) {
-                        System.err.println("taglet executed as expected");
-                        return;
-                    }
-                }
-                error("expected text not found in output " + f);
-            } else {
-                error("task failed");
-            }
-        }
-    }
-
-    static final String TEST_STRING = "xyzzy";
-    static final String testSrcText =
-            "package pkg;\n" +
-            "/** {@underline " + TEST_STRING + "} */\n" +
-            "public class C { }";
-}
-
diff --git a/langtools/test/tools/javadoc/badSuper/BadSuper.java b/langtools/test/tools/javadoc/badSuper/BadSuper.java
deleted file mode 100644
index e9a715042db..00000000000
--- a/langtools/test/tools/javadoc/badSuper/BadSuper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 2015, 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 4983023
- * @summary A bad superclass shouldn't throw the standard doclet into a loop
- * @modules jdk.javadoc
- */
-
-public class BadSuper {
-
-    public static void main(String[] args) {
-        String srcpath = System.getProperty("test.src", ".");
-
-        if (com.sun.tools.javadoc.Main.execute(
-                new String[] {"-d", "doc", "-sourcepath", srcpath, "p"}) != 0)
-            throw new Error("Javadoc encountered warnings or errors.");
-    }
-}
diff --git a/langtools/test/tools/javadoc/badSuper/p/A.java b/langtools/test/tools/javadoc/badSuper/p/A.java
deleted file mode 100644
index 063cf384a22..00000000000
--- a/langtools/test/tools/javadoc/badSuper/p/A.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 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 p;
-
-public class A extends Bogus {
-}
diff --git a/langtools/test/tools/javadoc/badSuper/p/B.java b/langtools/test/tools/javadoc/badSuper/p/B.java
deleted file mode 100644
index 938c4195ea4..00000000000
--- a/langtools/test/tools/javadoc/badSuper/p/B.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2004, 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 p;
-
-public class B extends I {      // should be "implements"
-}
-
-interface I {
-}
diff --git a/langtools/test/tools/javadoc/lib/ToyDoclet.java b/langtools/test/tools/javadoc/lib/ToyDoclet.java
new file mode 100644
index 00000000000..1b7c7a17fc8
--- /dev/null
+++ b/langtools/test/tools/javadoc/lib/ToyDoclet.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2017, 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.
+ */
+
+import java.util.Arrays;
+
+import com.sun.javadoc.ClassDoc;
+import com.sun.javadoc.PackageDoc;
+import com.sun.javadoc.ProgramElementDoc;
+import com.sun.javadoc.RootDoc;
+
+@SuppressWarnings("deprecation")
+public class ToyDoclet {
+
+    public static boolean start(RootDoc root) {
+        String whoami = "I am a toy doclet";
+        root.printNotice("Notice: " + whoami);
+        boolean status = false;
+        for (ClassDoc cls : root.classes()) {
+            if (!status) status = true;
+            root.printNotice("Classes: " + cls);
+            printClassMembers(root, cls);
+        }
+        for (ClassDoc cls : root.specifiedClasses()) {
+            if (!status) status = true;
+            root.printNotice("Specified-classes: " + cls);
+            printClassMembers(root, cls);
+        }
+        for (PackageDoc pkg : root.specifiedPackages()) {
+            if (!status) status = true;
+            root.printNotice("Specified-packages: " + pkg);
+        }
+        return status;
+    }
+
+    static void printClassMembers(RootDoc root, ClassDoc cls) {
+        root.printNotice("Members for: " + cls);
+        root.printNotice("  extends " + Arrays.asList(cls.superclass()));
+        root.printNotice("  Fields: ");
+        printMembers(root, cls.fields());
+        root.printNotice("  Constructor: ");
+        printMembers(root, cls.constructors());
+        root.printNotice("  Method: ");
+        printMembers(root, cls.methods());
+        if (cls.superclass() != null && !cls.superclassType().toString().equals("java.lang.Object"))
+            printClassMembers(root, cls.superclass());
+    }
+
+    static void printMembers(RootDoc root, ProgramElementDoc[] pgmDocs) {
+        for (ProgramElementDoc pgmDoc : pgmDocs) {
+            root.printNotice("     " + pgmDoc + ", Comments: " + pgmDoc.getRawCommentText());
+        }
+    }
+
+    public static int optionLength(String option) {
+        System.out.println("option: " + option);
+        return 0;  // all options are unsupported
+    }
+}
diff --git a/langtools/test/tools/javadoc/nonConstExprs/Test.java b/langtools/test/tools/javadoc/nonConstExprs/Test.java
index f3cff60e249..fbc5062639d 100644
--- a/langtools/test/tools/javadoc/nonConstExprs/Test.java
+++ b/langtools/test/tools/javadoc/nonConstExprs/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -34,7 +34,6 @@ public class Test {
     public static void main(String... args) throws Exception {
         File testSrc = new File(System.getProperty("test.src"));
         String[] jdoc_args = {
-            "-d", "out",
             new File(testSrc, Test.class.getSimpleName() + ".java").getPath()
         };
         int rc = com.sun.tools.javadoc.Main.execute(jdoc_args);
diff --git a/langtools/test/tools/javadoc/parser/7091528/T7091528.java b/langtools/test/tools/javadoc/parser/7091528/T7091528.java
index 98fb4619f71..41d55d9559c 100644
--- a/langtools/test/tools/javadoc/parser/7091528/T7091528.java
+++ b/langtools/test/tools/javadoc/parser/7091528/T7091528.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017, 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
@@ -26,6 +26,8 @@
  * @bug     7091528 8029145 8037484
  * @summary ensures javadoc parses unique source files and ignores all class files
  * @modules jdk.javadoc/com.sun.tools.doclets.standard
+ * @library /tools/javadoc/lib
+ * @build ToyDoclet
  * @compile p/C1.java p/q/C2.java
  * @run main T7091528
  */
@@ -42,22 +44,22 @@ public class T7091528 {
         File testSrc = new File(System.getProperty("test.src"));
         File testClasses = new File(System.getProperty("test.classes"));
         // 7091528, tests if class files are being ignored
-        runTest("-d", ".",
+        runTest(
             "-sourcepath", testClasses + File.pathSeparator + testSrc,
             "-subpackages",
             "p");
         // 8029145, tests if unique source files are parsed
-        runTest("-d", ".",
+        runTest(
             "-sourcepath", testSrc.getAbsolutePath(),
             "-subpackages",
             "p:p.q");
         File testPkgDir = new File(testSrc, "p");
         File testFile = new File(testPkgDir, "C3.java");
-        runTest("-d", ".",
+        runTest(
             "-sourcepath", testSrc.getAbsolutePath(),
             testFile.getAbsolutePath(),
             "p");
-        runTest("-d", ".",
+        runTest(
             "-classpath", testSrc.getAbsolutePath(),
             testFile.getAbsolutePath(),
             "p");
@@ -66,8 +68,8 @@ public class T7091528 {
     void runTest(String... args) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        String doclet = com.sun.tools.doclets.standard.Standard.class.getName();
-        int rc = com.sun.tools.javadoc.Main.execute("javadoc", pw, pw, pw, doclet, args);
+        int rc = com.sun.tools.javadoc.Main.execute("example", pw, pw, pw,
+                "ToyDoclet", getClass().getClassLoader(), args);
         pw.close();
 
         String out = sw.toString();
@@ -80,8 +82,5 @@ public class T7091528 {
 
         if (out.matches("(?s).*p/[^ ]+\\.class.*"))
             throw new Error("reading .class files");
-
-        if (!new File("index.html").exists())
-            throw new Error("index.html not found");
     }
 }
diff --git a/langtools/test/tools/javadoc/sampleapi/SampleApiTest.java b/langtools/test/tools/javadoc/sampleapi/SampleApiTest.java
deleted file mode 100644
index c344895a612..00000000000
--- a/langtools/test/tools/javadoc/sampleapi/SampleApiTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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 8130880
- * @library /jdk/javadoc/tool/sampleapi/lib
- * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.parser
- *          jdk.compiler/com.sun.tools.javac.tree
- *          jdk.compiler/com.sun.tools.javac.util
- *          jdk.javadoc/jdk.javadoc.internal.tool
- * @build sampleapi.SampleApiDefaultRunner
- * @run main SampleApiTest
- */
-
-import com.sun.tools.javadoc.*;
-import sampleapi.*;
-
-public class SampleApiTest {
-
-    public static void main(String... args) throws Exception {
-
-        // generate
-        SampleApiDefaultRunner.execute(
-            new String[] {
-                "-o=out/src",
-                "-r=" + System.getProperty("test.src") + "/res"
-            });
-
-        // html4
-        int res1 = Main.execute(
-            new String[] {
-                "-d", "out/doc.html4",
-                "-verbose",
-                "-private",
-                "-use",
-                "-splitindex",
-                "-linksource",
-                "-html4",
-                "-javafx",
-                "-windowtitle", "SampleAPI",
-                "-sourcepath", "out/src",
-                "sampleapi.simple",
-                "sampleapi.simple.sub",
-                "sampleapi.tiny",
-                "sampleapi.fx"
-            });
-
-        // html5
-        int res2 = Main.execute(
-            new String[] {
-                "-d", "out/doc.html5",
-                "-verbose",
-                "-private",
-                "-use",
-                "-splitindex",
-                "-linksource",
-                "-html5",
-                "-javafx",
-                "-windowtitle", "SampleAPI",
-                "-sourcepath", "out/src",
-                "sampleapi.simple",
-                "sampleapi.simple.sub",
-                "sampleapi.tiny",
-                "sampleapi.fx"
-            });
-
-        if (res1 + res2 > 0)
-            throw new Exception("One of exit statuses of test execution is non-zero: "
-                + res1 + " for HTML4, " + res2 + " for HTML5.");
-    }
-}
diff --git a/langtools/test/tools/javadoc/sampleapi/res/fx.xml b/langtools/test/tools/javadoc/sampleapi/res/fx.xml
deleted file mode 100644
index 840dcbb34a8..00000000000
--- a/langtools/test/tools/javadoc/sampleapi/res/fx.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2015, 2016, 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.
--->
-<sampleapi>
-    <module name="UNNAMED">
-        <package name="sampleapi.fx" style="fx">
-            <class basename="FXClass">
-                <modifier>public</modifier>
-                <member>
-                    <field basename="id">
-                        <modifier>public</modifier>
-                        <type>int|boolean</type>
-                    </field>
-                    <method basename="setProp">
-                        <modifier>public|protected|private</modifier>
-                        <param>int|String</param>
-                        <type>void</type>
-                    </method>
-                    <method basename="getProp">
-                        <modifier>public|protected|private</modifier>
-                        <type>int|int|String</type>
-                    </method>
-                </member>
-            </class>
-
-        </package>
-    </module>
-</sampleapi>
diff --git a/langtools/test/tools/javadoc/sampleapi/res/simple.xml b/langtools/test/tools/javadoc/sampleapi/res/simple.xml
deleted file mode 100644
index ab5a4c16b2b..00000000000
--- a/langtools/test/tools/javadoc/sampleapi/res/simple.xml
+++ /dev/null
@@ -1,533 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2015, 2016, 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.
--->
-<sampleapi>
-    <module name="UNNAMED">
-        <package name="sampleapi.simple">
-
-            <class basename="SampleClass" id="baseclass">
-                <modifier>public</modifier>
-                <modifier>none|abstract</modifier>
-                <member>
-                    <field basename="field">
-                        <modifier>none|public</modifier>
-                        <modifier>none|static</modifier>
-                        <modifier>none|final</modifier>
-                        <type>boolean|int|String</type>
-                    </field>
-                    <field basename="field">
-                        <modifier>protected|private</modifier>
-                        <type>String</type>
-                    </field>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>none|int|int,boolean|int,String</param>
-                    </constructor>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>String</param>
-                        <throw>NullPointerException</throw>
-                        <throw>SampleException0</throw>
-                    </constructor>
-                    <method basename="set">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>int</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>int|boolean|String</type>
-                    </method>
-                    <method basename="doSomething">
-                        <modifier>public</modifier>
-                        <type>void|int</type>
-                        <param>none|int|Object,int</param>
-                        <throw>NullPointerException</throw>
-                        <throw>ArithmeticException</throw>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="Derived">
-                <modifier>public</modifier>
-                <extend id="baseclass"/>
-                <member>
-                    <field basename="myField">
-                        <modifier>public</modifier>
-                        <type>int|boolean</type>
-                    </field>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>none|int|int,boolean|int,String</param>
-                    </constructor>
-                    <method basename="myGet">
-                        <modifier>public</modifier>
-                        <type>int|boolean</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="SampleSerial">
-                <import>java.io.Serializable</import>
-                <modifier>public</modifier>
-                <implement ref="Serializable"/>
-                <member>
-                    <field basename="specialData">
-                        <modifier>private|none|public</modifier>
-                        <type>boolean|int|String</type>
-                    </field>
-                </member>
-            </class>
-
-            <class basename="SampleSerial">
-                <import>java.io.Serializable</import>
-                <import>java.io.ObjectStreamField</import>
-                <modifier>public</modifier>
-                <implement ref="Serializable"/>
-                <member>
-                    <serialfield basename="serialField">String,Long,Boolean</serialfield>
-                    <method basename="justToBeHere">
-                        <modifier>public</modifier>
-                        <type>String|long|boolean</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="SampleSerial">
-                <import>java.io.Serializable</import>
-                <import>java.io.ObjectOutputStream</import>
-                <import>java.io.ObjectOutput</import>
-                <import>java.io.IOException</import>
-                <import>java.io.ObjectStreamException</import>
-                <modifier>public</modifier>
-                <implement ref="Serializable"/>
-                <member>
-                    <method name="writeObject">
-                        <modifier>private</modifier>
-                        <param>ObjectOutputStream</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                    </method>
-                    <method name="writeExternal">
-                        <modifier>public</modifier>
-                        <param>ObjectOutput</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                    </method>
-                    <method name="writeReplace">
-                        <modifier>protected</modifier>
-                        <param>none</param>
-                        <type>Object</type>
-                        <throw>ObjectStreamException</throw>
-                    </method>
-                    <method name="writeSomethingElse">
-                        <modifier>public</modifier>
-                        <param>Object</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="SampleSerial">
-                <import>java.io.Serializable</import>
-                <import>java.io.ObjectInputStream</import>
-                <import>java.io.ObjectInput</import>
-                <import>java.io.IOException</import>
-                <import>java.io.ObjectStreamException</import>
-                <modifier>public</modifier>
-                <implement ref="Serializable"/>
-                <member>
-                    <method name="readObject">
-                        <modifier>private</modifier>
-                        <param>ObjectInputStream</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                        <throw>ClassNotFoundException</throw>
-                    </method>
-                    <method name="readExternal">
-                        <modifier>public</modifier>
-                        <param>ObjectInput</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                    </method>
-                    <method name="readResolve">
-                        <modifier>protected</modifier>
-                        <param>none</param>
-                        <type>Object</type>
-                        <throw>ObjectStreamException</throw>
-                    </method>
-                    <method name="readSomethingElse">
-                        <modifier>public</modifier>
-                        <param>Object</param>
-                        <type>void</type>
-                        <throw>IOException</throw>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="Container">
-                <modifier>public</modifier>
-                <member>
-                    <class basename="Inner">
-                        <modifier>public</modifier>
-                        <member>
-                            <field basename="value">
-                                <modifier>public</modifier>
-                                <type>int</type>
-                            </field>
-                        </member>
-                    </class>
-                    <class basename="Nested">
-                        <modifier>public</modifier>
-                        <modifier>static</modifier>
-                    </class>
-                    <interface basename="EventListener">
-                        <modifier>public</modifier>
-                        <modifier>static</modifier>
-                        <member>
-                            <method basename="onEvent">
-                                <modifier>public</modifier>
-                                <type>void</type>
-                            </method>
-                        </member>
-                    </interface>
-                </member>
-            </class>
-
-            <!-- Errors and exceptions -->
-            <class basename="SampleError">
-                <modifier>public</modifier>
-                <extend ref="java.lang.Error"/>
-                <member>
-                    <field basename="errorInfo">
-                        <modifier>private</modifier>
-                        <type>boolean|int|String</type>
-                    </field>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>String</param>
-                    </constructor>
-                    <method basename="getSampleData">
-                        <modifier>public</modifier>
-                        <type>int|String</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="SampleException">
-                <modifier>public</modifier>
-                <extend ref="java.lang.Exception"/>
-                <member>
-                    <field basename="exceptionInfo">
-                        <modifier>private</modifier>
-                        <type>boolean|int|String</type>
-                    </field>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>String</param>
-                    </constructor>
-                    <method basename="getSampleData">
-                        <modifier>public</modifier>
-                        <type>int|String</type>
-                    </method>
-                </member>
-            </class>
-
-            <interface basename="SampleInterface" id="baseinterface">
-                <modifier>public|none</modifier>
-                <member>
-                    <method basename="method">
-                        <modifier>public</modifier>
-                        <type>void|int|Object</type>
-                    </method>
-                </member>
-            </interface>
-
-            <class basename="Implementor">
-                <modifier>public</modifier>
-                <implement id="baseinterface"/>
-                <member>
-                    <field basename="myField">
-                        <modifier>public</modifier>
-                        <type>int|boolean</type>
-                    </field>
-                    <method basename="myGet">
-                        <modifier>public</modifier>
-                        <type>int|boolean</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="GenericClass" tparam="T">
-                <import>java.util.List</import>
-                <modifier>public</modifier>
-                <member>
-                    <method basename="put">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>T</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>T</type>
-                        <param>int</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>List&lt;T&gt;</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="GenericClass" tparam="K,V">
-                <import>java.util.Set</import>
-                <import>java.util.List</import>
-                <import>java.util.Map</import>
-                <modifier>public</modifier>
-                <member>
-                    <method basename="put">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>K,V</param>
-                    </method>
-                    <method basename="putMap">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>Map&lt;K,V&gt;</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>V</type>
-                        <param>K</param>
-                    </method>
-                    <method basename="getV">
-                        <modifier>public</modifier>
-                        <type>Set&lt;V&gt;|List&lt;V&gt;</type>
-                    </method>
-                    <method basename="getK">
-                        <modifier>public</modifier>
-                        <type>Set&lt;K&gt;|List&lt;K&gt;</type>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="GenericClass" tparam="M,N,O">
-                <import>java.util.Set</import>
-                <import>java.util.List</import>
-                <import>java.util.Map</import>
-                <modifier>public</modifier>
-                <member>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>Set&lt;M&gt;|List&lt;M&gt;</type>
-                        <param>Map&lt;N,O&gt;</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>Set&lt;N&gt;|List&lt;N&gt;</type>
-                        <param>Map&lt;M,O&gt;</param>
-                    </method>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>Set&lt;O&gt;|List&lt;O&gt;</type>
-                        <param>Map&lt;M,N&gt;</param>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="GenericUtil"> <!-- public static generic methods like Collections -->
-                <import>java.util.Set</import>
-                <import>java.util.List</import>
-                <import>java.util.Map</import>
-                <import>java.util.function.Supplier</import>
-                <modifier>public</modifier>
-                <member>
-                    <method tparam="E" basename="getSomething">
-                        <modifier>public</modifier>
-                        <modifier>static</modifier>
-                        <type>Set&lt;? extends E&gt;|List&lt;? extends E&gt;</type>
-                    </method>
-                    <method tparam="V,K" basename="getMore">
-                        <modifier>public|private</modifier>
-                        <modifier>static</modifier>
-                        <type>Map&lt;V,K&gt;</type>
-                    </method>
-                    <method tparam="E" basename="doSomething">
-                        <modifier>public</modifier>
-                        <modifier>static</modifier>
-                        <type>void</type>
-                        <param>E</param>
-                    </method>
-                    <method tparam="X extends Throwable" basename="orElseThrow">
-                        <modifier>public|private</modifier>
-                        <modifier>static</modifier>
-                        <type>X</type>
-                        <param>Supplier&lt;? extends X&gt;</param>
-                        <throw>X</throw>
-                    </method>
-                </member>
-            </class>
-
-            <enum basename="SampleEnum">
-                <modifier>public</modifier>
-                <member>
-                    <constant basename="VALUE" count="3"/>
-                </member>
-            </enum>
-
-            <enum basename="SampleEnum">
-                <modifier>public</modifier>
-                <member>
-                    <constant basename="VALUE" count="2"/>
-                    <constant basename="NOVALUE" count="1"/>
-                    <field basename="field">
-                        <modifier>private</modifier>
-                        <type>int|String</type>
-                    </field>
-                    <method basename="method">
-                        <modifier>public</modifier>
-                        <type>void|String</type>
-                    </method>
-                </member>
-            </enum>
-
-            <annodecl id="documented">
-                <class>Documented</class>
-            </annodecl>
-
-            <annodecl id="reten-source">
-                <class>Retention</class>
-                <arg name="value" value="RetentionPolicy.SOURCE"/>
-            </annodecl>
-
-            <annodecl id="reten-class">
-                <class>Retention</class>
-                <arg name="value" value="RetentionPolicy.CLASS"/>
-            </annodecl>
-
-            <annodecl id="reten-runtime">
-                <class>Retention</class>
-                <arg name="value" value="RetentionPolicy.RUNTIME"/>
-            </annodecl>
-
-            <annodecl id="target-method">
-                <class>Target</class>
-                <arg value="ElementType.METHOD"/>
-            </annodecl>
-
-            <annodecl id="target-field">
-                <class>Target</class>
-                <arg value="ElementType.FIELD"/>
-            </annodecl>
-
-            <annodecl id="target-type">
-                <class>Target</class>
-                <arg value="{ElementType.TYPE, ElementType.TYPE_USE}"/>
-            </annodecl>
-
-            <annotation basename="AnnotatedAnno">
-                <import>java.lang.annotation.Documented</import>
-                <anno>@documented</anno>
-                <modifier>public</modifier>
-                <member>
-                    <method basename="value">
-                        <modifier>public</modifier>
-                        <type>boolean|String</type>
-                    </method>
-                </member>
-            </annotation>
-
-            <annotation basename="AnnotatedAnno">
-                <import>java.lang.annotation.Retention</import>
-                <import>java.lang.annotation.RetentionPolicy</import>
-                <anno>@reten-source|@reten-class|@reten-runtime</anno>
-                <modifier>public</modifier>
-                <member>
-                    <method basename="value">
-                        <modifier>public</modifier>
-                        <type>int</type>
-                    </method>
-                </member>
-            </annotation>
-
-            <class basename="AnnoContainer">
-                <import>java.lang.annotation.Retention</import>
-                <import>java.lang.annotation.RetentionPolicy</import>
-                <import>java.lang.annotation.Target</import>
-                <import>java.lang.annotation.ElementType</import>
-                <modifier>public</modifier>
-                <member>
-                    <annotation basename="AnnotatedAnno">
-                        <anno>@reten-source|@reten-class|@reten-runtime</anno>
-                        <anno>@target-method|@target-field|@target-type</anno>
-                        <modifier>public</modifier>
-                        <modifier>static</modifier>
-                        <member>
-                            <method basename="value">
-                                <modifier>public</modifier>
-                                <type>String</type>
-                            </method>
-                        </member>
-                    </annotation>
-                </member>
-            </class>
-
-            <annodecl id="deprecated">
-                <class>Deprecated</class>
-            </annodecl>
-
-            <annodecl id="safevarargs">
-                <class>SafeVarargs</class>
-            </annodecl>
-
-            <annodecl id="suppresswarnings">
-                <class>SuppressWarnings</class>
-                <arg value="{&quot;unchecked&quot;, &quot;rawtypes&quot;}"/>
-            </annodecl>
-
-            <class basename="AnnotatedClass">
-                <modifier>public</modifier>
-                <member>
-                    <method basename="deprecatedMethod">
-                        <anno>@deprecated</anno>
-                        <modifier>public</modifier>
-                        <type>void</type>
-                    </method>
-                    <method basename="safeVarargsMethod">
-                        <anno>@safevarargs</anno>
-                        <modifier>public</modifier>
-                        <type>void|int</type>
-                        <param>String...</param>
-                    </method>
-                    <method basename="suppressWarningsMethod">
-                        <anno>@suppresswarnings</anno>
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>int|Object</param>
-                    </method>
-                </member>
-            </class>
-        </package>
-    </module>
-</sampleapi>
diff --git a/langtools/test/tools/javadoc/sampleapi/res/sub.xml b/langtools/test/tools/javadoc/sampleapi/res/sub.xml
deleted file mode 100644
index 242ea7a9503..00000000000
--- a/langtools/test/tools/javadoc/sampleapi/res/sub.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2016, 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.
--->
-<sampleapi>
-    <module name="UNNAMED">
-        <package name="sampleapi.simple.sub">
-            <class basename="SClass">
-                <modifier>public</modifier>
-                <modifier>none|abstract</modifier>
-                <implement>SInterface0</implement>
-                <member>
-                    <field basename="id">
-                        <modifier>public</modifier>
-                        <type>int</type>
-                    </field>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>int</type>
-                        <throw>SException0</throw>
-                    </method>
-                    <method basename="put">
-                        <modifier>public</modifier>
-                        <param>int</param>
-                        <type>void</type>
-                        <throw>SException0</throw>
-                    </method>
-                </member>
-            </class>
-
-            <class basename="SException">
-                <modifier>public</modifier>
-                <extend ref="java.lang.Exception"/>
-                <member>
-                    <constructor>
-                        <modifier>public</modifier>
-                        <param>String</param>
-                    </constructor>
-                </member>
-            </class>
-
-            <interface basename="SInterface">
-                <modifier>public</modifier>
-                <member>
-                    <method basename="put">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>int</param>
-                    </method>
-                </member>
-            </interface>
-
-            <enum basename="SEnum">
-                <modifier>public</modifier>
-                <member>
-                    <constant basename="ON" count="1"/>
-                    <constant basename="OFF" count="1"/>
-                </member>
-            </enum>
-
-            <annotation basename="SAnno">
-                <modifier>public</modifier>
-                <member>
-                    <method basename="value">
-                        <modifier>public</modifier>
-                        <type>boolean</type>
-                    </method>
-                </member>
-            </annotation>
-        </package>
-    </module>
-</sampleapi>
-
diff --git a/langtools/test/tools/javadoc/sampleapi/res/tiny.xml b/langtools/test/tools/javadoc/sampleapi/res/tiny.xml
deleted file mode 100644
index 7c3eddc3671..00000000000
--- a/langtools/test/tools/javadoc/sampleapi/res/tiny.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2015, 2016, 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.
--->
-<sampleapi>
-    <module name="UNNAMED">
-        <package name="sampleapi.tiny">
-            <class basename="TinyClass">
-                <modifier>public</modifier>
-                <modifier>none|abstract</modifier>
-                <member>
-                    <field basename="id">
-                        <modifier>public</modifier>
-                        <type>int</type>
-                    </field>
-                    <method basename="get">
-                        <modifier>public</modifier>
-                        <type>int</type>
-                    </method>
-                </member>
-            </class>
-
-            <interface basename="TinyInterface">
-                <modifier>public</modifier>
-                <member>
-                    <method basename="put">
-                        <modifier>public</modifier>
-                        <type>void</type>
-                        <param>int</param>
-                    </method>
-                </member>
-            </interface>
-
-            <enum basename="TinyEnum">
-                <modifier>public</modifier>
-                <member>
-                    <constant basename="YES" count="1"/>
-                    <constant basename="NO" count="1"/>
-                    <constant basename="MAYBE" count="1"/>
-                </member>
-            </enum>
-
-            <annotation basename="TinyAnno">
-                <modifier>public</modifier>
-                <member>
-                    <method basename="value">
-                        <modifier>public</modifier>
-                        <type>boolean</type>
-                    </method>
-                </member>
-            </annotation>
-        </package>
-    </module>
-</sampleapi>

From b41bd21eec30bb96d9f0279fca4b9de7e05beff9 Mon Sep 17 00:00:00 2001
From: Andrey Nazarov <anazarov@openjdk.org>
Date: Thu, 22 Jun 2017 10:53:21 -0700
Subject: [PATCH 36/83] 8181105: Nashorn file descriptor leak

Reviewed-by: jlaskey, hannesw, sundar
---
 .../jdk/nashorn/internal/runtime/Source.java    | 10 ++++++----
 .../test/framework/AbstractScriptRunnable.java  |  4 ++--
 .../internal/test/framework/ScriptRunnable.java | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
index f118bcd2283..6444b1cb2a9 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Source.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -339,9 +339,11 @@ public final class Source implements Loggable {
         protected void loadMeta() throws IOException {
             if (length == 0 && lastModified == 0) {
                 final URLConnection c = url.openConnection();
-                length = c.getContentLength();
-                lastModified = c.getLastModified();
-                debug("loaded metadata for ", url);
+                try (InputStream in = c.getInputStream()) {
+                    length = c.getContentLength();
+                    lastModified = c.getLastModified();
+                    debug("loaded metadata for ", url);
+                }
             }
         }
     }
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
index 4e59f0fdf60..1019abdfcd0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -199,7 +199,7 @@ public abstract class AbstractScriptRunnable {
         try {
             return getEvaluator().run(out, err, args);
         } catch (final IOException e) {
-            throw new UnsupportedOperationException("I/O error in initializing shell - cannot redirect output to file");
+            throw new UnsupportedOperationException("I/O error in initializing shell - cannot redirect output to file", e);
         }
     }
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
index e52d2a66373..21a760983e0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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
@@ -118,9 +118,10 @@ public final class ScriptRunnable extends AbstractScriptRunnable implements ITes
 
         if (errors != 0 || checkCompilerMsg) {
             if (expectCompileFailure || checkCompilerMsg) {
-                final PrintStream outputDest = new PrintStream(new FileOutputStream(errorFileName));
-                TestHelper.dumpFile(outputDest, new StringReader(new String(err.toByteArray())));
-                outputDest.println("--");
+                try (PrintStream outputDest = new PrintStream(new FileOutputStream(errorFileName))) {
+                    TestHelper.dumpFile(outputDest, new StringReader(new String(err.toByteArray())));
+                    outputDest.println("--");
+                }
             } else {
                 log(new String(err.toByteArray()));
             }
@@ -224,7 +225,6 @@ public final class ScriptRunnable extends AbstractScriptRunnable implements ITes
 
         BufferedReader expected;
         if (expectedFile.exists()) {
-            expected = new BufferedReader(new InputStreamReader(new FileInputStream(expectedFileName0)));
             // copy expected file overwriting existing file and preserving last
             // modified time of source
             try {
@@ -235,11 +235,14 @@ public final class ScriptRunnable extends AbstractScriptRunnable implements ITes
             } catch (final IOException ex) {
                 fail("failed to copy expected " + expectedFileName + " to " + copyExpectedFileName + ": " + ex.getMessage());
             }
+            expected = new BufferedReader(new InputStreamReader(new FileInputStream(expectedFileName0)));
         } else {
             expected = new BufferedReader(new StringReader(""));
         }
 
-        final BufferedReader actual = new BufferedReader(new InputStreamReader(new FileInputStream(outputFileName0)));
-        compare(actual, expected, compareCompilerMsg);
+        try (BufferedReader actual = new BufferedReader(new InputStreamReader(new FileInputStream(outputFileName0)));
+             BufferedReader expected0 = expected){
+            compare(actual, expected0, compareCompilerMsg);
+        }
     }
 }

From b6d83bda4c4c6b3843130549b2e2febd49e8e01c Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:44 +0000
Subject: [PATCH 37/83] Added tag jdk-9+175 for changeset 74f490ba783a

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 98bbdae3716..0dab275e2d9 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -417,3 +417,4 @@ b25838a28195f4b6dab34668411eedd2d366a16c jdk-9+169
 2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172
 88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173
 5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174
+8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175

From 817c716a12eec95651f0c5a46866447d6c4346aa Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:45 +0000
Subject: [PATCH 38/83] Added tag jdk-9+175 for changeset e538c0cea8fe

---
 corba/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.hgtags b/corba/.hgtags
index 0cb7bc2e8c7..d0c4334ab0e 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -417,3 +417,4 @@ c62e5964cfcf144d8f72e9ba69757897785349a9 jdk-9+171
 95ed14547ca9246baed34f90ef3ca13217538a8c jdk-9+172
 534ba4f8cfcf12accc5b9adb943103f2ff79fe16 jdk-9+173
 3615768c12904e29bb2ec1b506cd4633cd8a9ced jdk-9+174
+dc78a3dd6b3a4f11cdae8a3e3d160e6a78bc7838 jdk-9+175

From f3ee3de2a3eb0f75327fcce0d56e35a6d90e234e Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:45 +0000
Subject: [PATCH 39/83] Added tag jdk-9+175 for changeset 459f03270e86

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 9deff2db564..a4580d1f2d2 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -577,3 +577,4 @@ d53171650a2cc6c6f699c966c533b914ca9c0602 jdk-9+171
 1ae9e84f68b359420d2d153ecfe5ee2903e33a2e jdk-9+172
 e64b1cb48d6e7703928a9d1da106fc27f8cb65fd jdk-9+173
 944791f8160185bffa13fbb821fc09b6198f1f25 jdk-9+174
+8f04d457168b9f1f4a1b2c37f49e0513ca9d33a7 jdk-9+175

From c0fdbd8d85d8c27e5af02e17336d1853e7f820ff Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:46 +0000
Subject: [PATCH 40/83] Added tag jdk-9+175 for changeset f7c39a27e5cd

---
 jaxp/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 760390f724b..6cbc95c191c 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -417,3 +417,4 @@ c27321c889cf4c8e465a61b84572c00ef7ee6004 jdk-9+171
 eedb6e54c8bd6197ecba5fc0d8568bac8ae852dd jdk-9+172
 9788347e0629d0cb3a0e55a903494ff741d4fa15 jdk-9+173
 b9c0b105002272d7414c8b34af9aded151f9cad6 jdk-9+174
+736412a8dccee9d439044e6b1af2e7470d0a3563 jdk-9+175

From c6d07be64f432f1771284ae6aef45dfdaec7fa0b Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:46 +0000
Subject: [PATCH 41/83] Added tag jdk-9+175 for changeset 65fdff10664d

---
 jaxws/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 8b82af23438..8412fcc1a97 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -420,3 +420,4 @@ e75d3abe579a7b39b762fc0a1a337c49eb072d82 jdk-9+170
 8c615099f3e3ca137325be34bf566b767d9e3c64 jdk-9+172
 2bd967aa452c1e0e87a6173bef6fbb96ef1c521b jdk-9+173
 c2296642010f1b215ac35da89e92c3ce44104e32 jdk-9+174
+a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175

From a247f0373ff869a9d1ff7dc47021d7e9341272c8 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:48 +0000
Subject: [PATCH 42/83] Added tag jdk-9+175 for changeset abb7c4afc7a8

---
 langtools/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/langtools/.hgtags b/langtools/.hgtags
index 6a975968853..156fafd928f 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -417,3 +417,4 @@ aae59039c1f5701ae933c5eed30e75d6e3afaeee jdk-9+171
 03669efa77f51852f5301623cad4a2e1bb4fb9f6 jdk-9+172
 123eb0956a459bca29d0812c62fca50da563ee40 jdk-9+173
 50c077995aa249890ece698a2a2db4c4fba90e10 jdk-9+174
+83f6eb009d8f6e94fd348c7d23e4b00754d745db jdk-9+175

From 5dbd06dfaa8aa7714ba37e18f31f39cd5d437a5f Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Thu, 22 Jun 2017 18:42:48 +0000
Subject: [PATCH 43/83] Added tag jdk-9+175 for changeset 2b0b8cd704d4

---
 nashorn/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 6ce656d70c1..082ca164294 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -408,3 +408,4 @@ fc416270a776409b74006262dd0a9f5f5ff31555 jdk-9+171
 c8d6b740f0f7ec834b4157bf0d4523e8bbddb3f0 jdk-9+172
 fa8e4de50e821eed876388c84f7129a6739268be jdk-9+173
 7d4006eaa088848c4fa2ac4aef0ba9982f80752a jdk-9+174
+734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175

From 7464411d76bc969347caef5a7d6f1d4cc71986c9 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:16 +0000
Subject: [PATCH 44/83] Added tag jdk-10+13 for changeset 9b00774291d5

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 2dc97e1991e..69b3f8c924a 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -431,3 +431,4 @@ b94be69cbb1d2943b886bf2d458745756df146e4 jdk-10+9
 5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174
 8d4ed1e06fe184c9cb08c5b708e7d6f5c066644f jdk-10+12
 8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175
+d67a3f1f057f7e31e12f33ebe3667cb73d252268 jdk-10+13

From 1a9b8152f9eafd93b8de8d4fb7e95b0caf57ac2d Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:17 +0000
Subject: [PATCH 45/83] Added tag jdk-10+13 for changeset 57ad1ec78a27

---
 jaxp/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 193557ecf6d..315d5f63b43 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -431,3 +431,4 @@ eedb6e54c8bd6197ecba5fc0d8568bac8ae852dd jdk-9+172
 b9c0b105002272d7414c8b34af9aded151f9cad6 jdk-9+174
 ff293e39e83366c40a5687dacd1ccb2305ed2c1e jdk-10+12
 736412a8dccee9d439044e6b1af2e7470d0a3563 jdk-9+175
+5d374af9e78d02976e0e7f8dc2706f91a020f025 jdk-10+13

From 6ed22d4bca8dc9eda6f560774699bce24fd4e9eb Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:22 +0000
Subject: [PATCH 46/83] Added tag jdk-10+13 for changeset de951549612c

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index c0532aa28e8..4c61de8151b 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -591,3 +591,4 @@ e64b1cb48d6e7703928a9d1da106fc27f8cb65fd jdk-9+173
 944791f8160185bffa13fbb821fc09b6198f1f25 jdk-9+174
 070aa7a2eb14c4645f7eb31384cba0a2ba72a4b5 jdk-10+12
 8f04d457168b9f1f4a1b2c37f49e0513ca9d33a7 jdk-9+175
+a9da03357f190807591177fe9846d6e68ad64fc0 jdk-10+13

From 8316229a7ee36db22697d255134ad301cdeac37b Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:26 +0000
Subject: [PATCH 47/83] Added tag jdk-10+13 for changeset 721bae7117fe

---
 nashorn/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 2dc91b743c2..5ef13db40c9 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -422,3 +422,4 @@ fa8e4de50e821eed876388c84f7129a6739268be jdk-9+173
 7d4006eaa088848c4fa2ac4aef0ba9982f80752a jdk-9+174
 de571c0a93258599054f18184cbdeae42cd95265 jdk-10+12
 734b3209b6edeb57e482c97793ae9c066af72871 jdk-9+175
+2ab4a2055c2e309872f648fa7ab4daae0bf8994c jdk-10+13

From a5156b06b1839283ee3304073b8ea23003a4ab57 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:27 +0000
Subject: [PATCH 48/83] Added tag jdk-10+13 for changeset 8d019eee3515

---
 langtools/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/langtools/.hgtags b/langtools/.hgtags
index 46475464a02..8e1bd72d64a 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -431,3 +431,4 @@ daa70bfed35ecf0575884c954dc95135e0f94b29 jdk-10+11
 50c077995aa249890ece698a2a2db4c4fba90e10 jdk-9+174
 2bd34895dda246cff9e713401f3544260dfbe80f jdk-10+12
 83f6eb009d8f6e94fd348c7d23e4b00754d745db jdk-9+175
+123f40b60a18225b1485fad891e3fa173a10e5af jdk-10+13

From c71f0454910dc91741d8931c7fde995b0ee8e51e Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:27 +0000
Subject: [PATCH 49/83] Added tag jdk-10+13 for changeset 965113ea3d05

---
 corba/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.hgtags b/corba/.hgtags
index 528ea850ea6..cd452cb8148 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -431,3 +431,4 @@ c62e5964cfcf144d8f72e9ba69757897785349a9 jdk-9+171
 3615768c12904e29bb2ec1b506cd4633cd8a9ced jdk-9+174
 00ae6307d78bac49883ddc85d687aa88c49f3971 jdk-10+12
 dc78a3dd6b3a4f11cdae8a3e3d160e6a78bc7838 jdk-9+175
+564fced058bd2c8375e9104aa8f9494642cd7bdd jdk-10+13

From 5aaf3d344785fc1b70e469793b0e6dc91e536b04 Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Sat, 24 Jun 2017 02:59:30 +0000
Subject: [PATCH 50/83] Added tag jdk-10+13 for changeset b5e375e70bc2

---
 jaxws/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 6ed992303a0..2b956827083 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -434,3 +434,4 @@ e705867d9989d00e4357f66f18b302c95e13b5e7 jdk-10+8
 c2296642010f1b215ac35da89e92c3ce44104e32 jdk-9+174
 712a3a657654079514590d37a0f4894d43541d5c jdk-10+12
 a5d361b9d1f7f78a675f3baef0d1fd32deee9ea2 jdk-9+175
+46a14aad004aa0b980d5f4ff7810d894fd5a36ae jdk-10+13

From 2fb3b40b409668876bf0bb8b500fd0b322ba2bda Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Sun, 25 Jun 2017 13:38:26 -0700
Subject: [PATCH 51/83] 8182489: jshell tool: rerun multiline snippet from
 history corrupts history

Reviewed-by: jlahoda
---
 .../ToolMultilineSnippetHistoryTest.java      | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java

diff --git a/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java b/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java
new file mode 100644
index 00000000000..febca14f641
--- /dev/null
+++ b/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, 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 8182489
+ * @summary test history with multiline snippets
+ * @modules
+ *     jdk.jshell/jdk.internal.jshell.tool.resources:open
+ *     jdk.jshell/jdk.jshell:open
+ * @build UITesting
+ * @build ToolMultilineSnippetHistoryTest
+ * @run testng ToolMultilineSnippetHistoryTest
+ */
+
+import org.testng.annotations.Test;
+
+@Test
+public class ToolMultilineSnippetHistoryTest extends UITesting {
+
+    public void testUpArrow() throws Exception {
+        doRunTest((inputSink, out) -> {
+            inputSink.write("int x=\n44\n");
+            waitOutput(out, "x ==> 44\n\u0005");
+            inputSink.write("/!\n");
+            waitOutput(out, "int x=\n44;\nx ==> 44\n\u0005");
+            inputSink.write("\020");
+            waitOutput(out,   "44;");
+            inputSink.write("\020");
+            waitOutput(out,  "int x=");
+        });
+    }
+
+}

From d07b9fdfdea07b1d5fcfd27a67e635d42684bae9 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Sun, 25 Jun 2017 13:42:31 -0700
Subject: [PATCH 52/83] 8176110: JShell: completions with package results
 should, in most cases, be dot terminated

Reviewed-by: jlahoda
---
 .../jdk/jshell/SourceCodeAnalysisImpl.java    | 12 ++++++--
 .../jdk/jshell/CompletionSuggestionTest.java  | 28 +++++++++----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index fccf5cedce6..a1095e2bd32 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -673,8 +673,16 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 continue;
             }
             String simpleName = simpleName(c);
-            if (c.getKind() == ElementKind.CONSTRUCTOR || c.getKind() == ElementKind.METHOD) {
-                simpleName += paren.apply(hasParams.contains(simpleName));
+            switch (c.getKind()) {
+                case CONSTRUCTOR:
+                case METHOD:
+                    // add trailing open or matched parenthesis, as approriate
+                    simpleName += paren.apply(hasParams.contains(simpleName));
+                    break;
+                case PACKAGE:
+                    // add trailing dot to package names
+                    simpleName += ".";
+                    break;
             }
             result.add(new SuggestionImpl(simpleName, smart.test(c)));
         }
diff --git a/langtools/test/jdk/jshell/CompletionSuggestionTest.java b/langtools/test/jdk/jshell/CompletionSuggestionTest.java
index 8ec12c05fd5..402fb92cd0f 100644
--- a/langtools/test/jdk/jshell/CompletionSuggestionTest.java
+++ b/langtools/test/jdk/jshell/CompletionSuggestionTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241
+ * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110
  * @summary Test Completion and Documentation
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -180,7 +180,7 @@ public class CompletionSuggestionTest extends KullaTesting {
         assertCompletion("list.add(0, |", true, "ccTest3");
         assertCompletion("new String(|", true, "ccTest3");
         assertCompletion("new String(new char[0], |", true, "ccTest1", "ccTest2");
-        assertCompletionIncludesExcludes("new jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+        assertCompletionIncludesExcludes("new jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
         assertCompletion("Class<String> clazz = String.c|", true, "class");
 
         Snippet klass = classKey(assertEval("class Klass {void method(int n) {} private void method(String str) {}}"));
@@ -241,14 +241,14 @@ public class CompletionSuggestionTest extends KullaTesting {
     }
 
     public void testFullyQualified() {
-        assertCompletion("Optional<String> opt = java.u|", "util");
+        assertCompletion("Optional<String> opt = java.u|", "util.");
         assertCompletionIncludesExcludes("Optional<Strings> opt = java.util.O|", new HashSet<>(Collections.singletonList("Optional")), Collections.emptySet());
 
         assertEval("void method(java.util.Optional<String> opt) {}");
-        assertCompletion("method(java.u|", "util");
+        assertCompletion("method(java.u|", "util.");
 
         assertCompletion("Object.notElement.|");
-        assertCompletion("Object o = com.su|", "sun");
+        assertCompletion("Object o = com.su|", "sun.");
 
         Path p1 = outDir.resolve("dir1");
         compiler.compile(p1,
@@ -262,8 +262,8 @@ public class CompletionSuggestionTest extends KullaTesting {
         compiler.jar(p1, jarName, "p1/p2/Test.class", "p1/p3/Test.class");
         addToClasspath(compiler.getPath(p1.resolve(jarName)));
 
-        assertCompletionIncludesExcludes("|", new HashSet<>(Collections.singletonList("p1")), Collections.emptySet());
-        assertCompletion("p1.|", "p2", "p3");
+        assertCompletionIncludesExcludes("|", new HashSet<>(Collections.singletonList("p1.")), Collections.emptySet());
+        assertCompletion("p1.|", "p2.", "p3.");
         assertCompletion("p1.p2.|", "Test");
         assertCompletion("p1.p3.|", "Test");
     }
@@ -273,15 +273,15 @@ public class CompletionSuggestionTest extends KullaTesting {
     }
 
     public void testCompletePackages() {
-        assertCompletion("java.u|", "util");
-        assertCompletionIncludesExcludes("jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+        assertCompletion("java.u|", "util.");
+        assertCompletionIncludesExcludes("jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
     }
 
     public void testImports() {
-        assertCompletion("import java.u|", "util");
-        assertCompletionIncludesExcludes("import jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
-        assertCompletion("import static java.u|", "util");
-        assertCompletionIncludesExcludes("import static jav|", new HashSet<>(Arrays.asList("java", "javax")), Collections.emptySet());
+        assertCompletion("import java.u|", "util.");
+        assertCompletionIncludesExcludes("import jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
+        assertCompletion("import static java.u|", "util.");
+        assertCompletionIncludesExcludes("import static jav|", new HashSet<>(Arrays.asList("java.", "javax.")), Collections.emptySet());
         assertCompletion("import static java.lang.Boolean.g|", "getBoolean");
         assertCompletion("import java.util.*|");
         assertCompletionIncludesExcludes("import java.lang.String.|",
@@ -296,7 +296,7 @@ public class CompletionSuggestionTest extends KullaTesting {
     }
 
     public void testImportStart() {
-        assertCompletionIncludesExcludes("import c|", Set.of("com"), Set.of());
+        assertCompletionIncludesExcludes("import c|", Set.of("com."), Set.of());
     }
 
     public void testBrokenClassFile() throws Exception {

From f2484da32cbf1b45e8f5edb3a0b7a3968c32a111 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Mon, 26 Jun 2017 14:16:34 -0700
Subject: [PATCH 53/83] 8182268: JShell: CompletionInfo.source() for
 CONSIDERED_INCOMPLETE missing semicolon

Reviewed-by: jlahoda
---
 .../jdk/jshell/SourceCodeAnalysisImpl.java        | 15 +++++++++++----
 langtools/test/jdk/jshell/CompletenessTest.java   |  7 +++++--
 langtools/test/jdk/jshell/KullaTesting.java       |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index a1095e2bd32..d7296e2039e 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -188,7 +188,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         int nonCommentNonWhiteLength = trimmedInput.length();
         String src = srcInput.substring(0, unitEndPos);
         switch (status) {
-            case COMPLETE:
+            case COMPLETE: {
                 if (unitEndPos == nonCommentNonWhiteLength) {
                     // The unit is the whole non-coment/white input plus semicolon
                     String compileSource = src
@@ -202,7 +202,8 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                     proc.debug(DBG_COMPA, "          remaining: %s\n", remain);
                     return new CompletionInfoImpl(status, src, remain);
                 }
-            case COMPLETE_WITH_SEMI:
+            }
+            case COMPLETE_WITH_SEMI: {
                 // The unit is the whole non-coment/white input plus semicolon
                 String compileSource = src
                         + ";"
@@ -210,12 +211,18 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 proc.debug(DBG_COMPA, "Complete with semi: %s\n", compileSource);
                 proc.debug(DBG_COMPA, "   nothing remains.\n");
                 return new CompletionInfoImpl(status, compileSource, "");
+            }
             case DEFINITELY_INCOMPLETE:
                 proc.debug(DBG_COMPA, "Incomplete: %s\n", srcInput);
                 return new CompletionInfoImpl(status, null, srcInput + '\n');
-            case CONSIDERED_INCOMPLETE:
+            case CONSIDERED_INCOMPLETE: {
+                // Since the source is potentually valid, construct the complete source
+                String compileSource = src
+                        + ";"
+                        + mcm.mask().substring(nonCommentNonWhiteLength);
                 proc.debug(DBG_COMPA, "Considered incomplete: %s\n", srcInput);
-                return new CompletionInfoImpl(status, null, srcInput + '\n');
+                return new CompletionInfoImpl(status, compileSource, srcInput + '\n');
+            }
             case EMPTY:
                 proc.debug(DBG_COMPA, "Detected empty: %s\n", srcInput);
                 return new CompletionInfoImpl(status, srcInput, "");
diff --git a/langtools/test/jdk/jshell/CompletenessTest.java b/langtools/test/jdk/jshell/CompletenessTest.java
index 62544a5c31e..2424fbe4de0 100644
--- a/langtools/test/jdk/jshell/CompletenessTest.java
+++ b/langtools/test/jdk/jshell/CompletenessTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8149524 8131024 8165211 8080071 8130454 8167343 8129559 8114842
+ * @bug 8149524 8131024 8165211 8080071 8130454 8167343 8129559 8114842 8182268
  * @summary Test SourceCodeAnalysis
  * @build KullaTesting TestingInputStream
  * @run testng CompletenessTest
@@ -208,10 +208,13 @@ public class CompletenessTest extends KullaTesting {
                 break;
 
             case DEFINITELY_INCOMPLETE:
-            case CONSIDERED_INCOMPLETE:
                 augSrc = null;
                 break;
 
+            case CONSIDERED_INCOMPLETE:
+                augSrc = source + ";";
+                break;
+
             case EMPTY:
             case COMPLETE:
             case UNKNOWN:
diff --git a/langtools/test/jdk/jshell/KullaTesting.java b/langtools/test/jdk/jshell/KullaTesting.java
index a2ea8e159b0..9cf8a55346c 100644
--- a/langtools/test/jdk/jshell/KullaTesting.java
+++ b/langtools/test/jdk/jshell/KullaTesting.java
@@ -793,7 +793,7 @@ public class KullaTesting {
     public void assertAnalyze(String input, Completeness status, String source, String remaining, Boolean isComplete) {
         CompletionInfo ci = getAnalysis().analyzeCompletion(input);
         if (status != null) assertEquals(ci.completeness(), status, "Input : " + input + ", status: ");
-        if (source != null) assertEquals(ci.source(), source, "Input : " + input + ", source: ");
+        assertEquals(ci.source(), source, "Input : " + input + ", source: ");
         if (remaining != null) assertEquals(ci.remaining(), remaining, "Input : " + input + ", remaining: ");
         if (isComplete != null) {
             boolean isExpectedComplete = isComplete;

From feee226151228c631852479cbfb7f72ba68dc815 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Mon, 26 Jun 2017 18:43:00 -0700
Subject: [PATCH 54/83] 8177847: jshell tool: retain delete of non-retained
 mode does not locally delete

Reviewed-by: jlahoda
---
 .../jdk/internal/jshell/tool/Feedback.java    |  6 ++++--
 .../jdk/jshell/ToolCommandOptionTest.java     | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java
index bbd919658eb..c834c00f62a 100644
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -1022,7 +1022,9 @@ class Feedback {
                     // Note: delete, for safety reasons, does NOT do name matching
                     if (commandOption || quietOption) {
                         errorat("jshell.err.conflicting.options");
-                    } else if (!(retainOption ? retainedMap : modeMap).containsKey(umode)) {
+                    } else if (retainOption
+                            ? !retainedMap.containsKey(umode) && !modeMap.containsKey(umode)
+                            : !modeMap.containsKey(umode)) {
                         // Cannot delete a mode that does not exist
                         errorat("jshell.err.mode.unknown", umode);
                     } else if (omode != null) {
diff --git a/langtools/test/jdk/jshell/ToolCommandOptionTest.java b/langtools/test/jdk/jshell/ToolCommandOptionTest.java
index 3bc3c2ee7b7..ec137a3ec60 100644
--- a/langtools/test/jdk/jshell/ToolCommandOptionTest.java
+++ b/langtools/test/jdk/jshell/ToolCommandOptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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,7 @@
 
  /*
  * @test
- * @bug 8157395 8157393 8157517 8158738 8167128 8163840 8167637 8170368 8172102 8172179
+ * @bug 8157395 8157393 8157517 8158738 8167128 8163840 8167637 8170368 8172102 8172179 8177847
  * @summary Tests of jshell comand options, and undoing operations
  * @modules jdk.jshell/jdk.internal.jshell.tool
  *          jdk.compiler/com.sun.tools.javac.api
@@ -35,6 +35,7 @@
 import java.nio.file.Path;
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 @Test
 public class ToolCommandOptionTest extends ReplToolTesting {
@@ -530,4 +531,18 @@ public class ToolCommandOptionTest extends ReplToolTesting {
         );
     }
 
+    public void retainModeDeleteLocalTest() {
+        test(
+                (a) -> assertCommand(a, "/set mode rmdlt normal -command",
+                        "|  Created new feedback mode: rmdlt"),
+                (a) -> assertCommand(a, "/set mode rmdlt -delete -retain ",
+                        ""),
+                (a) -> assertCommandCheckOutput(a, "/set feedback",
+                        (s) -> {
+                            assertTrue(s.contains("normal"), "Expected normal mode: " + s);
+                            assertFalse(s.contains("rmdlt"), "Didn't delete rmdlt: " + s);
+                        })
+        );
+    }
+
 }

From 965530668bd6bcc0240a93f96e228267e68f6f3e Mon Sep 17 00:00:00 2001
From: Priya Lakshmi Muthuswamy <priya.lakshmi.muthuswamy@oracle.com>
Date: Tue, 27 Jun 2017 15:30:21 +0530
Subject: [PATCH 55/83] 8058408: Compiler should emit a clearer message for
 invalid parenthesized expression

Reviewed-by: sadayapalam
---
 .../com/sun/tools/javac/comp/Attr.java        |  2 +-
 .../tools/javac/resources/compiler.properties |  3 ++
 langtools/test/tools/javac/Parens1.out        |  2 +-
 langtools/test/tools/javac/Parens4.out        |  2 +-
 .../IllegalParanthesisExpression.java         | 28 +++++++++++++++++++
 .../javac/expression/IllegalParenthesis.java  | 16 +++++++++++
 .../javac/expression/IllegalParenthesis.out   |  3 ++
 7 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java
 create mode 100644 langtools/test/tools/javac/expression/IllegalParenthesis.java
 create mode 100644 langtools/test/tools/javac/expression/IllegalParenthesis.out

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 329c877ac6f..f3734d167a1 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -3184,7 +3184,7 @@ public class Attr extends JCTree.Visitor {
         result = check(tree, owntype, pkind(), resultInfo);
         Symbol sym = TreeInfo.symbol(tree);
         if (sym != null && sym.kind.matches(KindSelector.TYP_PCK))
-            log.error(tree.pos(), Errors.IllegalStartOfType);
+            log.error(tree.pos(), Errors.IllegalParenthesizedExpression);
     }
 
     public void visitAssign(JCAssign tree) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index a06e8ba8a86..bd14a0cf202 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -591,6 +591,9 @@ compiler.err.illegal.start.of.stmt=\
 compiler.err.illegal.start.of.type=\
     illegal start of type
 
+compiler.err.illegal.parenthesized.expression=\
+    illegal parenthesized expression
+
 compiler.err.illegal.unicode.esc=\
     illegal unicode escape
 
diff --git a/langtools/test/tools/javac/Parens1.out b/langtools/test/tools/javac/Parens1.out
index 8797c53578d..68f0f6ff49e 100644
--- a/langtools/test/tools/javac/Parens1.out
+++ b/langtools/test/tools/javac/Parens1.out
@@ -1,2 +1,2 @@
-Parens1.java:12:20: compiler.err.illegal.start.of.type
+Parens1.java:12:20: compiler.err.illegal.parenthesized.expression
 1 error
diff --git a/langtools/test/tools/javac/Parens4.out b/langtools/test/tools/javac/Parens4.out
index 1d44883b7d3..95c28955aed 100644
--- a/langtools/test/tools/javac/Parens4.out
+++ b/langtools/test/tools/javac/Parens4.out
@@ -1,2 +1,2 @@
-Parens4.java:12:16: compiler.err.illegal.start.of.type
+Parens4.java:12:16: compiler.err.illegal.parenthesized.expression
 1 error
diff --git a/langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java b/langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java
new file mode 100644
index 00000000000..f2938d94557
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/IllegalParanthesisExpression.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2017, 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.parenthesized.expression
+
+class IllegalParenthesisExpression {
+    String s = (Integer).toString(123);
+}
diff --git a/langtools/test/tools/javac/expression/IllegalParenthesis.java b/langtools/test/tools/javac/expression/IllegalParenthesis.java
new file mode 100644
index 00000000000..b07f4b2a12e
--- /dev/null
+++ b/langtools/test/tools/javac/expression/IllegalParenthesis.java
@@ -0,0 +1,16 @@
+/*
+ * @test  /nodynamiccopyright/
+ * @bug 8058408
+ * @summary Test that illegal.parenthesized.expression error key is used for parenthesized expression used in cast
+ *
+ * @compile/fail/ref=IllegalParenthesis.out -XDrawDiagnostics IllegalParenthesis.java
+ */
+
+import java.time.LocalDate;
+
+class IllegalParenthesis {
+    String s = (Integer).toString(123);
+    void f(){
+        LocalDate date = (LocalDate).now();
+    }
+}
diff --git a/langtools/test/tools/javac/expression/IllegalParenthesis.out b/langtools/test/tools/javac/expression/IllegalParenthesis.out
new file mode 100644
index 00000000000..d5c06af7658
--- /dev/null
+++ b/langtools/test/tools/javac/expression/IllegalParenthesis.out
@@ -0,0 +1,3 @@
+IllegalParenthesis.java:12:16: compiler.err.illegal.parenthesized.expression
+IllegalParenthesis.java:14:26: compiler.err.illegal.parenthesized.expression
+2 errors

From d9cd3471bc7ad3893666f826c400508fed37061b Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Tue, 27 Jun 2017 08:43:15 -0700
Subject: [PATCH 56/83] 8182154: merge jdk.testlibrary.Platform and
 jdk.test.lib.Platform

Reviewed-by: sspitsyn, plevart
---
 test/lib/jdk/test/lib/Platform.java | 55 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 75720134be6..35766c3bbdb 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -23,10 +23,9 @@
 
 package jdk.test.lib;
 
+import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.RandomAccessFile;
 import java.util.regex.Pattern;
 
 public class Platform {
@@ -208,12 +207,13 @@ public class Platform {
      * Return a boolean for whether we expect to be able to attach
      * the SA to our own processes on this system.
      */
-    public static boolean shouldSAAttach() throws Exception {
-
+    public static boolean shouldSAAttach() throws IOException {
         if (isAix()) {
-            return false;   // SA not implemented.
+            return false; // SA not implemented.
         } else if (isLinux()) {
-            if (isS390x()) { return false; }   // SA not implemented.
+            if (isS390x()) {
+                return false; // SA not implemented.
+            }
             return canPtraceAttachLinux();
         } else if (isOSX()) {
             return canAttachOSX();
@@ -229,13 +229,15 @@ public class Platform {
      * if we are root, so return true.  Then return false for an expected denial
      * if "ptrace_scope" is 1, and true otherwise.
      */
-    public static boolean canPtraceAttachLinux() throws Exception {
-
+    private static boolean canPtraceAttachLinux() throws IOException {
         // SELinux deny_ptrace:
-        String deny_ptrace = fileAsString("/sys/fs/selinux/booleans/deny_ptrace");
-        if (deny_ptrace != null && deny_ptrace.contains("1")) {
-            // ptrace will be denied:
-            return false;
+        File deny_ptrace = new File("/sys/fs/selinux/booleans/deny_ptrace");
+        if (deny_ptrace.exists()) {
+            try (RandomAccessFile file = new RandomAccessFile(deny_ptrace, "r")) {
+                if (file.readByte() != '0') {
+                    return false;
+                }
+            }
         }
 
         // YAMA enhanced security ptrace_scope:
@@ -243,14 +245,17 @@ public class Platform {
         // 1 - restricted ptrace: a process must be a children of the inferior or user is root
         // 2 - only processes with CAP_SYS_PTRACE may use ptrace or user is root
         // 3 - no attach: no processes may use ptrace with PTRACE_ATTACH
-        String ptrace_scope = fileAsString("/proc/sys/kernel/yama/ptrace_scope");
-        if (ptrace_scope != null) {
-            if (ptrace_scope.startsWith("3")) {
-                return false;
-            }
-            if (!userName.equals("root") && !ptrace_scope.startsWith("0")) {
-                // ptrace will be denied:
-                return false;
+        File ptrace_scope = new File("/proc/sys/kernel/yama/ptrace_scope");
+        if (ptrace_scope.exists()) {
+            try (RandomAccessFile file = new RandomAccessFile(ptrace_scope, "r")) {
+                byte yama_scope = file.readByte();
+                if (yama_scope == '3') {
+                    return false;
+                }
+
+                if (!userName.equals("root") && yama_scope != '0') {
+                    return false;
+                }
             }
         }
         // Otherwise expect to be permitted:
@@ -260,7 +265,7 @@ public class Platform {
     /**
      * On OSX, expect permission to attach only if we are root.
      */
-    public static boolean canAttachOSX() throws Exception {
+    private static boolean canAttachOSX() {
         return userName.equals("root");
     }
 
@@ -269,10 +274,4 @@ public class Platform {
                       .matcher(osArch)
                       .matches();
     }
-
-    private static String fileAsString(String filename) throws IOException {
-        Path filePath = Paths.get(filename);
-        if (!Files.exists(filePath)) return null;
-        return new String(Files.readAllBytes(filePath));
-    }
 }

From 02d9418fb4183060a73714cce5fb0b0f64d2035c Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Tue, 27 Jun 2017 08:43:58 -0700
Subject: [PATCH 57/83] 8182154: merge jdk.testlibrary.Platform and
 jdk.test.lib.Platform

Reviewed-by: sspitsyn, plevart
---
 .../TestMutuallyExclusivePlatformPredicates.java               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
index 5e56d66bd4a..9903b188e62 100644
--- a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
+++ b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
@@ -51,8 +51,7 @@ public class TestMutuallyExclusivePlatformPredicates {
         VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero", "isEmbedded"),
         MODE("isInt", "isMixed", "isComp"),
         IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", "isSlowDebugBuild",
-                "shouldSAAttach", "canPtraceAttachLinux", "canAttachOSX",
-                "isTieredSupported");
+                "shouldSAAttach", "isTieredSupported");
 
         public final List<String> methodNames;
 

From 4b588dc9cbbc88f12cbf060f9855fb03933a7c5b Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:24 -0700
Subject: [PATCH 58/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 .jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.jcheck/conf b/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From 2cf79071bb22e93e677ca63385dc8c234c4adb86 Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:27 -0700
Subject: [PATCH 59/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 hotspot/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.jcheck/conf b/hotspot/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/hotspot/.jcheck/conf
+++ b/hotspot/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From c45b4ed6a5940d973b2b149c9660b94b259b9ea8 Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:27 -0700
Subject: [PATCH 60/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 corba/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.jcheck/conf b/corba/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/corba/.jcheck/conf
+++ b/corba/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From 80e9413e75fec340a0b7aaa856fe8e2e46be991f Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:28 -0700
Subject: [PATCH 61/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 jaxp/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxp/.jcheck/conf b/jaxp/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/jaxp/.jcheck/conf
+++ b/jaxp/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From c55de9bee1b779d6ab95337f199dce25788d64c4 Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:28 -0700
Subject: [PATCH 62/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 jaxws/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jaxws/.jcheck/conf b/jaxws/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/jaxws/.jcheck/conf
+++ b/jaxws/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From bd8f3f63f6d8f2e3c7821b67af65ecb9bc58f164 Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:31 -0700
Subject: [PATCH 63/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 langtools/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/langtools/.jcheck/conf b/langtools/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/langtools/.jcheck/conf
+++ b/langtools/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From badaec37d28b720f4462e140e1e31446e7fa2f8e Mon Sep 17 00:00:00 2001
From: Iris Clark <iris@openjdk.org>
Date: Wed, 28 Jun 2017 11:27:32 -0700
Subject: [PATCH 64/83] 8183142: Add bugids=dup to .jcheck/conf files for JDK
 10

Reviewed-by: mr
---
 nashorn/.jcheck/conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nashorn/.jcheck/conf b/nashorn/.jcheck/conf
index b2581358014..ad4189d7de5 100644
--- a/nashorn/.jcheck/conf
+++ b/nashorn/.jcheck/conf
@@ -1 +1,2 @@
 project=jdk10
+bugids=dup

From d4adff10ed18e80c1ac92168e1229996cac49501 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Wed, 28 Jun 2017 14:46:18 -0700
Subject: [PATCH 65/83] 8183148: cleanup ModuleSymbol.getSimpleName

Reviewed-by: jjg
---
 .../com/sun/tools/javac/code/Symbol.java      |  8 +------
 .../com/sun/tools/javac/util/Convert.java     | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index 1ab5b25b205..0f4d3fecd07 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -951,13 +951,7 @@ public abstract class Symbol extends AnnoConstruct implements Element {
 
         @Override @DefinedBy(Api.LANGUAGE_MODEL)
         public Name getSimpleName() {
-            Name fullName = getQualifiedName();
-            int lastPeriod = fullName.lastIndexOf((byte)'.');
-            if (lastPeriod == -1) {
-                return fullName;
-            } else {
-                return fullName.subName(lastPeriod + 1, fullName.length());
-            }
+            return Convert.shortName(name);
         }
 
         @Override @DefinedBy(Api.LANGUAGE_MODEL)
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
index 98095066567..67f1094ec99 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
@@ -303,15 +303,26 @@ public class Convert {
 
 /* Conversion routines for qualified name splitting
  */
-    /** Return the last part of a class name.
+    /** Return the last part of a qualified name.
+     *  @param name the qualified name
+     *  @return the last part of the qualified name
      */
-    public static Name shortName(Name classname) {
-        return classname.subName(
-            classname.lastIndexOf((byte)'.') + 1, classname.getByteLength());
+    public static Name shortName(Name name) {
+        int start = name.lastIndexOf((byte)'.') + 1;
+        int end = name.getByteLength();
+        if (start == 0 && end == name.length()) {
+            return name;
+        }
+        return name.subName(
+            name.lastIndexOf((byte)'.') + 1, name.getByteLength());
     }
 
-    public static String shortName(String classname) {
-        return classname.substring(classname.lastIndexOf('.') + 1);
+    /** Return the last part of a qualified name from its string representation
+     *  @param name the string representation of the qualified name
+     *  @return the last part of the qualified name
+     */
+    public static String shortName(String name) {
+        return name.substring(name.lastIndexOf('.') + 1);
     }
 
     /** Return the package name of a class name, excluding the trailing '.',

From 095fb6718dc8497fbd7b9e9c3dc88edf761f04dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 29 Jun 2017 12:05:08 +0200
Subject: [PATCH 66/83] 8182996: Incorrect mapping Long type to JavaScript
 equivalent

Reviewed-by: jlaskey, sundar
---
 .../internal/runtime/AccessorProperty.java    |  2 -
 .../api/scripting/test/JDK_8182996_Test.java  | 70 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java

diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
index be5d052092c..e14860eb6cd 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -349,8 +349,6 @@ public class AccessorProperty extends Property {
         setType(hasDualFields() ? JSType.unboxedFieldType(initialValue) : Object.class);
         if (initialValue instanceof Integer) {
             invokeSetter(owner, ((Integer)initialValue).intValue());
-        } else if (initialValue instanceof Long) {
-            invokeSetter(owner, ((Long)initialValue).longValue());
         } else if (initialValue instanceof Double) {
             invokeSetter(owner, ((Double)initialValue).doubleValue());
         } else {
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java b/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
new file mode 100644
index 00000000000..e4c55d52ace
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/test/JDK_8182996_Test.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2017, 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 jdk.nashorn.api.scripting.test;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import javax.script.*;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @bug 8182996
+ * @summary Incorrect mapping Long type to JavaScript equivalent
+ */
+@SuppressWarnings("javadoc")
+public class JDK_8182996_Test {
+
+    private ScriptEngine engine;
+    Bindings bindings;
+
+
+    @BeforeClass
+    public void setupTest() {
+        engine = new ScriptEngineManager().getEngineByName("js");
+        bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        bindings.put("long1", Long.valueOf(1L));
+        bindings.put("long2", Long.valueOf(2L));
+        bindings.put("long2", Long.valueOf(3L));
+    }
+
+    @Test
+    public void testType() throws ScriptException {
+        assertEquals(engine.eval("typeof long1"), "object");
+        assertEquals(engine.eval("typeof long2"), "object");
+    }
+
+    @Test
+    public void testValue() throws ScriptException {
+        assertEquals(engine.eval("long1"), Long.valueOf(1));
+        assertEquals(engine.eval("long2"), Long.valueOf(3));
+        assertEquals(bindings.get("long1"), Long.valueOf(1));
+        assertEquals(bindings.get("long2"), Long.valueOf(3));
+    }
+
+}

From dacae3939b009cac76ce16bac820a2750667bf51 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 29 Jun 2017 07:19:44 -0700
Subject: [PATCH 67/83] 8182747: javac crashes on bad annotation value

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Annotate.java    |  7 +++
 .../tools/javac/resources/compiler.properties |  3 ++
 .../T8182747/BadAnnotationRegressionTest.java | 45 +++++++++++++++++++
 .../T8182747/BadAnnotationRegressionTest.out  |  4 ++
 .../diags/examples/AnnoMustBeClasLiteral.java | 35 +++++++++++++++
 5 files changed, 94 insertions(+)
 create mode 100644 langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java
 create mode 100644 langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out
 create mode 100644 langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index 76ae273c2b8..ad7c7e2eb6f 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -630,6 +630,13 @@ public class Annotate {
             }
         }
 
+        // Class literals look like field accesses of a field named class
+        // at the tree level
+        if (TreeInfo.name(tree) != names._class) {
+            log.error(tree.pos(), Errors.AnnotationValueMustBeClassLiteral);
+            return new Attribute.Error(syms.errType);
+        }
+
         return new Attribute.Class(types,
                 (((JCFieldAccess) tree).selected).type);
     }
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index bd14a0cf202..69c2c697bb7 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -134,6 +134,9 @@ compiler.err.annotation.type.not.applicable.to.type=\
 compiler.err.annotation.value.must.be.annotation=\
     annotation value must be an annotation
 
+compiler.err.annotation.value.must.be.class.literal=\
+    annotation value must be a class literal
+
 compiler.err.annotation.value.must.be.name.value=\
     annotation values must be of the form ''name=value''
 
diff --git a/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java b/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java
new file mode 100644
index 00000000000..558b118e5f5
--- /dev/null
+++ b/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.java
@@ -0,0 +1,45 @@
+/* @test /nodynamiccopyright/
+ * @bug 8182747
+ * @summary javac crashes on bad annotation value
+ * @compile/fail/ref=BadAnnotationRegressionTest.out -XDrawDiagnostics BadAnnotationRegressionTest.java
+ */
+
+class BadAnnotationRegressionTest {
+    @interface ClassAnno {
+        Class<?> value();
+    }
+
+    @interface ArrayAnno {
+        int[] value();
+    }
+
+    @interface PrimitiveAnno {
+        int value();
+    }
+
+    @interface StringAnno {
+        String value();
+    }
+
+    enum E {
+        A,
+        B,
+    }
+
+    @interface EnumAnno {
+        E value();
+    }
+
+    static final Class<?> c = Object.class;
+    static final int i = 0;
+    static final int[] arr = new int[] { 1, 2, 3 };
+    static final E a = E.A;
+    static final String s = "";
+
+    @ClassAnno(c)     // error
+    @PrimitiveAnno(i) // ok
+    @ArrayAnno(arr)   // error
+    @EnumAnno(a)      // error
+    @StringAnno(s)    //ok
+    void testAnno() {}
+}
diff --git a/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out b/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out
new file mode 100644
index 00000000000..fe42586f0c9
--- /dev/null
+++ b/langtools/test/tools/javac/T8182747/BadAnnotationRegressionTest.out
@@ -0,0 +1,4 @@
+BadAnnotationRegressionTest.java:39:16: compiler.err.annotation.value.must.be.class.literal
+BadAnnotationRegressionTest.java:41:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int[], int)
+BadAnnotationRegressionTest.java:42:15: compiler.err.enum.annotation.must.be.enum.constant
+3 errors
diff --git a/langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java b/langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java
new file mode 100644
index 00000000000..d24f8dc6054
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/AnnoMustBeClasLiteral.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 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.annotation.value.must.be.class.literal
+
+class EnumAnnoValueMustBeEnumConstant {
+    @interface ClassAnno {
+        Class<?> value();
+    }
+
+    static final Class<?> c = Object.class;
+
+    @ClassAnno(c)
+    void testAnno() {}
+}

From ce13d717f4fcb7f21d58c9c4bae232d51230ee59 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 29 Jun 2017 08:24:25 -0700
Subject: [PATCH 68/83] 8182649: Unable to integrate due to compilation error

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       | 11 ++++-
 .../com/sun/tools/javac/comp/Infer.java       |  2 -
 ...AddCheckForPartiallyInferredTypesTest.java | 41 +++++++++++++++++++
 .../EagerReturnTypeResolutionTestb.out        | 12 +++---
 .../tools/javac/lambda/8016177/T8016177g.out  |  2 +-
 5 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index c87b5bc1cd2..284d2039d42 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -311,6 +311,15 @@ public class Types {
         if (tPrimitive == sPrimitive) {
             return isSubtypeUnchecked(t, s, warn);
         }
+        boolean tUndet = t.hasTag(UNDETVAR);
+        boolean sUndet = s.hasTag(UNDETVAR);
+
+        if (tUndet || sUndet) {
+            return tUndet ?
+                    isSubtype(t, boxedTypeOrType(s)) :
+                    isSubtype(boxedTypeOrType(t), s);
+        }
+
         return tPrimitive
             ? isSubtype(boxedClass(t).type, s)
             : isSubtype(unboxedType(t), s);
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index 82de32fdc05..08c5140e894 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -416,8 +416,6 @@ public class Infer {
             if (needsEagerInstantiation((UndetVar)qtype, to, inferenceContext) &&
                     (allowGraphInference || !to.isPrimitive())) {
                 to = generateReferenceToTargetConstraint(tree, (UndetVar)qtype, to, resultInfo, inferenceContext);
-            } else if (to.isPrimitive()) {
-                to = types.boxedClass(to).type;
             }
         } else if (rsInfoInfContext.free(resultInfo.pt)) {
             //propagation - cache captured vars
diff --git a/langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java b/langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java
new file mode 100644
index 00000000000..8e2e23ba425
--- /dev/null
+++ b/langtools/test/tools/javac/T8182649/AddCheckForPartiallyInferredTypesTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2017, 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 8182649
+ * @summary Unable to integrate due to compilation error
+ * @compile AddCheckForPartiallyInferredTypesTest.java
+ */
+
+class AddCheckForPartiallyInferredTypesTest {
+    interface Signed {}
+    interface WordBase {}
+
+    <S extends Signed> S signed(int offset) { return null; }
+    <W1 extends WordBase> W1 readWord(WordBase w,String s) { return null; }
+    <W2 extends WordBase> W2 readWord(int i,String s) { return null; }
+    <W3 extends WordBase> W3 test() {
+        return readWord(signed(10), "");
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out b/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out
index 8f03df33658..99b460844d6 100644
--- a/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out
+++ b/langtools/test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out
@@ -34,12 +34,12 @@ EagerReturnTypeResolutionTestb.java:110:21: compiler.err.cant.apply.symbol: kind
 EagerReturnTypeResolutionTestb.java:112:30: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: EagerReturnTypeResolutionTestb.I<? extends java.lang.Object&java.io.Serializable&java.lang.Comparable<? extends java.lang.Object&java.io.Serializable&java.lang.Comparable<?>>>, EagerReturnTypeResolutionTestb.I<java.lang.String>,java.lang.Object)
 EagerReturnTypeResolutionTestb.java:113:24: compiler.err.cant.apply.symbol: kindname.method, eq2, java.util.List<T>,java.util.List<T>, java.util.List<EagerReturnTypeResolutionTestb.J<java.lang.Integer>>,java.util.List<EagerReturnTypeResolutionTestb.K>, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.incompatible.eq.bounds: T, EagerReturnTypeResolutionTestb.K,EagerReturnTypeResolutionTestb.J<java.lang.Integer>)
 EagerReturnTypeResolutionTestb.java:114:24: compiler.err.cant.apply.symbol: kindname.method, upper2, java.util.List<? super T>,java.util.List<? super T>, java.util.List<EagerReturnTypeResolutionTestb.J<java.lang.Integer>>,java.util.List<EagerReturnTypeResolutionTestb.K>, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.incompatible.upper.bounds: T, EagerReturnTypeResolutionTestb.K,EagerReturnTypeResolutionTestb.J<java.lang.Integer>,java.lang.Object)
-EagerReturnTypeResolutionTestb.java:174:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: , T, long))
-EagerReturnTypeResolutionTestb.java:175:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: , T, long))
-EagerReturnTypeResolutionTestb.java:176:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: , T, long))
-EagerReturnTypeResolutionTestb.java:178:26: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.instance.exists: , T, long)
-EagerReturnTypeResolutionTestb.java:179:23: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.instance.exists: , T, long)
-EagerReturnTypeResolutionTestb.java:180:26: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.instance.exists: , T, long)
+EagerReturnTypeResolutionTestb.java:174:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Object))
+EagerReturnTypeResolutionTestb.java:175:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Object))
+EagerReturnTypeResolutionTestb.java:176:9: compiler.err.cant.apply.symbol: kindname.method, takeLong, long, java.lang.Double, kindname.class, EagerReturnTypeResolutionTestb, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Double,java.lang.Object))
+EagerReturnTypeResolutionTestb.java:178:26: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Object)
+EagerReturnTypeResolutionTestb.java:179:23: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Object)
+EagerReturnTypeResolutionTestb.java:180:26: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Long,java.lang.Double,java.lang.Object)
 - compiler.note.unchecked.filename: EagerReturnTypeResolutionTestb.java
 - compiler.note.unchecked.recompile
 42 errors
diff --git a/langtools/test/tools/javac/lambda/8016177/T8016177g.out b/langtools/test/tools/javac/lambda/8016177/T8016177g.out
index 18d24d665ed..45936930548 100644
--- a/langtools/test/tools/javac/lambda/8016177/T8016177g.out
+++ b/langtools/test/tools/javac/lambda/8016177/T8016177g.out
@@ -1,3 +1,3 @@
 T8016177g.java:34:14: compiler.err.cant.apply.symbol: kindname.method, print, java.lang.String, Test.Person, kindname.class, Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.upper.lower.bounds: R, java.lang.String,java.lang.Object, Test.Person))
-T8016177g.java:35:20: compiler.err.cant.apply.symbol: kindname.method, abs, int, java.lang.Double, kindname.class, Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.infer.no.conforming.instance.exists: , R, int))
+T8016177g.java:35:20: compiler.err.cant.apply.symbol: kindname.method, abs, int, java.lang.Double, kindname.class, Test, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Double, java.lang.Integer,java.lang.Object))
 2 errors

From 43ba99fd984755777c730e9b46124a8f3a41f39a Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 29 Jun 2017 13:40:38 -0700
Subject: [PATCH 69/83] 8182710: File.listRoots() always returns the root of CD
 drive

Include only logical drives with an extant filesystem location

Reviewed-by: clanger, rriggs, plevart, tvaleev
---
 .../classes/java/io/WinNTFileSystem.java      | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index 9cd515075fa..bcd8a6a5391 100644
--- a/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/jdk/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -27,6 +27,7 @@ package java.io;
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.BitSet;
 import java.util.Locale;
 import java.util.Properties;
 import sun.security.action.GetPropertyAction;
@@ -586,24 +587,12 @@ class WinNTFileSystem extends FileSystem {
 
     @Override
     public File[] listRoots() {
-        int ds = listRoots0();
-        int n = 0;
-        for (int i = 0; i < 26; i++) {
-            if (((ds >> i) & 1) != 0) {
-                if (!access((char)('A' + i) + ":" + slash))
-                    ds &= ~(1 << i);
-                else
-                    n++;
-            }
-        }
-        File[] fs = new File[n];
-        int j = 0;
-        char slash = this.slash;
-        for (int i = 0; i < 26; i++) {
-            if (((ds >> i) & 1) != 0)
-                fs[j++] = new File((char)('A' + i) + ":" + slash);
-        }
-        return fs;
+        return BitSet
+            .valueOf(new long[] {listRoots0()})
+            .stream()
+            .mapToObj(i -> new File((char)('A' + i) + ":" + slash))
+            .filter(f -> access(f.getPath()) && f.exists())
+            .toArray(File[]::new);
     }
 
     private static native int listRoots0();

From c00b47cf6e1372108426a0389b04b9b9846f4fb4 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 29 Jun 2017 14:32:39 -0700
Subject: [PATCH 70/83] 8183255: Fix langtools TEST.groups file after fix for
 JDK-8177511

Reviewed-by: jjg
---
 langtools/test/TEST.groups | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/langtools/test/TEST.groups b/langtools/test/TEST.groups
index 582daf7a365..0499d1b7dd4 100644
--- a/langtools/test/TEST.groups
+++ b/langtools/test/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2015, 2017, 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,7 +24,6 @@
 
 # (Nearly) all langtools tests are tier 1.
 tier1 = \
-    com \
     jdk \
     lib \
     tools \

From c33dc7513c1a6f7031e5f6c758259a1b24ebe6a4 Mon Sep 17 00:00:00 2001
From: Felix Yang <xiaofeya@openjdk.org>
Date: Thu, 29 Jun 2017 18:42:01 -0700
Subject: [PATCH 71/83] 8182975: Mark http2/BasicTest.java and
 FixedThreadPoolTest.java as intermittently failing

Reviewed-by: rriggs
---
 jdk/test/java/net/httpclient/http2/BasicTest.java           | 1 +
 jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jdk/test/java/net/httpclient/http2/BasicTest.java b/jdk/test/java/net/httpclient/http2/BasicTest.java
index 9744eda9034..ec510f55dfa 100644
--- a/jdk/test/java/net/httpclient/http2/BasicTest.java
+++ b/jdk/test/java/net/httpclient/http2/BasicTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8087112
+ * @key intermittent
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
diff --git a/jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java b/jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java
index d6de84aca6c..9183625ded8 100644
--- a/jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java
+++ b/jdk/test/java/net/httpclient/http2/FixedThreadPoolTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8087112
+ * @key intermittent
  * @library /lib/testlibrary server
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common

From b081062f1c91fbd52b04d23c7b63fca9d8b6d398 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Fri, 30 Jun 2017 05:47:35 -0700
Subject: [PATCH 72/83] 8182047: javac compile error on
 type-parameter-exceptions in lambda expressions

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       |  2 +-
 .../com/sun/tools/javac/comp/Attr.java        | 78 +++++++++++++++----
 .../com/sun/tools/javac/comp/Check.java       |  4 +
 .../tools/javac/resources/compiler.properties |  2 +-
 .../CorrectGenerationOfExConstraintsTest.java | 77 ++++++++++++++++++
 5 files changed, 147 insertions(+), 16 deletions(-)
 create mode 100644 langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 284d2039d42..5156f10ac32 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -2106,7 +2106,7 @@ public class Types {
             Type out = erasure.visit(t, recurse);
             return out;
         }
-        }
+    }
     // where
         private TypeMapping<Boolean> erasure = new StructuralTypeMapping<Boolean>() {
             private Type combineMetadata(final Type s,
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index f3734d167a1..5d0e27de95b 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -2515,14 +2515,9 @@ public class Attr extends JCTree.Visitor {
                 //add thrown types as bounds to the thrown types free variables if needed:
                 if (resultInfo.checkContext.inferenceContext().free(lambdaType.getThrownTypes())) {
                     List<Type> inferredThrownTypes = flow.analyzeLambdaThrownTypes(env, that, make);
-                    List<Type> thrownTypes = resultInfo.checkContext.inferenceContext().asUndetVars(lambdaType.getThrownTypes());
-
-                    chk.unhandled(inferredThrownTypes, thrownTypes);
-
-                    //18.2.5: "In addition, for all j (1 <= j <= n), the constraint reduces to the bound throws Ej"
-                    thrownTypes.stream()
-                            .filter(t -> t.hasTag(UNDETVAR))
-                            .forEach(t -> ((UndetVar)t).setThrow());
+                    if(!checkExConstraints(inferredThrownTypes, lambdaType.getThrownTypes(), resultInfo.checkContext.inferenceContext())) {
+                        log.error(that, Errors.IncompatibleThrownTypesInMref(lambdaType.getThrownTypes()));
+                    }
                 }
 
                 checkAccessibleTypes(that, localEnv, resultInfo.checkContext.inferenceContext(), lambdaType, currentTarget);
@@ -3111,17 +3106,72 @@ public class Attr extends JCTree.Visitor {
         }
 
         if (!speculativeAttr) {
-            List<Type> thrownTypes = inferenceContext.asUndetVars(descriptor.getThrownTypes());
-            if (chk.unhandled(refType.getThrownTypes(), thrownTypes).nonEmpty()) {
+            if (!checkExConstraints(refType.getThrownTypes(), descriptor.getThrownTypes(), inferenceContext)) {
                 log.error(tree, Errors.IncompatibleThrownTypesInMref(refType.getThrownTypes()));
             }
-            //18.2.5: "In addition, for all j (1 <= j <= n), the constraint reduces to the bound throws Ej"
-            thrownTypes.stream()
-                    .filter(t -> t.hasTag(UNDETVAR))
-                    .forEach(t -> ((UndetVar)t).setThrow());
         }
     }
 
+    boolean checkExConstraints(
+            List<Type> thrownByFuncExpr,
+            List<Type> thrownAtFuncType,
+            InferenceContext inferenceContext) {
+        /** 18.2.5: Otherwise, let E1, ..., En be the types in the function type's throws clause that
+         *  are not proper types
+         */
+        List<Type> nonProperList = thrownAtFuncType.stream()
+                .filter(e -> inferenceContext.free(e)).collect(List.collector());
+        List<Type> properList = thrownAtFuncType.diff(nonProperList);
+
+        /** Let X1,...,Xm be the checked exception types that the lambda body can throw or
+         *  in the throws clause of the invocation type of the method reference's compile-time
+         *  declaration
+         */
+        List<Type> checkedList = thrownByFuncExpr.stream()
+                .filter(e -> chk.isChecked(e)).collect(List.collector());
+
+        /** If n = 0 (the function type's throws clause consists only of proper types), then
+         *  if there exists some i (1 <= i <= m) such that Xi is not a subtype of any proper type
+         *  in the throws clause, the constraint reduces to false; otherwise, the constraint
+         *  reduces to true
+         */
+        ListBuffer<Type> uncaughtByProperTypes = new ListBuffer<>();
+        for (Type checked : checkedList) {
+            boolean isSubtype = false;
+            for (Type proper : properList) {
+                if (types.isSubtype(checked, proper)) {
+                    isSubtype = true;
+                    break;
+                }
+            }
+            if (!isSubtype) {
+                uncaughtByProperTypes.add(checked);
+            }
+        }
+
+        if (nonProperList.isEmpty() && !uncaughtByProperTypes.isEmpty()) {
+            return false;
+        }
+
+        /** If n > 0, the constraint reduces to a set of subtyping constraints:
+         *  for all i (1 <= i <= m), if Xi is not a subtype of any proper type in the
+         *  throws clause, then the constraints include, for all j (1 <= j <= n), <Xi <: Ej>
+         */
+        List<Type> nonProperAsUndet = inferenceContext.asUndetVars(nonProperList);
+        uncaughtByProperTypes.forEach(checkedEx -> {
+            nonProperAsUndet.forEach(nonProper -> {
+                types.isSubtype(checkedEx, nonProper);
+            });
+        });
+
+        /** In addition, for all j (1 <= j <= n), the constraint reduces to the bound throws Ej
+         */
+        nonProperAsUndet.stream()
+                .filter(t -> t.hasTag(UNDETVAR))
+                .forEach(t -> ((UndetVar)t).setThrow());
+        return true;
+    }
+
     /**
      * Set functional type info on the underlying AST. Note: as the target descriptor
      * might contain inference variables, we might need to register an hook in the
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index e3f13917a63..85b99543170 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1568,6 +1568,10 @@ public class Check {
             exc.hasTag(BOT);
     }
 
+    boolean isChecked(Type exc) {
+        return !isUnchecked(exc);
+    }
+
     /** Same, but handling completion failures.
      */
     boolean isUnchecked(DiagnosticPosition pos, Type exc) {
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 69c2c697bb7..ca68d362372 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -808,7 +808,7 @@ compiler.err.lambda.body.neither.value.nor.void.compatible=\
 
 # 0: list of type
 compiler.err.incompatible.thrown.types.in.mref=\
-    incompatible thrown types {0} in method reference
+    incompatible thrown types {0} in functional expression
 
 compiler.misc.incompatible.arg.types.in.lambda=\
     incompatible parameter types in lambda expression
diff --git a/langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java b/langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java
new file mode 100644
index 00000000000..af63ecd0e43
--- /dev/null
+++ b/langtools/test/tools/javac/T8182047/CorrectGenerationOfExConstraintsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, 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 8182047
+ * @summary javac compile error on type-parameter-exceptions in lambda expressions
+ * @compile CorrectGenerationOfExConstraintsTest.java
+ */
+
+public class CorrectGenerationOfExConstraintsTest {
+    public static class MyExBase extends Exception {
+        private static final long serialVersionUID = 1L;
+    }
+
+    public static class MyEx1 extends MyExBase {
+        private static final long serialVersionUID = 1L;
+    }
+
+    public static class MyEx2 extends MyExBase {
+        private static final long serialVersionUID = 1L;
+    }
+
+    public interface MyLambdaIF1 <E extends Exception> {
+        void lambdaFun() throws E, MyEx2;
+    }
+
+    public interface MyLambdaIF2 <E extends Exception> {
+        void lambdaFun() throws MyEx2, E;
+    }
+
+    public <E extends Exception> void fun1(MyLambdaIF1<E> myLambda) throws E, MyEx2 {
+        myLambda.lambdaFun();
+    }
+
+    public <E extends Exception> void fun2(MyLambdaIF2<E> myLambda) throws E, MyEx2 {
+        myLambda.lambdaFun();
+    }
+
+    public void useIt1() throws MyEx1, MyEx2 {
+        fun1(this::lambda);
+    }
+
+    public void useIt1a() throws MyExBase {
+        fun1(this::lambda);
+    }
+
+    public void useIt2() throws MyEx1, MyEx2 {
+        fun2(this::lambda);
+    }
+
+    public void lambda() throws MyEx1, MyEx2 {
+        if (Math.random() > 0.5)
+        throw new MyEx2();
+        throw new MyEx1();
+    }
+}

From 7b258a75616813f90a3f9e75a51816e670f087e7 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 30 Jun 2017 13:28:25 -0400
Subject: [PATCH 73/83] 8183019: Diagnostics for onExitTest

Reviewed-by: clanger
---
 .../java/lang/ProcessHandle/OnExitTest.java   | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/jdk/test/java/lang/ProcessHandle/OnExitTest.java b/jdk/test/java/lang/ProcessHandle/OnExitTest.java
index 7c54e475a46..2ae2652a21d 100644
--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java
@@ -42,14 +42,7 @@ import org.testng.TestNG;
  * @test
  * @key intermittent
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.management
  * @build jdk.test.lib.Utils
- *        jdk.test.lib.Asserts
- *        jdk.test.lib.JDKToolFinder
- *        jdk.test.lib.JDKToolLauncher
- *        jdk.test.lib.Platform
- *        jdk.test.lib.process.*
  * @run testng OnExitTest
  * @summary Functions of Process.onExit and ProcessHandle.onExit
  * @author Roger Riggs
@@ -251,10 +244,30 @@ public class OnExitTest extends ProcessUtil {
                 }
                 Assert.assertNull(line, "waitpid didn't wait");
 
+                A.toHandle().onExit().thenAccept(p -> {
+                    System.out.printf(" A.toHandle().onExit().A info: %s, now: %s%n",
+                            p.info(), Instant.now());
+                });
+
+                A.onExit().thenAccept(p -> {
+                    System.out.printf(" A.onExit().A info: %s, now: %s%n",
+                            p.info(), Instant.now());
+                });
+
+                ProcessHandle.Info A_info = A.info();
+
                 A.sendAction("exit", 0L);
 
                 // Look for B to report that A has exited
                 do {
+                    Instant start = Instant.now();
+                    while (blines.isEmpty() && A.isAlive()) {
+                        A_info = A.info(); // Spin
+                    }
+                    Instant end = Instant.now();
+                    System.out.printf(" a.isAlive: %s, a.info: %s, @%s%n", A.isAlive(), A.info(),
+                            Duration.between(start, end));
+
                     split = getSplitLine(blines);
                 } while (!"waitpid".equals(split[1]));
 

From 6cc1fadb9a63697f320e83556ac49e3048996604 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 30 Jun 2017 20:03:07 +0200
Subject: [PATCH 74/83] 8183021: JShell tests: Fix failing tests on Windows

Reviewed-by: jjg, rfield
---
 langtools/test/jdk/jshell/ToolBasicTest.java         | 12 ++++++------
 .../jdk/jshell/ToolMultilineSnippetHistoryTest.java  |  4 ++++
 langtools/test/jdk/jshell/UITesting.java             | 12 +++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/langtools/test/jdk/jshell/ToolBasicTest.java b/langtools/test/jdk/jshell/ToolBasicTest.java
index be5bce056c8..a5653406839 100644
--- a/langtools/test/jdk/jshell/ToolBasicTest.java
+++ b/langtools/test/jdk/jshell/ToolBasicTest.java
@@ -325,12 +325,12 @@ public class ToolBasicTest extends ReplToolTesting {
         String tilde = "~" + File.separator;
         test(
                 (a) -> assertCommand(a, "/env --class-path " + tilde + "forblato",
-                        "|  File '" + System.getProperty("user.home") + File.separator
-                                + "forblato' for '--class-path' is not found."),
+                        "|  File '" + Paths.get(System.getProperty("user.home"), "forblato").toString()
+                                + "' for '--class-path' is not found."),
                 (a) -> assertCommand(a, "/env --class-path " + jarPath + File.pathSeparator
                                                             + tilde + "forblato",
-                        "|  File '" + System.getProperty("user.home") + File.separator
-                                + "forblato' for '--class-path' is not found.")
+                        "|  File '" + Paths.get(System.getProperty("user.home"), "forblato").toString()
+                                + "' for '--class-path' is not found.")
         );
     }
 
@@ -370,8 +370,8 @@ public class ToolBasicTest extends ReplToolTesting {
         String tilde = "~" + File.separatorChar;
         test(
                 (a) -> assertCommand(a, "/env --module-path " + tilde + "snardugol",
-                        "|  File '" + System.getProperty("user.home")
-                                + File.separatorChar + "snardugol' for '--module-path' is not found.")
+                        "|  File '" + Paths.get(System.getProperty("user.home"), "snardugol").toString()
+                                + "' for '--module-path' is not found.")
         );
     }
 
diff --git a/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java b/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java
index febca14f641..a062fd39442 100644
--- a/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java
+++ b/langtools/test/jdk/jshell/ToolMultilineSnippetHistoryTest.java
@@ -38,6 +38,10 @@ import org.testng.annotations.Test;
 @Test
 public class ToolMultilineSnippetHistoryTest extends UITesting {
 
+    public ToolMultilineSnippetHistoryTest() {
+        super(true);
+    }
+
     public void testUpArrow() throws Exception {
         doRunTest((inputSink, out) -> {
             inputSink.write("int x=\n44\n");
diff --git a/langtools/test/jdk/jshell/UITesting.java b/langtools/test/jdk/jshell/UITesting.java
index 0fb5017a7ec..be1bb785425 100644
--- a/langtools/test/jdk/jshell/UITesting.java
+++ b/langtools/test/jdk/jshell/UITesting.java
@@ -41,6 +41,16 @@ import jdk.jshell.tool.JavaShellToolBuilder;
 
 public class UITesting {
 
+    private final boolean laxLineEndings;
+
+    public UITesting() {
+        this(false);
+    }
+
+    public UITesting(boolean laxLineEndings) {
+        this.laxLineEndings = laxLineEndings;
+    }
+
     protected void doRunTest(Test test) throws Exception {
         // turn on logging of launch failures
         Logger.getLogger("jdk.jshell.execution").setLevel(Level.ALL);
@@ -120,7 +130,7 @@ public class UITesting {
     }
 
     protected void waitOutput(StringBuilder out, String expected) {
-        expected = expected.replaceAll("\n", System.getProperty("line.separator"));
+        expected = expected.replaceAll("\n", laxLineEndings ? "\r?\n" : System.getProperty("line.separator"));
         Pattern expectedPattern = Pattern.compile(expected, Pattern.DOTALL);
         synchronized (out) {
             long s = System.currentTimeMillis();

From 43fc1b68a22dd7a5db6b46f939674a24a095219e Mon Sep 17 00:00:00 2001
From: Ogata Kazunori <ogatak@jp.ibm.com>
Date: Sat, 1 Jul 2017 20:35:28 +0200
Subject: [PATCH 75/83] 8182743: Ineffective use of volatile hurts performance
 of Charset.atBugLevel()

Reviewed-by: clanger, redestad, plevart, coffeys
---
 .../nio/charset/Charset-X-Coder.java.template | 12 +++++-----
 .../classes/java/nio/charset/Charset.java     | 15 +------------
 .../nio/charset/Charset/EmptyCharsetName.java | 22 ++-----------------
 .../charset/CharsetDecoder/AverageMax.java    | 17 ++------------
 4 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
index dd69c9bf62b..629cb1d7249 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -195,12 +195,10 @@ public abstract class Charset$Coder$ {
         if (max$ItypesPerOtype$ <= 0.0f)
             throw new IllegalArgumentException("Non-positive "
                                                + "max$ItypesPerOtype$");
-        if (!Charset.atBugLevel("1.4")) {
-            if (average$ItypesPerOtype$ > max$ItypesPerOtype$)
-                throw new IllegalArgumentException("average$ItypesPerOtype$"
-                                                   + " exceeds "
-                                                   + "max$ItypesPerOtype$");
-        }
+        if (average$ItypesPerOtype$ > max$ItypesPerOtype$)
+            throw new IllegalArgumentException("average$ItypesPerOtype$"
+                                               + " exceeds "
+                                               + "max$ItypesPerOtype$");
         this.replacement = replacement;
         this.average$ItypesPerOtype$ = average$ItypesPerOtype$;
         this.max$ItypesPerOtype$ = max$ItypesPerOtype$;
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
index 480ede3e6a2..3af94ff623f 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -281,19 +281,6 @@ public abstract class Charset
 
     /* -- Static methods -- */
 
-    private static volatile String bugLevel;
-
-    static boolean atBugLevel(String bl) {              // package-private
-        String level = bugLevel;
-        if (level == null) {
-            if (!VM.isBooted())
-                return false;
-            bugLevel = level = GetPropertyAction
-                    .privilegedGetProperty("sun.nio.cs.bugLevel", "");
-        }
-        return level.equals(bl);
-    }
-
     /**
      * Checks that the given string is a legal charset name. </p>
      *
@@ -305,7 +292,7 @@ public abstract class Charset
      */
     private static void checkName(String s) {
         int n = s.length();
-        if (n == 0 && !atBugLevel("1.4")) {
+        if (n == 0) {
             throw new IllegalCharsetNameException(s);
         }
         for (int i = 0; i < n; i++) {
diff --git a/jdk/test/java/nio/charset/Charset/EmptyCharsetName.java b/jdk/test/java/nio/charset/Charset/EmptyCharsetName.java
index 7b1e7737d4e..93797622553 100644
--- a/jdk/test/java/nio/charset/Charset/EmptyCharsetName.java
+++ b/jdk/test/java/nio/charset/Charset/EmptyCharsetName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
  * @bug 4786884
  * @summary Ensure that passing the empty string to Charset methods and
  *          constructors causes an IllegalArgumentException to be thrown
- *
- * @build EmptyCharsetName
- * @run main EmptyCharsetName
- * @run main/othervm -Dsun.nio.cs.bugLevel=1.4 EmptyCharsetName
  */
 
 import java.io.*;
@@ -38,8 +34,6 @@ import java.nio.charset.*;
 
 public class EmptyCharsetName {
 
-    static boolean compat;
-
     static abstract class Test {
 
         public abstract void go() throws Exception;
@@ -48,13 +42,6 @@ public class EmptyCharsetName {
             try {
                 go();
             } catch (Exception x) {
-                if (compat) {
-                    if (x instanceof UnsupportedCharsetException) {
-                        System.err.println("Thrown as expected: " + x);
-                        return;
-                    }
-                    throw new Exception("Exception thrown", x);
-                }
                 if (x instanceof IllegalCharsetNameException) {
                     System.err.println("Thrown as expected: " + x);
                     return;
@@ -63,18 +50,13 @@ public class EmptyCharsetName {
                                     + x.getClass().getName(),
                                     x);
             }
-            if (!compat)
-                throw new Exception("No exception thrown");
+            throw new Exception("No exception thrown");
         }
 
     }
 
     public static void main(String[] args) throws Exception {
 
-        // If sun.nio.cs.bugLevel == 1.4 then we want the 1.4 behavior
-        String bl = System.getProperty("sun.nio.cs.bugLevel");
-        compat = (bl != null && bl.equals("1.4"));
-
         new Test() {
                 public void go() throws Exception {
                     Charset.forName("");
diff --git a/jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java b/jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java
index 8041bcf7fae..25770e1570a 100644
--- a/jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java
+++ b/jdk/test/java/nio/charset/CharsetDecoder/AverageMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017, 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,10 +24,6 @@
 /* @test
  * @bug 4853350
  * @summary Ensure that averages do not exceed maxima
- *
- * @build AverageMax
- * @run main AverageMax
- * @run main/othervm -Dsun.nio.cs.bugLevel=1.4 AverageMax
  */
 
 import java.nio.*;
@@ -36,8 +32,6 @@ import java.nio.charset.*;
 
 public class AverageMax {
 
-    static boolean compat;
-
     static abstract class Test {
 
         public abstract void go() throws Exception;
@@ -46,9 +40,6 @@ public class AverageMax {
             try {
                 go();
             } catch (Exception x) {
-                if (compat) {
-                    throw new Exception("Exception thrown", x);
-                }
                 if (x instanceof IllegalArgumentException) {
                     System.err.println("Thrown as expected: " + x);
                     return;
@@ -57,17 +48,13 @@ public class AverageMax {
                                     + x.getClass().getName(),
                                     x);
             }
-            if (!compat)
-                throw new Exception("No exception thrown");
+            throw new Exception("No exception thrown");
         }
 
     }
 
     public static void main(String[] args) throws Exception {
 
-        // If sun.nio.cs.bugLevel == 1.4 then we want the 1.4 behavior
-        String bl = System.getProperty("sun.nio.cs.bugLevel");
-        compat = (bl != null && bl.equals("1.4"));
         final Charset ascii = Charset.forName("US-ASCII");
 
         new Test() {

From 9797f94e755a7f63f7842a53fd950c008fd42c9a Mon Sep 17 00:00:00 2001
From: Priya Lakshmi Muthuswamy <priya.lakshmi.muthuswamy@oracle.com>
Date: Mon, 3 Jul 2017 12:58:30 +0530
Subject: [PATCH 76/83] 8068836: Error message should be updated when Override
 is used with static methods

Issue a more direct, specific error when @Override annotation is used with a static method

Reviewed-by: sadayapalam
---
 .../com/sun/tools/javac/comp/Check.java       |  2 +-
 .../tools/javac/resources/compiler.properties |  3 ++
 .../javac/annotations/6359949/T6359949a.java  |  4 +--
 .../javac/annotations/6359949/T6359949a.out   |  2 +-
 .../OverrideAnnotatedStaticMethod.java        | 34 +++++++++++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 85b99543170..375838df8c1 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -2052,7 +2052,7 @@ public class Check {
                 }
             }
             log.error(pos,
-                      explicitOverride ? Errors.MethodDoesNotOverrideSuperclass :
+                      explicitOverride ? (m.isStatic() ? Errors.StaticMethodsCannotBeAnnotatedWithOverride : Errors.MethodDoesNotOverrideSuperclass) :
                                 Errors.AnonymousDiamondMethodDoesNotOverrideSuperclass(Fragments.DiamondAnonymousMethodsImplicitlyOverride));
         }
     }
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index ca68d362372..b60961873eb 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -727,6 +727,9 @@ compiler.err.malformed.fp.lit=\
 compiler.err.method.does.not.override.superclass=\
     method does not override or implement a method from a supertype
 
+compiler.err.static.methods.cannot.be.annotated.with.override=\
+    static methods cannot be annotated with @Override
+
 compiler.err.missing.meth.body.or.decl.abstract=\
     missing method body, or declare abstract
 
diff --git a/langtools/test/tools/javac/annotations/6359949/T6359949a.java b/langtools/test/tools/javac/annotations/6359949/T6359949a.java
index aa0f90a38a7..f51f763f7a6 100644
--- a/langtools/test/tools/javac/annotations/6359949/T6359949a.java
+++ b/langtools/test/tools/javac/annotations/6359949/T6359949a.java
@@ -1,7 +1,7 @@
 /*
  * @test    /nodynamiccopyright/
- * @bug     6359949
- * @summary (at)Override of static shouldn't be accepted (compiler shouldissue an error/warning)
+ * @bug     6359949 8068836
+ * @summary (at)Override of static methods shouldn't be accepted (compiler should issue an error)
  * @compile/fail/ref=T6359949a.out -XDrawDiagnostics  T6359949a.java
  */
 
diff --git a/langtools/test/tools/javac/annotations/6359949/T6359949a.out b/langtools/test/tools/javac/annotations/6359949/T6359949a.out
index b7119189fe5..f179ca1bc1a 100644
--- a/langtools/test/tools/javac/annotations/6359949/T6359949a.out
+++ b/langtools/test/tools/javac/annotations/6359949/T6359949a.out
@@ -1,2 +1,2 @@
-T6359949a.java:15:5: compiler.err.method.does.not.override.superclass
+T6359949a.java:15:5: compiler.err.static.methods.cannot.be.annotated.with.override
 1 error
diff --git a/langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java b/langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java
new file mode 100644
index 00000000000..7476dc729b7
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/OverrideAnnotatedStaticMethod.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, 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.static.methods.cannot.be.annotated.with.override
+
+class Example {
+    public static void example(){
+    }
+}
+class OverrideAnnotatedStaticMethod extends Example {
+    @Override
+    public static void example(){
+    }
+}
\ No newline at end of file

From 884b4d8e074d8d57a7623304a8b954294410b122 Mon Sep 17 00:00:00 2001
From: "J. Duke" <duke@openjdk.org>
Date: Wed, 5 Jul 2017 23:44:19 +0200
Subject: [PATCH 77/83] Added tag jdk-10+13 for changeset 9927a9f16738

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 68c1fe5c871..e5559259a9c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -430,3 +430,4 @@ aa5b01f5e5620438fd39efdb2e2f6365a2c7d898 jdk-10+9
 b0f2b8ff25a2209b2c807785d75f20e5086bbfc2 jdk-10+10
 036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
 e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
+9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13

From e3b9d3d8dd8df280db6b61bb665d295b2a00440a Mon Sep 17 00:00:00 2001
From: "J. Duke" <duke@openjdk.org>
Date: Thu, 24 Aug 2017 16:23:58 +0200
Subject: [PATCH 78/83] Added tag jdk-9+175 for changeset 994036e74ab8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 1d3fe1b99da..853723163e7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -418,3 +418,4 @@ c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
 dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
 6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
 94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
+994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175

From f5388e93adfc849fb02f900c5f6d1dbd6eb7e68a Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 3 Jul 2017 12:54:24 -0700
Subject: [PATCH 79/83] 8160199: Language's script should be reflected in
 user.script on Mac OS X

Reviewed-by: bchristi, sherman
---
 .../macosx/native/libjava/java_props_macosx.c | 136 ++++++++++++------
 .../macosx/native/libjava/java_props_macosx.h |   3 +-
 .../unix/native/libjava/locale_str.h          |  12 +-
 3 files changed, 102 insertions(+), 49 deletions(-)

diff --git a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c
index b11a4d00143..4c7ae30c760 100644
--- a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c
+++ b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.c
@@ -47,6 +47,7 @@ char *getPosixLocale(int cat) {
 #define LOCALEIDLENGTH  128
 char *getMacOSXLocale(int cat) {
     const char* retVal = NULL;
+    char localeString[LOCALEIDLENGTH];
 
     switch (cat) {
     case LC_MESSAGES:
@@ -74,73 +75,114 @@ char *getMacOSXLocale(int cat) {
             }
             CFRelease(languages);
 
-            retVal = languageString;
+            // Explicitly supply region, if there is none
+            char *hyphenPos = strchr(languageString, '-');
+            int langStrLen = strlen(languageString);
 
-            // Special case for Portuguese in Brazil:
-            // The language code needs the "_BR" region code (to distinguish it
-            // from Portuguese in Portugal), but this is missing when using the
-            // "Portuguese (Brazil)" language.
-            // If language is "pt" and the current locale is pt_BR, return pt_BR.
-            char localeString[LOCALEIDLENGTH];
-            if (strcmp(retVal, "pt") == 0 &&
-                    CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
-                                       localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding()) &&
-                    strcmp(localeString, "pt_BR") == 0) {
-                retVal = localeString;
+            if (hyphenPos == NULL || // languageString contains ISO639 only, e.g., "en"
+                languageString + langStrLen - hyphenPos == 5) { // ISO639-ScriptCode, e.g., "en-Latn"
+                CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
+                               localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding());
+                char *underscorePos = strrchr(localeString, '_');
+                char *region = NULL;
+
+                if (underscorePos != NULL) {
+                    region = underscorePos + 1;
+                }
+
+                if (region != NULL) {
+                    strcat(languageString, "-");
+                    strcat(languageString, region);
+                }
             }
+
+            retVal = languageString;
         }
         break;
+
     default:
         {
-            char localeString[LOCALEIDLENGTH];
             if (!CFStringGetCString(CFLocaleGetIdentifier(CFLocaleCopyCurrent()),
                                     localeString, LOCALEIDLENGTH, CFStringGetSystemEncoding())) {
                 return NULL;
             }
+
             retVal = localeString;
         }
         break;
     }
 
     if (retVal != NULL) {
-        // Language IDs use the language designators and (optional) region
-        // and script designators of BCP 47.  So possible formats are:
-        //
-        // "en"         (language designator only)
-        // "haw"        (3-letter lanuage designator)
-        // "en-GB"      (language with alpha-2 region designator)
-        // "es-419"     (language with 3-digit UN M.49 area code)
-        // "zh-Hans"    (language with ISO 15924 script designator)
-        // "zh-Hans-US"  (language with ISO 15924 script designator and region)
-        // "zh-Hans-419" (language with ISO 15924 script designator and UN M.49)
-        //
-        // In the case of region designators (alpha-2 and/or UN M.49), we convert
-        // to our locale string format by changing '-' to '_'.  That is, if
-        // the '-' is followed by fewer than 4 chars.
-        char* scriptOrRegion = strchr(retVal, '-');
-        if (scriptOrRegion != NULL) {
-            int length = strlen(scriptOrRegion);
-            if (length > 5) {
-                // Region and script both exist. Honor the script for now
-                scriptOrRegion[5] = '\0';
-            } else if (length < 5) {
-                *scriptOrRegion = '_';
+        return strdup(convertToPOSIXLocale(retVal));
+    }
 
-                assert((length == 3 &&
-                    // '-' followed by a 2 character region designator
-                      isalpha(scriptOrRegion[1]) &&
-                      isalpha(scriptOrRegion[2])) ||
-                       (length == 4 &&
-                    // '-' followed by a 3-digit UN M.49 area code
-                      isdigit(scriptOrRegion[1]) &&
-                      isdigit(scriptOrRegion[2]) &&
-                      isdigit(scriptOrRegion[3])));
-            }
+    return NULL;
+}
+
+/* Language IDs use the language designators and (optional) region
+ * and script designators of BCP 47.  So possible formats are:
+ *
+ * "en"         (language designator only)
+ * "haw"        (3-letter lanuage designator)
+ * "en-GB"      (language with alpha-2 region designator)
+ * "es-419"     (language with 3-digit UN M.49 area code)
+ * "zh-Hans"    (language with ISO 15924 script designator)
+ * "zh-Hans-US"  (language with ISO 15924 script designator and region)
+ * "zh-Hans-419" (language with ISO 15924 script designator and UN M.49)
+ *
+ * convert these tags into POSIX conforming locale string, i.e.,
+ * lang{_region}{@script}. e.g., for "zh-Hans-US" into "zh_US@Hans"
+ */
+const char * convertToPOSIXLocale(const char* src) {
+    char* scriptRegion = strchr(src, '-');
+    if (scriptRegion != NULL) {
+        int length = strlen(scriptRegion);
+        char* region = strchr(scriptRegion + 1, '-');
+        char* atMark = NULL;
+
+        if (region == NULL) {
+            // CFLocaleGetIdentifier() returns '_' before region
+            region = strchr(scriptRegion + 1, '_');
         }
 
-        return strdup(retVal);
+        *scriptRegion = '_';
+        if (length > 5) {
+            // Region and script both exist.
+            char tmpScript[4];
+            int regionLength = length - 6;
+            atMark = scriptRegion + 1 + regionLength;
+            memcpy(tmpScript, scriptRegion + 1, 4);
+            memmove(scriptRegion + 1, region + 1, regionLength);
+            memcpy(atMark + 1, tmpScript, 4);
+        } else if (length == 5) {
+            // script only
+            atMark = scriptRegion;
+        }
+
+        if (atMark != NULL) {
+            *atMark = '@';
+
+            // assert script code
+            assert(isalpha(atMark[1]) &&
+                   isalpha(atMark[2]) &&
+                   isalpha(atMark[3]) &&
+                   isalpha(atMark[4]));
+        }
+
+        assert(((length == 3 || length == 8) &&
+            // '_' followed by a 2 character region designator
+                isalpha(scriptRegion[1]) &&
+                isalpha(scriptRegion[2])) ||
+                ((length == 4 || length == 9) &&
+            // '_' followed by a 3-digit UN M.49 area code
+                isdigit(scriptRegion[1]) &&
+                isdigit(scriptRegion[2]) &&
+                isdigit(scriptRegion[3])) ||
+            // '@' followed by a 4 character script code (already validated above)
+                (length == 5));
     }
-    return NULL;
+
+    return src;
 }
 
 char *setupMacOSXLocale(int cat) {
diff --git a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h
index e5af6ff001c..db46d630fbe 100644
--- a/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h
+++ b/jdk/src/java.base/macosx/native/libjava/java_props_macosx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -26,6 +26,7 @@
 #include "java_props.h"
 
 char *setupMacOSXLocale(int cat);
+const char *convertToPOSIXLocale(const char* src);
 void setOSNameAndVersion(java_props_t *sprops);
 void setUserHome(java_props_t *sprops);
 void setProxyProperties(java_props_t *sProps);
diff --git a/jdk/src/java.base/unix/native/libjava/locale_str.h b/jdk/src/java.base/unix/native/libjava/locale_str.h
index 684f796662a..e59e3c09e69 100644
--- a/jdk/src/java.base/unix/native/libjava/locale_str.h
+++ b/jdk/src/java.base/unix/native/libjava/locale_str.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -211,6 +211,16 @@ static char *script_names[] = {
     "iqtelif", "Latn",
     "latin", "Latn",
 #endif
+    "Arab", "Arab",
+    "Cyrl", "Cyrl",
+    "Deva", "Deva",
+    "Ethi", "Ethi",
+    "Hans", "Hans",
+    "Hant", "Hant",
+    "Latn", "Latn",
+    "Sund", "Sund",
+    "Syrc", "Syrc",
+    "Tfng", "Tfng",
     "", "",
 };
 

From 22795d4108084566c885b410a1079f6b35663d62 Mon Sep 17 00:00:00 2001
From: Amy Lu <amlu@openjdk.org>
Date: Wed, 5 Jul 2017 08:26:54 +0800
Subject: [PATCH 80/83] 8183531: Wrong @modules in test
 javax/net/ssl/ciphersuites/ECCurvesconstraints.java

Reviewed-by: wetmore, xuelei
---
 jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java b/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java
index 742f71192dd..3a9bcde5111 100644
--- a/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java
+++ b/jdk/test/javax/net/ssl/ciphersuites/ECCurvesconstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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,7 +32,7 @@
  * @test
  * @bug 8148516
  * @summary Improve the default strength of EC in JDK
- * @modules jdk.crypyo.ec
+ * @modules jdk.crypto.ec
  * @run main/othervm ECCurvesconstraints PKIX
  * @run main/othervm ECCurvesconstraints SunX509
  */

From 1be87a5f55d2c681b61797ad1c95fe68175b788f Mon Sep 17 00:00:00 2001
From: Amy Lu <amlu@openjdk.org>
Date: Wed, 5 Jul 2017 08:30:36 +0800
Subject: [PATCH 81/83] 8183512: Remove intermittent key from nio test
 Transfer4GBFile.java TransferTo6GBFile.java and StressLoopback.java

Reviewed-by: alanb
---
 .../nio/channels/AsynchronousSocketChannel/StressLoopback.java  | 2 +-
 jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java     | 1 -
 jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java   | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
index b885a0fc52a..8f8f816cad6 100644
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
@@ -26,7 +26,7 @@
  * @summary Stress test connections through the loopback interface
  * @run main StressLoopback
  * @run main/othervm -Djdk.net.useFastTcpLoopback StressLoopback
- * @key randomness intermittent
+ * @key randomness
  */
 
 import java.nio.ByteBuffer;
diff --git a/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java b/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java
index 22240e767bf..a2af418ce01 100644
--- a/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer4GBFile.java
@@ -23,7 +23,6 @@
 
 /* @test
  * @bug 4638365
- * @key intermittent
  * @summary Test FileChannel.transferFrom and transferTo for 4GB files
  * @run testng/timeout=300 Transfer4GBFile
  */
diff --git a/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java b/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java
index 2365351e85a..5b2ae51aab0 100644
--- a/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java
+++ b/jdk/test/java/nio/channels/FileChannel/TransferTo6GBFile.java
@@ -23,7 +23,6 @@
 
 /* @test
  * @bug 6253145
- * @key intermittent
  * @summary Test FileChannel.transferTo with file positions up to 8GB
  * @run testng/timeout=300 TransferTo6GBFile
  */

From 728621618693da4af2dbaf29b43dc72f24d025d9 Mon Sep 17 00:00:00 2001
From: Felix Yang <xiaofeya@openjdk.org>
Date: Tue, 4 Jul 2017 18:49:16 -0700
Subject: [PATCH 82/83] 8183514: Remove intermittent key from httpclient test
 TimeoutOrdering and ErrorTest

Reviewed-by: dfuchs
---
 jdk/test/java/net/httpclient/TimeoutOrdering.java | 1 -
 jdk/test/java/net/httpclient/http2/ErrorTest.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/jdk/test/java/net/httpclient/TimeoutOrdering.java b/jdk/test/java/net/httpclient/TimeoutOrdering.java
index ce0a9eac0cc..8ead371cfa5 100644
--- a/jdk/test/java/net/httpclient/TimeoutOrdering.java
+++ b/jdk/test/java/net/httpclient/TimeoutOrdering.java
@@ -38,7 +38,6 @@ import static jdk.incubator.http.HttpResponse.BodyHandler.discard;
 
 /**
  * @test
- * @key intermittent
  * @summary Ensures that timeouts of multiple requests are handled in correct order
  * @run main/othervm TimeoutOrdering
  */
diff --git a/jdk/test/java/net/httpclient/http2/ErrorTest.java b/jdk/test/java/net/httpclient/http2/ErrorTest.java
index 9a8815df14b..dd7a79761dc 100644
--- a/jdk/test/java/net/httpclient/http2/ErrorTest.java
+++ b/jdk/test/java/net/httpclient/http2/ErrorTest.java
@@ -25,7 +25,6 @@
  * @test
  * @bug 8157105
  * @library /lib/testlibrary server
- * @key intermittent
  * @build jdk.testlibrary.SimpleSSLContext
  * @modules jdk.incubator.httpclient/jdk.incubator.http.internal.common
  *          jdk.incubator.httpclient/jdk.incubator.http.internal.frame

From 1a1484c7553f531a907de8e7399571da55357d29 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 5 Jul 2017 13:30:22 +0100
Subject: [PATCH 83/83] 8183536: Update jdk tests to allow for unique test
 classes directory

Reviewed-by: lancea
---
 .../lang/ModuleTests/AnnotationsTest.java     |  3 ++-
 .../java/lang/invoke/DefineClassTest.java     |  7 +++++--
 .../java/lang/module/ConfigurationTest.java   |  3 ++-
 .../customfs/ModulesInCustomFileSystem.java   |  7 ++++---
 .../AsynchronousChannelGroup/SetupJar.java    | 13 ++++++++----
 .../java/util/ServiceLoader/ModulesTest.java  | 21 +++++++++++++------
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/jdk/test/java/lang/ModuleTests/AnnotationsTest.java b/jdk/test/java/lang/ModuleTests/AnnotationsTest.java
index 9b3fe4c9839..de4125b7af8 100644
--- a/jdk/test/java/lang/ModuleTests/AnnotationsTest.java
+++ b/jdk/test/java/lang/ModuleTests/AnnotationsTest.java
@@ -28,6 +28,7 @@ import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,7 +75,7 @@ public class AnnotationsTest {
     public void testNamedModule() throws IOException {
 
         // "deprecate" java.xml
-        Path dir = Files.createTempDirectory("mods");
+        Path dir = Files.createTempDirectory(Paths.get(""), "mods");
         deprecateModule("java.xml", true, "9", dir);
 
         // "load" the cloned java.xml
diff --git a/jdk/test/java/lang/invoke/DefineClassTest.java b/jdk/test/java/lang/invoke/DefineClassTest.java
index baef2eb8793..fcad247d217 100644
--- a/jdk/test/java/lang/invoke/DefineClassTest.java
+++ b/jdk/test/java/lang/invoke/DefineClassTest.java
@@ -37,6 +37,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
@@ -164,14 +165,16 @@ public class DefineClassTest {
      */
     @Test
     public void testTwoProtectionDomains() throws Exception {
+        Path here = Paths.get("");
+
         // p.C1 in one exploded directory
-        Path dir1 = Files.createTempDirectory("classes");
+        Path dir1 = Files.createTempDirectory(here, "classes");
         Path p = Files.createDirectory(dir1.resolve("p"));
         Files.write(p.resolve("C1.class"), generateClass("p.C1"));
         URL url1 = dir1.toUri().toURL();
 
         // p.C2 in another exploded directory
-        Path dir2 = Files.createTempDirectory("classes");
+        Path dir2 = Files.createTempDirectory(here, "classes");
         p = Files.createDirectory(dir2.resolve("p"));
         Files.write(p.resolve("C2.class"), generateClass("p.C2"));
         URL url2 = dir2.toUri().toURL();
diff --git a/jdk/test/java/lang/module/ConfigurationTest.java b/jdk/test/java/lang/module/ConfigurationTest.java
index da008236aeb..b06aaf03cf8 100644
--- a/jdk/test/java/lang/module/ConfigurationTest.java
+++ b/jdk/test/java/lang/module/ConfigurationTest.java
@@ -42,6 +42,7 @@ import java.lang.module.ResolutionException;
 import java.lang.module.ResolvedModule;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -2117,7 +2118,7 @@ public class ConfigurationTest {
             target = null;
         }
         String name = descriptor.name();
-        Path dir = Files.createTempDirectory(name);
+        Path dir = Files.createTempDirectory(Paths.get(""), name);
         Path mi = dir.resolve("module-info.class");
         try (OutputStream out = Files.newOutputStream(mi)) {
             ModuleInfoWriter.write(descriptor, target, out);
diff --git a/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java b/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java
index 64586dad24b..3ecf862bcb5 100644
--- a/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java
+++ b/jdk/test/java/lang/module/customfs/ModulesInCustomFileSystem.java
@@ -48,6 +48,7 @@ import static org.testng.Assert.*;
 
 @Test
 public class ModulesInCustomFileSystem {
+    private static final Path HERE = Paths.get("");
 
     /**
      * Test exploded modules in a JAR file system.
@@ -59,7 +60,7 @@ public class ModulesInCustomFileSystem {
         assertEquals(mlib, m2.getParent());
 
         // create JAR file containing m1/** and m2/**
-        Path jar = Files.createTempDirectory("mlib").resolve("modules.jar");
+        Path jar = Files.createTempDirectory(HERE, "mlib").resolve("modules.jar");
         JarUtils.createJarFile(jar, mlib);
         testJarFileSystem(jar);
     }
@@ -70,12 +71,12 @@ public class ModulesInCustomFileSystem {
     public void testModularJARsInJarFileSystem() throws Exception {
         Path m1 = findModuleDirectory("m1");
         Path m2 = findModuleDirectory("m2");
-        Path contents = Files.createTempDirectory("contents");
+        Path contents = Files.createTempDirectory(HERE, "contents");
         JarUtils.createJarFile(contents.resolve("m1.jar"), m1);
         JarUtils.createJarFile(contents.resolve("m2.jar"), m2);
 
         // create JAR file containing m1.jar and m2.jar
-        Path jar = Files.createTempDirectory("mlib").resolve("modules.jar");
+        Path jar = Files.createTempDirectory(HERE, "mlib").resolve("modules.jar");
         JarUtils.createJarFile(jar, contents);
         testJarFileSystem(jar);
     }
diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java
index a50a3891f30..52794ef9349 100644
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/SetupJar.java
@@ -21,14 +21,19 @@
  * questions.
  */
 
+import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.stream.Stream;
 
 public class SetupJar {
-
     public static void main(String args[]) throws Exception {
-        Path classes = Paths.get(System.getProperty("test.classes", ""));
-        JarUtils.createJarFile(Paths.get("privileged.jar"),
-                               classes.resolve("bootlib"));
+        String cp = System.getProperty("test.class.path");
+        Path bootlib = Stream.of(cp.split(File.pathSeparator))
+                .map(Paths::get)
+                .filter(e -> e.endsWith("bootlib"))  // file name
+                .findAny()
+                .orElseThrow(() -> new InternalError("bootlib not found"));
+        JarUtils.createJarFile(Paths.get("privileged.jar"), bootlib);
     }
 }
diff --git a/jdk/test/java/util/ServiceLoader/ModulesTest.java b/jdk/test/java/util/ServiceLoader/ModulesTest.java
index 622eea0d1fd..713c8613f00 100644
--- a/jdk/test/java/util/ServiceLoader/ModulesTest.java
+++ b/jdk/test/java/util/ServiceLoader/ModulesTest.java
@@ -33,6 +33,7 @@
  * @summary Basic test for ServiceLoader with a provider deployed as a module.
  */
 
+import java.io.File;
 import java.lang.module.Configuration;
 import java.lang.module.ModuleFinder;
 import java.nio.file.Files;
@@ -49,6 +50,7 @@ import java.util.ServiceLoader;
 import java.util.ServiceLoader.Provider;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.script.ScriptEngineFactory;
 
 import org.testng.annotations.Test;
@@ -236,8 +238,10 @@ public class ModulesTest {
      */
     @Test
     public void testWithAutomaticModule() throws Exception {
+        Path here = Paths.get("");
+        Path jar = Files.createTempDirectory(here, "lib").resolve("pearscript.jar");
         Path classes = Paths.get(System.getProperty("test.classes"));
-        Path jar = Files.createTempDirectory("lib").resolve("pearscript.jar");
+
         JarUtils.createJarFile(jar, classes, "META-INF", "org");
 
         ModuleFinder finder = ModuleFinder.of(jar);
@@ -353,8 +357,7 @@ public class ModulesTest {
                 .isPresent());
 
         ClassLoader scl = ClassLoader.getSystemClassLoader();
-        Path dir = Paths.get(System.getProperty("test.classes", "."), "modules");
-        ModuleFinder finder = ModuleFinder.of(dir);
+        ModuleFinder finder = ModuleFinder.of(testModulePath());
 
         // layer1
         Configuration cf1 = cf0.resolveAndBind(finder, ModuleFinder.of(), Set.of());
@@ -451,11 +454,10 @@ public class ModulesTest {
 
     /**
      * Create a custom layer by resolving the given module names. The modules
-     * are located in the {@code ${test.classes}/modules} directory.
+     * are located on the test module path ({@code ${test.module.path}}).
      */
     private ModuleLayer createCustomLayer(String... modules) {
-        Path dir = Paths.get(System.getProperty("test.classes", "."), "modules");
-        ModuleFinder finder = ModuleFinder.of(dir);
+        ModuleFinder finder = ModuleFinder.of(testModulePath());
         Set<String> roots = new HashSet<>();
         Collections.addAll(roots, modules);
         ModuleLayer bootLayer = ModuleLayer.boot();
@@ -467,6 +469,13 @@ public class ModulesTest {
         return layer;
     }
 
+    private Path[] testModulePath() {
+        String mp = System.getProperty("test.module.path");
+        return Stream.of(mp.split(File.pathSeparator))
+                .map(Paths::get)
+                .toArray(Path[]::new);
+    }
+
     private <E> List<E> collectAll(ServiceLoader<E> loader) {
         List<E> list = new ArrayList<>();
         Iterator<E> iterator = loader.iterator();