From 74f1e6da4e54656ed6a51d32ecd3da00ec23409d Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 19 May 2020 15:49:46 +0200
Subject: [PATCH] 8244093: Move all IDE support into coherent structure in make
 directory

Reviewed-by: mcimadamore, jlahoda, chegar, erikj
---
 bin/idea.sh                                   |    2 +-
 make/Main.gmk                                 |   10 +-
 make/{idea => ide/idea/jdk}/build.xml         |    0
 make/ide/idea/jdk/idea.gmk                    |   58 +
 make/{idea => ide/idea/jdk}/template/.name    |    0
 make/{idea => ide/idea/jdk}/template/ant.xml  |    2 +-
 .../idea/jdk}/template/compiler.xml           |    0
 .../template/copyright/profiles_settings.xml  |    0
 make/{idea => ide/idea/jdk}/template/jdk.iml  |    0
 make/{idea => ide/idea/jdk}/template/misc.xml |    2 +-
 .../idea/jdk}/template/modules.xml            |    0
 .../jdk}/template/scopes/scope_settings.xml   |    0
 .../template/src/idea/IdeaLoggerWrapper.java  |    0
 .../template/src/idea/JdkIdeaAntLogger.java   |    0
 make/{idea => ide/idea/jdk}/template/vcs.xml  |    0
 .../idea/jdk}/template/workspace.xml          |    2 +-
 .../intellij => ide/idea/langtools}/build.xml |    4 +-
 .../idea/langtools}/template/ant.xml          |    2 +-
 .../langtools}/template/codeStyleSettings.xml |    0
 .../idea/langtools}/template/compiler.xml     |    0
 .../template/copyright/langtools.xml          |    0
 .../template/copyright/profiles_settings.xml  |    0
 .../template/inspectionProfiles/langtools.xml |    0
 .../inspectionProfiles/profiles_settings.xml  |    0
 .../idea/langtools}/template/langtools.iml    |    0
 .../idea/langtools}/template/misc.xml         |    2 +-
 .../idea/langtools}/template/modules.xml      |    0
 .../template/runConfigurations/javac.xml      |    2 +-
 .../template/runConfigurations/javadoc.xml    |    2 +-
 .../template/runConfigurations/javap.xml      |    2 +-
 .../template/runConfigurations/jshell.xml     |    2 +-
 .../template/runConfigurations/sjavac.xml     |    2 +-
 .../template/src/idea/IdeaLoggerWrapper.java  |    0
 .../src/idea/LangtoolsIdeaAntLogger.java      |    0
 .../idea/langtools}/template/vcs.xml          |    0
 .../idea/langtools}/template/workspace.xml    |    2 +-
 .../hotspot}/nbproject/configurations.xml     |    0
 .../netbeans/hotspot}/nbproject/project.xml   |    0
 .../netbeans/langtools}/README                |    0
 .../netbeans/langtools/build.xml              |    0
 .../langtools/nbproject/project.properties    |    0
 .../netbeans/langtools/nbproject/project.xml  |    0
 .../visualstudio/hotspot}/CreateVSProject.gmk |    4 +-
 .../tools/projectcreator/ArgsParser.java      |    0
 .../tools/projectcreator/BuildConfig.java     |    0
 .../tools/projectcreator/FileTreeCreator.java |    0
 .../projectcreator/FileTreeCreatorVC10.java   |    0
 .../tools/projectcreator/ProjectCreator.java  |    0
 .../build/tools/projectcreator/Util.java      |    0
 .../projectcreator/WinGammaPlatform.java      |    0
 .../projectcreator/WinGammaPlatformVC10.java  |    0
 .../vscode/hotspot}/CreateVSCodeProject.gmk   |   12 +-
 .../hotspot}/indexers/ccls-extensions.txt     |    0
 .../vscode/hotspot}/indexers/ccls-notes.txt   |    0
 .../hotspot}/indexers/ccls-settings.txt       |    0
 .../hotspot}/indexers/clangd-extensions.txt   |    0
 .../vscode/hotspot}/indexers/clangd-notes.txt |    0
 .../hotspot}/indexers/clangd-settings.txt     |    0
 .../hotspot}/indexers/cpptools-extensions.txt |    0
 .../hotspot}/indexers/cpptools-settings.txt   |    0
 .../hotspot}/indexers/rtags-extensions.txt    |    0
 .../hotspot}/indexers/rtags-settings.txt      |    0
 .../vscode/hotspot}/template-launch.jsonc     |    0
 .../vscode/hotspot}/template-tasks.jsonc      |    0
 .../hotspot}/template-workspace-folder.txt    |    0
 .../vscode/hotspot}/template-workspace.jsonc  |    0
 make/idea/idea.gmk                            |   33 -
 make/jdk/netbeans/README                      |  622 -------
 make/jdk/netbeans/awt2d/README                |  220 ---
 make/jdk/netbeans/awt2d/build.properties      |   76 -
 make/jdk/netbeans/awt2d/build.xml             |  100 --
 make/jdk/netbeans/awt2d/nbproject/project.xml |   96 --
 make/jdk/netbeans/client_sanity/README        |   15 -
 make/jdk/netbeans/client_sanity/build.xml     |   94 --
 make/jdk/netbeans/client_sanity/manifest.mf   |    3 -
 .../client_sanity/nbproject/build-impl.xml    | 1429 -----------------
 .../nbproject/genfiles.properties             |    8 -
 .../nbproject/project.properties              |   79 -
 .../client_sanity/nbproject/project.xml       |   17 -
 make/jdk/netbeans/common/README-ent           |   25 -
 make/jdk/netbeans/common/architectures/README |    3 -
 .../architectures/arch-amd64.properties       |   32 -
 .../common/architectures/arch-i386.properties |   32 -
 .../architectures/arch-sparc.properties       |   32 -
 .../common/architectures/arch-x86.properties  |   32 -
 .../architectures/arch-x86_64.properties      |   32 -
 .../common/architectures/name-Bsd.properties  |   32 -
 .../architectures/name-Linux.properties       |   32 -
 .../architectures/name-Macosx.properties      |   32 -
 .../architectures/name-SunOS.properties       |   32 -
 make/jdk/netbeans/common/build-folder.ent     |   36 -
 .../netbeans/common/closed-share-sources.ent  |   47 -
 .../jdk/netbeans/common/closed-share-view.ent |   39 -
 make/jdk/netbeans/common/demo-sources.ent     |   38 -
 make/jdk/netbeans/common/demo-view.ent        |   38 -
 make/jdk/netbeans/common/file-view.ent        |   45 -
 make/jdk/netbeans/common/java-data-native.ent |   51 -
 .../netbeans/common/java-data-no-native.ent   |   48 -
 make/jdk/netbeans/common/jtreg-sources.ent    |   38 -
 make/jdk/netbeans/common/jtreg-view.ent       |   38 -
 make/jdk/netbeans/common/macosx-sources.ent   |   49 -
 make/jdk/netbeans/common/macosx-view.ent      |   43 -
 make/jdk/netbeans/common/make.xml             |   78 -
 make/jdk/netbeans/common/properties.ent       |   45 -
 make/jdk/netbeans/common/sample-sources.ent   |   38 -
 make/jdk/netbeans/common/sample-view.ent      |   38 -
 make/jdk/netbeans/common/share-sources.ent    |   45 -
 make/jdk/netbeans/common/share-view.ent       |   39 -
 make/jdk/netbeans/common/shared.xml           |  377 -----
 make/jdk/netbeans/common/standard-actions.ent |   39 -
 .../jdk/netbeans/common/standard-bindings.ent |  177 --
 make/jdk/netbeans/common/unix-sources.ent     |   49 -
 make/jdk/netbeans/common/unix-view.ent        |   43 -
 make/jdk/netbeans/common/windows-sources.ent  |   45 -
 make/jdk/netbeans/common/windows-view.ent     |   39 -
 make/jdk/netbeans/j2se/README                 |   13 -
 make/jdk/netbeans/j2se/build.properties       |   35 -
 make/jdk/netbeans/j2se/build.xml              |   47 -
 make/jdk/netbeans/j2se/nbproject/project.xml  |  107 --
 make/jdk/netbeans/jarzip/README               |   38 -
 make/jdk/netbeans/jarzip/build.properties     |   46 -
 make/jdk/netbeans/jarzip/build.xml            |   48 -
 .../jdk/netbeans/jarzip/nbproject/project.xml |   76 -
 make/jdk/netbeans/jconsole/README             |   67 -
 make/jdk/netbeans/jconsole/build.properties   |   47 -
 make/jdk/netbeans/jconsole/build.xml          |   74 -
 .../netbeans/jconsole/nbproject/project.xml   |   84 -
 make/jdk/netbeans/jdbc/README                 |   64 -
 make/jdk/netbeans/jdbc/build.properties       |   46 -
 make/jdk/netbeans/jdbc/build.xml              |   52 -
 make/jdk/netbeans/jdbc/nbproject/project.xml  |   88 -
 make/jdk/netbeans/jdwpgen/build.xml           |   74 -
 .../netbeans/jdwpgen/nbproject/build-impl.xml |  642 --------
 .../jdwpgen/nbproject/findbugs.settings       |   72 -
 .../jdwpgen/nbproject/genfiles.properties     |    8 -
 .../jdwpgen/nbproject/project.properties      |   65 -
 .../netbeans/jdwpgen/nbproject/project.xml    |   16 -
 .../netbeans/jdwpgen/nbproject/sqe.properties |    2 -
 make/jdk/netbeans/jmx/README                  |   90 --
 make/jdk/netbeans/jmx/build.properties        |   55 -
 make/jdk/netbeans/jmx/build.xml               |   89 -
 make/jdk/netbeans/jmx/nbproject/project.xml   |   77 -
 make/jdk/netbeans/swing/README                |   62 -
 make/jdk/netbeans/swing/build.properties      |   40 -
 make/jdk/netbeans/swing/build.xml             |  116 --
 make/jdk/netbeans/swing/nbproject/project.xml |   84 -
 make/jdk/netbeans/world/README                |   15 -
 make/jdk/netbeans/world/build.properties      |   34 -
 make/jdk/netbeans/world/build.xml             |   44 -
 make/jdk/netbeans/world/nbproject/project.xml |   84 -
 make/langtools/build.xml                      |    5 +-
 151 files changed, 88 insertions(+), 7300 deletions(-)
 rename make/{idea => ide/idea/jdk}/build.xml (100%)
 create mode 100644 make/ide/idea/jdk/idea.gmk
 rename make/{idea => ide/idea/jdk}/template/.name (100%)
 rename make/{idea => ide/idea/jdk}/template/ant.xml (87%)
 rename make/{idea => ide/idea/jdk}/template/compiler.xml (100%)
 rename make/{idea => ide/idea/jdk}/template/copyright/profiles_settings.xml (100%)
 rename make/{idea => ide/idea/jdk}/template/jdk.iml (100%)
 rename make/{idea => ide/idea/jdk}/template/misc.xml (86%)
 rename make/{idea => ide/idea/jdk}/template/modules.xml (100%)
 rename make/{idea => ide/idea/jdk}/template/scopes/scope_settings.xml (100%)
 rename make/{idea => ide/idea/jdk}/template/src/idea/IdeaLoggerWrapper.java (100%)
 rename make/{idea => ide/idea/jdk}/template/src/idea/JdkIdeaAntLogger.java (100%)
 rename make/{idea => ide/idea/jdk}/template/vcs.xml (100%)
 rename make/{idea => ide/idea/jdk}/template/workspace.xml (96%)
 rename make/{langtools/intellij => ide/idea/langtools}/build.xml (76%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/ant.xml (85%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/codeStyleSettings.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/compiler.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/copyright/langtools.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/copyright/profiles_settings.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/inspectionProfiles/langtools.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/inspectionProfiles/profiles_settings.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/langtools.iml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/misc.xml (90%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/modules.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/runConfigurations/javac.xml (94%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/runConfigurations/javadoc.xml (94%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/runConfigurations/javap.xml (94%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/runConfigurations/jshell.xml (94%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/runConfigurations/sjavac.xml (94%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/src/idea/IdeaLoggerWrapper.java (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/src/idea/LangtoolsIdeaAntLogger.java (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/vcs.xml (100%)
 rename make/{langtools/intellij => ide/idea/langtools}/template/workspace.xml (92%)
 rename make/{nb_native => ide/netbeans/hotspot}/nbproject/configurations.xml (100%)
 rename make/{nb_native => ide/netbeans/hotspot}/nbproject/project.xml (100%)
 rename make/{langtools/netbeans => ide/netbeans/langtools}/README (100%)
 rename make/{langtools => ide}/netbeans/langtools/build.xml (100%)
 rename make/{langtools => ide}/netbeans/langtools/nbproject/project.properties (100%)
 rename make/{langtools => ide}/netbeans/langtools/nbproject/project.xml (100%)
 rename make/{hotspot/ide => ide/visualstudio/hotspot}/CreateVSProject.gmk (97%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/Util.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java (100%)
 rename make/{ => ide/visualstudio}/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java (100%)
 rename make/{vscode => ide/vscode/hotspot}/CreateVSCodeProject.gmk (89%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/ccls-extensions.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/ccls-notes.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/ccls-settings.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/clangd-extensions.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/clangd-notes.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/clangd-settings.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/cpptools-extensions.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/cpptools-settings.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/rtags-extensions.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/indexers/rtags-settings.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/template-launch.jsonc (100%)
 rename make/{vscode => ide/vscode/hotspot}/template-tasks.jsonc (100%)
 rename make/{vscode => ide/vscode/hotspot}/template-workspace-folder.txt (100%)
 rename make/{vscode => ide/vscode/hotspot}/template-workspace.jsonc (100%)
 delete mode 100644 make/idea/idea.gmk
 delete mode 100644 make/jdk/netbeans/README
 delete mode 100644 make/jdk/netbeans/awt2d/README
 delete mode 100644 make/jdk/netbeans/awt2d/build.properties
 delete mode 100644 make/jdk/netbeans/awt2d/build.xml
 delete mode 100644 make/jdk/netbeans/awt2d/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/client_sanity/README
 delete mode 100644 make/jdk/netbeans/client_sanity/build.xml
 delete mode 100644 make/jdk/netbeans/client_sanity/manifest.mf
 delete mode 100644 make/jdk/netbeans/client_sanity/nbproject/build-impl.xml
 delete mode 100644 make/jdk/netbeans/client_sanity/nbproject/genfiles.properties
 delete mode 100644 make/jdk/netbeans/client_sanity/nbproject/project.properties
 delete mode 100644 make/jdk/netbeans/client_sanity/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/common/README-ent
 delete mode 100644 make/jdk/netbeans/common/architectures/README
 delete mode 100644 make/jdk/netbeans/common/architectures/arch-amd64.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/arch-i386.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/arch-sparc.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/arch-x86.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/arch-x86_64.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/name-Bsd.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/name-Linux.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/name-Macosx.properties
 delete mode 100644 make/jdk/netbeans/common/architectures/name-SunOS.properties
 delete mode 100644 make/jdk/netbeans/common/build-folder.ent
 delete mode 100644 make/jdk/netbeans/common/closed-share-sources.ent
 delete mode 100644 make/jdk/netbeans/common/closed-share-view.ent
 delete mode 100644 make/jdk/netbeans/common/demo-sources.ent
 delete mode 100644 make/jdk/netbeans/common/demo-view.ent
 delete mode 100644 make/jdk/netbeans/common/file-view.ent
 delete mode 100644 make/jdk/netbeans/common/java-data-native.ent
 delete mode 100644 make/jdk/netbeans/common/java-data-no-native.ent
 delete mode 100644 make/jdk/netbeans/common/jtreg-sources.ent
 delete mode 100644 make/jdk/netbeans/common/jtreg-view.ent
 delete mode 100644 make/jdk/netbeans/common/macosx-sources.ent
 delete mode 100644 make/jdk/netbeans/common/macosx-view.ent
 delete mode 100644 make/jdk/netbeans/common/make.xml
 delete mode 100644 make/jdk/netbeans/common/properties.ent
 delete mode 100644 make/jdk/netbeans/common/sample-sources.ent
 delete mode 100644 make/jdk/netbeans/common/sample-view.ent
 delete mode 100644 make/jdk/netbeans/common/share-sources.ent
 delete mode 100644 make/jdk/netbeans/common/share-view.ent
 delete mode 100644 make/jdk/netbeans/common/shared.xml
 delete mode 100644 make/jdk/netbeans/common/standard-actions.ent
 delete mode 100644 make/jdk/netbeans/common/standard-bindings.ent
 delete mode 100644 make/jdk/netbeans/common/unix-sources.ent
 delete mode 100644 make/jdk/netbeans/common/unix-view.ent
 delete mode 100644 make/jdk/netbeans/common/windows-sources.ent
 delete mode 100644 make/jdk/netbeans/common/windows-view.ent
 delete mode 100644 make/jdk/netbeans/j2se/README
 delete mode 100644 make/jdk/netbeans/j2se/build.properties
 delete mode 100644 make/jdk/netbeans/j2se/build.xml
 delete mode 100644 make/jdk/netbeans/j2se/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/jarzip/README
 delete mode 100644 make/jdk/netbeans/jarzip/build.properties
 delete mode 100644 make/jdk/netbeans/jarzip/build.xml
 delete mode 100644 make/jdk/netbeans/jarzip/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/jconsole/README
 delete mode 100644 make/jdk/netbeans/jconsole/build.properties
 delete mode 100644 make/jdk/netbeans/jconsole/build.xml
 delete mode 100644 make/jdk/netbeans/jconsole/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/jdbc/README
 delete mode 100644 make/jdk/netbeans/jdbc/build.properties
 delete mode 100644 make/jdk/netbeans/jdbc/build.xml
 delete mode 100644 make/jdk/netbeans/jdbc/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/jdwpgen/build.xml
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/project.properties
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/jdwpgen/nbproject/sqe.properties
 delete mode 100644 make/jdk/netbeans/jmx/README
 delete mode 100644 make/jdk/netbeans/jmx/build.properties
 delete mode 100644 make/jdk/netbeans/jmx/build.xml
 delete mode 100644 make/jdk/netbeans/jmx/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/swing/README
 delete mode 100644 make/jdk/netbeans/swing/build.properties
 delete mode 100644 make/jdk/netbeans/swing/build.xml
 delete mode 100644 make/jdk/netbeans/swing/nbproject/project.xml
 delete mode 100644 make/jdk/netbeans/world/README
 delete mode 100644 make/jdk/netbeans/world/build.properties
 delete mode 100644 make/jdk/netbeans/world/build.xml
 delete mode 100644 make/jdk/netbeans/world/nbproject/project.xml

diff --git a/bin/idea.sh b/bin/idea.sh
index ca674e2925d..ad89aedacbc 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -74,7 +74,7 @@ if [ "x$TOPLEVEL_DIR" = "x" ] ; then
 fi
 
 MAKE_DIR="$SCRIPT_DIR/../make"
-IDEA_MAKE="$MAKE_DIR/idea"
+IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
diff --git a/make/Main.gmk b/make/Main.gmk
index 0b303fa52f8..e4d6d696b99 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -261,7 +261,7 @@ endef
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
 $(eval $(call SetupTarget, hotspot-ide-project, \
-    MAKEFILE := hotspot/ide/CreateVSProject, \
+    MAKEFILE := ide/visualstudio/hotspot/CreateVSProject, \
     DEPS := hotspot exploded-image, \
     ARGS := -I$(TOPDIR)/make/hotspot, \
 ))
@@ -302,25 +302,25 @@ ALL_TARGETS += $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JD
 # VS Code projects
 
 $(eval $(call SetupTarget, vscode-project, \
-    MAKEFILE := CreateVSCodeProject, \
+    MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
     ARGS := VSCODE_INDEXER=cpptools, \
     DEPS := compile-commands, \
 ))
 
 $(eval $(call SetupTarget, vscode-project-clangd, \
-    MAKEFILE := CreateVSCodeProject, \
+    MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
     ARGS := VSCODE_INDEXER=clangd, \
     DEPS := compile-commands, \
 ))
 
 $(eval $(call SetupTarget, vscode-project-rtags, \
-    MAKEFILE := CreateVSCodeProject, \
+    MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
     ARGS := VSCODE_INDEXER=rtags, \
     DEPS := compile-commands, \
 ))
 
 $(eval $(call SetupTarget, vscode-project-ccls, \
-    MAKEFILE := CreateVSCodeProject, \
+    MAKEFILE := ide/vscode/hotspot/CreateVSCodeProject, \
     ARGS := VSCODE_INDEXER=ccls, \
     DEPS := compile-commands, \
 ))
diff --git a/make/idea/build.xml b/make/ide/idea/jdk/build.xml
similarity index 100%
rename from make/idea/build.xml
rename to make/ide/idea/jdk/build.xml
diff --git a/make/ide/idea/jdk/idea.gmk b/make/ide/idea/jdk/idea.gmk
new file mode 100644
index 00000000000..9d286c961d1
--- /dev/null
+++ b/make/ide/idea/jdk/idea.gmk
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+include Makefile
+include make/MainSupport.gmk
+
+.PHONY: idea
+
+ifeq ($(SPEC),)
+  ifneq ($(words $(SPECS)),1)
+	@echo "Error: Multiple build specification files found. Please select one explicitly."
+	@exit 2
+  endif
+  idea:
+	@cd $(topdir)
+	@$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/ide/idea/jdk/idea.gmk SPEC=$(SPECS) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) MODULES="$(MODULES)" idea
+else #with SPEC
+  include make/common/Modules.gmk
+
+  ifeq ($(MODULES),)
+    SEL_MODULES := $(call FindAllModules)
+  else
+    SEL_MODULES := $(MODULES)
+  endif
+
+  idea:
+	$(ECHO) "SUPPORT=$(SUPPORT_OUTPUTDIR)" >> $(OUT)
+	$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(SEL_MODULES), $(call FindModuleSrcDirs,$(mod)))\"" >> $(OUT)
+	$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(SEL_MODULES), $(mod)))\"" >> $(OUT)
+	$(ECHO) "SEL_MODULES=\"$(SEL_MODULES)\"" >> $(OUT)
+	$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
+	$(ECHO) "CYGPATH=\"$(CYGPATH)\"" >> $(OUT)
+	$(ECHO) "SPEC=\"$(SPEC)\"" >> $(OUT)
+	$(ECHO) "JT_HOME=\"$(JT_HOME)\"" >> $(OUT)
+
+endif
diff --git a/make/idea/template/.name b/make/ide/idea/jdk/template/.name
similarity index 100%
rename from make/idea/template/.name
rename to make/ide/idea/jdk/template/.name
diff --git a/make/idea/template/ant.xml b/make/ide/idea/jdk/template/ant.xml
similarity index 87%
rename from make/idea/template/ant.xml
rename to make/ide/idea/jdk/template/ant.xml
index c99a025be03..9cb90246ea0 100644
--- a/make/idea/template/ant.xml
+++ b/make/ide/idea/jdk/template/ant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://###ROOT_DIR###/make/idea/build.xml">
+    <buildFile url="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml">
       <properties>
         <property name="intellij.ismake" value="$IsMake$" />
         <property name="build.target.dir" value="###BUILD_DIR###" />
diff --git a/make/idea/template/compiler.xml b/make/ide/idea/jdk/template/compiler.xml
similarity index 100%
rename from make/idea/template/compiler.xml
rename to make/ide/idea/jdk/template/compiler.xml
diff --git a/make/idea/template/copyright/profiles_settings.xml b/make/ide/idea/jdk/template/copyright/profiles_settings.xml
similarity index 100%
rename from make/idea/template/copyright/profiles_settings.xml
rename to make/ide/idea/jdk/template/copyright/profiles_settings.xml
diff --git a/make/idea/template/jdk.iml b/make/ide/idea/jdk/template/jdk.iml
similarity index 100%
rename from make/idea/template/jdk.iml
rename to make/ide/idea/jdk/template/jdk.iml
diff --git a/make/idea/template/misc.xml b/make/ide/idea/jdk/template/misc.xml
similarity index 86%
rename from make/idea/template/misc.xml
rename to make/ide/idea/jdk/template/misc.xml
index f9e33b817d7..d05605a4041 100644
--- a/make/idea/template/misc.xml
+++ b/make/ide/idea/jdk/template/misc.xml
@@ -9,7 +9,7 @@
     <jre alt="true" value="###IMAGES_DIR###" />
     <options></options>
     <ant>
-      <target file="file://###ROOT_DIR###/make/idea/build.xml" name="images" />
+      <target file="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml" name="images" />
     </ant>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" assert-keyword="true" jdk-15="true">
diff --git a/make/idea/template/modules.xml b/make/ide/idea/jdk/template/modules.xml
similarity index 100%
rename from make/idea/template/modules.xml
rename to make/ide/idea/jdk/template/modules.xml
diff --git a/make/idea/template/scopes/scope_settings.xml b/make/ide/idea/jdk/template/scopes/scope_settings.xml
similarity index 100%
rename from make/idea/template/scopes/scope_settings.xml
rename to make/ide/idea/jdk/template/scopes/scope_settings.xml
diff --git a/make/idea/template/src/idea/IdeaLoggerWrapper.java b/make/ide/idea/jdk/template/src/idea/IdeaLoggerWrapper.java
similarity index 100%
rename from make/idea/template/src/idea/IdeaLoggerWrapper.java
rename to make/ide/idea/jdk/template/src/idea/IdeaLoggerWrapper.java
diff --git a/make/idea/template/src/idea/JdkIdeaAntLogger.java b/make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java
similarity index 100%
rename from make/idea/template/src/idea/JdkIdeaAntLogger.java
rename to make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java
diff --git a/make/idea/template/vcs.xml b/make/ide/idea/jdk/template/vcs.xml
similarity index 100%
rename from make/idea/template/vcs.xml
rename to make/ide/idea/jdk/template/vcs.xml
diff --git a/make/idea/template/workspace.xml b/make/ide/idea/jdk/template/workspace.xml
similarity index 96%
rename from make/idea/template/workspace.xml
rename to make/ide/idea/jdk/template/workspace.xml
index 498ec8df0b3..f1270d4fb5d 100644
--- a/make/idea/template/workspace.xml
+++ b/make/ide/idea/jdk/template/workspace.xml
@@ -11,7 +11,7 @@
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://###ROOT_DIR###/make/idea/build.xml">
+    <buildFile url="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml">
       <runInBackground value="false" />
       <targetFilters>
         <filter targetName="clean" isVisible="true" />
diff --git a/make/langtools/intellij/build.xml b/make/ide/idea/langtools/build.xml
similarity index 76%
rename from make/langtools/intellij/build.xml
rename to make/ide/idea/langtools/build.xml
index 8f08492afc0..e7a5be5479c 100644
--- a/make/langtools/intellij/build.xml
+++ b/make/ide/idea/langtools/build.xml
@@ -1,11 +1,11 @@
 <!-- importing.xml -->
-<project name="langtools" basedir = "../../..">
+<project name="langtools" basedir = "../../../..">
 
     <taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath=".idea/classes"/>
 
     <wrapLogger/>
 
-    <import file="../build.xml"/>
+    <import file="../../../langtools/build.xml"/>
 
     <target name="cond-clean" unless="${intellij.ismake}">
         <antcall target="clean"/>
diff --git a/make/langtools/intellij/template/ant.xml b/make/ide/idea/langtools/template/ant.xml
similarity index 85%
rename from make/langtools/intellij/template/ant.xml
rename to make/ide/idea/langtools/template/ant.xml
index 1f07218654c..41b160500ec 100644
--- a/make/langtools/intellij/template/ant.xml
+++ b/make/ide/idea/langtools/template/ant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/make/langtools/intellij/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml">
       <properties>
 	    <property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
         <property name="intellij.ismake" value="$IsMake$" />
diff --git a/make/langtools/intellij/template/codeStyleSettings.xml b/make/ide/idea/langtools/template/codeStyleSettings.xml
similarity index 100%
rename from make/langtools/intellij/template/codeStyleSettings.xml
rename to make/ide/idea/langtools/template/codeStyleSettings.xml
diff --git a/make/langtools/intellij/template/compiler.xml b/make/ide/idea/langtools/template/compiler.xml
similarity index 100%
rename from make/langtools/intellij/template/compiler.xml
rename to make/ide/idea/langtools/template/compiler.xml
diff --git a/make/langtools/intellij/template/copyright/langtools.xml b/make/ide/idea/langtools/template/copyright/langtools.xml
similarity index 100%
rename from make/langtools/intellij/template/copyright/langtools.xml
rename to make/ide/idea/langtools/template/copyright/langtools.xml
diff --git a/make/langtools/intellij/template/copyright/profiles_settings.xml b/make/ide/idea/langtools/template/copyright/profiles_settings.xml
similarity index 100%
rename from make/langtools/intellij/template/copyright/profiles_settings.xml
rename to make/ide/idea/langtools/template/copyright/profiles_settings.xml
diff --git a/make/langtools/intellij/template/inspectionProfiles/langtools.xml b/make/ide/idea/langtools/template/inspectionProfiles/langtools.xml
similarity index 100%
rename from make/langtools/intellij/template/inspectionProfiles/langtools.xml
rename to make/ide/idea/langtools/template/inspectionProfiles/langtools.xml
diff --git a/make/langtools/intellij/template/inspectionProfiles/profiles_settings.xml b/make/ide/idea/langtools/template/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from make/langtools/intellij/template/inspectionProfiles/profiles_settings.xml
rename to make/ide/idea/langtools/template/inspectionProfiles/profiles_settings.xml
diff --git a/make/langtools/intellij/template/langtools.iml b/make/ide/idea/langtools/template/langtools.iml
similarity index 100%
rename from make/langtools/intellij/template/langtools.iml
rename to make/ide/idea/langtools/template/langtools.iml
diff --git a/make/langtools/intellij/template/misc.xml b/make/ide/idea/langtools/template/misc.xml
similarity index 90%
rename from make/langtools/intellij/template/misc.xml
rename to make/ide/idea/langtools/template/misc.xml
index 3b0415c7f2d..c2121cda146 100644
--- a/make/langtools/intellij/template/misc.xml
+++ b/make/ide/idea/langtools/template/misc.xml
@@ -9,7 +9,7 @@
     <jre alt="true" value="@IDEA_TARGET_JDK@" />
     <options>@XPATCH@</options>
     <ant>
-      <target file="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" name="build-all-classes" />
+      <target file="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" name="build-all-classes" />
     </ant>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
diff --git a/make/langtools/intellij/template/modules.xml b/make/ide/idea/langtools/template/modules.xml
similarity index 100%
rename from make/langtools/intellij/template/modules.xml
rename to make/ide/idea/langtools/template/modules.xml
diff --git a/make/langtools/intellij/template/runConfigurations/javac.xml b/make/ide/idea/langtools/template/runConfigurations/javac.xml
similarity index 94%
rename from make/langtools/intellij/template/runConfigurations/javac.xml
rename to make/ide/idea/langtools/template/runConfigurations/javac.xml
index eae93223583..0d245bee9d1 100644
--- a/make/langtools/intellij/template/runConfigurations/javac.xml
+++ b/make/ide/idea/langtools/template/runConfigurations/javac.xml
@@ -16,7 +16,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="Make" enabled="false" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" target="build-all-classes" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" target="build-all-classes" />
     </method>
   </configuration>
 </component>
diff --git a/make/langtools/intellij/template/runConfigurations/javadoc.xml b/make/ide/idea/langtools/template/runConfigurations/javadoc.xml
similarity index 94%
rename from make/langtools/intellij/template/runConfigurations/javadoc.xml
rename to make/ide/idea/langtools/template/runConfigurations/javadoc.xml
index 5c28b78d4f3..9701434b204 100644
--- a/make/langtools/intellij/template/runConfigurations/javadoc.xml
+++ b/make/ide/idea/langtools/template/runConfigurations/javadoc.xml
@@ -16,7 +16,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="Make" enabled="false" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" target="build-all-classes" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" target="build-all-classes" />
     </method>
   </configuration>
 </component>
diff --git a/make/langtools/intellij/template/runConfigurations/javap.xml b/make/ide/idea/langtools/template/runConfigurations/javap.xml
similarity index 94%
rename from make/langtools/intellij/template/runConfigurations/javap.xml
rename to make/ide/idea/langtools/template/runConfigurations/javap.xml
index 3dcf3e4d18a..38d5cd5289d 100644
--- a/make/langtools/intellij/template/runConfigurations/javap.xml
+++ b/make/ide/idea/langtools/template/runConfigurations/javap.xml
@@ -16,7 +16,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="Make" enabled="false" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" target="build-all-classes" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" target="build-all-classes" />
     </method>
   </configuration>
 </component>
diff --git a/make/langtools/intellij/template/runConfigurations/jshell.xml b/make/ide/idea/langtools/template/runConfigurations/jshell.xml
similarity index 94%
rename from make/langtools/intellij/template/runConfigurations/jshell.xml
rename to make/ide/idea/langtools/template/runConfigurations/jshell.xml
index 06c2fd21ced..7b849fbc730 100644
--- a/make/langtools/intellij/template/runConfigurations/jshell.xml
+++ b/make/ide/idea/langtools/template/runConfigurations/jshell.xml
@@ -14,7 +14,7 @@
     <envs />
     <method>
       <option name="Make" enabled="false" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" target="build-all-classes" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" target="build-all-classes" />
     </method>
   </configuration>
 </component>
diff --git a/make/langtools/intellij/template/runConfigurations/sjavac.xml b/make/ide/idea/langtools/template/runConfigurations/sjavac.xml
similarity index 94%
rename from make/langtools/intellij/template/runConfigurations/sjavac.xml
rename to make/ide/idea/langtools/template/runConfigurations/sjavac.xml
index 1e613df3deb..cba46ff58d8 100644
--- a/make/langtools/intellij/template/runConfigurations/sjavac.xml
+++ b/make/ide/idea/langtools/template/runConfigurations/sjavac.xml
@@ -16,7 +16,7 @@
     <ConfigurationWrapper RunnerId="Run" />
     <method>
       <option name="Make" enabled="false" />
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/langtools/intellij/build.xml" target="build-all-classes" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml" target="build-all-classes" />
     </method>
   </configuration>
 </component>
diff --git a/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java b/make/ide/idea/langtools/template/src/idea/IdeaLoggerWrapper.java
similarity index 100%
rename from make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java
rename to make/ide/idea/langtools/template/src/idea/IdeaLoggerWrapper.java
diff --git a/make/langtools/intellij/template/src/idea/LangtoolsIdeaAntLogger.java b/make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java
similarity index 100%
rename from make/langtools/intellij/template/src/idea/LangtoolsIdeaAntLogger.java
rename to make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java
diff --git a/make/langtools/intellij/template/vcs.xml b/make/ide/idea/langtools/template/vcs.xml
similarity index 100%
rename from make/langtools/intellij/template/vcs.xml
rename to make/ide/idea/langtools/template/vcs.xml
diff --git a/make/langtools/intellij/template/workspace.xml b/make/ide/idea/langtools/template/workspace.xml
similarity index 92%
rename from make/langtools/intellij/template/workspace.xml
rename to make/ide/idea/langtools/template/workspace.xml
index 94f6d01b59b..9001832c826 100644
--- a/make/langtools/intellij/template/workspace.xml
+++ b/make/ide/idea/langtools/template/workspace.xml
@@ -6,7 +6,7 @@
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/make/langtools/intellij/build.xml">
+    <buildFile url="file://$PROJECT_DIR$/make/ide/idea/langtools/build.xml">
       <runInBackground value="false" />
       <targetFilters>
         <filter targetName="build-all-tools" isVisible="true" />
diff --git a/make/nb_native/nbproject/configurations.xml b/make/ide/netbeans/hotspot/nbproject/configurations.xml
similarity index 100%
rename from make/nb_native/nbproject/configurations.xml
rename to make/ide/netbeans/hotspot/nbproject/configurations.xml
diff --git a/make/nb_native/nbproject/project.xml b/make/ide/netbeans/hotspot/nbproject/project.xml
similarity index 100%
rename from make/nb_native/nbproject/project.xml
rename to make/ide/netbeans/hotspot/nbproject/project.xml
diff --git a/make/langtools/netbeans/README b/make/ide/netbeans/langtools/README
similarity index 100%
rename from make/langtools/netbeans/README
rename to make/ide/netbeans/langtools/README
diff --git a/make/langtools/netbeans/langtools/build.xml b/make/ide/netbeans/langtools/build.xml
similarity index 100%
rename from make/langtools/netbeans/langtools/build.xml
rename to make/ide/netbeans/langtools/build.xml
diff --git a/make/langtools/netbeans/langtools/nbproject/project.properties b/make/ide/netbeans/langtools/nbproject/project.properties
similarity index 100%
rename from make/langtools/netbeans/langtools/nbproject/project.properties
rename to make/ide/netbeans/langtools/nbproject/project.properties
diff --git a/make/langtools/netbeans/langtools/nbproject/project.xml b/make/ide/netbeans/langtools/nbproject/project.xml
similarity index 100%
rename from make/langtools/netbeans/langtools/nbproject/project.xml
rename to make/ide/netbeans/langtools/nbproject/project.xml
diff --git a/make/hotspot/ide/CreateVSProject.gmk b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
similarity index 97%
rename from make/hotspot/ide/CreateVSProject.gmk
rename to make/ide/visualstudio/hotspot/CreateVSProject.gmk
index 6bd1f71c939..9872d17c0ac 100644
--- a/make/hotspot/ide/CreateVSProject.gmk
+++ b/make/ide/visualstudio/hotspot/CreateVSProject.gmk
@@ -93,12 +93,12 @@ ifeq ($(call isTargetOs, windows), true)
   ################################################################################
   # Build the ProjectCreator java tool.
 
-  TOOLS_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/support/tools_classes
+  TOOLS_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/support/ide_classes
 
   $(eval $(call SetupJavaCompilation, BUILD_PROJECT_CREATOR, \
       TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
       DISABLED_WARNINGS := auxiliaryclass deprecation rawtypes unchecked cast options, \
-      SRC := $(TOPDIR)/make/hotspot/src/classes, \
+      SRC := $(TOPDIR)/make/ide/visualstudio/hotspot/src/classes, \
       BIN := $(TOOLS_OUTPUTDIR), \
       JAVAC_FLAGS := -XDstringConcat=inline, \
   ))
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ArgsParser.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreator.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/Util.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/Util.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/Util.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/Util.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatform.java
diff --git a/make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java b/make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java
similarity index 100%
rename from make/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java
rename to make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java
diff --git a/make/vscode/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
similarity index 89%
rename from make/vscode/CreateVSCodeProject.gmk
rename to make/ide/vscode/hotspot/CreateVSCodeProject.gmk
index 19f80426ddc..4405b31004e 100644
--- a/make/vscode/CreateVSCodeProject.gmk
+++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
 # 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,7 +35,7 @@ include MakeBase.gmk
 # Param 1: Fragment name
 ################################################################################
 GetIndexerFragment = \
-    $(TOPDIR)/make/vscode/indexers/$(VSCODE_INDEXER)-$(1).txt
+    $(TOPDIR)/make/ide/vscode/hotspot/indexers/$(VSCODE_INDEXER)-$(1).txt
 
 ################################################################################
 # Show indexer-specific notes if they exist, otherwise do nothing
@@ -60,7 +60,7 @@ endif
 # from TOPDIR.
 ################################################################################
 ifneq ($(WORKSPACE_ROOT),$(TOPDIR))
-  GetExtraWorkspaceRoot = $(TOPDIR)/make/vscode/template-workspace-folder.txt
+  GetExtraWorkspaceRoot = $(TOPDIR)/make/ide/vscode/hotspot/template-workspace-folder.txt
 else
   GetExtraWorkspaceRoot = /dev/null
 endif
@@ -96,14 +96,14 @@ endef
 
 $(OUTPUTDIR)/jdk.code-workspace:
 	$(call LogWarn, Creating workspace $@)
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-workspace.jsonc, $@)
+	$(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-workspace.jsonc, $@)
 	$(call ShowIndexerNotes)
 
 $(OUTPUTDIR)/.vscode/tasks.json:
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-tasks.jsonc, $@)
+	$(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-tasks.jsonc, $@)
 
 $(OUTPUTDIR)/.vscode/launch.json:
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-launch.jsonc, $@)
+	$(call CreateFromTemplate, $(TOPDIR)/make/ide/vscode/hotspot/template-launch.jsonc, $@)
 
 TARGETS := $(OUTPUTDIR)/jdk.code-workspace $(OUTPUTDIR)/.vscode/tasks.json \
     $(OUTPUTDIR)/.vscode/launch.json
diff --git a/make/vscode/indexers/ccls-extensions.txt b/make/ide/vscode/hotspot/indexers/ccls-extensions.txt
similarity index 100%
rename from make/vscode/indexers/ccls-extensions.txt
rename to make/ide/vscode/hotspot/indexers/ccls-extensions.txt
diff --git a/make/vscode/indexers/ccls-notes.txt b/make/ide/vscode/hotspot/indexers/ccls-notes.txt
similarity index 100%
rename from make/vscode/indexers/ccls-notes.txt
rename to make/ide/vscode/hotspot/indexers/ccls-notes.txt
diff --git a/make/vscode/indexers/ccls-settings.txt b/make/ide/vscode/hotspot/indexers/ccls-settings.txt
similarity index 100%
rename from make/vscode/indexers/ccls-settings.txt
rename to make/ide/vscode/hotspot/indexers/ccls-settings.txt
diff --git a/make/vscode/indexers/clangd-extensions.txt b/make/ide/vscode/hotspot/indexers/clangd-extensions.txt
similarity index 100%
rename from make/vscode/indexers/clangd-extensions.txt
rename to make/ide/vscode/hotspot/indexers/clangd-extensions.txt
diff --git a/make/vscode/indexers/clangd-notes.txt b/make/ide/vscode/hotspot/indexers/clangd-notes.txt
similarity index 100%
rename from make/vscode/indexers/clangd-notes.txt
rename to make/ide/vscode/hotspot/indexers/clangd-notes.txt
diff --git a/make/vscode/indexers/clangd-settings.txt b/make/ide/vscode/hotspot/indexers/clangd-settings.txt
similarity index 100%
rename from make/vscode/indexers/clangd-settings.txt
rename to make/ide/vscode/hotspot/indexers/clangd-settings.txt
diff --git a/make/vscode/indexers/cpptools-extensions.txt b/make/ide/vscode/hotspot/indexers/cpptools-extensions.txt
similarity index 100%
rename from make/vscode/indexers/cpptools-extensions.txt
rename to make/ide/vscode/hotspot/indexers/cpptools-extensions.txt
diff --git a/make/vscode/indexers/cpptools-settings.txt b/make/ide/vscode/hotspot/indexers/cpptools-settings.txt
similarity index 100%
rename from make/vscode/indexers/cpptools-settings.txt
rename to make/ide/vscode/hotspot/indexers/cpptools-settings.txt
diff --git a/make/vscode/indexers/rtags-extensions.txt b/make/ide/vscode/hotspot/indexers/rtags-extensions.txt
similarity index 100%
rename from make/vscode/indexers/rtags-extensions.txt
rename to make/ide/vscode/hotspot/indexers/rtags-extensions.txt
diff --git a/make/vscode/indexers/rtags-settings.txt b/make/ide/vscode/hotspot/indexers/rtags-settings.txt
similarity index 100%
rename from make/vscode/indexers/rtags-settings.txt
rename to make/ide/vscode/hotspot/indexers/rtags-settings.txt
diff --git a/make/vscode/template-launch.jsonc b/make/ide/vscode/hotspot/template-launch.jsonc
similarity index 100%
rename from make/vscode/template-launch.jsonc
rename to make/ide/vscode/hotspot/template-launch.jsonc
diff --git a/make/vscode/template-tasks.jsonc b/make/ide/vscode/hotspot/template-tasks.jsonc
similarity index 100%
rename from make/vscode/template-tasks.jsonc
rename to make/ide/vscode/hotspot/template-tasks.jsonc
diff --git a/make/vscode/template-workspace-folder.txt b/make/ide/vscode/hotspot/template-workspace-folder.txt
similarity index 100%
rename from make/vscode/template-workspace-folder.txt
rename to make/ide/vscode/hotspot/template-workspace-folder.txt
diff --git a/make/vscode/template-workspace.jsonc b/make/ide/vscode/hotspot/template-workspace.jsonc
similarity index 100%
rename from make/vscode/template-workspace.jsonc
rename to make/ide/vscode/hotspot/template-workspace.jsonc
diff --git a/make/idea/idea.gmk b/make/idea/idea.gmk
deleted file mode 100644
index 8b9d862794b..00000000000
--- a/make/idea/idea.gmk
+++ /dev/null
@@ -1,33 +0,0 @@
-include Makefile
-include make/MainSupport.gmk
-
-.PHONY: idea
-
-ifeq ($(SPEC),)
-  ifneq ($(words $(SPECS)),1)
-	@echo "Error: Multiple build specification files found. Please select one explicitly."
-	@exit 2
-  endif
-  idea:
-	@cd $(topdir)
-	@$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/idea/idea.gmk SPEC=$(SPECS) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) MODULES="$(MODULES)" idea
-else #with SPEC
-  include make/common/Modules.gmk
-
-  ifeq ($(MODULES),)
-    SEL_MODULES := $(call FindAllModules)
-  else
-    SEL_MODULES := $(MODULES)
-  endif
-
-  idea:
-	$(ECHO) "SUPPORT=$(SUPPORT_OUTPUTDIR)" >> $(OUT)
-	$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(SEL_MODULES), $(call FindModuleSrcDirs,$(mod)))\"" >> $(OUT)
-	$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(SEL_MODULES), $(mod)))\"" >> $(OUT)
-	$(ECHO) "SEL_MODULES=\"$(SEL_MODULES)\"" >> $(OUT)
-	$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
-	$(ECHO) "CYGPATH=\"$(CYGPATH)\"" >> $(OUT)
-	$(ECHO) "SPEC=\"$(SPEC)\"" >> $(OUT)
-	$(ECHO) "JT_HOME=\"$(JT_HOME)\"" >> $(OUT)
-
-endif
diff --git a/make/jdk/netbeans/README b/make/jdk/netbeans/README
deleted file mode 100644
index ffae80f95ce..00000000000
--- a/make/jdk/netbeans/README
+++ /dev/null
@@ -1,622 +0,0 @@
-Working on OpenJDK using NetBeans
-    This note describes how to work on the OpenJDK from NetBeans. We've
-    provided several NetBeans projects as starting points. Below we'll
-    describe how to use them, as well as how to create your own.
-
-Getting Started
-    In addition to the source bundle for Open JDK, you'll need to download
-    and install copies of the JDK and of NetBeans. And if you want to run
-    tests on the JDK (you do want to run tests, right?), you'll need to
-    install the jtreg test harness.
-
-    In this note, when pathnames are not fully specified, they should be
-    interpreted as being relative to the directory containing this README
-    and the NetBeans projects themselves.
-
-        The JDK build process is largely make-based, and is not
-        exceptionally tolerant of pathnames with spaces in them (such as
-        "Program Files". Please be sure to install everything in a
-        directories whose paths don't have any spaces!
-
-    Downloading the JDK
-        You've probably done this a million times. Download and install it
-        from http://www.oracle.com/technetwork/java/javase/overview/index.html
-
-    Downloading the OpenJDK sources
-        Since you're reading this, d you've already downloaded the OpenJDK
-        source bundle.  Later in this document we'll refer to the location
-        where you installed the Open JDK sources as *install-dir*.
-
-    Downloading a pre-built, JDK 8
-        This will be necessary to do builds of some of the projects.  In
-        general, you want to download and install a pre-built JDK that
-        corresponds to the OpenJDK sources you download.  Building the entire
-        OpenJDK depends on a few parts of the pre-built JDK.  Get this from
-        http://download.java.net/jdk8/binaries
-
-        Note: For working on certain projects, like JMX and JConsole, you
-              may find convenient to use a pre-built version of JDK 8 (or
-              OpenJDK) rather than building your own. This will allow you
-              to build only that part of the OpenJDK sources which correspond
-              to that project.
-
-    NetBeans 7.0 or later
-        Older versions may also work but are unsupported.
-
-    jtreg
-        "jtreg" is the test harness for running OpenJDK's regression tests.
-        Get it from http://openjdk.java.net/jtreg
-
-    Ant
-       NetBeans comes with ant, but if you use a separately-installed copy
-       please make sure that it is at least version 1.8.1.
-
-Configuring
-    Building OpenJDK is hard and complex. No, strike that. While it's not
-    exactly "easy", we've got it down to *relatively* small set of
-    properties you need to set.
-
-    The NetBeans projects provided here share a fair amount of common
-    structure. They share properties values where it makes sense. Each
-    project loads properties from these properties files, in this order
-
-        ${basedir}/nbproject/private/build.properties
-        $HOME/.openjdk/${ant.project.name}-build.properties
-        $HOME/.openjdk/build.properties
-        ${basedir}/build.properties
-
-    (${basedir} refers to the directory containing a particular NetBeans
-    project.) The first time a property defined determines value: it is
-    *not* overridden if it is read from properties files read later. The net
-    result is that by carefully choosing where to define a property, you can
-    have it for a specific project, all uses of a specific project (useful
-    if you work on multiple copies of the OpenJDK sources), all projects, or
-    only projects in a specific sandbox.
-
-    With that in mind, please set the following properties. Presuming you
-    want the same values for all your work, set them in
-    $HOME/.openjdk/build.properties.
-
-    * bootstrap.jdk
-        Set to the location where you installed JDK 7.
-
-    * jtreg.home
-        Set to the location where you installed jtreg.
-
-    * make.options
-        Some of the projects invoke "make", since they compile native code.
-        The make.options property is for passing information about what you
-        installed where to make.  Change the paths to fit your particular
-        situation:
-
-        make.options=\
-            ALT_BOOTDIR=/home/me/bin/jdk1.7.0 \
-            ALT_JDK_IMPORT_PATH=/home/me/bin/jdk1.8.0 \
-            OPENJDK=true
-
-        The trailing '\' are important, so that make gets the above as a
-        single set of options.
-
-        You might want to add additional additional options: see the README
-        for the project you're using for more information.  And see
-                 *install-dir*/jdk/make/README-builds.html
-        to read much more about building the JDK.
-
-  Windows-specific configuration
-    First, please note that the entire JDK cannot currently be built on
-    Windows platforms.  This will likely limit your ability to build
-    make-based projects.  See
-         *install-dir*/jdk/make/README-builds.html
-    for full information on issues with building on the Windows platform.
-
-    That said, there are two ways to work with the Windows-required settings
-    for the Microsoft tools. Either:
-
-    * Set environment variables values in Windows
-        Doing so means accessing the System control panel in Windows, and
-        setting the environment variables there.
-
-        By doing so, you can launch NetBeans by double-clicking its icon,
-        and the environment variable values will be available.
-
-    * Set environment variable values in a shell
-        Doing so means adding the settings to an init file (e.g. .bashrc,
-        .cshrc, etc.) or a file that you source before running NetBeans. In
-        this case, you'll have to launch NetBeans from the command line in a
-        shell in which you've set the environment variables.
-
-    In either case, the end result should be that the settings are available
-    to the make-based build process when it runs from within NetBeans.
-
-    The make-based builds presumes that you're using cygwin, and expects to
-    find "make" in c:\cygwin\bin\make. If you've installed cygwin elsewhere,
-    set "make" in a properties file.
-
-  Configuring Project Properties
-    A note of caution is in order: These are NetBeans *freeform* projects.
-    If you use the NetBeans GUI to examine them, things are likely to not
-    look "right". Please don't edit them there, please instead use a text
-    editor.
-
-  Locale Requirements
-    To build the OpenJDK sources, be certain that you are using the "C"
-    locale on Unix (R) platforms, or "English (United States)" locale on
-    Windows.
-
-Platforms and architectures, oh my!
-    The Open JDK can be built for a variety of operating system platforms
-    and hardware architectures. The resulting builds are always placed in a
-    directory which contains the platform and architecture as part of the
-    pathname, as in *platform*-*arch*. For example, if you build the jdk
-    project on a Linux platform running on x86 hardware, the resulting build
-    will be in:
-
-    *install-dir*/jdk/build/linux-i586
-
-    We've provided support for some platforms and architectures in
-    common/architectures. Add another, if your needs require it.
-
-Provided NetBeans projects
-    This section describes the NetBeans projects that help you work on
-    particular parts of the JDK. While they're largely similar in structure
-    and should work the way you expect NetBeans projects to work: edit,
-    build, test, etc. But there are some differences. They don't all support
-    the same targets (e.g., there's nothing to run in jarzip project).
-
-    Some projects are built by invoking make, since they involve compilation
-    of native code or other activities that cannot be done by javac. We call
-    these "make-based", and call all others "ant-based".
-
-    They all are configured by way of a build.properties file, which
-    specifies what subdirectories of the JDK sources they manipulate, what
-    directories contain their tests, whether they use make or ant, etc.
-
-    The very first time you open any one of these projects on set of Open
-    JDK sources, NetBeans will scan the entire set of sources, not just
-    those for the project you opened. This will take a few minutes, but will
-    ensure that Go To Type, Go To Source, and so on work as expected. Later,
-    when you open other projects on the same Open JDK sources, there will be
-    at most a slight delay.
-
-    There's a README accompanying each project. Most are text files, which
-    you can Open in NetBeans, some are HTML files, in which case unless you
-    enjoy reading raw HTML, you're better off choosing the *View* menu item
-    from the context menu, which will display the README in your web
-    browser.
-
-    Finally, note that these projects were all created by different people,
-    and are while some attempt has been made to make them look and behave
-    the same, they are maintained separately and will vary somewhat.
-
-    The projects currently provided are:
-
-    jdk (directory "jdk")
-        A convenient starting point for the other projects, and from which
-        you can build the entire OpenJDK. Please note that depending on your
-        hardware, this could take a *very* long time. The results of the
-        build are in *install-dir*/jdk/build/*platform*-*arch*.
-
-    world (directory "world")
-        This project builds both the Hotspot VM and all of JavaSE. Please
-        note that pretty much regardless of your hardware, this *will* take
-        a long time, and use *lots* of disk space (more than 3GB). The
-        results of the build are in
-        *install-dir*/build/*platform*-*arch* and
-        *install-dir*/build/*platform*-*arch*-fastdebug.
-
-        Consult the project's README file for details.
-
-    AWT & Java2d (directory "awt2d")
-        For working on AWT and Java2d. Supports running the Font2DTest demo.
-
-        This is a make-based project: In order to build this project, you
-        should build the jdk project first, since AWT and Java2d include
-        native code.
-
-    JConsole (directory "jconsole")
-        For working on JConsole. Creates ../dist/lib/jconsole.jar. Supports
-        running and debugging JConsole.
-
-        This ant-based project does *not* require that you build the jdk
-        project first, provided that you use a pre-built version of JDK 7.
-
-    Java (TM) Management Extensions (JMX(TM)) API (directory "jmx")
-        For working on JMX source code. Creates ../dist/lib/jmx.jar.
-
-        This ant-based project does *not* require that you build the jdk
-        project first, provided that you use a pre-built version of JDK 7.
-
-    Jar & Zip (directory "jarzip")
-        For working on jar & zip. It builds the zip library (including
-        native code), the jar library, and the jar tool. Creates an
-        executable jar program in ../build/*platform*-*arch*/bin/jar.
-
-        This is a make-based project: In order to build this project, you
-        should build the jdk project first, since AWT and Java2d include
-        native code.
-
-    Swing (directory "swing")
-        For working on Swing. Creates ../dist/lib/swing.jar. Supports
-        running and debugging the SampleTree demo.
-
-        This ant-based project does *not* require that you build the jdk
-        project first, provided that you use a pre-built version of JDK 7.
-
-    In addition, there are projects for building the compiler, javadoc,
-    and related tools, in the OpenJDK langtools component.  These
-    projects are separate from those described here, and have their
-    own set of guidelines and conventions. For more details, see the
-    README files in make/netbeans in the OpenJDK langtools component.
-
-Running Tests
-    We use the jtreg test harness, described more fully at
-    http://openjdk.java.net/jtreg
-
-    The OpenJDK tests are in the default Java package, are public classes,
-    and have a "static void main(String[] args)" with which they are
-    invoked. Some tests are actually shell scripts, which might compile
-    code, etc. jtreg is quite flexible.
-
-    To run tests for a project, use *Test Project* from NetBeans. From the
-    command line, you can invoke "ant jtreg" on any individual project's
-    build.xml file.
-
-    In either NetBeans of on the command line, jtreg prints summary output
-    about the pass/fail nature of each test. An HTML report of the entire
-    test run is
-
-    ../build/*platform*-*arch*/jtreg/*ant-project-name*/JTreport/report.html
-
-    In that same JTreport directory are also individual HTML files
-    summarizing the test environment, test passes and failures, etc.
-
-    More detail on any individual test is under
-
-    ../build/*platform*-*arch*/jtreg/*ant-project-name*/JTwork.
-
-    For example, details about the awt/Modal/SupportedTest/SupportedTest
-    test are under the JTwork directory at the same pathname as the test
-    itself in a ".jtr" file. For example:
-
-    ../build/*platform*-*arch*/jtreg/*ant-project-name*/JTwork/awt/Modal/SupportedTest/SupportedTest.jtr
-
-    Sometimes you will see that running jtreg has resulted in a failure.
-    This does not always mean that a test has an error in it. Jtreg
-    distinguishes between these two cases. There are a number of tests that
-    are "ignored", and not run, and these are reported as failures.
-
-    You can run a single test by right clicking on it and choosing *Run
-    File* from the context menu. Similarly, you can debug a single test by
-    choosing *Debug File*.
-
-Debugging
-    Debugging is enabled by default in ant-based projects, as if
-    "-g:lines,vars,source" were given. You can alter these settings via
-    entries in one of the configuration properties files. For example:
-
-     javac.debug=false
-     javac.debuglevel=<debug level options>
-
-    To debug a project or test, use NetBeans in the normal way, with *Debug
-    Project* or *Debug File*. Note that not all projects provide a target
-    that can be debugged, but tests can be debugged.
-
-Creating Javadoc
-    You can create Javadoc for any of the projects: just choose *Generate
-    Javadoc for Project* from the NetBeans menu. Your default browser will
-    open up, displaying the just-generated javadoc.
-
-    Javadoc gets generated into a separate subdirectory for each project.
-    For example, the Jar & Zip project's javadoc gets generated in
-
-    ../build/*platform*-*arch*/jtreg/*ant-project-name*/javadoc/jarzip
-
-Cleaning projects
-    Each project can of course be cleaned. Make-based and ant-based projects
-    differ a little in what exactly gets cleaned. In both cases, all jtreg
-    results and javadoc are removed.
-
-    In ant-based projects, project-specific files as determined by the
-    project's build.properties file are removed from the classes and gensrc
-    directories that are under ../build/*platform*-*arch*.
-
-    In make-based projects, "make clean" is run in the same directories as
-    "make all" is run when building the project.
-
-    Please note that the jdk project is "special" with respect to
-    cleaning: in this case, the entire ../build directory is removed.
-    Similar for the world project.
-
-Creating your own NetBeans project
-    The project's we've provided are hopefully a useful starting point, but
-    chances are that you want to work on something else. This section will
-    describe how to select an existing project, and then adapt it to your
-    needs.
-
-  Considerations
-    The first consideration is whether or not the code in which you're
-    interested needs anything beyond javac and copying of resources to
-    build. If so, then you'll need to create a make-based project. If not,
-    an ant-based project is possible. See the project descriptions above to
-    learn which are make-based, and which are ant-based.
-
-    The second consideration is to consider the files that you'll need. Each
-    project is defined by 3 files:
-
-    * build.xml
-        This is the ant build script. For a make-based project, they tend to
-        have a target for "make clean" and another for "make all", each of
-        which invokes "make-run" in the same set of directories. Take a look
-        at jarzip/build.xml for an example.
-
-        For an ant-based project, there might be nothing, with all the work
-        done via the declaration of properties in the build.properties file.
-        Take a look at jconsole/build.xml for an example, and notice how it
-        overrides the -pre-compile and -post-compile targets that are
-        defined in common/shared.xml (where they are defined to do nothing).
-
-    * build.properties
-        This file defines the directories (and possibly files) that are
-        included in and excluded from. Basically, a file is considered to be
-        in a project if it is mentioned in the includes list, or is
-        contained under a directory mentioned in that list, *unless* it is
-        explicitly excluded or is contained under a directory that is
-        excluded. Take a look awt2d/build.properties for an example.
-
-    * nbproject/project.xml
-        This file defines a project for NetBeans for a "freeform" project.
-        Each declares several entity references, which are used later in the
-        project. For an example, see javadoc/nbproject/project.xml, which is
-        an ant-based project. Compare that with
-        jarzip/nbproject/project.xml, which is make-based. Not much
-        difference! That's because while the jarzip project is make-based,
-        it does not have any platform-specifc native code. Contrast that
-        with awt2d/nbproject/project.xml, which does have native code;
-        notice that it uses platform-specific entity references.
-
-    In summary, we recommend exploring the given projects, and choosing one
-    that most closely suits our needs.
-
-  Example: A project for working on collections
-    Let's create a project to work with on the collections classes. There's no native
-    code here, so an ant-based project will do. Therefore, the jconsole
-    project is a reasonable project to use as a starting point.
-
-   Clone the existing project
-    Make a directory for the collections project next to the existing projects:
-
-        % mkdir -p collections/nbproject
-
-    Copy files from the jconsole project:
-
-        % cp jconsole/build.properties collections
-        % cp jconsole/build.xml collections
-        % cp jconsole/nbproject/project.xml collections/nbproject
-
-   Change the set of files included in the project
-    The collections sources are all under one directory, and we want to include
-    them all. The same is true of the tests. So edit
-    collections/build.properties so that it contains these lines:
-
-        includes=\
-            java/util/
-        excludes=\
-            java/util/Calendar.java,\
-            java/util/jar/,\
-            java/util/logging/,\
-            java/util/prefs/,\
-            java/util/regex/,\
-            java/util/spi/,\
-            java/util/zip/,\
-            **/*-XLocales.java.template
-        jtreg.tests=\
-            java/util/**/*Collection/ \
-            java/util/**/*Map/ \
-            java/util/**/*Set/ \
-            java/util/**/*List/
-
-    Notice the trailing "/" in some of those pathnames: that tells NetBeans to
-    treat the path as a directory and include (or exclude) everything beneath
-    it in the hierarchy.  Note also how we include java/util, but then exclude
-    several directories under that which are not related to collections.
-
-    The build.xml for collections is about as simple as can be. First, change the
-    name of the project:
-
-        <project name="collections" default="build" basedir=".">
-
-    Then remove the -pre-compile target from the build.xml.  Change the
-    -post-compile target to create collections.jar without any manifest, and
-    to only contain the collections-related classes.  The jar task now looks
-    like this:
-
-        <jar destfile="${dist.dir}/lib/collections.jar">
-            <fileset dir="${classes.dir}">
-                <include name="java/util/*.class"/>
-                <exclude name="java/util/Calendar*.class"/>
-            </fileset>
-        </jar>
-
-    Also, change the clean target to remove collections.jar instead of
-    jconsole.jar.
-
-    Now edit project.xml file. NetBeans uses an internal name and a
-    user-visible name, both of which should be changed:
-
-        <name>Collections</name> <!-- Customized -->
-
-        <property name="name">collections</property> <!-- Customized -->
-
-    Inside of <ide-actions>, you'll see actions defined for "run" and
-    "debug". The Open JDK sources don't include any interesting Collections
-    demos, but leave these here for now: Chances are you'll find or create
-    some collections app of your own, and want to run and or debug it.
-
-    Now, open the Collections project in NetBeans. You'll find that it operates
-    just like all the other projects.
-
-    If/when you want to have this project run a collections demo, change the run
-    target in collections/build.xml to invoke it in whatever manner is appropriate
-    for the app. From NetBeans, you should be able to run and debug the app,
-    including setting breakpoints in collections code.
-
-Appendix 1: Customizations
-    There are several ways to customize NetBeans projects. These projects
-    share a common structure, based on common/shared.xml and
-    common/make.xml. Because of that sharing, some mechanisms described
-    below apply to most any project.
-
-    Several properties can be user-defined (and several should not be
-    user-defined!). There are different properties files read. Some default
-    targets can be overridden.
-
-  Property files
-    When projects are started, and when when ant runs (whether from NetBeans
-    or the command line), these properties files are loaded in the order
-    shown:
-
-        ${basedir}/nbproject/private/build.properties
-        $HOME/.openjdk/${ant.project.name}-build.properties
-        $HOME/.openjdk/build.properties
-        ${basedir}/build.properties
-
-    Recall that with ant, once a property is defined, its value cannot be
-    changed, so it's "first one wins".
-
-    To set or change a property for all your projects, put the change into
-    $HOME/.openjdk/build.properties. This will affect all projects,
-    regardless of how many copies of the Open JDK sources you have
-    installed.
-
-    Let's say you have 2 copies of the Open JDK sources installed on your
-    machine. To set or change a property for only the jconsole projects, but
-    for both of them, make the change in
-    $HOME/.openjdk/${ant.project.name}-build.properties. If you wanted to
-    make the change for only one of them, do it in that project's
-    ${basedir}/build.properties or
-    ${basedir}/nbproject/private/build.properties.
-
-    Note that the ${basedir}/build.properties file is provided as part of
-    the Open JDK sources. If you want to make a change for a particular
-    project, you can do so there. To be sure that you don't ever
-    accidentally check it in to the Open JDK sources, you might prefer to
-    change it in ${basedir}/nbproject/private/build.properties.
-
-  User-definable Properties
-    You can provide your own definitions for the properties listed below. We
-    don't recommend overriding the definitions of other properties.
-
-    The following two properties should be set before you try to use the
-    projects with NetBeans or ant:
-
-    * bootstrap.jdk
-        Default: None. Please set this, normally in
-        $HOME/.openjdk/build.properties.
-
-    * jtreg.home
-        Default: None. Please set this, normally in
-        $HOME/.openjdk/build.properties.
-
-    These options are for configuring the behavior of make:
-
-    * use.make
-        Default: Not set. Set this, normally in ${basedir}/build.properties,
-        for a project which is make-based.
-
-    * make
-        Default: The right make for the platform, at the normal location, set
-        in *install-dir*/jdk/make/netbeans/common/make.xml
-
-    * make.options
-        Default: Empty string. Set this to any options you want to pass to
-        make, normally in ${basedir}/build.properties.
-
-    The remaining options are for use at your discretion:
-
-    * javac.options
-        Default: -Xlint
-
-    * javac.debug
-        Default: true
-
-    * javac.debuglevel
-        Default: lines,vars,source
-
-    * javadoc.options
-        Default: Empty string.  Some projects will need to set this to
-        increase the heap for running javadoc.  For example, see the jconsole
-        project.
-
-    * javadoc.packagenames
-        Default: "none".  Set this only if your project has packages that
-        should be javadoc'd which are outside of those listed in the javadoc
-        target's packageset.  See the jconsole project for an example.
-
-    * jtreg.tests
-        Default: None. Set this to a list of tests and/or directories
-        containing regression tests, normally in
-        ${basedir}/build.properties.
-
-    * jtreg.options
-        Default: Empty string. See http://openjdk.java.net/jtreg
-
-    * jtreg.vm.options
-        Default: Empty string. See http://openjdk.java.net/jtreg
-
-    * jtreg.samevm
-        Default: false. See http://openjdk.java.net/jtreg
-
-  User-overridable Targets
-    The following targets are provided for your convenience in customizing
-    various standard actions of the build process. The default action for
-    each one is to do nothing.
-
-    These come in pairs, allowing your scripts to take some action before or
-    after a standard action.
-
-    * -pre-init
-        Runs before any other initialization has been done.
-
-    * -post-init
-        Runs before after all other initialization has been done.
-
-    * -pre-compile
-        Runs before compilation, whether via ant or make. Note that in the
-        case of make, it is before the -build-make target has run, not after
-        each individual make-run has run.
-
-    * -post-compile
-        Runs after compilation, whether via ant or make.
-
-    * -pre-jtreg
-        Runs before regression tests are run.
-
-    * -post-jtreg
-        Runs before after regression tests are run.
-
-    In a make-based project, you should override these targets to do the
-    build and clean actions required of your project.
-
-    * -build-make
-    * -clean-make
-
-Known Issues
-
-  Can't run nor debug a single test in the JConsole test
-    In most projects, you can run a single test by opening it in the editor,
-    and choosing Run File from the context menu.  If you try this with the a
-    JConsole test, instead you'll see that *all* tests from *all* projects
-    are run.  The workaround is to not try to run a single JConsole test.
-    Debugging is similarly problematic (both running and debugging use the
-    same underlying infrastructure).
-
-    If you do Run File a JConsole tests, you can always stop them by pressing
-    the stop button in the NetBeans output window.  But you'll be surprised to
-    learn that they are actually still running in the background.  The only
-    way out of this situation is to exit NetBeans.  A few more tests will run,
-    but after restarting NetBeans things will be OK.
-
-Attribution
-    UNIX is a registered trademark in the United States and other countries,
-    exclusively licensed through X/Open Company, Ltd.
-
diff --git a/make/jdk/netbeans/awt2d/README b/make/jdk/netbeans/awt2d/README
deleted file mode 100644
index 4df566dd157..00000000000
--- a/make/jdk/netbeans/awt2d/README
+++ /dev/null
@@ -1,220 +0,0 @@
-Working on  AWT and Java2D code with NetBeans
-
-  This project includes most of Java2D and AWT-related files,
-  allows easy navigation and builds from within NetBeans.
-  
-  Since both AWT and Java2D have lots of native code, this
-  project uses "make" targets for building.
-  
-  Unfortunately currently this project doesn't support
-  working with native code. Meaning, there is no navigation, code 
-  completion, refactoring, etc.
-  In the future we will provide native code support.
-  
-  You can certainly install the C/C++ pack for NetBeans 6.0
-  once it becomes available, or use any other editor for
-  working with C/C++ files.
-  
-  In order to use this project from within NetBeans you will have 
-  to perform a full jdk build first.
-  
-Here are the steps:
-   1. setup your jdk build environment as described in 
-      other documents (see build documentation)
-  
-   2. perform a full jdk build (preferably a FASTDEBUG build,
-      as it simplifies the debugging - the classes and object files
-      will be built with the debug information). 
-      You only need to build jdk's "all" target:
-        #> cd jdk/make
-        #> make all > build.log 2>&1
-  
-   3. set "make" and "make.options"  properties in your 
-      ~/.openjdk/build.properties file (see the main README 
-      file for more information on property files)
-      to set up the environment in NetBeans.
-
-      To get a list of variables you most likely will need to override
-      to make the the build work in NetBeans, you can do something like this 
-      (on Windows):
-        #>env | grep ALT
-        ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0
-        ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0
-
-      If your build is a FASTDEBUG build, don't forget
-      to set FASTDEBUG=true in the property file as well so that what you 
-      have built from the terminal matches what will be built from NetBeans.
-
-      Set "make.options" in your build.properties
-      accordingly:
-        make.options=\
-            ALT_JDK_IMPORT_PATH=c:/devtools/java/jdk1.7.0 \
-            ALT_BOOTDIR=c:/DevTools/java/jdk1.6.0 \
-            FASTDEBUG=true
-        make=c:/devtools/cygwin/bin/make
-
-   4. Windows only: make sure you either call vcvars32.bat
-      file which sets the compiler environment
-      (typically located in <YourVisualStudioInstallDir>/VC7/bin)
-      and start NetBeans from the same terminal,
-      or make Visual Studio register its environment
-      variables globally.
-      (When building on 64-bit Windows platform, use setenv.cmd
-       from Platform SDK instead of vcvars32, as described in the 
-       build documentation)
-
-   5. Now you can launch NetBeans
-
-Notes on building the project from NetBeans
-
-  If you work only with Java files, you can compile them
-  with "Compile Single File" target ("F9" by default), the ant build
-  will compile the class files into the correct directory automatically.
-
-  However, if you touched any of C/C++ files, 
-  you will need to use "build main project" ("F11") which launches
-  "make" on a set of directories.
-  
-  Same goes if you touched a Java file which has native
-  methods. You will need to run the build so that
-  "javah" can generate the JNI header files used by 
-  the native code.
-
-Demos
-
-  The default run target for this project is Font2DTest,
-  which is launched with the runtime you built.
-
-  You can also start other demos by selecting a demo
-  in the Project or Files view and choosing "Run" from 
-  the menu.
-  
-  In particular, there is a J2DBench demo project, 
-  which is a Java2D benchmark. To run it,
-  select java2d.J2DBench/build.xml node in the
-  "Projects" explorer and execute "Run" target.
-  For more information on this benchmark, see
-  the project's README file in the "Files" view.
-
-Notes on using CND (C/C++ pack) with this project and NetBeans.
-
-  As mentioned above currently a project for working with native code is not 
-  provided. However, you can set it up by yourself if you have 
-  access to CND pack for NetBeans 6.0.
-
-  First, install CND as described here (this is a page for CND 5.5,
-  there likely will be one for 6.0 as well):
-    http://www.netbeans.org/community/releases/55/cnd-install.html
-  and make sure everyting works it works.
-
-  Then, create a new C/C++ project of "from existing code" type (see page 
-  mentioned above for examples). The project should be located in the same 
-  directoryas this project is - on the same level. Call it something like 
-  "awt2d-native-${platform}-${arch}". So, for example, you may have
-    jdk/make/netbeans/awt2d
-    jdk/make/netbeans/awt2d-native-windows-i586
-
-  Specify the top level Makefile (jdk/make/Makefile), even though
-  you will not be using, as the Java awt2d project is set up
-  for building the workspace (thus make sure it's the default project,
-  so when you hit "Build Project" it's awt2d one that's chosen).
-
-  The most important thing is to specify the directories which will
-  be included into this project, the defines, and the directories for 
-  include files.
-  This will enable code completion and limited navigation.
-
-  Using the project wizard, select the source directories you're interested in.
-
-  For example, 
-   src/share/native/sun/java2d
-   src/windows/native/sun/java2d
-   ....
-  (this will recursively include the subdirectories)
-
-  Then set the list of the includes required by CND to enable code assistance.
-  You can get a complete list of include directories by looking at your
-  build log file and checking what directories are included with "-I" when 
-  the files you're interesed in are built (you can probably devise some
-  script to generate the list of include files relative to the native
-  cnd project directory, and the list of defines passed to the compiler)
-
-  For example, on Windows x86, you might have something like this
-  (a somewhat complete list of awt and 2d native directories on windows):
-
-  ../../src/share/javavm/export;
-  ../../src/share/native/common;
-  ../../src/share/native/sun/awt/debug;
-  ../../src/share/native/sun/awt/image/cvutils;
-  ../../src/share/native/sun/awt/image;
-  ../../src/share/native/sun/awt/medialib;
-  ../../src/share/native/sun/awt;
-  ../../src/share/native/sun/font/bidi;
-  ../../src/share/native/sun/font/layout;
-  ../../src/share/native/sun/font;
-  ../../src/share/native/sun/java2d/cmm/lcms;
-  ../../src/share/native/sun/java2d/cmm;
-  ../../src/share/native/sun/java2d/loops;
-  ../../src/share/native/sun/java2d/opengl;
-  ../../src/share/native/sun/java2d/pipe;
-  ../../src/share/native/sun/java2d;
-  ../../src/windows/javavm/export;
-  ../../src/windows/native/common;
-  ../../src/windows/native/sun/awt;
-  ../../src/windows/native/sun/java2d/d3d;
-  ../../src/windows/native/sun/java2d/opengl;
-  ../../src/windows/native/sun/java2d/windows;
-  ../../src/windows/native/sun/java2d;
-  ../../src/windows/native/sun/windows;
-  ../../build/windows-i586/tmp/sun/sun.awt/awt/CClassHeaders;
-  ../../build/windows-i586/tmp/sun/sun.awt/awt/obj;
-  ../../build/windows-i586/tmp/sun/sun.awt/awt/obj_gO;
-  ../../build/windows-i586/tmp/sun/sun.awt/jpeg/CClassHeaders;
-  ../../build/windows-i586/tmp/sun/sun.awt/splashscreen/CClassHeaders;
-  ../../build/windows-i586/tmp/sun/sun.font/fontmanager/CClassHeaders;
-  ../../build/windows-i586/tmp/sun/sun.font/t2k/CClassHeaders;
-  C:/devtools/VS2003/SDK/v1.1/include;
-  C:/devtools/VS2003/VC7/ATLMFC/INCLUDE;
-  C:/devtools/VS2003/VC7/INCLUDE;
-  C:/devtools/VS2003/VC7/PlatformSDK/include;
-  C:/devtools/VS2003/VC7/PlatformSDK/include/prerelease;
-
-  (you can format this into a single line with ';' delimiters and paste it
-  into the text field instead of entering them one by one)
-
-  Note that most paths are relative to the native project directory - 
-  this helps if you decide to relocate the workspace later. The ones that 
-  aren't relative are paths to external include directories, like those 
-  of the Platform SDK.
-  On Unix platforms these may be directories like /usr/include.
-
-  The parser must know some defines to correctly parse the source files,
-  these can also be obtained from the log file. For example, on Windows
-  x86 with debugging enabled, the defines would be something like this:
-    D3D_OVERLOADS; UNICODE; _UNICODE; WIN32; IAL; _LITTLE_ENDIAN; WIN32; _X86_; 
-    x86; WIN32_LEAN_AND_MEAN; INTERNAL_BUILD; JDK_MAJOR_VERSION='"1"'; 
-    JDK_MINOR_VERSION='"7"'; RELEASE=1.7.0-internal; DEBUG="true"
-
-  (again, format it into a single line with '; ' delimiter - note the 
-  space after ';' - and paste into the corresponding text field)
-
-  Note that the list of include directories will be different on different
-  platforms and architectures - consult you build log file.
-
-  After the project is created a loaded, you may want to check the list
-  of include files which weren't found (right-click on the native 
-  project root in Projects exprorer, and select "View failed #include Directives" 
-  from the popup menu. Update the inlcude directories list accordingly.
-
-  You can later create a different configuration for non-debug build,
-  just make a copy of your current configuration - call it ${arch}-debug
-  (in the native project's Properties dialog) and remove "DEBUG=true" from
-  the list of defines.
-
-  Note that with both Java and native projects opened the default
-  heap size NetBeans starts with might not be sufficient for comfortable work,
-  so you may need to increase it. You can do it either from the command line
-  or by editing your ~/.netbeans/dev/etc/netbeans.conf file and adding
-  something like this:
-     -J-Xms312m -J-Xmx512m -J-XX:PermSize=128m -J-XX:MaxPermSize=200m
-  to netbeans_default_options property.
diff --git a/make/jdk/netbeans/awt2d/build.properties b/make/jdk/netbeans/awt2d/build.properties
deleted file mode 100644
index 6c0d518b6af..00000000000
--- a/make/jdk/netbeans/awt2d/build.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    com/sun/java2d/ \
-    com/sun/image/ \
-    com/sun/imageio/ \
-    java/awt/ \
-    javax/imageio/ \
-    javax/print/ \
-    sun/dcpr/ \
-    sun/image/ \
-    sun/awt/ \
-    sun/splashscreen/ \
-    sun/xawt/ \
-    sun/headless/ \
-    sun/font/ \
-    sun/jpeg/ \
-    sun/cmm/ \
-    sun/jawt/ \
-    sun/text/ \
-    sun/java2d/ \
-    sun/print/
-excludes=\
-    java/awt/doc-files/ \
-    java/awt/im/ \
-    sun/awt/im/ \
-    sun/awt/resources/ \
-    sun/print/resources/
-demos=\
-    java2d/J2DBench/src/ \
-    java2d/J2DBench/options/ \
-    java2d/J2DBench/build.xml \
-    jfc/
-jtreg.tests=\
-    java/awt/ \
-    javax/imageio/ \
-    javax/print/ \
-    sun/awt/ \
-    sun/java2d/ \
-    closed/java/awt/ \
-    closed/javax/imageio/ \
-    closed/javax/print/ \
-    closed/sun/awt/ \
-    closed/sun/java2d/
-jtreg.options=-automatic
-use.make=true
-javadoc.options=-J-Xmx256m
diff --git a/make/jdk/netbeans/awt2d/build.xml b/make/jdk/netbeans/awt2d/build.xml
deleted file mode 100644
index 1af15abdbb3..00000000000
--- a/make/jdk/netbeans/awt2d/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="awt2d" default="build" basedir=".">
-    <description>
-        JDK: AWT &amp; Java2D Ant build file
-    </description>
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-build-make" depends="-make.init,-build-make-unix,-build-make-windows" if="use.make"/>
-
-    <target name="-build-make-unix" depends="-make.init" if="osfamily.unix">
-        <make-run target="all" dir="${make.dir}/java/awt"/>
-        <make-run target="all" dir="${make.dir}/sun/dcpr"/>
-        <make-run target="all" dir="${make.dir}/sun/image"/>
-        <make-run target="all" dir="${make.dir}/sun/awt"/>
-        <make-run target="all" dir="${make.dir}/sun/splashscreen"/>
-        <make-run target="all" dir="${make.dir}/sun/xawt"/>
-        <make-run target="all" dir="${make.dir}/sun/headless"/>
-        <make-run target="all" dir="${make.dir}/sun/font"/>
-        <make-run target="all" dir="${make.dir}/sun/jpeg"/>
-        <make-run target="all" dir="${make.dir}/sun/cmm"/>
-        <make-run target="all" dir="${make.dir}/sun/jawt"/>
-        <make-run target="all" dir="${make.dir}/sun/text"/>
-        <make-run target="all" dir="${make.dir}/com/sun/image"/>
-        <make-run target="all" dir="${make.dir}/com/sun/java2d"/>
-    </target>
-
-    <target name="-build-make-windows" depends="-make.init" if="os.windows">
-        <make-run target="all" dir="${make.dir}/java/awt"/>
-        <make-run target="all" dir="${make.dir}/sun/dcpr"/>
-        <make-run target="all" dir="${make.dir}/sun/awt"/>
-        <make-run target="all" dir="${make.dir}/sun/splashscreen"/>
-        <make-run target="all" dir="${make.dir}/sun/font"/>
-        <make-run target="all" dir="${make.dir}/sun/jpeg"/>
-        <make-run target="all" dir="${make.dir}/sun/cmm"/>
-        <make-run target="all" dir="${make.dir}/sun/jawt"/>
-        <make-run target="all" dir="${make.dir}/sun/text"/>
-        <make-run target="all" dir="${make.dir}/com/sun/image"/>
-        <make-run target="all" dir="${make.dir}/com/sun/java2d"/>
-    </target>
-
-    <target name="-clean-make" depends="-make.init,-clean-docs-tests" if="use.make">
-        <make-run target="clean" dir="${make.dir}/java/awt"/>
-        <make-run target="clean" dir="${make.dir}/sun/dcpr"/>
-        <make-run target="clean" dir="${make.dir}/sun/image"/>
-        <make-run target="clean" dir="${make.dir}/sun/awt"/>
-        <make-run target="clean" dir="${make.dir}/sun/splashscreen"/>
-        <make-run target="clean" dir="${make.dir}/sun/xawt"/>
-        <make-run target="clean" dir="${make.dir}/sun/font"/>
-        <make-run target="clean" dir="${make.dir}/sun/jpeg"/>
-        <make-run target="clean" dir="${make.dir}/sun/cmm"/>
-        <make-run target="clean" dir="${make.dir}/sun/jawt"/>
-        <make-run target="clean" dir="${make.dir}/sun/text"/>
-        <make-run target="clean" dir="${make.dir}/com/sun/image"/>
-        <make-run target="clean" dir="${make.dir}/com/sun/java2d"/>
-        <make-run target="clean" dir="${make.dir}/mkdemo/jfc"/>
-    </target>
-    
-    <target name="run" depends="-make.init">
-        <make-run target="all" dir="${make.dir}/mkdemo/jfc"/>
-        <property name="jvm.args" value=""/>
-        <java jar="${build.dir}/demo/jfc/Font2DTest/Font2DTest.jar"
-            fork="true"
-            classpath="${classes.dir}:${bootstrap.jdk}/jre/lib/rt.jar">
-            <jvmarg line="${jvm.args}"/>
-        </java>
-     </target>
-
-
-</project>
diff --git a/make/jdk/netbeans/awt2d/nbproject/project.xml b/make/jdk/netbeans/awt2d/nbproject/project.xml
deleted file mode 100644
index d151f854db4..00000000000
--- a/make/jdk/netbeans/awt2d/nbproject/project.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
-    <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
-    <!ENTITY demo-sources SYSTEM "../../common/demo-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
-    <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
-    <!ENTITY demo-view SYSTEM "../../common/demo-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>AWT &amp; Java2d</name> <!-- Customized -->
-            <properties>
-                <property name="name">awt2d</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &unix-sources;
-                &windows-sources;
-                &demo-sources;
-                &jtreg-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-                <action name="run">
-                    <target>run</target>
-                </action>
-                <action name="debug">
-                    <target>debug</target>
-                </action>
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &unix-view;
-                    &windows-view;
-                    &demo-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                    <ide-action name="run"/>
-                    <ide-action name="debug"/>
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/client_sanity/README b/make/jdk/netbeans/client_sanity/README
deleted file mode 100644
index 76d57db49c3..00000000000
--- a/make/jdk/netbeans/client_sanity/README
+++ /dev/null
@@ -1,15 +0,0 @@
-This NetBeans project corresponds to client sanity test suite in jdk/test/sanity/client.
-
-It simplifies working on the suite in NetBeans.
-
-It also includes the following custom tasks:
-
-prepare-bundle      creates dist/sanity.zip containing standalone bundle of the suite
-
-run-jemmy-browser   runs Jemmy browser for the ButtonDemo (hardcoded in build.xml file)
-                    The tool allows to explore the UI hierarchy.
-                    
-There is no task to run tests using JTReg. Please refer to corresponding README file 
-in the client sanity test suite folder on how to run the tests.
-
-Contact alexander.kouznetsov@oracle.com in case of issues.
\ No newline at end of file
diff --git a/make/jdk/netbeans/client_sanity/build.xml b/make/jdk/netbeans/client_sanity/build.xml
deleted file mode 100644
index 734fe10b036..00000000000
--- a/make/jdk/netbeans/client_sanity/build.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="SanityTests" default="default" basedir=".">
-    <description>Builds, tests, and runs the project SanityTests.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="SanityTests-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-    
-    <target name="prepare-bundle" depends="init">
-        <zip zipfile="${dist.dir}/sanity.zip">
-            <fileset dir="../../../test" includes="sanity/client/SwingSet/**"/>
-            <fileset dir="../../../test" includes="sanity/client/lib/**"/>
-            <fileset dir="../../../test" includes="sanity/client/ReadMe.txt"/>
-            <fileset dir="../../../test" includes="sanity/client/TEST.properties"/>            
-            <mappedresources>
-                <fileset dir="../../../test/sanity/client" includes="TEST.ROOT.template"/>
-                <globmapper from="TEST.ROOT.template" to="TEST.ROOT" />
-            </mappedresources>            
-        </zip>
-    </target>
-    
-    <target name="run-jemmy-browser" depends="init">
-        <java 
-            classpath="${run.classpath}"
-            classname="org.netbeans.jemmy.explorer.GUIBrowser" 
-            args="com.sun.swingset3.demos.button.ButtonDemo"/>
-    </target>
-    
-</project>
diff --git a/make/jdk/netbeans/client_sanity/manifest.mf b/make/jdk/netbeans/client_sanity/manifest.mf
deleted file mode 100644
index 1574df4a2de..00000000000
--- a/make/jdk/netbeans/client_sanity/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/make/jdk/netbeans/client_sanity/nbproject/build-impl.xml b/make/jdk/netbeans/client_sanity/nbproject/build-impl.xml
deleted file mode 100644
index 00073338957..00000000000
--- a/make/jdk/netbeans/client_sanity/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1429 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SanityTests-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or/>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.src3.dir}"/>
-                <available file="${src.src4.dir}"/>
-                <available file="${src.src2.dir}"/>
-                <available file="${src.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <property name="java.failonerror" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.src3.dir">Must set src.src3.dir</fail>
-        <fail unless="src.src4.dir">Must set src.src4.dir</fail>
-        <fail unless="src.src2.dir">Must set src.src2.dir</fail>
-        <fail unless="src.src.dir">Must set src.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src3.dir}:${src.src4.dir}:${src.src2.dir}:${src.src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src3.dir}:${src.src4.dir}:${src.src2.dir}:${src.src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src3.dir}:${src.src4.dir}:${src.src2.dir}:${src.src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set"/>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="SanityTests" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename SanityTests -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: SanityTests was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.src3.dir}:${src.src4.dir}:${src.src2.dir}:${src.src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.src4.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src3.dir}:${src.src4.dir}:${src.src2.dir}:${src.src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcal target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.src3.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.src4.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.src2.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.src3.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir=""/>
-        <copy todir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="" srcdir=""/>
-        <copy todir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: SanityTests was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/make/jdk/netbeans/client_sanity/nbproject/genfiles.properties b/make/jdk/netbeans/client_sanity/nbproject/genfiles.properties
deleted file mode 100644
index 48d69459d3f..00000000000
--- a/make/jdk/netbeans/client_sanity/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=0f9d9977
-build.xml.script.CRC32=f902e8b8
-build.xml.stylesheet.CRC32=8064a381@1.75.2.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=16caf60f
-nbproject/build-impl.xml.script.CRC32=c12f9d04
-nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
diff --git a/make/jdk/netbeans/client_sanity/nbproject/project.properties b/make/jdk/netbeans/client_sanity/nbproject/project.properties
deleted file mode 100644
index f3e9384ce3f..00000000000
--- a/make/jdk/netbeans/client_sanity/nbproject/project.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=SanityTests
-application.vendor=akouznet
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/SanityTests.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=*.cfg
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${libs.testng.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xmaxwarns 9999 -Xlint:all -Xlint:-serial
-javac.deprecation=false
-javac.external.vm=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=-ea
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.src.dir=..\\..\\..\\test\\sanity\\client\\SwingSet\\src
-src.src2.dir=..\\..\\..\\test\\sanity\\client\\lib\\SwingSet3\\src
-src.src3.dir=..\\..\\..\\test\\sanity\\client\\lib\\jemmy\\src
-src.src4.dir=..\\..\\..\\test\\sanity\\client\\lib\\Extensions\\src
diff --git a/make/jdk/netbeans/client_sanity/nbproject/project.xml b/make/jdk/netbeans/client_sanity/nbproject/project.xml
deleted file mode 100644
index 554dc3073d5..00000000000
--- a/make/jdk/netbeans/client_sanity/nbproject/project.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>SanityTests</name>
-            <source-roots>
-                <root id="src.src3.dir" name="lib\jemmy\src"/>
-                <root id="src.src4.dir" name="lib\Extensions\src"/>
-                <root id="src.src2.dir" name="lib\SwingSet3\src"/>
-                <root id="src.src.dir" name="SwingSet\src"/>
-            </source-roots>
-            <test-roots/>
-        </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/2"/>
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/common/README-ent b/make/jdk/netbeans/common/README-ent
deleted file mode 100644
index f7b31eb8666..00000000000
--- a/make/jdk/netbeans/common/README-ent
+++ /dev/null
@@ -1,25 +0,0 @@
-The *.ent files in this directory provide common functionality to the
-project.xml file of various projects.  There are different kinds,
-e.g. "-sources" from share-sources.ent
-
-* -sources: Defines sources used by a project.
-
-* -view: Defines project's sources that are displayed in the Projects tab.
-
-* -actions: Defines a set of actions of the project available from NetBeans.
-
-* -bindings: Defines the targets invoked by the corresponding actions.
-
-Note that -sources and -view files come in pairs: A project will have an
-entity reference for each, so that it uses and displays the sources.
-
-Similarly, -actions and -bindings are paired.
-
-These kinds are not paired:
-
-build-folder.ent: Defines the location of the folder where compiled classes,
-resources, etc. are placed.
-
-java-data-native.ent, java-data-no-native.ent: These define information about
-the location of classes and sources of native and non-native projects, where
-"native" is suggestive of "native code", that is, non-Java source code.
diff --git a/make/jdk/netbeans/common/architectures/README b/make/jdk/netbeans/common/architectures/README
deleted file mode 100644
index 1d19b4404fd..00000000000
--- a/make/jdk/netbeans/common/architectures/README
+++ /dev/null
@@ -1,3 +0,0 @@
-List of translations from Java's os.name and os.arch properties
-into the platform names used by the JDK makefiles.
-Add your own translations as needed.
diff --git a/make/jdk/netbeans/common/architectures/arch-amd64.properties b/make/jdk/netbeans/common/architectures/arch-amd64.properties
deleted file mode 100644
index fa7c293d516..00000000000
--- a/make/jdk/netbeans/common/architectures/arch-amd64.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-arch=i586
diff --git a/make/jdk/netbeans/common/architectures/arch-i386.properties b/make/jdk/netbeans/common/architectures/arch-i386.properties
deleted file mode 100644
index fa7c293d516..00000000000
--- a/make/jdk/netbeans/common/architectures/arch-i386.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-arch=i586
diff --git a/make/jdk/netbeans/common/architectures/arch-sparc.properties b/make/jdk/netbeans/common/architectures/arch-sparc.properties
deleted file mode 100644
index e8e59ebe9c4..00000000000
--- a/make/jdk/netbeans/common/architectures/arch-sparc.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-arch=sparc
diff --git a/make/jdk/netbeans/common/architectures/arch-x86.properties b/make/jdk/netbeans/common/architectures/arch-x86.properties
deleted file mode 100644
index fa7c293d516..00000000000
--- a/make/jdk/netbeans/common/architectures/arch-x86.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-arch=i586
diff --git a/make/jdk/netbeans/common/architectures/arch-x86_64.properties b/make/jdk/netbeans/common/architectures/arch-x86_64.properties
deleted file mode 100644
index a0758fdbb9b..00000000000
--- a/make/jdk/netbeans/common/architectures/arch-x86_64.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-arch=x86_64
diff --git a/make/jdk/netbeans/common/architectures/name-Bsd.properties b/make/jdk/netbeans/common/architectures/name-Bsd.properties
deleted file mode 100644
index e09f9404df3..00000000000
--- a/make/jdk/netbeans/common/architectures/name-Bsd.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-platform=bsd
diff --git a/make/jdk/netbeans/common/architectures/name-Linux.properties b/make/jdk/netbeans/common/architectures/name-Linux.properties
deleted file mode 100644
index fb4ae7a80e4..00000000000
--- a/make/jdk/netbeans/common/architectures/name-Linux.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-platform=linux
diff --git a/make/jdk/netbeans/common/architectures/name-Macosx.properties b/make/jdk/netbeans/common/architectures/name-Macosx.properties
deleted file mode 100644
index c07f80bfc38..00000000000
--- a/make/jdk/netbeans/common/architectures/name-Macosx.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-platform=macosx
diff --git a/make/jdk/netbeans/common/architectures/name-SunOS.properties b/make/jdk/netbeans/common/architectures/name-SunOS.properties
deleted file mode 100644
index 75b6cc8dc93..00000000000
--- a/make/jdk/netbeans/common/architectures/name-SunOS.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-platform=solaris
diff --git a/make/jdk/netbeans/common/build-folder.ent b/make/jdk/netbeans/common/build-folder.ent
deleted file mode 100644
index 02fa5d5f1f9..00000000000
--- a/make/jdk/netbeans/common/build-folder.ent
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<build-folder>
-    <location>${root}/build</location>
-</build-folder>
diff --git a/make/jdk/netbeans/common/closed-share-sources.ent b/make/jdk/netbeans/common/closed-share-sources.ent
deleted file mode 100644
index b94ffaea7e5..00000000000
--- a/make/jdk/netbeans/common/closed-share-sources.ent
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Closed-Source Packages</label>
-    <type>java</type>
-    <location>${root}/src/closed/share/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-    <encoding>US-ASCII</encoding>
-</source-folder>
-<source-folder>
-    <label>Closed-Source Packages</label>
-    <location>${root}/src/closed/share/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/closed-share-view.ent b/make/jdk/netbeans/common/closed-share-view.ent
deleted file mode 100644
index c03b53caeee..00000000000
--- a/make/jdk/netbeans/common/closed-share-view.ent
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree">
-    <label>Closed Sources</label>
-    <location>${root}/src/closed/share/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/demo-sources.ent b/make/jdk/netbeans/common/demo-sources.ent
deleted file mode 100644
index 1d3be852b62..00000000000
--- a/make/jdk/netbeans/common/demo-sources.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Demos</label>
-    <location>${root}/src/share/demo</location>
-    <includes>${demos}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/demo-view.ent b/make/jdk/netbeans/common/demo-view.ent
deleted file mode 100644
index 161acf04942..00000000000
--- a/make/jdk/netbeans/common/demo-view.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree"> <!-- hierarchy in demo/ dir isn't packages -->
-    <label>Demos</label>
-    <location>${root}/src/share/demo</location>
-    <includes>${demos}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/file-view.ent b/make/jdk/netbeans/common/file-view.ent
deleted file mode 100644
index e7d20392f8c..00000000000
--- a/make/jdk/netbeans/common/file-view.ent
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-file>
-    <location>README.html</location>
-</source-file>
-<source-file>
-    <location>README</location>
-</source-file>
-<source-file>
-    <location>build.properties</location>
-</source-file>
-<source-file>
-    <location>build.xml</location>
-</source-file>
diff --git a/make/jdk/netbeans/common/java-data-native.ent b/make/jdk/netbeans/common/java-data-native.ent
deleted file mode 100644
index b50ea59afe7..00000000000
--- a/make/jdk/netbeans/common/java-data-native.ent
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
-    <compilation-unit>
-        <package-root>${root}/src/share/classes</package-root>
-        <package-root>${root}/src/macosx/classes</package-root>
-        <package-root>${root}/src/solaris/classes</package-root>
-        <package-root>${root}/src/windows/classes</package-root>
-        <classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
-        <built-to>${root}/../build/${platform}-${arch}/jdk/classes</built-to>
-        <javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
-        <source-level>1.8</source-level>
-    </compilation-unit>
-    <compilation-unit>
-        <package-root>${root}/test</package-root>
-        <unit-tests/>
-        <classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
-        <source-level>1.8</source-level>
-    </compilation-unit>
-</java-data>
diff --git a/make/jdk/netbeans/common/java-data-no-native.ent b/make/jdk/netbeans/common/java-data-no-native.ent
deleted file mode 100644
index 882072e0e9c..00000000000
--- a/make/jdk/netbeans/common/java-data-no-native.ent
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
-    <compilation-unit>
-        <package-root>${root}/src/share/classes</package-root>
-        <classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
-        <built-to>${root}/../build/${platform}-${arch}/jdk/classes</built-to>
-        <javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
-        <source-level>1.8</source-level>
-    </compilation-unit>
-    <compilation-unit>
-        <package-root>${root}/test</package-root>
-        <unit-tests/>
-        <classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
-        <source-level>1.8</source-level>
-    </compilation-unit>
-</java-data>
diff --git a/make/jdk/netbeans/common/jtreg-sources.ent b/make/jdk/netbeans/common/jtreg-sources.ent
deleted file mode 100644
index 1574445b6f2..00000000000
--- a/make/jdk/netbeans/common/jtreg-sources.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Tests</label>
-    <location>${root}/test</location>
-    <includes>${jtreg.tests}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/jtreg-view.ent b/make/jdk/netbeans/common/jtreg-view.ent
deleted file mode 100644
index 5901b1bf4bc..00000000000
--- a/make/jdk/netbeans/common/jtreg-view.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree"> <!-- hierarchy in test/ dir isn't packages -->
-    <label>Tests</label>
-    <location>${root}/test</location>
-    <includes>${jtreg.tests}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/macosx-sources.ent b/make/jdk/netbeans/common/macosx-sources.ent
deleted file mode 100644
index 779ec604f63..00000000000
--- a/make/jdk/netbeans/common/macosx-sources.ent
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!--
-  OS X is a trademark in the United States and other countries,
-  exclusively licensed through Apple Inc.
--->
-<source-folder>
-    <label>Sources for OS X™ Platform</label>
-    <type>java</type>
-    <location>${root}/src/macosx/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-    <encoding>US-ASCII</encoding>
-</source-folder>
-<source-folder>
-    <label>Sources for OS X™ Platform</label>
-    <location>${root}/src/macosx/classes</location>
-</source-folder>
diff --git a/make/jdk/netbeans/common/macosx-view.ent b/make/jdk/netbeans/common/macosx-view.ent
deleted file mode 100644
index 8696adb6e25..00000000000
--- a/make/jdk/netbeans/common/macosx-view.ent
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!--
-  OS X is a trademark in the United States and other countries,
-  exclusively licensed through Apple Inc.
--->
-<source-folder style="tree">
-    <label>Sources for OS X™ Platform</label>
-    <location>${root}/src/macosx/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/make.xml b/make/jdk/netbeans/common/make.xml
deleted file mode 100644
index 7fd5fae3fc5..00000000000
--- a/make/jdk/netbeans/common/make.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="make" basedir="..">
-    
-    <target name="-make.init" depends="-init,-pre-init.linux,-pre-init.macosx,-pre-init.solaris,-pre-init.windows,-pre-init.macosx">
-        <property name="make.options" value=""/> <!-- default, can be overridden per user or per project -->
-    </target>
-    
-    <target name="-pre-init.linux" if="os.linux">
-        <property name="platform" value="linux"/>
-        <property name="make" value="make"/>
-    </target>
-
-    <target name="-pre-init.macosx" if="os.macosx">
-        <property name="platform" value="macosx"/>
-        <property name="make" value="make"/>
-    </target>
-
-    <target name="-pre-init.solaris" if="os.solaris">
-        <property name="platform" value="solaris"/>
-        <property name="make" value="gmake"/>
-    </target>
-
-    <target name="-pre-init.windows" if="os.windows">
-        <property name="platform" value="windows"/>
-        <property name="make" value="c:/cygwin/bin/make"/>
-    </target>
-    
-    <macrodef name="make-run">
-            <attribute name="target"/>
-            <attribute name="dir"/>
-            <attribute name="opts" default=""/>
-            <sequential>
-                <echo message="Entering directory `@{dir}'"/>
-                <exec executable="${make}" dir="@{dir}" failonerror="true">
-                    <arg value="@{target}"/>
-                    <arg line="@{opts}"/>
-                    <arg line="${make.options}"/>
-                    <!-- Unset key variables -->
-                    <env key="JAVA_HOME" value=""/>
-                    <env key="LANG" value=""/>
-                    <env key="LD_LIBRARY_PATH" value=""/>
-                </exec>
-                <echo message="Leaving directory `@{dir}'"/>
-            </sequential>
-        </macrodef>
-</project>
diff --git a/make/jdk/netbeans/common/properties.ent b/make/jdk/netbeans/common/properties.ent
deleted file mode 100644
index 67c4271bae9..00000000000
--- a/make/jdk/netbeans/common/properties.ent
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<property name="root">../../..</property>
-<property-file>../common/architectures/name-${os.name}.properties</property-file>
-<property name="platform">windows</property>
-<property-file>../common/architectures/arch-${os.arch}.properties</property-file>
-<property name="arch">${os.arch}</property>
-<property-file>nbproject/private/build.properties</property-file>
-<property-file>${user.home}/.openjdk/${name}-build.properties</property-file>
-<property-file>${user.home}/.openjdk/build.properties</property-file>
-<property-file>build.properties</property-file>
-<property name="bootstrap.jdk">${java.home}/..</property>
-<property name="jtreg.home">${env.JT_HOME}</property>
-<property name="jtreg.tests">**</property>
diff --git a/make/jdk/netbeans/common/sample-sources.ent b/make/jdk/netbeans/common/sample-sources.ent
deleted file mode 100644
index b6e4e3a2c69..00000000000
--- a/make/jdk/netbeans/common/sample-sources.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Samples</label>
-    <location>${root}/src/share/sample</location>
-    <includes>${samples}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/sample-view.ent b/make/jdk/netbeans/common/sample-view.ent
deleted file mode 100644
index c2f63479901..00000000000
--- a/make/jdk/netbeans/common/sample-view.ent
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree"> <!-- hierarchy in sample/ dir isn't packages -->
-    <label>Samples</label>
-    <location>${root}/src/share/sample</location>
-    <includes>${samples}</includes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/share-sources.ent b/make/jdk/netbeans/common/share-sources.ent
deleted file mode 100644
index da2f850a77a..00000000000
--- a/make/jdk/netbeans/common/share-sources.ent
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Sources for All Platforms</label>
-    <type>java</type>
-    <location>${root}/src/share/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-    <encoding>US-ASCII</encoding>
-</source-folder>
-<source-folder>
-    <label>Sources for All Platforms</label>
-    <location>${root}/src/share/classes</location>
-</source-folder>
diff --git a/make/jdk/netbeans/common/share-view.ent b/make/jdk/netbeans/common/share-view.ent
deleted file mode 100644
index 66912992ce0..00000000000
--- a/make/jdk/netbeans/common/share-view.ent
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree">
-    <label>Sources for All Platforms</label>
-    <location>${root}/src/share/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/shared.xml b/make/jdk/netbeans/common/shared.xml
deleted file mode 100644
index 2f1b27bf31b..00000000000
--- a/make/jdk/netbeans/common/shared.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="shared" basedir="..">
-
-    <import file="make.xml"/>
-
-    <target name="-tstamp">
-        <tstamp>
-            <format property="build.time" pattern="MM/dd/yyyy hh:mm aa"/>
-            <format property="build.fullversion.time" pattern="MM/dd/yyyy_HH_mm"/>
-        </tstamp>
-    </target>
-
-    <target name="-first-init" depends="-tstamp">
-        <mkdir dir="${user.home}/.openjdk"/>
-        <property name="workspace-user-build.properties" location="nbproject/private/build.properties"/>
-        <property file="${workspace-user-build.properties}"/>
-        <property file="${user.home}/.openjdk/${ant.project.name}-build.properties"/>
-        <property name="user-build.properties" location="${user.home}/.openjdk/build.properties"/>
-        <property file="${user-build.properties}"/>
-        <property file="${basedir}/build.properties"/>
-        <property environment="env."/>
-    </target>
-    <target name="-warn-about-bootstrap.jdk" depends="-first-init" unless="bootstrap.jdk">
-        <property name="fallback.jdk" location="${java.home}/.."/>
-        <echo level="warning">Warning: falling back to building against ${fallback.jdk}</echo>
-        <echo level="warning">Please define bootstrap.jdk=.../recent/jdk7/snapshot in ${user-build.properties} or ${workspace-user-build.properties}</echo>
-    </target>
-    <target name="-pre-init">
-        <!-- Invoked before -first-init. -->
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-post-init">
-        <!-- Invoked after -project-init. -->
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init" description="Initial configuration used by everything else." depends="-pre-init,-first-init,-project-init,-post-init"/>
-    <target name="-project-init" depends="-warn-about-bootstrap.jdk">
-        <property name="root" location="../../.."/>
-        <property file="../common/architectures/name-${os.name}.properties"/>
-        <property name="platform" value="windows"/>
-        <property file="../common/architectures/arch-${os.arch}.properties"/>
-        <property name="arch" value="${os.arch}"/>
-        <echo level="verbose">System configuration claims architecture is ${platform}-${arch}</echo>
-        <property name="build.dir" location="${root}/build/${platform}-${arch}"/>
-        <property name="bin.dir" location="${build.dir}/bin"/>
-        <property name="make.dir" location="${root}/make"/> <!-- this is old build make files! -->
-        <property name="gensrc.dir" location="${build.dir}/gensrc"/>
-        <property name="classes.dir" location="${build.dir}/classes"/>
-        <property name="jtreg.dir" location="${build.dir}/jtreg/${ant.project.name}"/>
-        <property name="dist.dir" value="${root}/dist"/>
-        <property name="includes" value="(nothing)"/>
-        <property name="excludes" value=""/>
-        <property name="javadoc.dir" location="${build.dir}/javadoc/${ant.project.name}"/>
-        <condition property="os.macosx">
-            <os family="mac"/>
-        </condition>
-        <condition property="os.linux">
-            <os name="linux"/>
-        </condition>
-        <condition property="os.solaris">
-            <os name="SunOS"/>
-        </condition>
-        <condition property="osfamily.unix">
-            <os family="unix"/>
-        </condition>
-        <condition property="os.windows">
-            <os family="windows"/>
-        </condition>
-        <condition property="platform.src.dir" value="${root}/src/solaris/classes">
-            <os family="unix"/>
-        </condition>
-        <condition property="platform.src.dir" value="${root}/src/windows/classes">
-            <os family="windows"/>
-        </condition>
-        <property name="share.src.dir" value="${root}/src/share/classes"/>
-        <property name="bootstrap.jdk" location="${fallback.jdk}"/>
-        <!-- XXX ensure that bootstrap.jdk meets some minimum version requirements (TBD) -->
-        <condition property="bootstrap.javac" value="${bootstrap.jdk}/bin/javac">
-            <available file="${bootstrap.jdk}/bin/javac"/>
-        </condition>
-        <condition property="bootstrap.javac" value="${bootstrap.jdk}\bin\javac.exe">
-            <available file="${bootstrap.jdk}\bin\javac.exe"/>
-        </condition>
-        <fail unless="bootstrap.javac">${bootstrap.jdk} does not appear to be a functional JDK; no javac found.</fail>
-        <property name="javac.options" value="-Xlint"/> <!-- default, can be overridden per user or per project -->
-        <property name="javac.debug" value="true"/>  <!-- default, can be overridden per user or per project -->
-        <property name="javac.debuglevel" value="lines,vars,source"/>  <!-- default, can be overridden per user or per project -->
-        <macrodef name="jdk-javac">
-            <attribute name="srcdir"/>
-            <attribute name="includes" default="${includes}"/>
-            <attribute name="excludes" default="${excludes}"/>
-            <attribute name="classesdir" default="${classes.dir}"/>
-            <sequential>
-                <mkdir dir="@{classesdir}"/>
-                <javac srcdir="@{srcdir}" includes="@{includes}" excludes="@{excludes}" sourcepath=""
-                    destdir="@{classesdir}" fork="true" executable="${bootstrap.javac}"
-                    debug="${javac.debug}" debuglevel="${javac.debuglevel}">
-                    <!-- Mandatory for compiling partial JDK sources against a snapshot; should NEVER be used for any other purpose: -->
-                    <compilerarg value="-XDignore.symbol.file=true"/>
-                    <compilerarg line="${javac.options}"/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <available property="have.closed.src" file="${root}/src/closed/share/classes" type="dir"/>
-    </target>
-
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-
-    <target name="build" depends="-init,-pre-compile,-build-ant,-build-make,-post-compile" description="Build sources."/>
-    <target name="-do-build-ant">
-        <depend srcdir="${share.src.dir}:${platform.src.dir}:${root}/src/closed/share/classes:${gensrc.dir}" destdir="${classes.dir}" cache="${build.dir}/depcache" includes="${includes}" excludes="${excludes}"/>
-        <mkdir dir="${gensrc.dir}"/>
-        <jdk-javac srcdir="${share.src.dir}:${platform.src.dir}:${gensrc.dir}"/>
-        <property name="copy.excludes" value="**/*.java,**/package.html,**/doc-files/"/>
-        <copy todir="${classes.dir}">
-            <fileset dir="${share.src.dir}" includes="${includes}" excludes="${excludes},${copy.excludes}"/>
-            <fileset dir="${platform.src.dir}" includes="${includes}" excludes="${excludes},${copy.excludes}"/>
-        </copy>
-        <antcall target="-maybe-do-build-ant-closed"/>
-    </target>
-    <target name="-maybe-do-build-ant-closed" if="have.closed.src">
-        <jdk-javac srcdir="${root}/src/closed/share/classes"/>
-        <copy todir="${classes.dir}">
-            <fileset dir="${root}/src/closed/share/classes" includes="${includes}" excludes="${excludes},${copy.excludes}"/>
-        </copy>
-    </target>
-    <target name="-build-ant" depends="-init" unless="use.make">
-        <antcall target="-do-build-ant"/>
-    </target>
-    <target name="-build-make" depends="-init" if="use.make"> <!-- override me to call <make-run> -->
-        <echo level="info">No make target defined for this project; falling back to simple Java build</echo>
-        <antcall target="-do-build-ant"/>
-    </target>
-
-    <target name="clean" depends="-init,-clean-docs-tests,-clean-ant,-clean-make" description="Clean build products."/>
-    <target name="-do-clean-ant">
-        <!-- XXX first s/\.java/.class/g in includes and excludes! -->
-        <delete dir="${classes.dir}" includes="${includes}" excludes="${excludes}" includeemptydirs="true"/>
-        <delete dir="${gensrc.dir}" includes="${includes}" excludes="${excludes}" includeemptydirs="true"/>
-        <delete dir="${build.dir}/depcache"/>
-    </target>
-    <target name="-clean-docs-tests">
-        <delete dir="${javadoc.dir}" includeemptydirs="true"/>
-        <delete dir="${jtreg.dir}" includeemptydirs="true"/>
-    </target>
-    <target name="-clean-ant" depends="-init" unless="use.make">
-        <antcall target="-do-clean-ant"/>
-    </target>
-    <target name="-clean-make" depends="-init" if="use.make"> <!-- override me to call <make-run> -->
-        <echo level="info">No make clean target defined for this project; falling back to simple Java clean</echo>
-        <antcall target="-do-clean-ant"/>
-    </target>
-
-    <target name="compile-single" depends="-init">
-        <fail unless="srcdir">Must set property 'srcdir'</fail>
-        <fail unless="includes">Must set property 'includes'</fail>
-        <jdk-javac srcdir="${srcdir}" includes="${includes}" excludes=""/>
-    </target>
-    <target name="debug-fix" depends="-init" if="netbeans.home">
-        <fail unless="class">Must set property 'class'</fail>
-        <antcall target="compile-single">
-            <param name="includes" value="${class}.java"/>
-        </antcall>
-        <nbjpdareload>
-            <fileset dir="${classes.dir}">
-                <include name="${class}.class"/>
-            </fileset>
-        </nbjpdareload>
-    </target>
-
-    <target name="-taskdef-jtreg" depends="-init" unless="jtreg.defined">
-        <fail message="Cannot locate jtreg: please set jtreg.home to its location">
-            <condition>
-                <not>
-                    <isset property="jtreg.home"/>
-                </not>
-            </condition>
-        </fail>
-        <fail message="jtreg is not installed in ${jtreg.home}">
-            <condition>
-                <not>
-                    <and>
-                        <available file="${jtreg.home}/lib/jtreg.jar"/>
-                        <available file="${jtreg.home}/lib/javatest.jar"/>
-                    </and>
-                </not>
-            </condition>
-        </fail>
-        <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant">
-            <classpath>
-                <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
-                <pathelement location="${jtreg.home}/lib/javatest.jar"/>
-            </classpath>
-        </taskdef>
-        <property name="jtreg.defined" value="true"/>
-    </target>
-    <target name="-check-tests-defined" unless="jtreg.tests">
-        <fail>You must define jtreg.tests to select some tests to run.</fail>
-    </target>
-    <target name="-jtreg-setup">
-        <property name="jtreg.vm.options" value=""/> <!-- default, can be overridden per user or per project -->
-        <property name="jtreg.options" value=""/> <!-- default, can be overridden per user or per project -->
-        <property name="jtreg.samevm" value="false"/>  <!-- default, can be overridden per user or per project -->
-    </target>
-    <target name="-jtreg-ant" unless="use.make">
-        <jtreg dir="${root}/test" samevm="${jtreg.samevm}" verbose="summary"
-               jdk="${bootstrap.jdk}"
-               failonerror="false" resultproperty="jtreg.result"
-               javacoptions="-g"
-               vmoptions="-Xbootclasspath/p:${classes.dir} ${jtreg.vm.options}"
-               reportDir="${jtreg.dir}/JTreport"
-               workDir="${jtreg.dir}/JTwork"
-               includes="${jtreg.tests}">
-            <arg line="${jtreg.options}"/>
-        </jtreg>
-    </target>
-    <target name="-jtreg-make" if="use.make">
-        <jtreg dir="${root}/test" samevm="${jtreg.samevm}" verbose="summary"
-               failonerror="false" resultproperty="jtreg.result"
-               jdk="${build.dir}"
-               vmoptions="${jtreg.vm.options}"
-               javacoptions="-g"
-               reportDir="${jtreg.dir}/JTreport"
-               workDir="${jtreg.dir}/JTwork"
-               includes="${jtreg.tests}">
-            <arg line="${jtreg.options}"/>
-        </jtreg>
-    </target>
-    <target name="-pre-jtreg">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-post-jtreg">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-jtreg" depends="-init,-pre-jtreg,-taskdef-jtreg,-check-tests-defined,-jtreg-setup,-jtreg-make,-jtreg-ant,-post-jtreg">
-        <property name="jtreg.report" location="${jtreg.dir}/JTreport/html/report.html"/>
-        <condition property="jtreg.passed">
-            <equals arg1="${jtreg.result}" arg2="0"/>
-        </condition>
-    </target>
-    <target name="test" depends="jtreg"/> <!-- Allow use of existing finger muscle memory from command line. -->
-    <target name="jtreg" depends="-jtreg" description="Run jtreg-based tests." unless="jtreg.passed">
-        <fail>${jtreg.report}: some tests failed.</fail>
-    </target>
-    <target name="jtreg-nb" depends="-jtreg" if="netbeans.home" unless="jtreg.passed">
-        <makeurl file="${jtreg.report}" property="jtreg.report.url"/>
-        <nbbrowse url="${jtreg.report.url}#Results"/>
-        <fail>Some tests failed; see report for details.</fail>
-    </target>
-    <target name="jtreg-debug-nb" depends="-init" if="netbeans.home">
-        <!-- No package decls -> "source root" is immediately containing dir -->
-        <dirname file="${root}/test/${jtreg.tests}" property="test.dir"/>
-        <nbjpdastart addressproperty="jpda.address" name="${ant.project.name}" transport="dt_socket">
-            <bootclasspath>
-                <pathelement location="${classes.dir}"/>
-                <pathelement location="${bootstrap.jdk}/jre/lib/rt.jar"/>
-            </bootclasspath>
-            <classpath>
-                <pathelement location="${jtreg.dir}/JTwork/classes"/>
-            </classpath>
-            <sourcepath>
-                <pathelement location="${share.src.dir}"/>
-                <pathelement location="${platform.src.dir}"/>
-                <pathelement location="${root}/src/closed/share/classes"/>
-                <pathelement location="${test.dir}"/>
-            </sourcepath>
-        </nbjpdastart>
-        <antcall target="-jtreg">
-            <param name="jtreg.vm.options" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-        </antcall>
-    </target>
-
-    <target name="debug" depends="-init" if="netbeans.home">
-        <!-- No package decls -> "source root" is immediately containing dir -->
-        <dirname file="${root}/test/${jtreg.tests}" property="test.dir"/>
-        <nbjpdastart addressproperty="jpda.address" name="${ant.project.name}" transport="dt_socket">
-            <bootclasspath>
-                <pathelement location="${classes.dir}"/>
-                <pathelement location="${bootstrap.jdk}/jre/lib/rt.jar"/>
-            </bootclasspath>
-            <sourcepath>
-                <pathelement location="${share.src.dir}"/>
-                <pathelement location="${platform.src.dir}"/>
-                <pathelement location="${root}/src/closed/share/classes"/>
-                <pathelement location="${test.dir}"/>
-            </sourcepath>
-        </nbjpdastart>
-        <antcall target="run">
-            <param name="jvm.args" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-        </antcall>
-    </target>
-
-    <target name="javadoc" depends="-init" description="Build basic Javadoc for public packages.">
-        <property name="javadoc.options" value=""/> <!-- default, can be overridden per user or per project -->
-        <!-- Note: even with this default value, includes/excludes
-         from share.src.dir get javadoc'd; see packageset below -->
-        <property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project -->
-        <javadoc destdir="${javadoc.dir}" source="1.8"
-            windowtitle="UNOFFICIAL" failonerror="true" use="true"
-            author="false" version="false"
-            packagenames="${javadoc.packagenames}">
-            <header><![CDATA[<strong>Unofficial Javadoc</strong> generated from developer sources for preview purposes only]]></header>
-            <arg line="${javadoc.options}"/>
-            <bootclasspath>
-                <path location="${bootstrap.jdk}/jre/lib/rt.jar"/>
-                <path location="${classes.dir}"/>
-            </bootclasspath>
-            <sourcepath>
-                <pathelement location="${share.src.dir}"/>
-                <pathelement location="${platform.src.dir}"/>
-                <pathelement location="${root}/src/closed/share/classes"/>
-                <pathelement location="${root}/src/share/doc/stub"/>
-            </sourcepath>
-            <!-- XXX just <fileset> (restricted further to **/*.java) and no <packageset> -->
-            <!-- means that {@link some.package} will not work, which is no good. -->
-            <!-- (It correctly skips excluded single classes, but not if packageset is also included, -->
-            <!-- which also causes duplicates in the class index for included files.) -->
-            <packageset dir="${share.src.dir}" includes="${includes}" excludes="${excludes}">
-                <or>
-                    <filename name="java/"/>
-                    <filename name="javax/"/>
-                    <filename name="org/ietf/jgss/"/>
-                    <filename name="org/omg/"/>
-                    <filename name="org/w3c/"/>
-                    <filename name="org/xml/sax/"/>
-                </or>
-            </packageset>
-        </javadoc>
-    </target>
-    <target name="javadoc-nb" depends="javadoc" if="netbeans.home">
-        <nbbrowse file="${javadoc.dir}/index.html"/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/common/standard-actions.ent b/make/jdk/netbeans/common/standard-actions.ent
deleted file mode 100644
index 2cfa925c7c9..00000000000
--- a/make/jdk/netbeans/common/standard-actions.ent
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<ide-action name="build"/>
-<ide-action name="rebuild"/>
-<ide-action name="clean"/>
-<ide-action name="javadoc"/>
-<separator/>
-<ide-action name="test"/>
diff --git a/make/jdk/netbeans/common/standard-bindings.ent b/make/jdk/netbeans/common/standard-bindings.ent
deleted file mode 100644
index 49a7bd0a2d7..00000000000
--- a/make/jdk/netbeans/common/standard-bindings.ent
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<action name="build">
-    <target>build</target>
-</action>
-<action name="clean">
-    <target>clean</target>
-</action>
-<action name="rebuild">
-    <target>clean</target>
-    <target>build</target>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/share/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/solaris/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/solaris/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/windows/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/windows/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="compile.single">
-    <target>compile-single</target>
-    <property name="srcdir">${root}/src/closed/share/classes</property>
-    <context>
-        <property>includes</property>
-        <folder>${root}/src/closed/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="test">
-    <target>jtreg-nb</target>
-</action>
-<action name="run.single">
-    <target>jtreg-nb</target>
-    <context>
-        <property>jtreg.tests</property>
-        <folder>${root}/test</folder>
-        <pattern>\.(java|sh)$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <separated-files>,</separated-files>
-        </arity>
-    </context>
-</action>
-<action name="debug.single">
-    <target>jtreg-debug-nb</target>
-    <context>
-        <property>jtreg.tests</property>
-        <folder>${root}/test</folder>
-        <pattern>\.(java|sh)$</pattern>
-        <format>relative-path</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/share/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/solaris/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/solaris/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/windows/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/windows/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="debug.fix">
-    <target>debug-fix</target>
-    <property name="srcdir">${root}/src/closed/share/classes</property>
-    <context>
-        <property>class</property>
-        <folder>${root}/src/closed/share/classes</folder>
-        <pattern>\.java$</pattern>
-        <format>relative-path-noext</format>
-        <arity>
-            <one-file-only/>
-        </arity>
-    </context>
-</action>
-<action name="javadoc">
-    <target>javadoc-nb</target>
-</action>
diff --git a/make/jdk/netbeans/common/unix-sources.ent b/make/jdk/netbeans/common/unix-sources.ent
deleted file mode 100644
index f971251909f..00000000000
--- a/make/jdk/netbeans/common/unix-sources.ent
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!--
-  UNIX is a registered trademark in the United States and other countries,
-  exclusively licensed through X/Open Company, Ltd.
--->
-<source-folder>
-    <label>Sources for Unix® Platform</label>
-    <type>java</type>
-    <location>${root}/src/solaris/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-    <encoding>US-ASCII</encoding>
-</source-folder>
-<source-folder>
-    <label>Sources for Unix® Platform</label>
-    <location>${root}/src/solaris/classes</location>
-</source-folder>
diff --git a/make/jdk/netbeans/common/unix-view.ent b/make/jdk/netbeans/common/unix-view.ent
deleted file mode 100644
index 05b9df5146a..00000000000
--- a/make/jdk/netbeans/common/unix-view.ent
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!--
-  UNIX is a registered trademark in the United States and other countries,
-  exclusively licensed through X/Open Company, Ltd.
--->
-<source-folder style="tree">
-    <label>Sources for Unix® Platform</label>
-    <location>${root}/src/solaris/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/common/windows-sources.ent b/make/jdk/netbeans/common/windows-sources.ent
deleted file mode 100644
index 8211eb14ded..00000000000
--- a/make/jdk/netbeans/common/windows-sources.ent
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder>
-    <label>Sources for Windows Platform</label>
-    <type>java</type>
-    <location>${root}/src/windows/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-    <encoding>US-ASCII</encoding>
-</source-folder>
-<source-folder>
-    <label>Sources for Windows Platform</label>
-    <location>${root}/src/windows/classes</location>
-</source-folder>
diff --git a/make/jdk/netbeans/common/windows-view.ent b/make/jdk/netbeans/common/windows-view.ent
deleted file mode 100644
index fce6193ed7b..00000000000
--- a/make/jdk/netbeans/common/windows-view.ent
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<source-folder style="tree">
-    <label>Sources for Windows Platform</label>
-    <location>${root}/src/windows/classes</location>
-    <includes>${includes}</includes>
-    <excludes>${excludes}</excludes>
-</source-folder>
diff --git a/make/jdk/netbeans/j2se/README b/make/jdk/netbeans/j2se/README
deleted file mode 100644
index 8def695e801..00000000000
--- a/make/jdk/netbeans/j2se/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Building the entire JavaSE source base
-
-This project exists for building the entire JavaSE source base which is in the
-jdk directory.  Rather than using this project for editing Java code, please
-use one of the other projects which will narrow the scope of the sources to a
-more manageable size.
-
-Given that it can take a rather long time to build all of the JavaSE code, you
-might prefer to build this project from the command line using ant.
-
-The results of building this project are all in the directory
-<install-dir>/jdk/build/<platform>-<arch>.  The other subprojects, with the
-exception of the "world" project, place their results in same build directory.
diff --git a/make/jdk/netbeans/j2se/build.properties b/make/jdk/netbeans/j2se/build.properties
deleted file mode 100644
index 4afc7c1f080..00000000000
--- a/make/jdk/netbeans/j2se/build.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    **
-use.make=true
-javadoc.options=-J-Xmx256m
diff --git a/make/jdk/netbeans/j2se/build.xml b/make/jdk/netbeans/j2se/build.xml
deleted file mode 100644
index afb1f8c9d2a..00000000000
--- a/make/jdk/netbeans/j2se/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="jdk" default="build" basedir=".">
-    <description>
-        jdk ant build file
-    </description>
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-build-make" depends="-make.init" if="use.make">
-        <make-run target="jdk" dir="${root}/.."/>
-    </target>
-
-    <target name="-clean-make" depends="-make.init" if="use.make">
-        <make-run target="clean-jdk" dir="${root}/.."/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/j2se/nbproject/project.xml b/make/jdk/netbeans/j2se/nbproject/project.xml
deleted file mode 100644
index dd15578f98a..00000000000
--- a/make/jdk/netbeans/j2se/nbproject/project.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
-    <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
-    <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
-    <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
-    <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>JDK</name> <!-- Customized -->
-            <properties>
-                <property name="name">jdk</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &macosx-sources;
-                &unix-sources;
-                &windows-sources;
-                &build-folder;
-		&jtreg-sources;
-            </folders>
-            <ide-actions>
-                <action name="build">
-                    <target>build</target>
-                </action>
-                <action name="rebuild">
-                    <target>clean</target>
-                    <target>build</target>
-                </action>
-                <action name="clean">
-                    <target>clean</target>
-                </action>
-                <!--
-                <action name="javadoc">
-                    <target>javadoc-nb</target>
-                </action>
-                -->
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &macosx-view;
-                    &unix-view;
-                    &windows-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    <ide-action name="build"/>
-                    <ide-action name="rebuild"/>
-                    <ide-action name="clean"/>
-                    <!--
-                    <ide-action name="javadoc"/>
-                    -->
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/jarzip/README b/make/jdk/netbeans/jarzip/README
deleted file mode 100644
index b757213631d..00000000000
--- a/make/jdk/netbeans/jarzip/README
+++ /dev/null
@@ -1,38 +0,0 @@
-Working on Jar and Zip code using the NetBeans IDE
-
-This note is specific to working on jar and zip; much more information about
-working with this project and others is in ../README.
-
-This project allows developers to work on the Jar and Zip in java.util.jar and
-java.util.zip, as well as the jar tool itself in sun.tools.jar.  The NetBeans
-project supports editing, building, testing, and debugging of this code.  This
-is a make-based project, and involves compilation of native code.  Some of
-this native code is provided by the JDK community, but the base zip library is
-from http://www.zlib.net.
-
-Please note: The most recent zlib is version 1.2.3.  We are providing zlib
-version 1.1.3, modified to include security fixes that have been added since
-that release.
-
-Source code layout
-
-The jar tool depends on the jar library, which in turn depends on the zip
-library.  This in turn depends on some native code, which in turn depends on
-the zlib library:
-
-sun.tools.jar depends on
-  java.util.jar, which depends on
-    java.util.zip, which depends on
-      src/share/native/java/util/zip, which depends on
-        src/share/native/java/util/zip/zlib-1.1.3.
-
-The project is set up to invoke make on the zip code first.  This make target
-compile the native zip code, as well as the Java sources in java.util.zip.
-Subsequent invocations of make build java.util.jar, and then sun.tools.jar.
-
-Insofar as NetBeans use is concerned with Java code, most things you are used
-to.  You can build the project.  There are several regression tests included,
-run either as a group via Test Project or individually via Run File.
-Debugging is also supported, try Debug File.  Since the jar tool needs command
-line parameters in order to do anything interesting, it is not hooked up to
-Run Project in NetBeans.
diff --git a/make/jdk/netbeans/jarzip/build.properties b/make/jdk/netbeans/jarzip/build.properties
deleted file mode 100644
index fa8d6f005dd..00000000000
--- a/make/jdk/netbeans/jarzip/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    java/util/jar/ \
-    java/util/zip/ \
-    sun/tools/jar/ \
-    com/sun/java/util/jar/pack/ 
-excludes=\
-    sun/tools/jar/resources/
-jtreg.tests=\
-    tools/jar/ \
-    java/util/jar/ \
-    java/util/zip/
-javadoc.packagenames=\
-    sun.tools.jar.*
-javadoc.options=-J-Xmx256m
-use.make=true
diff --git a/make/jdk/netbeans/jarzip/build.xml b/make/jdk/netbeans/jarzip/build.xml
deleted file mode 100644
index 178ecfa6966..00000000000
--- a/make/jdk/netbeans/jarzip/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="jarzip" default="build" basedir=".">
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-build-make" depends="-make.init" if="use.make">
-        <make-run target="all" dir="${make.dir}/java/zip"/>
-        <make-run target="all" dir="${make.dir}/java/jar"/>
-        <make-run target="all" dir="${make.dir}/sun/jar"/>
-    </target>
-
-    <target name="-clean-make" depends="-make.init,-clean-docs-tests" if="use.make">
-        <make-run target="clean" dir="${make.dir}/java/zip"/>
-        <make-run target="clean" dir="${make.dir}/java/jar"/>
-        <make-run target="clean" dir="${make.dir}/sun/jar"/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/jarzip/nbproject/project.xml b/make/jdk/netbeans/jarzip/nbproject/project.xml
deleted file mode 100644
index 12079ed12c3..00000000000
--- a/make/jdk/netbeans/jarzip/nbproject/project.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>Jar &amp; Zip</name> <!-- Customized -->
-            <properties>
-                <property name="name">jarzip</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &jtreg-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-no-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/jconsole/README b/make/jdk/netbeans/jconsole/README
deleted file mode 100644
index f06f7033c3e..00000000000
--- a/make/jdk/netbeans/jconsole/README
+++ /dev/null
@@ -1,67 +0,0 @@
-Working on JConsole Using the NetBeans IDE
-
-This JConsole NetBeans project allows a developer interested in making changes
-to and/or fixing bugs in the jconsole tool to modify, build, run and test
-jconsole in a standalone manner as well as generating the javadoc for the
-JConsole plugin API.
-
-README FIRST
-
-  make/netbeans/README to get started with NetBeans IDE and OpenJDK, and
-  working with the OpenJDK NetBeans projects.
-
-WORKING WITH JCONSOLE
-
-JConsole doesn't contain native code. It's a pure java tool. You don't need to
-have all the Java SE sources to work on JConsole but just the following subset:
-
-            make/netbeans/ 
-            src/share/classes/com/sun/tools/jconsole/
-            src/share/classes/sun/tools/jconsole/
-            test/TEST.ROOT
-            test/sun/tools/jconsole/
-
-The set of actions supported by this project are:
-
-* Build Project:
-
-  - Compiles JConsole's source files and puts the class files under
-    build/${platform}-${arch}/classes.
-
-  - Generates JConsole's jar file under dist/lib/jconsole.jar
-
-    This new jar file could be used to patch an existing JDK installation
-    by replacing the jar file at <jdk-home>/lib/jconsole.jar, then calling
-    <jdk-home>/bin/jconsole will make use of the new jar file.
-
-* Generate Javadoc for Project
-
-  - Generates the javadoc for the JConsole Plugin API source files,
-    i.e. the ones under src/share/classes/com/sun/tools/jconsole.
-
-  - The javadoc is generated under build/${platform}-${arch}/javadoc/jconsole.
-
-* Test Project
-
-  - Runs the JConsole jtreg unit tests located under test/sun/tools/jconsole.
-
-  - The test results are written under
-
-        build/${platform}-${arch}/jtreg/jconsole
-
-    and the HTML test report can be found at
-
-        build/${platform}-${arch}/jtreg/jconsole/JTreport/report.html
-
-* Run Project
-
-  - Runs the newly built JConsole tool.
-
-* Clean Project
-
-  - Cleans the files created by this projet under build and dist.
-
-IMPORTANT NOTE
-
-  Please make sure to follow carefully the governance rules documented at
-  http://openjdk.dev.java.net/
diff --git a/make/jdk/netbeans/jconsole/build.properties b/make/jdk/netbeans/jconsole/build.properties
deleted file mode 100644
index 27e7741382a..00000000000
--- a/make/jdk/netbeans/jconsole/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    com/sun/tools/jconsole/ \
-    sun/tools/jconsole/
-excludes=\
-    sun/tools/jconsole/Version.java.template
-jtreg.tests=\
-    sun/tools/jconsole/
-javadoc.packagenames=\
-    com.sun.tools.jconsole.*
-javadoc.options=-J-Xmx256m
-
-build.jdk.version = 1.7.0
-build.release = ${build.jdk.version}-opensource
-build.number = b00
-jconsole.version = ${build.release}-${user.name}-${build.number}
-jconsole.args = -debug
diff --git a/make/jdk/netbeans/jconsole/build.xml b/make/jdk/netbeans/jconsole/build.xml
deleted file mode 100644
index 90b44346ebe..00000000000
--- a/make/jdk/netbeans/jconsole/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
- Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="jconsole" default="build" basedir=".">
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-pre-compile">
-        <copy
-            file="${root}/src/share/classes/sun/tools/jconsole/Version.java.template"
-            tofile="${gensrc.dir}/sun/tools/jconsole/Version.java"/>
-        <replace
-            file="${gensrc.dir}/sun/tools/jconsole/Version.java"
-            token="@@jconsole_version@@"
-            value="${jconsole.version}"/>
-    </target>
-
-    <target name="-post-compile">
-        <mkdir dir="${dist.dir}/lib"/>
-        <jar destfile="${dist.dir}/lib/jconsole.jar"
-             manifest="${classes.dir}/sun/tools/jconsole/manifest">
-            <fileset dir="${classes.dir}">
-                <include name="sun/tools/jconsole/**/*.class"/>
-                <include name="com/sun/tools/jconsole/**/*.class"/>
-                <include name="sun/tools/jconsole/resources/*.properties"/>
-                <include name="sun/tools/jconsole/resources/*.gif"/>
-                <include name="sun/tools/jconsole/resources/*.png"/>
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="run" depends="-init,build">
-        <property name="jvm.args" value=""/>
-        <java classname="sun.tools.jconsole.JConsole"
-              fork="true"
-              classpath="${classes.dir}:${bootstrap.jdk}/lib/tools.jar">
-            <jvmarg line="${jvm.args}"/>
-            <arg line="${jconsole.args}"/>
-        </java>
-    </target>
-
-    <target name="clean" depends="-init,shared.clean">
-        <delete file="${dist.dir}/lib/jconsole.jar"/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/jconsole/nbproject/project.xml b/make/jdk/netbeans/jconsole/nbproject/project.xml
deleted file mode 100644
index bbe397921fb..00000000000
--- a/make/jdk/netbeans/jconsole/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>JConsole</name> <!-- Customized -->
-            <properties>
-                <property name="name">jconsole</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &jtreg-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-                <action name="run">
-                    <target>run</target>
-                </action>
-                <action name="debug">
-                    <target>debug</target>
-                </action>
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                    <ide-action name="run"/>
-                    <ide-action name="debug"/>
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-no-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/jdbc/README b/make/jdk/netbeans/jdbc/README
deleted file mode 100644
index 2b3c1cad2a3..00000000000
--- a/make/jdk/netbeans/jdbc/README
+++ /dev/null
@@ -1,64 +0,0 @@
-Working on JDBC Using the NetBeans IDE
-
-This JDBC NetBeans project allows a developer interested in making changes
-to and/or fixing bugs in the JDBC source to modify, build, run and test
-as well as generating the javadoc.
-
-README FIRST
-
-  make/netbeans/README to get started with NetBeans IDE and OpenJDK, and
-  working with the OpenJDK NetBeans projects.
-
-WORKING WITH JDBC
-
-JDBC doesn't contain native code. You don't need to
-have all the Java SE sources to work on JDBC but just the following subset:
-
-            make/netbeans/ 
-            src/share/classes/com/sun/rowset/
-            src/share/classes/java/sql/
-            src/share/classes/javax/sql/
-            test/TEST.ROOT
-            test/java/sql/
-            test/javax/sql/
-
-The set of actions supported by this project are:
-
-* Build Project:
-
-  - Compiles JDBC source files and puts the class files under
-    build/${platform}-${arch}/classes.
-
-  - Generates JDBC's jar file under dist/lib/jdbc.jar
-
-    This new jar file could be used to patch an existing JDK installation
-    by using -Xbootclasspath/p:$MYSRC/dist/lib/jdbc.jar
-
-* Generate Javadoc for Project
-
-  - Generates the javadoc for the JDBC source files,
-
-  - The javadoc is generated under build/${platform}-${arch}/javadoc/jdbc.
-
-* Test Project
-
-  - Runs the JDBC jtreg unit tests located under test/java/sql or test/javax/sql.
-
-  - The test results are written under
-
-        build/${platform}-${arch}/jtreg/jdbc
-
-    and the HTML test report can be found at
-
-        build/${platform}-${arch}/jtreg/jdbc/JTreport/html/report.html
-
-
-
-* Clean Project
-
-  - Cleans the files created by this projet under build and dist.
-
-IMPORTANT NOTE
-
-  Please make sure to follow carefully the governance rules documented at
-  http://openjdk.dev.java.net/
diff --git a/make/jdk/netbeans/jdbc/build.properties b/make/jdk/netbeans/jdbc/build.properties
deleted file mode 100644
index 59c1f633e67..00000000000
--- a/make/jdk/netbeans/jdbc/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    java/sql/ \
-    javax/sql/ \
-    com/sun/rowset/
-excludes= 
-jtreg.tests=\
-    java/sql/ \
-    javax/sql/
-
-build.jdk.version = 1.8.0
-build.release = ${build.jdk.version}-opensource
-build.number = b00
-jdbc.version = ${build.release}-${user.name}-${build.number}
-jdbc.args = -debug
-javadoc.options=-J-Xmx256m -Xdoclint:none -keywords  -quiet
diff --git a/make/jdk/netbeans/jdbc/build.xml b/make/jdk/netbeans/jdbc/build.xml
deleted file mode 100644
index 233e9b82c3f..00000000000
--- a/make/jdk/netbeans/jdbc/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="jdbc" default="build" basedir=".">
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-post-compile">
-        <mkdir dir="${dist.dir}/lib"/>
-        <jar destfile="${dist.dir}/lib/jdbc.jar">
-            <fileset dir="${classes.dir}">
-                <include name="java/sql/**/*.class"/>
-                <include name="javax/sql/**/*.class"/>
-                <include name="com/sun/rowset/**/*.class"/>
-            </fileset>
-        </jar>
-    </target>
-
-    
-    <target name="clean" depends="-init,shared.clean">
-        <delete file="${dist.dir}/lib/jdbc.jar"/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/jdbc/nbproject/project.xml b/make/jdk/netbeans/jdbc/nbproject/project.xml
deleted file mode 100644
index af7e5580b69..00000000000
--- a/make/jdk/netbeans/jdbc/nbproject/project.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>JDBC</name> <!-- Customized -->
-            <properties>
-                <property name="name">jdbc</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &jtreg-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-                <action name="run">
-                    <target>run</target>
-                </action>
-                <action name="debug">
-                    <target>debug</target>
-                </action>
-               <action name="rowsetjavadoc">
-                    <target>debug</target>
-                </action>
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                    <ide-action name="run"/>
-                    <ide-action name="debug"/>
-                    <ide-action name="rowsetjavadoc"/>
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-no-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/jdwpgen/build.xml b/make/jdk/netbeans/jdwpgen/build.xml
deleted file mode 100644
index da67672e2af..00000000000
--- a/make/jdk/netbeans/jdwpgen/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="jdwpgen" default="default" basedir=".">
-    <description>Builds, tests, and runs the project jdwpgen.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="jdwpgen-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml b/make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml
deleted file mode 100644
index 9997d00d9e7..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/build-impl.xml
+++ /dev/null
@@ -1,642 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jdwpgen-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.src.dir">Must set src.src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="/does/not/exist" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings b/make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings
deleted file mode 100644
index cb205d1aa21..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/findbugs.settings
+++ /dev/null
@@ -1,72 +0,0 @@
-#FindBugs User Preferences
-#Mon Jun 15 13:37:16 PDT 2009
-detectorAbnormalFinallyBlockReturn=AbnormalFinallyBlockReturn|false
-detectorAbstractClassEmptyMethods=AbstractClassEmptyMethods|false
-detectorAbstractOverriddenMethod=AbstractOverriddenMethod|false
-detectorArrayBasedCollections=ArrayBasedCollections|false
-detectorArrayWrappedCallByReference=ArrayWrappedCallByReference|false
-detectorBloatedAssignmentScope=BloatedAssignmentScope|false
-detectorBloatedSynchronizedBlock=BloatedSynchronizedBlock|false
-detectorClassEnvy=ClassEnvy|false
-detectorCollectStatistics=CollectStatistics|false
-detectorConfusingAutoboxedOverloading=ConfusingAutoboxedOverloading|false
-detectorConstantListIndex=ConstantListIndex|false
-detectorCopiedOverriddenMethod=CopiedOverriddenMethod|false
-detectorCustomBuiltXML=CustomBuiltXML|false
-detectorCyclomaticComplexity=CyclomaticComplexity|false
-detectorDateComparison=DateComparison|false
-detectorDeclaredRuntimeException=DeclaredRuntimeException|false
-detectorDeletingWhileIterating=DeletingWhileIterating|false
-detectorDubiousListCollection=DubiousListCollection|false
-detectorFieldCouldBeLocal=FieldCouldBeLocal|false
-detectorFinalParameters=FinalParameters|false
-detectorFloatingPointLoops=FloatingPointLoops|false
-detectorInefficientStringBuffering=InefficientStringBuffering|false
-detectorInheritanceTypeChecking=InheritanceTypeChecking|false
-detectorJDBCVendorReliance=JDBCVendorReliance|false
-detectorListIndexedIterating=ListIndexedIterating|false
-detectorLiteralStringComparison=LiteralStringComparison|false
-detectorLocalSynchronizedCollection=LocalSynchronizedCollection|false
-detectorLostExceptionStackTrace=LostExceptionStackTrace|false
-detectorManualArrayCopy=ManualArrayCopy|false
-detectorMethodReturnsConstant=MethodReturnsConstant|false
-detectorNeedlessAutoboxing=NeedlessAutoboxing|false
-detectorNeedlessCustomSerialization=NeedlessCustomSerialization|false
-detectorNeedlessInstanceRetrieval=NeedlessInstanceRetrieval|false
-detectorNeedlessMemberCollectionSynchronization=NeedlessMemberCollectionSynchronization|false
-detectorNonCollectionMethodUse=NonCollectionMethodUse|false
-detectorNonOwnedSynchronization=NonOwnedSynchronization|false
-detectorNonRecycleableTaglibs=NonRecycleableTaglibs|false
-detectorOrphanedDOMNode=OrphanedDOMNode|false
-detectorOverlyConcreteParameter=OverlyConcreteParameter|false
-detectorParallelLists=ParallelLists|false
-detectorPartiallyConstructedObjectAccess=PartiallyConstructedObjectAccess|false
-detectorPossibleIncompleteSerialization=PossibleIncompleteSerialization|false
-detectorPossibleMemoryBloat=PossibleMemoryBloat|false
-detectorPossiblyRedundantMethodCalls=PossiblyRedundantMethodCalls|false
-detectorSQLInLoop=SQLInLoop|false
-detectorSection508Compliance=Section508Compliance|false
-detectorSillynessPotPourri=SillynessPotPourri|false
-detectorSloppyClassReflection=SloppyClassReflection|false
-detectorSluggishGui=SluggishGui|false
-detectorSpoiledChildInterfaceImplementor=SpoiledChildInterfaceImplementor|false
-detectorSpuriousThreadStates=SpuriousThreadStates|false
-detectorStaticArrayCreatedInMethod=StaticArrayCreatedInMethod|false
-detectorStaticMethodInstanceInvocation=StaticMethodInstanceInvocation|false
-detectorSuspiciousComparatorReturnValues=SuspiciousComparatorReturnValues|false
-detectorSuspiciousJDKVersionUse=SuspiciousJDKVersionUse|false
-detectorSuspiciousWaitOnConcurrentObject=SuspiciousWaitOnConcurrentObject|false
-detectorSyncCollectionIterators=SyncCollectionIterators|false
-detectorTailRecursion=TailRecursion|false
-detectorUnnecessaryStoreBeforeReturn=UnnecessaryStoreBeforeReturn|false
-detectorUnrelatedCollectionContents=UnrelatedCollectionContents|false
-detectorUnrelatedReturnValues=UnrelatedReturnValues|false
-detectorUseAddAll=UseAddAll|false
-detectorUseCharacterParameterizedMethod=UseCharacterParameterizedMethod|false
-detectorUseEnumCollections=UseEnumCollections|false
-detectorUseSplit=UseSplit|false
-detectorUseToArray=UseToArray|false
-detector_threshold=2
-effort=default
-filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false
-filter_settings_neg=|
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties b/make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties
deleted file mode 100644
index a82838d7b0f..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=b40e775f
-build.xml.script.CRC32=af8dc3cb
-build.xml.stylesheet.CRC32=958a1d3e
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b40e775f
-nbproject/build-impl.xml.script.CRC32=624d12c5
-nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/project.properties b/make/jdk/netbeans/jdwpgen/nbproject/project.properties
deleted file mode 100644
index 3cc3b8f4f19..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/project.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-application.title=jdwpgen
-application.vendor=sun
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jdwpgen.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.tools-jdwpgen=../../src/classes/build/tools/jdwpgen
-file.reference.tools-src=../../src/classes
-includes=build/tools/jdwpgen/**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:all
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=true
-javadoc.nonavbar=true
-javadoc.notree=true
-javadoc.private=true
-javadoc.splitindex=false
-javadoc.use=false
-javadoc.version=false
-javadoc.windowtitle=
-main.class=jdwpgen.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.src.dir=${file.reference.tools-src}
-test.src.dir=test
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/project.xml b/make/jdk/netbeans/jdwpgen/nbproject/project.xml
deleted file mode 100644
index c7bf8edefc0..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/project.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>jdwpgen</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/jdwpgen/nbproject/sqe.properties b/make/jdk/netbeans/jdwpgen/nbproject/sqe.properties
deleted file mode 100644
index 978ef5bc013..00000000000
--- a/make/jdk/netbeans/jdwpgen/nbproject/sqe.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Path to FindbugsSettingsFile (relative)
-findbugs.settings.file=findbugs.settings
diff --git a/make/jdk/netbeans/jmx/README b/make/jdk/netbeans/jmx/README
deleted file mode 100644
index 4e6c0e14a3b..00000000000
--- a/make/jdk/netbeans/jmx/README
+++ /dev/null
@@ -1,90 +0,0 @@
-Working On Java[TM] Management Extensions (JMX[TM)) Using NetBeans IDE
-
-README FIRST
- 
-  make/netbeans/README for getting started with NetBeans IDE and OpenJDK,
-  and workings with OpenJDK NetBeans projects. 
-
-This README focusses on working on the OpenJDK JMX API using NetBeans IDE.
-
-  This NetBeans project for OpenJDK JMX allows you to modify, build, and test
-  the JMX API in a standalone manner. It can also be used to generate 
-  the JMX API documentation for preview.
-
-  The JMX API does not contain native code. It is a pure java library. 
-  You do not need to install all the Java SE sources to work on JMX,
-  you only need the following subset:
-
-            make/netbeans/
-            src/share/classes/com/sun/jmx/
-            src/share/classes/javax/management/
-            test/TEST.ROOT
-            test/com/sun/management/
-            test/java/lang/management/
-            test/javax/management/
-
-  If you don't want to build the whole JDK, you will also need a 
-  pre-built version of OpenJDK (or JDK 7). Edit your 
-
-            $HOME/.openjdk/build.properties
-
-  file (create it if you don't have one yet) and set the bootstrap.jdk variable 
-  point to that JDK:
-
-            bootstrap.jdk=<JDK_7_HOME>
-
-  Then from within NetBeans IDE open the JMX project, and invoke the 
-  "Build Project" and "Test Project" target. Note that running all the
-  tests for JMX takes a while. The build may also fail if it doesn't 
-  find a directory named src/${platform}. This may happen if you haven't
-  installed all OpenJDK sources. In this case, you can simply
-  create an empty directory with the name expected by the build mechanism.
-         
-  Which tests are run are defined by the jtreg.test variable declared
-  in make/netbeans/jmx/build.properties. Note that JMX tests are all
-  placed under test/javax/management/.   test/java/lang/management/
-  and test/com/sun/management/ contain some tests that happen to
-  use JMX and we therefore recommend to run these tests too.
-
-  If you are working on a JMX fix, don't forget to create a 
-  corresponding jtreg unit test under test/javax/management/. 
-  You can look at existing tests to see how this is done.
-
-The set of actions defined in this project are:
-
-* Build Project:
-
-  - Compiles JMX API source files and puts the class files under
-    build/${platform}-${arch}/classes.
-
-  - Generates a JMX jar file under dist/lib/jmx.jar. To use your modified
-    JMX classes instead of the built-in JDK classes you will need
-    to put this jar file in front of the bootclasspath:
-
-       java -Xbootclasspath/p:dist/lib/jmx.jar mytestapp.MyAppMainClass
-
-* Generate Javadoc for Project
-
-  - Generates the JMX API Documentation under
-
-    build/${platform}-${arch}/javadoc/jmx.
-
-* Test Project
-
-  - Runs the JMX and Management and Monitoring jtreg unit tests.
-
-  - The results are written under build/${platform}-${arch}/jtreg/jmx
-    and the HTML test report can be found at
-    build/${platform}-${arch}/jtreg/jmx/JTreport/report.html.
-
-* Clean Project
-
-  - Cleans the files created by this projet under build/ 
-    Some files may remain.
-
-
-IMPORTANT NOTE
-
-  Please make sure to follow carefully the governance rules documented at
-  http://openjdk.dev.java.net/
-
diff --git a/make/jdk/netbeans/jmx/build.properties b/make/jdk/netbeans/jmx/build.properties
deleted file mode 100644
index 38509a59384..00000000000
--- a/make/jdk/netbeans/jmx/build.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    com/sun/jmx/ \
-    javax/management/ \
-    org/omg/stub/javax/management/
-
-excludes=
-
-jtreg.tests=\
-    com/sun/jmx/ \
-    com/sun/management/ \
-    java/lang/management/ \
-    javax/management/
-
-project.spec.version			= JMX API 2.0
-
-jar.jmx.name				= jmx.jar
-jar.jmx.sealed				= true
-jar.jmx.spec.title			= JSR 003, 160, 255 - JMX API
-jar.jmx.spec.version			= ${project.spec.version}
-jar.jmx.spec.vendor			= Oracle Corporation
-jar.jmx.impl.title			= JSR 003, 160, 255 - OpenJDK 7 JMX API
-jar.jmx.impl.vendor			= Project OpenJDK
-
-javadoc.options=-J-Xmx256m
diff --git a/make/jdk/netbeans/jmx/build.xml b/make/jdk/netbeans/jmx/build.xml
deleted file mode 100644
index c7b48a45d5c..00000000000
--- a/make/jdk/netbeans/jmx/build.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
- Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="jmx" default="build" basedir=".">
-
-     <import file="../common/shared.xml"/>
-
-    <target name="-pre-init">
-        <!-- Set the values for build date and time -->
-        <tstamp>
-	    <format property="BUILD_DATE"        pattern="yyyy.MM.dd_HH:mm:ss_z" />
-	    <format property="BUILD_DATE_SIMPLE" pattern="dd_MMM_yyyy" />
-        </tstamp>
-
-        <!-- These properties are set here instead of in the build.properties file, -->
-        <!-- because they depend on the values of BUILD_DATE and BUILD_DATE_SIMPLE  -->
-        <!-- At this time, ./build.properties has not been loaded yet. -->
-        <property name="project.build.name" value="openjdk-bXX"/>
-	<property name="project.build.fulltag"
-                  value="${ant.project.name}-${project.build.name}-${BUILD_DATE}" />
-
-        <!-- unchecked warnings will be fixed in JMX 2.0 as part of the work
-             being done on JSR 255 new features                              -->
-        <property name="javac.options"
-                  value="-Xlint -Xlint:-deprecation"/>
-    </target>
-
-
-    <target name="-pre-compile" depends="-init">
-	<!-- Dir to keep generated stub source -->
-        <mkdir dir="${gensrc.dir}" />
-    </target>
-
-
-    <target name="-post-compile" depends="-init"
-            description="Jar JMX class files (including RMI stubs)" >
-       <mkdir dir="${dist.dir}/lib"/>
-       <jar jarfile="${dist.dir}/lib/${jar.jmx.name}"
-	    update="true"
-	    index="false"
-	    duplicate="fail">
-	    <fileset dir="${classes.dir}" excludes="**/*.java"/>
-	    <manifest >
-		<attribute name="Built-By"                 value="${user.name}" />
-		<section name="common">
-		    <attribute name="Sealed"                 value="${jar.jmx.sealed}" />
-		    <attribute name="Specification-Title"    value="${jar.jmx.spec.title}" />
-		    <attribute name="Specification-Version"  value="${jar.jmx.spec.version}" />
-		    <attribute name="Specification-Vendor"   value="${jar.jmx.spec.vendor}" />
-		    <attribute name="Implementation-Title"   value="${jar.jmx.impl.title}" />
-		    <attribute name="Implementation-Version" value="${project.build.fulltag}" />
-		    <attribute name="Implementation-Vendor"  value="${jar.jmx.impl.vendor}" />
-		</section>
-	    </manifest>
-       </jar>
-    </target>
-
-    <target name="clean" depends="-init,shared.clean">
-        <delete file="${dist.dir}/lib/${jar.jmx.name}"/>
-    </target>
-</project>
diff --git a/make/jdk/netbeans/jmx/nbproject/project.xml b/make/jdk/netbeans/jmx/nbproject/project.xml
deleted file mode 100644
index c1ef7f2804c..00000000000
--- a/make/jdk/netbeans/jmx/nbproject/project.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY sample-sources SYSTEM "../../common/sample-sources.ent">
-    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>JMX™</name> <!-- Customized -->
-            <properties>
-                <property name="name">jmx</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &jtreg-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &jtreg-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-no-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/swing/README b/make/jdk/netbeans/swing/README
deleted file mode 100644
index 29907601eae..00000000000
--- a/make/jdk/netbeans/swing/README
+++ /dev/null
@@ -1,62 +0,0 @@
-Working on Swing Using the NetBeans IDE
-
-This Swing NetBeans project allows a developer interested in making changes to
-and/or fixing bugs in swing to modify, build, run and test swing in a
-standalone manner as well as generating the javadoc for the swing classes.
-
-README FIRST
-
-  make/netbeans/README to get started with NetBeans IDE and OpenJDK, and
-  working with the OpenJDK NetBeans projects.
-
-WORKING WITH SWING
-
-Swing doesn't contain native code; it's pure java. You don't need to
-have all the Java SE sources to work on Swing but just the following subset:
-
-            make/netbeans/ 
-            javax/swing/
-            com/sun/swing/
-            com/sun/java/swing/
-            sun/swing/
-
-The set of actions supported by this project are:
-
-* Build Project:
-
-  - Compiles Swing's source files and puts the class files under
-    build/${platform}-${arch}/classes.
-
-  - Generates swing.jar file under dist/lib/swing.jar
-
-    This new jar file could be used to patch an existing JDK installation
-    by using -Xbootclasspath/p:$MYSRC/dist/lib/swing.jar
-
-* Generate Javadoc for Project
-
-  - Generates the javadoc for the Swing source files,
-
-  - The javadoc is generated under build/${platform}-${arch}/javadoc/swing.
-
-* Run Project
-
-  - Builds and runs the SampleTree demo.
-
-* Debug Project
-
-  - Builds and then runs the debugger on the SampleTree demo.
-
-* Clean Project
-
-  - Cleans the files created by this project under build, dist, and demo.
-
-IMPORTANT NOTE
-
-  Please make sure to follow carefully the governance rules documented at
-  http://openjdk.dev.java.net/
-
-KNOWN ISSUES
-
-  When debugging the project, breakpoints set in SampleTree's code will be
-  stopped at, but the editor display will not update correctly.  Breakpoints
-  outside of the constructor work as expected.
diff --git a/make/jdk/netbeans/swing/build.properties b/make/jdk/netbeans/swing/build.properties
deleted file mode 100644
index d1e848dd9b2..00000000000
--- a/make/jdk/netbeans/swing/build.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    javax/swing/ \
-    com/sun/swing/ \
-    com/sun/java/swing/ \
-    sun/swing/
-demos=\
-    jfc/SampleTree/
-javadoc.options=-J-Xmx256m
-javac.options=-Xlint -J-Xms80m -J-Xmx256m
diff --git a/make/jdk/netbeans/swing/build.xml b/make/jdk/netbeans/swing/build.xml
deleted file mode 100644
index 44c068c9255..00000000000
--- a/make/jdk/netbeans/swing/build.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="swing" default="build" basedir=".">
-    
-    <import file="../common/shared.xml"/>
-   
-    <target name="-pre-init" depends="-check-swing.windows" if="swing.windows">
-        <property name="excludes" value="com/sun/java/swing/plaf/gtk/"/>
-    </target>
-
-    <target name="-check-swing.windows">
-        <condition property="swing.windows">
-            <os family="windows"/>
-        </condition>
-    </target>
-
-     <target name="-post-compile">
-        <mkdir dir="${dist.dir}/lib"/>
-        <jar destfile="${dist.dir}/lib/swing.jar">
-            <fileset dir="${classes.dir}">
-                <include name="javax/swing/**/*.class"/>
-                <include name="com/sun/swing/**/*.class"/>
-                <include name="com/sun/java/swing/**/*.class"/>
-                <include name="sun/swing/**/*.class"/>
-            </fileset>
-            <fileset dir="${share.src.dir}">
-                <include name="javax/swing/**/*.bdtd"/>
-                <include name="javax/swing/**/*.css"/>
-                <include name="javax/swing/**/*.dtd"/>
-                <include name="javax/swing/**/*.gif"/>
-                <include name="javax/swing/**/*.html"/>
-                <include name="javax/swing/**/*.jpg"/>
-                <include name="javax/swing/**/*.png"/>
-                <include name="javax/swing/**/*.txt"/>
-                <include name="javax/swing/**/*.wav"/>
-
-                <include name="com/sun/swing/**/*.properties"/>
-
-                <include name="com/sun/java/swing/**/*.gif"/>
-                <include name="com/sun/java/swing/**/*.png"/>
-                <include name="com/sun/java/swing/**/*.properties"/>
-                <include name="com/sun/java/swing/**/*.xml"/>
-            </fileset>
-        </jar>
-    </target>
-    
-    <target name="-demo-init" depends="-demo-init.unix,-demo-init.windows">
-        <property name="swing.demo.src" value="${root}/src/share/demo/jfc/SampleTree"/>
-        <property name="swing.demo.classes" value="${build.dir}/demo/jfc/SampleTree"/>
-    </target>
-
-    <target name="-demo-init.unix" if="osfamily.unix">
-        <property name="demo.bootclasspath"
-            value="-Xbootclasspath/p:${dist.dir}/lib/swing.jar:${classes.dir}"/>
-    </target>
-
-    <target name="-demo-init.windows" if="os.windows">
-        <property name="demo.bootclasspath"
-            value="-Xbootclasspath/p:${dist.dir}/lib/swing.jar;${classes.dir}"/>
-    </target>
-
-    <target name="run" depends="-init,-demo-init">
-        <mkdir dir="${swing.demo.classes}"/>
-        <property name="jvm.args" value=""/>
-        <javac srcdir="${swing.demo.src}" destdir="${swing.demo.classes}"
-            fork="true" failonerror="true"
-            classpath="${dist.dir}/lib/swing.jar:${classes.dir}"
-            debug="${javac.debug}" debuglevel="${javac.debuglevel}">
-            <compilerarg line="${javac.options}"/>
-        </javac>
-        <copy todir="${swing.demo.classes}">
-            <fileset dir="${swing.demo.src}" includes="resources/**/*.gif"/>
-        </copy>
-        <java classname="SampleTree" classpath="${swing.demo.classes}"
-            fork="true" failonerror="true"
-            jvm="${bootstrap.jdk}/bin/java">
-            <jvmarg line="${demo.bootclasspath}"/>
-            <arg line="${jvm.args}"/>
-        </java>
-    </target>
-
-    <target name="clean" depends="-init,-demo-init,shared.clean">
-        <delete file="${dist.dir}/lib/swing.jar"/>
-        <delete dir="${swing.demo.classes}"/>
-    </target>
-    
-</project>
diff --git a/make/jdk/netbeans/swing/nbproject/project.xml b/make/jdk/netbeans/swing/nbproject/project.xml
deleted file mode 100644
index d03e5843a64..00000000000
--- a/make/jdk/netbeans/swing/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY demo-sources SYSTEM "../../common/demo-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY demo-view SYSTEM "../../common/demo-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>Swing</name> <!-- Customized -->
-            <properties>
-                <property name="name">swing</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &demo-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-                <action name="run">
-                    <target>run</target>
-                </action>
-                <action name="debug">
-                    <target>debug</target>
-                </action>
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &demo-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                    <ide-action name="run"/>
-                    <ide-action name="debug"/>
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-no-native;
-    </configuration>
-</project>
diff --git a/make/jdk/netbeans/world/README b/make/jdk/netbeans/world/README
deleted file mode 100644
index 54c2ccc1f23..00000000000
--- a/make/jdk/netbeans/world/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Building the entire Open JDK source code
-
-This project exists solely for building the entire Open JDK source code,
-i.e. both the Hotspot VM and the JDK.
-
-Building this project takes considerable time and disk space.  Expect several
-hours and over 3GB.  Given that it takes a long time to build all of this
-project code, you might prefer to build it from the command line using ant.
-
-Please note: the results of building this project are *not* put in the place
-used by other projects.  In this case, the results are place in
-
-    <install-dir>/build/<platform>-<arch>
-and
-    <install-dir>/build/<platform>-<arch>-fastdebug
diff --git a/make/jdk/netbeans/world/build.properties b/make/jdk/netbeans/world/build.properties
deleted file mode 100644
index 4ad2ca2ed5e..00000000000
--- a/make/jdk/netbeans/world/build.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - 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.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
-# 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.
-#
-
-includes=\
-    **
-use.make=true
diff --git a/make/jdk/netbeans/world/build.xml b/make/jdk/netbeans/world/build.xml
deleted file mode 100644
index 84e38b7f2a9..00000000000
--- a/make/jdk/netbeans/world/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<project name="world" default="build" basedir=".">
-
-    <import file="../common/shared.xml"/>
-
-    <target name="-build-make" depends="-make.init" if="use.make">
-        <make-run target="dev" dir="${root}/.." opts="SKIP_COMPARE_IMAGES=true"/>
-    </target>
-
-    <target name="-clean-make" depends="-make.init" if="use.make">
-        <make-run target="clean" dir="${root}/.."/>
-    </target>
-
-</project>
diff --git a/make/jdk/netbeans/world/nbproject/project.xml b/make/jdk/netbeans/world/nbproject/project.xml
deleted file mode 100644
index 7f2f437905e..00000000000
--- a/make/jdk/netbeans/world/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - 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.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
- 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.
--->
-
-<!DOCTYPE project [
-    <!ENTITY properties SYSTEM "../../common/properties.ent">
-    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-    <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
-    <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
-    <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
-    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-    <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
-    <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
-    <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
-    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
-    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
-    <!ENTITY java-data-native SYSTEM "../../common/java-data-native.ent">
-]>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ant.freeform</type>
-    <configuration>
-        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
-            <name>World</name> <!-- Customized -->
-            <properties>
-                <property name="name">world</property> <!-- Customized -->
-                &properties;
-            </properties>
-            <folders>
-                &share-sources;
-                &macosx-sources;
-                &unix-sources;
-                &windows-sources;
-                &build-folder;
-            </folders>
-            <ide-actions>
-                &standard-bindings;
-            </ide-actions>
-            <view>
-                <items>
-                    &share-view;
-                    &macosx-view;
-                    &unix-view;
-                    &windows-view;
-                    &file-view;
-                </items>
-                <context-menu>
-                    &standard-actions;
-                </context-menu>
-            </view>
-        </general-data>
-        &java-data-native;
-    </configuration>
-</project>
diff --git a/make/langtools/build.xml b/make/langtools/build.xml
index 84db47e0edb..efd0a9e9d65 100644
--- a/make/langtools/build.xml
+++ b/make/langtools/build.xml
@@ -73,6 +73,7 @@
     <property name="src.dir" location="src"/>
     <property name="test.dir" location="test"/>
     <property name="make.dir" location="make/langtools"/>
+    <property name="make.idea.dir" location="make/ide/idea/langtools"/>
     <property name="make.conf.dir" location="${make.dir}/conf"/>
     <property name="make.tools.dir" location="${make.dir}/tools"/>
     <property name="build.dir" location="build/langtools"/>
@@ -252,7 +253,7 @@
     <target name="idea" depends="-check-langtools.jdk.home">
         <mkdir dir=".idea"/>
         <copy todir=".idea" >
-            <fileset dir="${make.dir}/intellij/template">
+            <fileset dir="${make.idea.dir}/template">
                <exclude name="**/src/**"/>
                <exclude name="**/utils/**"/>
             </fileset>
@@ -272,7 +273,7 @@
         <mkdir dir=".idea/classes"/>
         <javac source="${javac.build.source}"
                target="${javac.build.target}"
-               srcdir="${make.dir}/intellij/template/src"
+               srcdir="${make.idea.dir}/template/src"
                destdir=".idea/classes"/>
     </target>