[netbeans] 01/01: Import Debian changes 8.1+dfsg3-2

Markus Koschany apo at moszumanska.debian.org
Thu Apr 20 12:25:01 UTC 2017


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository netbeans.

commit ba4abccf3241a7694c807d18533fed5002a40def
Author: Markus Koschany <apo at debian.org>
Date:   Thu Apr 20 12:35:05 2017 +0200

    Import Debian changes 8.1+dfsg3-2
    
    netbeans (8.1+dfsg3-2) unstable; urgency=medium
    
      [ Markus Koschany ]
      * Add missing dependencies to libnb-ide14-java.
        Thanks to Andreas Beckmann for the report. (Closes: #857955)
      * Fix ClassNotFoundException: org.jcodings.Encoding.
        See https://netbeans.org/bugzilla/show_bug.cgi?id=256166
      * Update orig-tar script and use $BASE variable.
      * Use jdk8.builds option consistently.
      * Add README.Debian file.
    
      [ Emmanuel Bourg ]
      * Switch back to libcglib-java.
---
 .pc/.quilt_patches                                 |    1 -
 .pc/.quilt_series                                  |    1 -
 .pc/.version                                       |    1 -
 .../modules/css/lib/NbParseTreeBuilder.java        |  500 -----
 .pc/applied-patches                                |   35 -
 .../db/dataview/output/DataViewTableUI.java        |  658 -------
 .../modules/db/dataview/output/DataViewUI.java     |  589 ------
 .../db/dataview/table/ResultSetJXTable.java        |  519 ------
 .../o.eclipse.jgit/nbproject/project.xml           |   28 -
 .../ui/customizer/vmo/gen/CommandLineParser.java   | 1285 -------------
 .pc/netbeans-build.patch/nbbuild/build.xml         | 1943 --------------------
 .../nbbuild/cluster.properties                     | 1528 ---------------
 .../source/parsing/CachingArchiveClassLoader.java  |  266 ---
 .../hudson/ui/APITokenConnectionAuthenticator.java |  242 ---
 .../nbproject/project.properties                   |  103 --
 .../nbproject/project.properties                   |    6 -
 .../extexecution.process/nbproject/project.xml     |   64 -
 .../extexecution/process/ProcessesImpl.java        |   62 -
 .../ide/launcher/netbeans.conf                     |   63 -
 .../ide/launcher/unix/netbeans                     |  253 ---
 .../db.sql.visualeditor/build.xml                  |   43 -
 .../jemmy/nbproject/project.properties             |   49 -
 .../libs.jaxb/nbproject/project.properties         |   61 -
 .../css.editor/nbproject/project.properties        |   59 -
 .../db.drivers/nbproject/project.properties        |   49 -
 .../derby/nbproject/project.properties             |   55 -
 .../html.editor/nbproject/project.properties       |   54 -
 .../j2ee.eclipselink/nbproject/project.properties  |   55 -
 .../libs.swingx/nbproject/project.properties       |   45 -
 .../nbproject/project.properties                   |   47 -
 .../o.apache.tools.ant.module/build.xml            |  225 ---
 .../o.apache.tools.ant.module/external/build.xml   |   53 -
 .../o.n.bootstrap/nbproject/project.properties     |   58 -
 .../nbbuild/build.properties                       |  254 ---
 .../nbbuild/cluster.properties                     | 1540 ----------------
 .../net.java.html/build.xml                        |    5 -
 .../junitlib/nbproject/project.properties          |   10 -
 .../nbbuild/cluster.properties                     | 1532 ---------------
 .../libs.jna.platform/nbproject/project.properties |   46 -
 .../libs.jna/nbproject/project.properties          |   57 -
 .../src/org/netbeans/libs/jna/Installer.java       |   55 -
 .../nbbuild/cluster.properties                     | 1530 ---------------
 .../libs.testng/nbproject/project.properties       |   50 -
 .../o.jdesktop.layout/nbproject/project.properties |   47 -
 .../windows-launcher-src/Makefile                  |   86 -
 .../nbproject/Makefile-app.exe.mk                  |  102 -
 .../nbproject/Makefile-app64.exe.mk                |  102 -
 .../ide/launcher/windows/nblauncher.cpp            |  609 ------
 .../o.n.bootstrap/launcher/windows/Makefile        |   90 -
 .../launcher/windows/nbproject/Makefile-nbexec.mk  |  120 --
 .../windows/nbproject/Makefile-nbexec64.mk         |  120 --
 .../o.n.bootstrap/launcher/windows/utilsfuncs.cpp  |  473 -----
 .../o.eclipse.jgit/nbproject/project.xml           |   28 -
 .../slf4j.dummy/build.xml                          |    0
 .../slf4j.dummy/manifest.mf                        |    0
 .../slf4j.dummy/nbproject/project.xml              |    0
 .../apisupport.kit/nbproject/project.xml           |   74 -
 .../editor.kit/nbproject/project.xml               |  153 --
 .../ide.kit/nbproject/project.xml                  |  323 ----
 .../java.kit/nbproject/project.xml                 |  385 ----
 .../xsl/nbproject/project.xml                      |  270 ---
 .../modules/java/hints/spiimpl/Utilities.java      | 1623 ----------------
 .../svnkit/SvnKitClientAdapterFactory.java         |   94 -
 .../modules/updatecenters/resources/mf-layer.xml   |   87 -
 .../org/netbeans/api/java/source/SourceUtils.java  | 1437 ---------------
 .../xml.jaxb.api/nbproject/project.properties      |   54 -
 .pc/netbeans-xsl-httpserver.patch/xsl/manifest.mf  |    7 -
 .../netbeans/modules/netbinox/JarBundleFile.java   |  377 ----
 .../org/netbeans/modules/netbinox/Netbinox.java    |  243 ---
 .../org/netbeans/nbbuild/UpdateTracking.java       |  620 -------
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 apisupport.harness/windows-launcher-src/Makefile   |    7 +-
 .../nbproject/Makefile-app.exe.mk                  |   24 +-
 .../nbproject/Makefile-app64.exe.mk                |   16 +-
 apisupport.kit/nbproject/project.xml               |    4 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 css.editor/nbproject/project.properties            |    4 +-
 .../modules/css/lib/NbParseTreeBuilder.java        |    2 +-
 .../db/dataview/output/DataViewTableUI.java        |    1 +
 .../modules/db/dataview/output/DataViewUI.java     |    1 +
 .../db/dataview/table/ResultSetJXTable.java        |   10 +
 .../external/binaries-list                         |    0
 db.drivers/nbproject/project.properties            |    4 +-
 db.sql.visualeditor/build.xml                      |    4 +-
 .../external/binaries-list                         |    0
 .../db => db}/external/binaries-list               |    0
 debian/README.Debian                               |    6 +
 debian/changelog                                   |   15 +-
 debian/control                                     |    5 +-
 debian/orig-tar.sh                                 |    4 +-
 debian/patches/netbeans-ide-launcher.patch         |    2 +-
 debian/rules                                       |    2 +-
 .../derby => derby}/external/binaries-list         |    0
 derby/nbproject/project.properties                 |    6 +-
 .../external/binaries-list                         |    0
 .../nbproject/project.properties                   |   77 +
 .../external/binaries-list                         |    0
 editor.kit/nbproject/project.xml                   |    8 +-
 .../external/binaries-list                         |    0
 extexecution.process/nbproject/project.properties  |    6 +-
 extexecution.process/nbproject/project.xml         |    4 +-
 .../extexecution/process/ProcessesImpl.java        |    3 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 html.editor/nbproject/project.properties           |    2 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../hudson/ui/APITokenConnectionAuthenticator.java |    3 +-
 ide.kit/nbproject/project.xml                      |    4 +-
 ide/launcher/netbeans.conf                         |    3 +-
 ide/launcher/unix/netbeans                         |   10 +-
 ide/launcher/windows/nblauncher.cpp                |    1 -
 .../j2ee.dd => j2ee.dd}/external/binaries-list     |    0
 .../external/binaries-list                         |    0
 j2ee.eclipselink/nbproject/project.properties      |    5 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../j2eeapis => j2eeapis}/external/binaries-list   |    0
 .../ui/customizer/vmo/gen/CommandLineParser.java   |    4 +-
 java.kit/nbproject/project.xml                     |    4 +-
 .../org/netbeans/api/java/source/SourceUtils.java  |    6 +-
 .../source/parsing/CachingArchiveClassLoader.java  |    3 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../javahelp => javahelp}/external/binaries-list   |    0
 .../external/binaries-list                         |    0
 .../jemmy => jemmy}/external/binaries-list         |    0
 jemmy/nbproject/project.properties                 |    4 +-
 .../junitlib => junitlib}/external/binaries-list   |    0
 junitlib/nbproject/project.properties              |    4 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../libs.asm => libs.asm}/external/binaries-list   |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../libs.jaxb => libs.jaxb}/external/binaries-list |    0
 libs.jaxb/nbproject/project.properties             |    4 +-
 .../external/binaries-list                         |    0
 libs.jna.platform/nbproject/project.properties     |    2 +-
 .../libs.jna => libs.jna}/external/binaries-list   |    0
 libs.jna/nbproject/project.properties              |   24 +-
 libs.jna/src/org/netbeans/libs/jna/Installer.java  |    2 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../libs.jstl => libs.jstl}/external/binaries-list |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../libs.osgi => libs.osgi}/external/binaries-list |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../svnkit/SvnKitClientAdapterFactory.java         |    4 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 libs.swingx/nbproject/project.properties           |    2 +-
 .../external/binaries-list                         |    0
 libs.testng/nbproject/project.properties           |    2 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../maven => maven}/external/binaries-list         |    0
 .../org/netbeans/nbbuild/UpdateTracking.java       |    2 +-
 nbbuild/build.properties                           |    1 +
 nbbuild/build.xml                                  |    6 +-
 nbbuild/cluster.properties                         |  116 +-
 .../nbbuild => nbbuild}/external/binaries-list     |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 net.java.html/build.xml                            |    1 -
 .../external/binaries-list                         |    0
 .../netbinox => netbinox}/external/binaries-list   |    0
 .../netbeans/modules/netbinox/JarBundleFile.java   |    2 +-
 .../org/netbeans/modules/netbinox/Netbinox.java    |    8 -
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 o.apache.tools.ant.module/build.xml                |    4 +-
 .../external/binaries-list                         |    0
 o.apache.tools.ant.module/external/build.xml       |    2 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 o.eclipse.jgit/nbproject/project.xml               |    7 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../nbproject/project.properties                   |    4 +-
 .../external/binaries-list                         |    0
 o.jdesktop.layout/nbproject/project.properties     |    4 +-
 o.n.bootstrap/launcher/windows/Makefile            |   18 +-
 .../launcher/windows/nbproject/Makefile-nbexec.mk  |   30 +-
 .../windows/nbproject/Makefile-nbexec64.mk         |   26 +-
 o.n.bootstrap/launcher/windows/utilsfuncs.cpp      |    1 -
 o.n.bootstrap/nbproject/project.properties         |   10 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 slf4j.dummy/build.xml                              |   12 -
 slf4j.dummy/manifest.mf                            |    1 -
 slf4j.dummy/nbproject/project.xml                  |   15 -
 .../external/binaries-list                         |    0
 .../modules/java/hints/spiimpl/Utilities.java      |    6 +-
 .../external/binaries-list                         |    0
 .../modules/updatecenters/resources/mf-layer.xml   |    6 +-
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../web.jsf12 => web.jsf12}/external/binaries-list |    0
 .../web.jsf20 => web.jsf20}/external/binaries-list |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 .../external/binaries-list                         |    0
 xml.jaxb.api/nbproject/project.properties          |    4 +-
 xsl/manifest.mf                                    |    1 +
 xsl/nbproject/project.xml                          |    4 +-
 280 files changed, 389 insertions(+), 21813 deletions(-)

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/antlr-3.5.2.patch/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java b/.pc/antlr-3.5.2.patch/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
deleted file mode 100644
index bbb50fa..0000000
--- a/.pc/antlr-3.5.2.patch/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2011 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.css.lib;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.debug.BlankDebugEventListener;
-
-import java.util.Stack;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import org.antlr.runtime.NoViableAltException;
-import org.netbeans.modules.css.lib.api.CssTokenId;
-import org.netbeans.modules.css.lib.api.Node;
-import org.netbeans.modules.css.lib.api.NodeType;
-import org.netbeans.modules.css.lib.api.ProblemDescription;
-import org.openide.util.NbBundle;
-import static org.netbeans.modules.css.lib.Bundle.*;
-
-/**
- * A patched version of ANLR's ParseTreeBuilder 
- * 
- * @author mfukala at netbeans.org
- */
-public class NbParseTreeBuilder extends BlankDebugEventListener {
-
-    //ignore 'syncToIdent' rule - the DBG.enter/exit/Rule calls are generated
-    //automatically by ANTLR but we do not care about them since 
-    //the error recovery implementation in syncToSet(...)
-    //calls DBG.enter/exit/Rule("recovery") itself.
-    private String[] IGNORED_RULES = new String[]{"syncToDeclarationsRule", "syncToFollow"}; //!!! must be sorted alphabetically !!!
-    Stack<RuleNode> callStack = new Stack<>();
-    List<CommonToken> hiddenTokens = new ArrayList<>();
-    private int backtracking = 0;
-    private CommonToken lastConsumedToken;
-    private CharSequence source;
-    static boolean debug_tokens = false; //testing 
-    private Stack<ErrorNode> errorNodes = new Stack<>();
-    private boolean resync;
-    private CommonToken unexpectedToken;
-
-    private Map<CommonToken, Pair<Node>> noViableAltNodes = new HashMap<>();
-    private Collection<RuleNode> leafRuleNodes = new ArrayList<>();
-    
-    private static final String RECOVERY_RULE_NAME = "recovery";
-    private final Collection<ProblemDescription> problems = new LinkedHashSet<> ();
-    
-    public NbParseTreeBuilder(CharSequence source) {
-        this.source = source;
-        callStack.push(new RootNode(source));
-    }
-
-    public AbstractParseTreeNode getTree() {
-        return callStack.elementAt(0);
-    }
-
-    /** Backtracking or cyclic DFA, don't want to add nodes to tree */
-    @Override
-    public void enterDecision(int d, boolean couldBacktrack) {
-        backtracking++;
-    }
-
-    @Override
-    public void exitDecision(int i) {
-        backtracking--;
-    }
-
-    private boolean isIgnoredRule(String ruleName) {
-        return Arrays.binarySearch(IGNORED_RULES, ruleName) >= 0;
-    }
-
-    @Override
-    public void enterRule(String filename, String ruleName) {
-        if (backtracking > 0) {
-            return;
-        }
-        if (isIgnoredRule(ruleName)) {
-            return;
-        }
-
-        AbstractParseTreeNode parentRuleNode = callStack.peek();
-        RuleNode ruleNode = new RuleNode(NodeType.valueOf(ruleName), source);
-        addNodeChild(parentRuleNode, ruleNode);
-        callStack.push(ruleNode);
-    }
-
-    @Override
-    public void exitRule(String filename, String ruleName) {
-        if (backtracking > 0) {
-            return;
-        }
-        if (isIgnoredRule(ruleName)) {
-            return;
-        }
-
-        RuleNode ruleNode = callStack.pop();
-        if (ruleNode.getChildCount() > 0) {
-            //set the rule end offset
-            if (lastConsumedToken != null) {
-                ruleNode.setLastToken(lastConsumedToken);
-            }
-        } else {
-            //empty node - we cannot remove it right now since an error node
-            //may be attached to it later.
-            //all the nodes from possiblyEmptyRuleNodes list are checked after
-            //the parsing finishes and removed from the parse tree if still empty
-            leafRuleNodes.add(ruleNode);
-        }
-        
-        if(RECOVERY_RULE_NAME.equals(ruleName)) {
-            
-            if(ruleNode.getChildCount() > 0) {
-                //create a ProblemDescription for the skipped tokens
-                //create a ParsingProblem
-                int trimmedSize = 0;
-                StringBuilder tokensList = new StringBuilder();
-                for(int i = 0; i < ruleNode.getChildCount(); i++) {
-                    Node child = (Node)ruleNode.getChild(i);
-                    trimmedSize+=child.image().toString().trim().length();
-                    
-                    tokensList.append('\'');
-                    tokensList.append(child.image());
-                    tokensList.append('\'');
-                    if(i < ruleNode.getChildCount() - 1) {
-                        tokensList.append(',');
-                    }
-                }
-
-                if(trimmedSize > 0) {
-                    //do not report skipped whitespaces
-                    ProblemDescription problemDescription = new ProblemDescription(
-                        ruleNode.from(),
-                        ruleNode.to(),
-                        MSG_Error_Unexpected_Char(tokensList),
-                        ProblemDescription.Keys.PARSING.name(),
-                        ProblemDescription.Type.ERROR);
-
-                    problems.add(problemDescription);
-                }
-            }
-            
-        }
-    }
-
-    @Override
-    public void beginResync() {
-        super.beginResync();
-        resync = true;
-    }
-
-    @Override
-    public void endResync() {
-        super.endResync();
-        resync = false;
-    }
-    
-    @Override
-    public void consumeToken(Token token) {
-        if (backtracking > 0 || resync) {
-            return;
-        }
-
-        if (debug_tokens) {
-            CommonToken ct = (CommonToken) token;
-            int[] ctr = CommonTokenUtil.getCommonTokenOffsetRange(ct);
-            System.out.println(token + "(" + ctr[0] + "-" + ctr[1] + ")");
-        }
-
-        //ignore the closing EOF token, we do not want it
-        //it the parse tree
-        if (token.getType() == Css3Lexer.EOF) {
-            return;
-        }
-
-        //also ignore error tokens - they are added as children of ErrorNode-s in the recognitionException(...) method
-        if (token.getType() == Token.INVALID_TOKEN_TYPE) {
-            return;
-        }
-
-        lastConsumedToken = (CommonToken) token;
-
-        RuleNode ruleNode = callStack.peek();
-        TokenNode elementNode = new TokenNode(source, (CommonToken) token);
-        elementNode.hiddenTokens = this.hiddenTokens;
-        hiddenTokens.clear();
-        ruleNode.addChild(elementNode);
-
-        updateFirstTokens(ruleNode, lastConsumedToken);
-    }
-
-    //set first token for all RuleNode-s in the stack without the first token set
-    private void updateFirstTokens(RuleNode ruleNode, CommonToken token) {
-        while (true) {
-
-            if (ruleNode.from() != -1) {
-                break;
-            }
-            ruleNode.setFirstToken(token);
-            ruleNode = (RuleNode) ruleNode.getParent();
-            if (ruleNode == null) {
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void consumeHiddenToken(Token token) {
-        if (backtracking > 0 || resync) {
-            return;
-        }
-
-        if (debug_tokens) {
-            CommonToken ct = (CommonToken) token;
-            int[] ctr = CommonTokenUtil.getCommonTokenOffsetRange(ct);
-            System.out.println(token + "(" + ctr[0] + "-" + ctr[1] + ")");
-        }
-
-        hiddenTokens.add((CommonToken) token);
-    }
-
-    @Override
-    @NbBundle.Messages({
-        "# {0} - the unexpected token", 
-        "MSG_Error_Unexpected_Token=Unexpected token {0} found", 
-        "MSG_Error_Premature_EOF=Premature end of file"})
-    public void recognitionException(RecognitionException e) {
-        if (backtracking > 0) {
-            return;
-        }
-        
-        RuleNode ruleNode = callStack.peek();
-
-        String message;
-        int from, to;
-
-        assert e.token != null;
-
-        //invalid token found int the stream
-        unexpectedToken = (CommonToken) e.token;
-        int unexpectedTokenCode = e.getUnexpectedType();
-        CssTokenId unexpectedTokenId = CssTokenId.forTokenTypeCode(unexpectedTokenCode);
-
-        assert unexpectedTokenId != null : "No CssTokenId for " + unexpectedToken;
-
-        //special handling for EOF token - it has lenght == 1 !
-        if(unexpectedTokenId == CssTokenId.EOF) {
-            from = to = CommonTokenUtil.getCommonTokenOffsetRange(unexpectedToken)[0]; 
-        } else {
-            //normal tokens
-            from = CommonTokenUtil.getCommonTokenOffsetRange(unexpectedToken)[0]; 
-            to = CommonTokenUtil.getCommonTokenOffsetRange(unexpectedToken)[1];
-        }
-      
-        if (unexpectedTokenId == CssTokenId.EOF) {
-            message = MSG_Error_Premature_EOF();
-        } else {
-            message = MSG_Error_Unexpected_Token(unexpectedTokenId.name());
-        }
-        
-        //create a ParsingProblem
-        ProblemDescription problemDescription = new ProblemDescription(
-                from,
-                to,
-                message,
-                ProblemDescription.Keys.PARSING.name(),
-                ProblemDescription.Type.ERROR);
-
-        problems.add(problemDescription);
-        
-        //create an error node and add it to the parse tree
-        ErrorNode errorNode = new ErrorNode(from, to, problemDescription, source);
-
-        //add the unexpected token as a child of the error node
-        TokenNode tokenNode = new TokenNode(source, unexpectedToken);
-        addNodeChild(errorNode, tokenNode);
-        
-        if(e instanceof NoViableAltException) {
-            //error during predicate - the unexpected token may or may not be
-            //reported later as an error. To handle this,
-            //store the error node and the ruleNode where the error node should be added
-            noViableAltNodes.put(unexpectedToken, new Pair<Node>(ruleNode, errorNode));
-            errorNodes.push(errorNode);
-        } else {
-            //possibly remove the unexpectedToken from the noViableAltNodes map
-            
-            //NOTICE:
-            //Uncomment the following line if you want the parse tree not to produce
-            //multiple error nodes for the same token. If the line is active, there 
-            //wont be error nodes for semantic predicates if the unexpected token
-            //is matched by another error rule later.
-//            noViableAltNodes.remove(unexpectedToken);
-            
-            addNodeChild(ruleNode, errorNode);
-            errorNodes.push(errorNode);
-
-            //create and artificial error token so the rules on stack can properly set their ranges
-            lastConsumedToken = new CommonToken(Token.INVALID_TOKEN_TYPE);
-            lastConsumedToken.setStartIndex(from);
-            lastConsumedToken.setStopIndex(to - 1); // ... ( -1 => last *char* index )
-        }
-
-
-    }
-
-    @Override
-    public void terminate() {
-        super.terminate();
-
-        //process unreported errors from NoViableAltException
-        for(Pair<Node> pair : noViableAltNodes.values()) {
-            RuleNode ruleNode = (RuleNode)pair.n1;
-            ErrorNode errorNode = (ErrorNode)pair.n2;
-            
-            ruleNode.addChild(errorNode);
-            errorNode.setParent(ruleNode);
-        }
-        
-        //Finally after the parsing is done fix the error nodes and their predecessors.
-        //This fixes the problem with rules where RecognitionException happened
-        //but the errorneous or missing token has been matched in somewhere further
-        for (ErrorNode en : errorNodes) {
-            synchronizeAncestorsBoundaries(en);
-        }
-        
-        //clean parse tree from empty rule nodes 
-        //empty rule node == rule node without a single _token node_ child
-        for(RuleNode node : leafRuleNodes) {
-            removeLeafRuleNodes(node);
-        }
-
-    }
-    
-    //removes all empty rule nodes in the tree path from the given node to the parse tree root
-    private void removeLeafRuleNodes(RuleNode node) {
-        for(;;) {
-            if(node.children().isEmpty()) {
-                RuleNode parent = (RuleNode)node.parent();
-                if(parent == null) {
-                    return ;
-                }
-                parent.deleteChild(node);
-                node = parent;
-            } else {
-                break;
-            }
-        }
-    }
-    
-    private void synchronizeAncestorsBoundaries(RuleNode en) {
-        RuleNode n = en;
-            for (;;) {
-                if (n == null) {
-                    break;
-                }
-                
-                //adjust the parent nodes ranges to the errorNode
-                if (n.from() == -1 || n.from() > en.from()) {
-                    n.from = en.from();
-                }
-                if(n.to() == -1 || n.to() < en.to()) {                    
-                    n.to = en.to();
-                }
-                
-                n = (RuleNode) n.parent();
-            }
-    }
-
-    public Collection<ProblemDescription> getProblems() {
-        return problems;
-    }
-
-    //note: it would be possible to handle this all in consumeToken since it is called from the
-    //BaseRecognizer.consumeUntil(...) {   input.consume();   } but for the better usability
-    //it is done this way. So the beginResyn/endResync doesn't have to be used.
-    //the NbParseTreeBuilder.consumeToken() method ignores tokens with ERROR type so they
-    //won't be duplicated in the parse tree
-    
-    //creates a "recovery" node with all the skipped tokens as children
-    void consumeSkippedTokens(List<Token> tokens) {
-        if(tokens.isEmpty()) {
-            return ;
-        }
-
-        CommonToken first = (CommonToken)tokens.get(0);
-        CommonToken last = (CommonToken)tokens.get(tokens.size() - 1);
-        
-        
-
-        //if there's just one recovered token and the token is the same as the unexpectedToken just skip the 
-        //recovery node creation, the parse tree for the errorneous piece of code is already complete
-        boolean ignoreFirstToken = unexpectedToken  == first;
-        if(ignoreFirstToken && tokens.size() == 1) {
-            return ;
-        }
-        
-        //do not add the first token as children of the recovery node if it has been already
-        //added as a child of the error node created for the RecognitionException
-        if(ignoreFirstToken) {
-            first = (CommonToken)tokens.get(1); //use second
-        }
-        
-        //find last error which triggered this recovery and add the skipped tokens to it
-//        ErrorNode errorNode = errorNodes.peek();
-//        RuleNode peek = callStack.peek();
-//        if(!(peek instanceof ErrorNode)) {
-        
-        RuleNode peek = errorNodes.peek();
-        
-            RuleNode node = new RuleNode(NodeType.recovery, source);
-            peek.addChild(node);
-            node.setParent(peek);
-            peek = node;
-            
-//        }
-            
-        
-        //set first and last token
-        peek.setFirstToken(first);
-        peek.setLastToken(last);
-        
-        synchronizeAncestorsBoundaries(peek);
-        
-        //set range
-        peek.from = CommonTokenUtil.getCommonTokenOffsetRange(first)[0]; 
-        peek.to = CommonTokenUtil.getCommonTokenOffsetRange(last)[1]; 
-        
-        //set the error tokens as children of the error node
-        for(int i = (ignoreFirstToken ? 1 : 0); i < tokens.size(); i++) {
-            CommonToken token = (CommonToken)tokens.get(i);
-            TokenNode tokenNode = new TokenNode(source, token);
-            addNodeChild(peek, tokenNode);
-        }
-        
-        //create and artificial error token so the rules on stack can properly set their ranges
-        lastConsumedToken = new CommonToken(Token.INVALID_TOKEN_TYPE);
-        lastConsumedToken.setStartIndex(first.getStartIndex());
-        lastConsumedToken.setStopIndex(last.getStopIndex()); 
-                
-    }
-    
-    
-    private void addNodeChild(AbstractParseTreeNode parent, AbstractParseTreeNode child) {
-        parent.addChild(child);
-        child.setParent(parent);
-    }
-    
-    private static class Pair<T> {
-        T n1, n2;
-        public Pair(T n1, T n2) {
-            this.n1 = n1;
-            this.n2 = n2;
-        }
-    }
-    
-}
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index ead1990..0000000
--- a/.pc/applied-patches
+++ /dev/null
@@ -1,35 +0,0 @@
-netbeans-platform-disable-net.java-modules.patch
-netbeans-empty-binaries-list.patch
-netbeans-platform-junitlib.patch
-netbeans-platform-nbi.patch
-netbeans-platform-nojnabinaries.patch
-netbeans-platform-o.n.html.ko4j.patch
-netbeans-platform-windowslauncher.patch
-osgi-update.patch
-netbeans-javacc.patch
-netbeans-commons-net.patch
-netbeans-o.apache.tools.ant.module.patch
-netbeans-spi.java.hints.patch
-netbeans-libs.jaxb.patch
-netbeans-xml.jaxb.api.patch
-netbeans-build.patch
-netbeans-updatecenters.patch
-reproducible-build.patch
-netbeans-cluster-properties.patch
-netbeans-o.n.bootstrap.patch
-netbeans-platform-properties.patch
-netbeans-jemmy.patch
-antlr-3.5.2.patch
-netbeans-nocopy.patch
-db.dataview-setRowFilter-method.patch
-netbeans-small-ide.patch
-netbeans-dlight.nativeexecution.patch
-netbeans-extexecution.impl.patch
-javaewah-version.patch
-netbeans-wildUpperBound.patch
-netbeans-com.sun.tools.hc.patch
-netbeans-CommandLineParser.patch
-netbeans-ide-launcher.patch
-netbeans-xsl-httpserver.patch
-netbeans-svnclientadapter.patch
-netbeans-slf4j.dummy.patch
diff --git a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
deleted file mode 100644
index e0d8a70..0000000
--- a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.modules.db.dataview.output;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JComponent;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JTable;
-import javax.swing.RowFilter;
-import javax.swing.SortOrder;
-import javax.swing.UIManager;
-import javax.swing.border.LineBorder;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
-import org.jdesktop.swingx.renderer.JRendererCheckBox;
-import org.netbeans.modules.db.dataview.meta.DBColumn;
-import org.netbeans.modules.db.dataview.meta.DBException;
-import org.netbeans.modules.db.dataview.meta.DBTable;
-import org.netbeans.modules.db.dataview.table.ResultSetCellRenderer;
-import org.netbeans.modules.db.dataview.table.ResultSetJXTable;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
-import org.openide.util.datatransfer.ExClipboard;
-import org.openide.windows.WindowManager;
-
-/**
- * Renders the current result page
- *
- * @author Ahimanikya Satapathy
- */
-final class DataViewTableUI extends ResultSetJXTable {
-
-    private JPopupMenu tablePopupMenu;
-    private final DataViewUI dataviewUI;
-    private final DataViewActionHandler handler;
-    private int selectedRow = -1;
-    private int selectedColumn = -1;
-    private final TableModelListener dataChangedListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            dataviewUI.handleColumnUpdated();
-        }
-    };
-
-    public DataViewTableUI(DataViewUI dataviewUI, DataViewActionHandler handler, DataView dataView, DataViewPageContext pageContext) {
-        this.dataviewUI = dataviewUI;
-        this.handler = handler;
-
-        // Make sure sorting can be disabled by taking unsorted into the sort order cycle
-        this.setSortOrderCycle(SortOrder.ASCENDING, SortOrder.DESCENDING, SortOrder.UNSORTED);
-
-        TableSelectionListener listener = new TableSelectionListener(this);
-        this.getSelectionModel().addListSelectionListener(listener);
-        this.getColumnModel().getSelectionModel().addListSelectionListener(listener);
-
-        addKeyListener(createControKeyListener());
-        createPopupMenu(handler, dataView, pageContext);
-    }
-
-    @Override
-    @SuppressWarnings({"unchecked"})
-    public void setModel(TableModel dataModel) {
-        if (!(dataModel instanceof DataViewTableUIModel)) {
-            throw new IllegalArgumentException("DataViewTableUI only supports"
-                    + " instances of DataViewTableUIModel");
-        }
-        RowFilter<?, ?> oldFilter = getRowFilter();
-        if (getModel() != null) {
-            getModel().removeTableModelListener(dataChangedListener); // Remove ChangeListener on replace
-        }
-        super.setModel(dataModel);
-        dataModel.addTableModelListener(dataChangedListener); // Add new change listener
-        setRowFilter((RowFilter) oldFilter);
-        if (dataviewUI != null) {
-            dataviewUI.handleColumnUpdated();
-        }
-    }
-
-    @Override
-    public DataViewTableUIModel getModel() {
-        return (DataViewTableUIModel) super.getModel();
-    }
-
-    @Override
-    protected TableModel createDefaultDataModel() {
-        return new DataViewTableUIModel(new DBColumn[0]);
-    }
-
-    @Override
-    public TableCellRenderer getCellRenderer(int row, int column) {
-        try {
-            if (getModel().hasUpdates(
-                    convertRowIndexToModel(row),
-                    convertColumnIndexToModel(column))) {
-                return new UpdatedResultSetCellRenderer();
-            }
-        } catch (IndexOutOfBoundsException ex) {
-            // Swallow it, caused by pack from JXTable - Bug #228753
-        }
-        return super.getCellRenderer(row, column);
-    }
-
-    @Override
-    protected KeyListener createControKeyListener() {
-        return new Control0KeyListener();
-    }
-
-    private static class UpdatedResultSetCellRenderer extends ResultSetCellRenderer {
-
-        static int borderThickness = 1;
-        static Color selectedForeground;
-        static Color unselectedForeground;
-        private final JComponent holder = new JComponent() {};
-
-        static {
-            Color selectedFgFromMngr = UIManager.getColor(
-                    "nb.dataview.tablecell.edited.selected.foreground"); //NOI18N
-            selectedForeground = selectedFgFromMngr != null
-                    ? selectedFgFromMngr
-                    : new Color(229, 148, 0);
-            Color unselectedFgFromMngr = UIManager.getColor(
-                    "nb.dataview.tablecell.edited.unselected.foreground"); //NOI18N
-            unselectedForeground = unselectedFgFromMngr != null
-                    ? unselectedFgFromMngr
-                    : new Color(0, 128, 0); // green color
-        }
-
-        public UpdatedResultSetCellRenderer() {
-            holder.setLayout(new BorderLayout());
-        }
-
-        @Override
-        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-            Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
-            assert (table.getModel() instanceof DataViewTableUIModel) : "Assuming usage with DataViewTableUIModel";
-
-            Color color = isSelected ? selectedForeground : unselectedForeground;
-
-            if (c instanceof JRendererCheckBox) {
-                holder.removeAll();
-                holder.setBorder(new LineBorder(color, borderThickness));
-                holder.add(c);
-                return holder;
-            } else {
-                c.setForeground(color);
-            }
-            return c;
-        }
-    }
-
-    private class Control0KeyListener implements KeyListener {
-
-        public Control0KeyListener() {
-        }
-
-        @Override
-        public void keyTyped(KeyEvent e) {
-        }
-
-        @Override
-        public void keyPressed(KeyEvent e) {
-            if (e.isControlDown() && e.getKeyCode() == KeyEvent.VK_DELETE) {
-                TableCellEditor editor = getCellEditor();
-                if (editor != null) {
-                    editor.stopCellEditing();
-                }
-                handler.deleteRecordActionPerformed();
-                e.consume();
-            } else if (e.isControlDown() && e.getKeyChar() == KeyEvent.VK_0) {
-                int row = getSelectedRow();
-                int col = getSelectedColumn();
-                if (row == -1) {
-                    return;
-                }
-
-                setCellToNull(row, col);
-                setRowSelectionInterval(row, row);
-                e.consume();
-            } else if (e.isControlDown() && e.getKeyChar() == KeyEvent.VK_1) {
-                int row = getSelectedRow();
-                int col = getSelectedColumn();
-                if (row == -1) {
-                    return;
-                }
-                setCellToDefault(row, col);
-                setRowSelectionInterval(row, row);
-                e.consume();
-            }
-        }
-
-        @Override
-        public void keyReleased(KeyEvent e) {
-        }
-    }
-
-    private void setCellToNull(int row, int col) {
-        int modelColumn = convertColumnIndexToModel(col);
-        DBColumn dbcol = getModel().getColumn(modelColumn);
-        if (dbcol.isGenerated() || !dbcol.isNullable()) {
-            Toolkit.getDefaultToolkit().beep();
-        } else {
-            Class modelClass = getModel().getColumnClass(modelColumn);
-            if (Blob.class.isAssignableFrom(modelClass)
-                    || Clob.class.isAssignableFrom(modelClass)) {
-                setValueAt(null, row, col);
-            } else {
-                setValueAt("<NULL>", row, col);
-            }
-        }
-    }
-
-    private void setCellToDefault(int row, int col) {
-        int modelColumn = convertColumnIndexToModel(col);
-        DBColumn dbcol = getModel().getColumn(modelColumn);
-        Object val = getValueAt(row, col);
-        if (dbcol.isGenerated() || !dbcol.hasDefault()) {
-            Toolkit.getDefaultToolkit().beep();
-        } else if (val != null && val instanceof String
-                && ((String) val).equals("<DEFAULT>")) {
-            setValueAt(null, row, col);
-        } else {
-            setValueAt("<DEFAULT>", row, col);
-        }
-        setRowSelectionInterval(row, row);
-    }
-
-    private class TableSelectionListener implements ListSelectionListener {
-
-        JTable table;
-
-        TableSelectionListener(JTable table) {
-            this.table = table;
-        }
-
-        @Override
-        public void valueChanged(ListSelectionEvent e) {
-            if (dataviewUI == null) {
-                return;
-            }
-
-            if (e.getSource() == table.getSelectionModel()
-                    && table.getRowSelectionAllowed()) {
-                boolean rowSelected = table.getSelectedRows().length > 0;
-                if (rowSelected && getModel().isEditable()) {
-                    dataviewUI.enableDeleteBtn(!dataviewUI.isDirty());
-                } else {
-                    dataviewUI.enableDeleteBtn(false);
-                }
-            }
-        }
-    }
-
-    private void createPopupMenu(final DataViewActionHandler handler, final DataView dataView, final DataViewPageContext pageContext) {
-        // content popup menu on table with results
-        tablePopupMenu = new JPopupMenu();
-        final JMenuItem miInsertAction = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_insert"));
-        miInsertAction.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.insertActionPerformed();
-            }
-        });
-        tablePopupMenu.add(miInsertAction);
-
-        final JMenuItem miDeleteAction = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_deleterow"));
-        miDeleteAction.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.deleteRecordActionPerformed();
-            }
-        });
-        tablePopupMenu.add(miDeleteAction);
-
-        final JMenuItem miCommitAction = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_commit"));
-        miCommitAction.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.commitActionPerformed(true);
-            }
-        });
-        tablePopupMenu.add(miCommitAction);
-
-        final JMenuItem miCancelEdits = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_cancel_edits"));
-        miCancelEdits.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.cancelEditPerformed(true);
-            }
-        });
-        tablePopupMenu.add(miCancelEdits);
-
-        final JMenuItem miTruncateRecord = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_truncate_table"));
-        miTruncateRecord.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.truncateActionPerformed();
-            }
-        });
-        tablePopupMenu.add(miTruncateRecord);
-        tablePopupMenu.addSeparator();
-
-        final JMenuItem miCopyValue = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_copy_cell_value"));
-        miCopyValue.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    Object o = getValueAt(selectedRow, selectedColumn);
-                    // Limit 1 MB/1 Million Characters.
-                    String output = convertToClipboardString(o, 1024 * 1024);
-
-                    ExClipboard clipboard = Lookup.getDefault().lookup(ExClipboard.class);
-                    StringSelection strSel = new StringSelection(output);
-                    clipboard.setContents(strSel, strSel);
-                } catch (ArrayIndexOutOfBoundsException exc) {
-                }
-            }
-        });
-        tablePopupMenu.add(miCopyValue);
-
-        final JMenuItem miCopyRowValues = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_copy_row_value"));
-        miCopyRowValues.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                copyRowValues(false);
-            }
-        });
-        tablePopupMenu.add(miCopyRowValues);
-
-        final JMenuItem miCopyRowValuesH = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_copy_row_header"));
-        miCopyRowValuesH.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                copyRowValues(true);
-            }
-        });
-        tablePopupMenu.add(miCopyRowValuesH);
-        tablePopupMenu.addSeparator();
-
-        final JMenuItem miCreateSQLScript = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_show_create_sql"));
-        miCreateSQLScript.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    DBTable table = pageContext.getTableMetaData().getTable(0);
-                    String createSQL = dataView.getSQLStatementGenerator().generateCreateStatement(table);
-                    ShowSQLDialog dialog = new ShowSQLDialog();
-                    dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-                    dialog.setText(createSQL + ";\n"); // NOI18N
-                    dialog.setVisible(true);
-                } catch (Exception ex) {
-                    NotifyDescriptor nd = new NotifyDescriptor.Message(ex.getMessage());
-                    DialogDisplayer.getDefault().notify(nd);
-                }
-            }
-        });
-        tablePopupMenu.add(miCreateSQLScript);
-
-        final JMenuItem miInsertSQLScript = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_show_insert_sql"));
-        miInsertSQLScript.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                try {
-                    int[] rows = getSelectedRows();
-                    String insertSQL = "";
-                    for (int j = 0; j < rows.length; j++) {
-                        int modelIndex = convertRowIndexToModel(rows[j]);
-                        Object[] insertRow = getModel().getRowData(modelIndex);
-                        // @todo make table configurable
-                        DBTable table = pageContext.getTableMetaData().getTable(0);
-                        String sql = dataView.getSQLStatementGenerator()
-                                .generateRawInsertStatement(table, insertRow);
-                        insertSQL += sql + ";\n"; // NOI18N
-                    }
-                    ShowSQLDialog dialog = new ShowSQLDialog();
-                    dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-                    dialog.setText(insertSQL);
-                    dialog.setVisible(true);
-                } catch (DBException ex) {
-                    NotifyDescriptor nd = new NotifyDescriptor.Message(ex.getMessage());
-                    DialogDisplayer.getDefault().notify(nd);
-                }
-            }
-        });
-        tablePopupMenu.add(miInsertSQLScript);
-
-        final JMenuItem miDeleteSQLScript = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_show_delete_sql"));
-        miDeleteSQLScript.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int[] rows = getSelectedRows();
-                String rawDeleteStmt = "";
-                for (int j = 0; j < rows.length; j++) {
-                    SQLStatementGenerator generator = dataView.getSQLStatementGenerator();
-                    int modelIndex = convertRowIndexToModel(rows[j]);
-                    // @todo make table configurable
-                    DBTable table = pageContext.getTableMetaData().getTable(0);
-                    final String deleteStmt = generator.generateDeleteStatement(table, modelIndex, getModel());
-                    rawDeleteStmt += deleteStmt + ";\n"; // NOI18N
-                }
-                ShowSQLDialog dialog = new ShowSQLDialog();
-                dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-                dialog.setText(rawDeleteStmt);
-                dialog.setVisible(true);
-            }
-        });
-        tablePopupMenu.add(miDeleteSQLScript);
-
-        final JMenuItem miUpdateScript = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_show_update_sql"));
-        miUpdateScript.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String rawUpdateStmt = "";
-                SQLStatementGenerator generator = dataView.getSQLStatementGenerator();
-                // @todo make table configurable
-                DBTable table = pageContext.getTableMetaData().getTable(0);
-
-                try {
-                    for (Integer row : getModel().getUpdateKeys()) {
-                        Map<Integer, Object> changedData = getModel().getChangedData(row);
-                        rawUpdateStmt += generator.generateUpdateStatement(table, row, changedData, getModel()) + ";\n"; // NOI18N
-                    }
-                    ShowSQLDialog dialog = new ShowSQLDialog();
-                    dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
-                    dialog.setText(rawUpdateStmt);
-                    dialog.setVisible(true);
-                } catch (DBException ex) {
-                    NotifyDescriptor nd = new NotifyDescriptor.Message(ex.getMessage());
-                    DialogDisplayer.getDefault().notify(nd);
-                }
-            }
-        });
-        tablePopupMenu.add(miUpdateScript);
-
-        tablePopupMenu.addSeparator();
-
-        JMenuItem printTable = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_print_data"));
-
-        printTable.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Logger mLogger = Logger.getLogger(DataViewTableUI.class.getName());
-                try {
-                    if (!print()) {
-                        mLogger.log(Level.INFO, NbBundle.getMessage(DataViewTableUI.class, "MSG_cancel_printing"));
-                    }
-                } catch (java.awt.print.PrinterException ex) {
-                    mLogger.log(Level.INFO, NbBundle.getMessage(DataViewTableUI.class, "MSG_failure_to_print" + ex.getMessage()));
-                }
-            }
-        });
-        tablePopupMenu.add(printTable);
-
-        JMenuItem miRefreshAction = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_refresh"));
-        miRefreshAction.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                handler.refreshActionPerformed();
-            }
-        });
-        tablePopupMenu.add(miRefreshAction);
-
-        tablePopupMenu.addSeparator();
-
-        final JMenuItem miSetNull = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_set_cell_to_null"));
-        miSetNull.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                for (int col : getSelectedColumns()) {
-                    int modelColumn = convertColumnIndexToModel(col);
-                    DBColumn dbcol = getModel().getColumn(modelColumn);
-                    for (int row : getSelectedRows()) {
-                        if ((!dbcol.isGenerated()) && dbcol.isNullable()) {
-                            setCellToNull(row, col);
-                        }
-                    }
-                }
-            }
-        });
-        tablePopupMenu.add(miSetNull);
-
-        final JMenuItem miSetDefault = new JMenuItem(NbBundle.getMessage(DataViewTableUI.class, "TOOLTIP_set_cell_to_default"));
-        miSetDefault.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                for (int col : getSelectedColumns()) {
-                    int modelColumn = convertColumnIndexToModel(col);
-                    DBColumn dbcol = getModel().getColumn(modelColumn);
-                    for (int row : getSelectedRows()) {
-                        if ((!dbcol.isGenerated()) && dbcol.hasDefault()) {
-                            setCellToDefault(row, col);
-                        }
-                    }
-                }
-            }
-        });
-        tablePopupMenu.add(miSetDefault);
-
-        addMouseListener(new MouseAdapter() {
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                if (e.getButton() == MouseEvent.BUTTON3) {
-                    selectedRow = rowAtPoint(e.getPoint());
-                    selectedColumn = columnAtPoint(e.getPoint());
-                    boolean inSelection = false;
-
-                    int[] rows = getSelectedRows();
-                    for (int a = 0; a < rows.length; a++) {
-                        if (rows[a] == selectedRow) {
-                            inSelection = true;
-                            break;
-                        }
-                    }
-                    if (!getRowSelectionAllowed()) {
-                        inSelection = false;
-                        int[] columns = getSelectedColumns();
-                        for (int a = 0; a < columns.length; a++) {
-                            if (columns[a] == selectedColumn) {
-                                inSelection = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!inSelection) {
-                        changeSelection(selectedRow, selectedColumn, false, false);
-                    }
-
-                    boolean commitEnabled = dataviewUI.isCommitEnabled();
-                    boolean modelEditable = getModel().isEditable();
-                    boolean rowsSelected = getSelectedRows().length > 0;
-                    boolean cellUnderCursor = selectedColumn >= 0 && selectedRow >= 0;
-
-                    miCommitAction.setEnabled(commitEnabled);
-                    miCancelEdits.setEnabled(commitEnabled);
-                    miUpdateScript.setEnabled(commitEnabled);
-
-                    miInsertAction.setEnabled(modelEditable);
-                    miTruncateRecord.setEnabled(modelEditable);
-                    miCreateSQLScript.setEnabled(modelEditable);
-
-                    miInsertSQLScript.setEnabled(modelEditable && rowsSelected);
-                    miDeleteSQLScript.setEnabled(modelEditable && rowsSelected);
-                    miDeleteAction.setEnabled(modelEditable && rowsSelected);
-
-                    boolean enableSetToNull = false;
-                    boolean enableSetToDefault = false;
-
-                    if (modelEditable && rowsSelected) {
-                        for (int col : getSelectedColumns()) {
-                            int modelColumn = convertColumnIndexToModel(col);
-                            DBColumn dbcol = getModel().getColumn(modelColumn);
-                            if (!dbcol.isGenerated()) {
-                                if (dbcol.isNullable()) {
-                                    enableSetToNull = true;
-                                }
-                                if (dbcol.hasDefault()) {
-                                    enableSetToDefault = true;
-                                }
-                            }
-                        }
-                    }
-
-                    miSetDefault.setEnabled(enableSetToDefault);
-                    miSetNull.setEnabled(enableSetToNull);
-
-                    // Enable copy if one or more rows are selected
-                    miCopyRowValues.setEnabled(rowsSelected);
-                    miCopyRowValuesH.setEnabled(rowsSelected);
-
-                    miCopyValue.setEnabled(cellUnderCursor);
-
-                    tablePopupMenu.show(DataViewTableUI.this, e.getX(), e.getY());
-                }
-            }
-        });
-    }
-}
diff --git a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
deleted file mode 100644
index b0eb987..0000000
--- a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR parent HEADER.
- *
- * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
- *
- * The contents of parent file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use parent file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include parent License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates parent
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied parent code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of parent file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include parent software in parent distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of parent file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.modules.db.dataview.output;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.net.URL;
-
-import javax.swing.AbstractButton;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.SwingUtilities;
-import org.jdesktop.swingx.JXButton;
-import org.jdesktop.swingx.JXLabel;
-import org.jdesktop.swingx.JXPanel;
-import org.netbeans.modules.db.dataview.table.JXTableRowHeader;
-import org.netbeans.modules.db.dataview.table.MultiColPatternFilter;
-import org.netbeans.modules.db.dataview.table.ResultSetJXTable;
-import static org.netbeans.modules.db.dataview.table.SuperPatternFilter.MODE.LITERAL_FIND;
-import org.openide.util.NbBundle;
-
-/**
- * DataViewUI hosting display of design-level SQL test output.
- *
- * @author Ahimanikya Satapathy
- */
-class DataViewUI extends JXPanel {
-
-    private JXButton commit;
-    private JXButton refreshButton;
-    private JXButton truncateButton;
-    private JXButton next;
-    private JXButton last;
-    private JXButton previous;
-    private JXButton first;
-    private JXButton deleteRow;
-    private JXButton insert;
-    private JTextField refreshField;
-    private JTextField matchBoxField;
-    private JXLabel totalRowsLabel;
-    private JXLabel limitRow;
-    private JXButton[] editButtons = new JXButton[5];
-    private DataViewTableUI dataPanel;
-    private JScrollPane dataPanelScrollPane;
-    private final DataViewPageContext pageContext;
-    private JXButton cancel;
-    private DataViewActionHandler actionHandler;
-    private String imgPrefix = "/org/netbeans/modules/db/dataview/images/"; // NOI18N
-
-    private static final int MAX_TAB_LENGTH = 25;
-
-    private final PropertyChangeListener pageContextListener =
-            new PropertyChangeListener() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    updateTotalCountLabel();
-                }
-            };
-
-    /** Shared mouse listener used for setting the border painting property
-     * of the toolbar buttons and for invoking the popup menu.
-     */
-    private static final MouseListener sharedMouseListener = new org.openide.awt.MouseUtils.PopupMouseAdapter() {
-
-        @Override
-        public void mouseEntered(MouseEvent evt) {
-            Object src = evt.getSource();
-
-            if (src instanceof AbstractButton) {
-                AbstractButton button = (AbstractButton) evt.getSource();
-                if (button.isEnabled()) {
-                    button.setContentAreaFilled(true);
-                    button.setBorderPainted(true);
-                }
-            }
-        }
-
-        @Override
-        public void mouseExited(MouseEvent evt) {
-            Object src = evt.getSource();
-            if (src instanceof AbstractButton) {
-                AbstractButton button = (AbstractButton) evt.getSource();
-                button.setContentAreaFilled(false);
-                button.setBorderPainted(false);
-            }
-        }
-
-        @Override
-        protected void showPopup(MouseEvent evt) {
-        }
-    };
-
-    DataViewUI(DataView dataView, DataViewPageContext pageContext, boolean nbOutputComponent) {
-        assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT thread";  //NOI18N
-
-        this.pageContext = pageContext;
-
-        //do not show tab view if there is only one tab
-        this.putClientProperty("TabPolicy", "HideWhenAlone"); //NOI18N
-        this.putClientProperty("PersistenceType", "Never"); //NOI18N
-
-        this.setLayout(new BorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder());
-
-        // Main pannel with toolbars
-        JPanel panel = initializeMainPanel(nbOutputComponent);
-        this.add(panel, BorderLayout.NORTH);
-
-        actionHandler = new DataViewActionHandler(this, dataView, pageContext);
-
-        //add resultset data panel
-        dataPanel = new DataViewTableUI(this, actionHandler, dataView, pageContext);
-        dataPanelScrollPane = new JScrollPane(dataPanel);
-        JXTableRowHeader rowHeader = new JXTableRowHeader(dataPanel);
-        dataPanelScrollPane.setRowHeaderView(rowHeader);
-        dataPanelScrollPane.setCorner(JScrollPane.UPPER_LEFT_CORNER, rowHeader.getTableHeader());
-
-        this.add(dataPanelScrollPane, BorderLayout.CENTER);
-        dataPanel.revalidate();
-        dataPanel.repaint();
-
-        dataPanel.setModel(pageContext.getModel());
-        pageContext.addPropertyChangeListener(pageContextListener);
-        updateTotalCountLabel();
-    }
-
-    void handleColumnUpdated() {
-        boolean editMode = dataPanel.getModel().hasUpdates();
-        commit.setEnabled(editMode);
-        cancel.setEnabled(editMode);
-        insert.setEnabled(!editMode);
-        deleteRow.setEnabled(!editMode);
-        truncateButton.setEnabled(!editMode);
-    }
-
-    JButton[] getEditButtons() {
-        return editButtons;
-    }
-
-    final void updateTotalCountLabel() {
-        assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT thread";  //NOI18N
-
-        if (pageContext.isTotalRowCountAvailable()) {
-            totalRowsLabel.setText(
-                    pageContext.getTotalRows() + "   " + pageContext.pageOf());
-        } else {
-            totalRowsLabel.setText(NbBundle.getMessage(DataViewUI.class,
-                    "LBL_not_available") + " "
-                    + pageContext.pageOf());
-        }
-    }
-
-    boolean isCommitEnabled() {
-        return commit.isEnabled();
-    }
-
-    DataViewTableUI getDataViewTableUI() {
-        return dataPanel;
-    }
-
-    DataViewTableUIModel getDataViewTableUIModel() {
-        return dataPanel.getModel();
-    }
-
-    void setCommitEnabled(boolean flag) {
-        commit.setEnabled(flag);
-    }
-
-    void setCancelEnabled(boolean flag) {
-        cancel.setEnabled(flag);
-    }
-
-    void disableButtons() {
-        assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT thread";  //NOI18N
-
-        truncateButton.setEnabled(false);
-        refreshButton.setEnabled(false);
-        refreshField.setEnabled(false);
-        matchBoxField.setEditable(false);
-
-        first.setEnabled(false);
-        previous.setEnabled(false);
-        next.setEnabled(false);
-        last.setEnabled(false);
-        deleteRow.setEnabled(false);
-        commit.setEnabled(false);
-        cancel.setEnabled(false);
-        insert.setEnabled(false);
-
-        dataPanel.revalidate();
-        dataPanel.repaint();
-    }
-
-    int getPageSize() {
-        int pageSize = pageContext.getPageSize();
-        int totalCount = pageContext.getTotalRows();
-        try {
-            int count = Integer.parseInt(refreshField.getText().trim());
-            return count < 0 ? pageSize : count;
-        } catch (NumberFormatException ex) {
-            return totalCount < pageSize ? totalCount : pageSize;
-        }
-    }
-
-    boolean isDirty() {
-        return dataPanel.getModel().hasUpdates();
-    }
-
-    void resetToolbar(boolean wasError) {
-        assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT thread";  //NOI18N
-
-        refreshButton.setEnabled(true);
-        refreshField.setEnabled(true);
-        matchBoxField.setEditable(true);
-        deleteRow.setEnabled(false);
-        if (!wasError) {
-            if (pageContext.hasPrevious()) {
-                first.setEnabled(true);
-                previous.setEnabled(true);
-            }
-
-            if (pageContext.hasNext()) {
-                next.setEnabled(true);
-                if (pageContext.getTotalRows() >= 0) {
-                    last.setEnabled(true);
-                }
-            }
-
-            if (pageContext.hasOnePageOnly()) {
-                first.setEnabled(false);
-                previous.setEnabled(false);
-            }
-
-            if (pageContext.isLastPage()) {
-                next.setEnabled(false);
-                last.setEnabled(false);
-            }
-
-            // editing controls
-            if (! dataPanel.getModel().isEditable()) {
-                commit.setEnabled(false);
-                cancel.setEnabled(false);
-                deleteRow.setEnabled(false);
-                insert.setEnabled(false);
-                truncateButton.setEnabled(false);
-            } else {
-                if (pageContext.hasRows()) {
-                    truncateButton.setEnabled(true);
-                } else {
-                    deleteRow.setEnabled(false);
-                    truncateButton.setEnabled(false);
-                    pageContext.first();
-                }
-                insert.setEnabled(true);
-                if (getDataViewTableUIModel().getUpdateKeys().isEmpty()) {
-                    commit.setEnabled(false);
-                    cancel.setEnabled(false);
-                } else {
-                    commit.setEnabled(true);
-                    cancel.setEnabled(true);
-                }
-            }
-        } else {
-            disableButtons();
-        }
-
-        refreshField.setText("" + pageContext.getPageSize());
-        if (dataPanel != null) {
-            dataPanel.revalidate();
-            dataPanel.repaint();
-        }
-    }
-
-    private ActionListener createOutputListener() {
-
-        ActionListener outputListener = new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Object src = e.getSource();
-                if (src.equals(refreshButton)) {
-                    actionHandler.refreshActionPerformed();
-                } else if (src.equals(first)) {
-                    actionHandler.firstActionPerformed();
-                } else if (src.equals(last)) {
-                    actionHandler.lastActionPerformed();
-                } else if (src.equals(next)) {
-                    actionHandler.nextActionPerformed();
-                } else if (src.equals(previous)) {
-                    actionHandler.previousActionPerformed();
-                } else if (src.equals(refreshField)) {
-                    actionHandler.updateActionPerformed();
-                } else if (src.equals(commit)) {
-                    actionHandler.commitActionPerformed(false);
-                } else if (src.equals(cancel)) {
-                    actionHandler.cancelEditPerformed(false);
-                } else if (src.equals(deleteRow)) {
-                    actionHandler.deleteRecordActionPerformed();
-                } else if (src.equals(insert)) {
-                    actionHandler.insertActionPerformed();
-                } else if (src.equals(truncateButton)) {
-                    actionHandler.truncateActionPerformed();
-                }
-            }
-        };
-
-        return outputListener;
-    }
-    private static final Insets BUTTON_INSETS = new Insets(2, 1, 0, 1);
-
-    private void processButton(AbstractButton button) {
-        button.setContentAreaFilled(false);
-        button.setBorderPainted(false);
-        button.setMargin(BUTTON_INSETS);
-        if (button instanceof AbstractButton) {
-            button.addMouseListener(sharedMouseListener);
-        }
-        //Focus shouldn't stay in toolbar
-        button.setFocusable(false);
-    }
-
-    private void initToolbarWest(JToolBar toolbar, ActionListener outputListener, boolean nbOutputComponent) {
-
-        if (!nbOutputComponent) {
-            JButton[] btns = getEditButtons();
-            for (JButton btn : btns) {
-                if (btn != null) {
-                    toolbar.add(btn);
-                }
-            }
-        }
-
-        toolbar.addSeparator(new Dimension(10, 10));
-
-        //add refresh button
-        URL url = getClass().getResource(imgPrefix + "refresh.png"); // NOI18N
-        refreshButton = new JXButton(new ImageIcon(url));
-        refreshButton.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_refresh"));
-        refreshButton.addActionListener(outputListener);
-        processButton(refreshButton);
-
-        toolbar.add(refreshButton);
-
-        // add navigation buttons
-        url = getClass().getResource(imgPrefix + "navigate_beginning.png"); // NOI18N
-        first = new JXButton(new ImageIcon(url));
-        first.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_first"));
-        first.addActionListener(outputListener);
-        first.setEnabled(false);
-        processButton(first);
-        toolbar.add(first);
-
-        url = getClass().getResource(imgPrefix + "navigate_left.png"); // NOI18N
-        previous = new JXButton(new ImageIcon(url));
-        previous.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_previous"));
-        previous.addActionListener(outputListener);
-        previous.setEnabled(false);
-        processButton(previous);
-        toolbar.add(previous);
-
-        url = getClass().getResource(imgPrefix + "navigate_right.png"); // NOI18N
-        next = new JXButton(new ImageIcon(url));
-        next.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_next"));
-        next.addActionListener(outputListener);
-        next.setEnabled(false);
-        processButton(next);
-        toolbar.add(next);
-
-        url = getClass().getResource(imgPrefix + "navigate_end.png"); // NOI18N
-        last = new JXButton(new ImageIcon(url));
-        last.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_last"));
-        last.addActionListener(outputListener);
-        last.setEnabled(false);
-        toolbar.add(last);
-        processButton(last);
-        toolbar.addSeparator(new Dimension(10, 10));
-
-        //add limit row label
-        limitRow = new JXLabel(NbBundle.getMessage(DataViewUI.class, "LBL_max_rows"));
-        limitRow.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
-        toolbar.add(limitRow);
-
-        //add refresh text field
-        refreshField = new JTextField(5);
-        refreshField.setMinimumSize(refreshField.getPreferredSize());
-        refreshField.setMaximumSize(refreshField.getPreferredSize());
-        refreshField.addFocusListener(new FocusAdapter() {
-            @Override
-            public void focusGained(FocusEvent e) {
-                refreshField.selectAll();
-            }
-        });
-        refreshField.addActionListener(outputListener);
-        toolbar.add(refreshField);
-        toolbar.addSeparator(new Dimension(10, 10));
-
-        JXLabel totalRowsNameLabel = new JXLabel(NbBundle.getMessage(DataViewUI.class, "LBL_total_rows"));
-        totalRowsNameLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(DataViewUI.class, "LBL_total_rows"));
-        totalRowsNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
-        toolbar.add(totalRowsNameLabel);
-        totalRowsLabel = new JXLabel();
-        toolbar.add(totalRowsLabel);
-
-        toolbar.addSeparator(new Dimension(10, 10));
-    }
-
-    private void initToolbarEast(JToolBar toolbar) {
-        // match box labble
-        JXLabel matchBoxRow = new JXLabel(NbBundle.getMessage(DataViewUI.class, "LBL_matchbox"));
-        matchBoxRow.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
-        toolbar.add(matchBoxRow);
-
-        //add matchbox text field
-        matchBoxField = new JTextField(10);
-        matchBoxField.setText(""); // NOI18N
-        matchBoxField.setMinimumSize(new Dimension(35, matchBoxField.getHeight()));
-        matchBoxField.setSize(35, matchBoxField.getHeight());
-
-        matchBoxField.addKeyListener(new KeyListener() {
-
-            @Override
-            public void keyTyped(KeyEvent e) {
-                processKeyEvents();
-            }
-
-            @Override
-            public void keyPressed(KeyEvent e) {
-                processKeyEvents();
-            }
-
-            @Override
-            public void keyReleased(KeyEvent e) {
-                processKeyEvents();
-            }
-        });
-        toolbar.add(matchBoxField);
-    }
-
-    private void processKeyEvents() {
-        ResultSetJXTable table = getDataViewTableUI();
-        int[] rows = new int[table.getColumnCount()];
-        for (int i = 0; i < table.getColumnCount(); i++) {
-            rows[i] = i;
-        }
-        {
-            MultiColPatternFilter filterP = new MultiColPatternFilter(rows);
-            filterP.setFilterStr(matchBoxField.getText(), LITERAL_FIND);
-            table.setRowFilter(filterP);
-        }
-    }
-
-    private void initVerticalToolbar(ActionListener outputListener) {
-
-        URL url = getClass().getResource(imgPrefix + "row_add.png"); // NOI18N
-        insert = new JXButton(new ImageIcon(url));
-        insert.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_insert")+" (Alt+I)");
-        insert.setMnemonic('I');
-        insert.addActionListener(outputListener);
-        insert.setEnabled(false);
-        processButton(insert);
-        editButtons[0] = insert;
-
-        url = getClass().getResource(imgPrefix + "row_delete.png"); // NOI18N
-        deleteRow = new JXButton(new ImageIcon(url));
-        deleteRow.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_deleterow"));
-        deleteRow.addActionListener(outputListener);
-        deleteRow.setEnabled(false);
-        processButton(deleteRow);
-        editButtons[1] = deleteRow;
-
-        url = getClass().getResource(imgPrefix + "row_commit.png"); // NOI18N
-        commit = new JXButton(new ImageIcon(url));
-        commit.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_commit_all"));
-        commit.addActionListener(outputListener);
-        commit.setEnabled(false);
-        processButton(commit);
-        editButtons[2] = commit;
-
-        url = getClass().getResource(imgPrefix + "cancel_edits.png"); // NOI18N
-        cancel = new JXButton(new ImageIcon(url));
-        cancel.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_cancel_edits_all"));
-        cancel.addActionListener(outputListener);
-        cancel.setEnabled(false);
-        processButton(cancel);
-        editButtons[3] = cancel;
-
-        //add truncate button
-        url = getClass().getResource(imgPrefix + "table_truncate.png"); // NOI18N
-        truncateButton = new JXButton(new ImageIcon(url));
-        truncateButton.setToolTipText(NbBundle.getMessage(DataViewUI.class, "TOOLTIP_truncate_table")+" (Alt+T)");
-        truncateButton.setMnemonic('T');
-        truncateButton.addActionListener(outputListener);
-        truncateButton.setEnabled(false);
-        processButton(truncateButton);
-        editButtons[4] = truncateButton;
-    }
-
-    private JPanel initializeMainPanel(boolean nbOutputComponent) {
-
-        JXPanel panel = new JXPanel();
-        panel.setBorder(BorderFactory.createEtchedBorder());
-        panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
-
-        ActionListener outputListener = createOutputListener();
-        initVerticalToolbar(outputListener);
-
-        JToolBar toolbarWest = new JToolBar();
-        toolbarWest.setFloatable(false);
-        toolbarWest.setRollover(true);
-        initToolbarWest(toolbarWest, outputListener, nbOutputComponent);
-        
-        JToolBar toolbarEast = new JToolBar();
-        toolbarEast.setFloatable(false);
-        toolbarEast.setRollover(true);
-        initToolbarEast(toolbarEast);
-        toolbarEast.setMinimumSize(toolbarWest.getPreferredSize());
-        toolbarEast.setSize(toolbarWest.getPreferredSize());
-        toolbarEast.setMaximumSize(toolbarWest.getPreferredSize());
-
-        panel.add(toolbarWest);
-        panel.add(Box.createHorizontalGlue());
-        panel.add(toolbarEast);
-
-        return panel;
-    }
-
-    public void enableDeleteBtn(boolean value) {
-        deleteRow.setEnabled(value);
-    }
-}
diff --git a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
deleted file mode 100644
index 88a9b3a..0000000
--- a/.pc/db.dataview-setRowFilter-method.patch/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2012 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.db.dataview.table;
-
-import java.awt.datatransfer.StringSelection;
-import java.awt.datatransfer.Transferable;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.DefaultRowSorter;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.RowFilter;
-import javax.swing.RowSorter;
-import javax.swing.TransferHandler;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.plaf.UIResource;
-import javax.swing.table.*;
-import org.jdesktop.swingx.JXTableHeader;
-import org.jdesktop.swingx.decorator.ColorHighlighter;
-import org.jdesktop.swingx.decorator.HighlightPredicate;
-import org.jdesktop.swingx.decorator.HighlighterFactory;
-import org.jdesktop.swingx.renderer.CheckBoxProvider;
-import org.jdesktop.swingx.renderer.JRendererCheckBox;
-import org.jdesktop.swingx.renderer.StringValues;
-import org.netbeans.modules.db.dataview.meta.DBColumn;
-import org.netbeans.modules.db.dataview.table.celleditor.*;
-import org.netbeans.modules.db.dataview.util.BinaryToStringConverter;
-import org.netbeans.modules.db.dataview.util.DataViewUtils;
-import org.netbeans.modules.db.dataview.util.DateType;
-import org.netbeans.modules.db.dataview.util.TimeType;
-import org.netbeans.modules.db.dataview.util.TimestampType;
-import org.openide.util.Exceptions;
-import org.openide.util.Lookup;
-import org.openide.util.datatransfer.ExClipboard;
-
-/**
- * A better-looking table than JTable, implements JXTable and a decorator to draw empty rows 
- *
- * @author Ahimanikya Satapathy
- */
-public class ResultSetJXTable extends JXTableDecorator {
-    private static final String data = "WE WILL EITHER FIND A WAY, OR MAKE ONE."; // NOI18N
-    private static final Logger mLogger = Logger.getLogger(ResultSetJXTable.class.getName());
-    private static final int MAX_COLUMN_WIDTH = 25;
-    private static final DateFormat timeFormat = new SimpleDateFormat(TimeType.DEFAULT_FOMAT_PATTERN);
-    private static final DateFormat dateFormat = new SimpleDateFormat(DateType.DEFAULT_FOMAT_PATTERN);
-    private static final DateFormat timestampFormat = new SimpleDateFormat(TimestampType.DEFAULT_FORMAT_PATTERN);
-    
-    private final int multiplier;
-
-    // If structure changes, enforce relayout
-    private final TableModelListener dataExchangedListener = new TableModelListener() {
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            if(e.getFirstRow() == TableModelEvent.HEADER_ROW) {
-                updateHeader();
-            }
-        }
-    };
-
-    @SuppressWarnings("OverridableMethodCallInConstructor")
-    public ResultSetJXTable() {
-        this.setAutoCreateColumnsFromModel(false);
-        this.setTransferHandler(new TableTransferHandler());
-
-        setShowGrid(true, true);
-        setGridColor(GRID_COLOR);
-
-        getTableHeader().setReorderingAllowed(false);
-        setColumnControlVisible(true);
-        getColumnControl().setToolTipText(org.openide.util.NbBundle.getMessage(ResultSetJXTable.class, "ResultSetJXTable.columnControl.tooltip"));
-        setFillsViewportHeight(true);
-        setHorizontalScrollEnabled(true);
-
-        setHighlighters(HighlighterFactory.createAlternateStriping(ROW_COLOR, ALTERNATE_ROW_COLOR));
-        addHighlighter(new ColorHighlighter(HighlightPredicate.ROLLOVER_ROW, ROLLOVER_ROW_COLOR, null));
-
-        setDefaultCellRenderers();
-        setDefaultCellEditors();
-
-        multiplier = getFontMetrics(getFont()).stringWidth(data) / data.length() + 4;
-        putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
-        this.setModel(createDefaultDataModel());
-
-        getActionMap().put("selectNextColumnCell", new EditingAwareAction(getActionMap().get("selectNextColumnCell")));
-        getActionMap().put("selectPreviousColumnCell", new EditingAwareAction(getActionMap().get("selectPreviousColumnCell")));
-        getActionMap().put("selectNextRowCell", new EditingAwareAction(getActionMap().get("selectNextRowCell")));
-        getActionMap().put("selectNextPreviousCell", new EditingAwareAction(getActionMap().get("selectPreviousRowCell")));
-
-        setSurrendersFocusOnKeystroke(true);
-    }
-
-    @Override
-    protected JTableHeader createDefaultTableHeader() {
-        return new JTableHeaderImpl(columnModel);
-    }
-
-    @Override
-    protected RowSorter<? extends TableModel> createDefaultRowSorter() {
-        return new StringFallbackRowSorter(this.getModel());
-    }
-
-    @Override
-    protected TableModel createDefaultDataModel() {
-        return new ResultSetTableModel(new DBColumn[0]);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <R extends TableModel> void setRowFilter(RowFilter<? super R, ? super Integer> filter) {
-        if(getRowSorter() instanceof DefaultRowSorter) {
-            ((DefaultRowSorter) getRowSorter()).setRowFilter(filter);
-        } else {
-            super.setRowFilter(filter);
-        }
-    }
-
-    @Override
-    public void setModel(TableModel dataModel) {
-        if(! (dataModel instanceof ResultSetTableModel)) {
-            throw new IllegalArgumentException(
-                    "TableModel for ResultSetJXTable must be an "  // NOI18N
-                    + " instance of ResultSetTableModel"           // NOI18N
-            );
-        }
-        if(getModel() != null) {
-            getModel().removeTableModelListener(dataExchangedListener);
-        }
-        super.setModel(dataModel);
-        updateHeader();
-        dataModel.addTableModelListener(dataExchangedListener);
-    }
-
-    @Override
-    public ResultSetTableModel getModel() {
-        return (ResultSetTableModel) super.getModel();
-    }
-
-    @SuppressWarnings("deprecation")
-    protected void setDefaultCellRenderers() {
-        setDefaultRenderer(Object.class, new ResultSetCellRenderer());
-        setDefaultRenderer(String.class, new ResultSetCellRenderer());
-        setDefaultRenderer(Number.class, new ResultSetCellRenderer(StringValues.NUMBER_TO_STRING, JLabel.RIGHT));
-        setDefaultRenderer(Boolean.class, new ResultSetCellRenderer(new CheckBoxProvider()));
-        setDefaultRenderer(java.sql.Date.class, new ResultSetCellRenderer(StringValues.DATE_TO_STRING));
-        setDefaultRenderer(java.sql.Time.class, new ResultSetCellRenderer(ResultSetCellRenderer.TIME_TO_STRING));
-        setDefaultRenderer(java.sql.Timestamp.class, new ResultSetCellRenderer(ResultSetCellRenderer.DATETIME_TO_STRING));
-        setDefaultRenderer(java.util.Date.class, new ResultSetCellRenderer(ResultSetCellRenderer.DATETIME_TO_STRING));
-    }
-
-    protected void setDefaultCellEditors() {
-
-        KeyListener kl = createControKeyListener();
-        JTextField txtFld = new JTextField();
-        txtFld.addKeyListener(kl);
-
-        setDefaultEditor(Object.class, new StringTableCellEditor(txtFld));
-        setDefaultEditor(String.class, new StringTableCellEditor(txtFld));
-        setDefaultEditor(java.sql.Time.class, new StringTableCellEditor(txtFld));
-        setDefaultEditor(Blob.class, new BlobFieldTableCellEditor());
-        setDefaultEditor(Clob.class, new ClobFieldTableCellEditor());
-        
-        JTextField numFld = new JTextField();
-        txtFld.addKeyListener(kl);
-        setDefaultEditor(Number.class, new NumberFieldEditor(numFld));
-
-        JRendererCheckBox b = new JRendererCheckBox();
-        b.addKeyListener(kl);
-        setDefaultEditor(Boolean.class, new BooleanTableCellEditor(b));
-
-        try {
-            DateTimePickerCellEditor dateEditor = new DateTimePickerCellEditor(new SimpleDateFormat (DateType.DEFAULT_FOMAT_PATTERN));
-            setDefaultEditor(java.sql.Date.class, dateEditor);
-        } catch (NullPointerException npe) {
-            mLogger.log(Level.WARNING, "While creating DatePickerCellEditor was thrown " + npe, npe);
-        }
-
-        try{
-            DateTimePickerCellEditor dateTimeEditor = new DateTimePickerCellEditor(new SimpleDateFormat (TimestampType.DEFAULT_FORMAT_PATTERN));
-            dateTimeEditor.addKeyListener(kl);
-            setDefaultEditor(Timestamp.class, dateTimeEditor);
-            setDefaultEditor(java.util.Date.class, dateTimeEditor);
-        } catch (NullPointerException npe) {
-            mLogger.log(Level.WARNING, "While creating DateTimePickerCellEditor was thrown " + npe, npe);
-        }
-    }
-
-    protected KeyListener createControKeyListener() {
-        return new KeyListener() {
-
-            @Override
-            public void keyTyped(KeyEvent arg0) {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent arg0) {
-            }
-
-            @Override
-            public void keyReleased(KeyEvent arg0) {
-            }
-        };
-    }
-
-    protected void updateHeader() {
-        TableColumnModel dtcm = createDefaultColumnModel();
-
-        DBColumn[] columns = getModel().getColumns();
-
-        List<Integer> columnWidthList = getColumnWidthList(columns);
-
-        for (int i = 0; i < columns.length; i++) {
-            TableColumn tc = getColumnFactory().createTableColumn(i);
-            tc.setPreferredWidth(columnWidthList.get(i));
-
-            DBColumn col = columns[i];
-            StringBuilder sb = new StringBuilder();
-            sb.append("<html>");                                    //NOI18N
-            if (col.getDisplayName() != null) {
-                sb.append(DataViewUtils.escapeHTML(col.getDisplayName()));
-            }
-            sb.append("</html>");                                  // NOI18N
-            tc.setHeaderValue(sb.toString());
-            tc.setIdentifier(col.getDisplayName() == null
-                    ? "COL_" + i : col.getDisplayName());           //NOI18N
-
-            dtcm.addColumn(tc);
-        }
-
-        setColumnModel(dtcm);
-    }
-
-    private List<Integer> getColumnWidthList(DBColumn[] columns) {
-        List<Integer> result = new ArrayList<>();
-
-        for (DBColumn col : columns) {
-            int fieldWidth = col.getDisplaySize();
-            int labelWidth = col.getDisplayName().length();
-            int colWidth = Math.max(fieldWidth, labelWidth) * multiplier;
-            if (colWidth < 5) {
-                colWidth = 15 * multiplier;
-            }
-            if (colWidth > MAX_COLUMN_WIDTH * multiplier) {
-                colWidth = MAX_COLUMN_WIDTH * multiplier;
-            }
-            result.add(colWidth);
-        }
-        return result;
-    }
-
-    @Override
-    public boolean isCellEditable(int row, int column) {
-        if (getCellEditor(row, column) instanceof AlwaysEnable) {
-            return true;
-        }
-        try {
-            if (getModel() != null) {
-                int modelRow = convertRowIndexToModel(row);
-                int modelColumn = convertColumnIndexToModel(column);
-                return getModel().isCellEditable(modelRow, modelColumn);
-            }
-        } catch (IndexOutOfBoundsException ex) {
-            // Swallow it silently - its unclear under which circumstances
-            // the problem happens, but in case an illegal row/column combination
-            // is requested its saver/saner to just mark cell as not editable
-        }
-        return false;
-    }
-    
-    /**
-     * Quote string for use in TSV (tab-separated values file
-     *
-     * Assumptions: column separator is \t and row separator is \n
-     */
-    protected String quoteIfNecessary(String value) {
-        if (value == null || value.isEmpty()) {
-            return "\"\""; //NOI18N
-        } else if (value.contains("\t") || value.contains("\n") //NOI18N
-                || value.contains("\"")) { //NOI18N
-            return "\"" + value.replace("\"", "\"\"") + "\""; //NOI18N
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * Convert object to string representation
-     *
-     * @param o object to convert
-     * @param limitSize in case of CLOBs and BLOBs limit to limitSize
-     * bytes/chars
-     * @return string representation of o
-     */
-    protected String convertToClipboardString(Object o, int limitSize) {
-        if (o instanceof Blob) {
-            Blob b = (Blob) o;
-            try {
-                if (b.length() <= limitSize) {
-                    return BinaryToStringConverter.convertToString(
-                            b.getBytes(1, (int) b.length()), 16, false);
-                }
-            } catch (SQLException ex) {
-            }
-        } else if (o instanceof Clob) {
-            Clob c = (Clob) o;
-            try {
-                if (c.length() <= limitSize) {
-                    return c.getSubString(1, (int) c.length());
-                }
-            } catch (SQLException ex) {
-            }
-        } else if (o instanceof java.sql.Time) {
-            synchronized(timeFormat) {
-                return timeFormat.format((java.util.Date) o);
-            }
-        } else if (o instanceof java.sql.Date) {
-            synchronized(dateFormat) {
-                return dateFormat.format((java.util.Date) o);
-            }
-        } else if (o instanceof java.util.Date) {
-            synchronized(timestampFormat) {
-                return timestampFormat.format((java.util.Date) o);
-            }
-        } else if (o == null) {
-            return "";  //NOI18N
-        }
-        return o.toString();
-    }
-
-    /**
-     * Create TSV (tab-separated values) string from row data
-     *
-     * @param withHeader include column headers?
-     * @return Transferable for clipboard transfer
-     */
-    private StringSelection createTransferableTSV(boolean withHeader) {
-        try {
-            int[] rows = getSelectedRows();
-            int[] columns;
-            if (getRowSelectionAllowed()) {
-                columns = new int[getColumnCount()];
-                for (int a = 0; a < columns.length; a++) {
-                    columns[a] = a;
-                }
-            } else {
-                columns = getSelectedColumns();
-            }
-            if (rows != null && columns != null) {
-                StringBuilder output = new StringBuilder();
-
-                if (withHeader) {
-                    for (int column = 0; column < columns.length; column++) {
-                        if (column > 0) {
-                            output.append('\t'); //NOI18N
-
-                        }
-                        Object o = getColumnModel().getColumn(column).
-                                getIdentifier();
-                        String s = o != null ? o.toString() : "";
-                        output.append(quoteIfNecessary(s));
-                    }
-                    output.append('\n'); //NOI18N
-
-                }
-
-                for (int row = 0; row < rows.length; row++) {
-                    for (int column = 0; column < columns.length; column++) {
-                        if (column > 0) {
-                            output.append('\t'); //NOI18N
-
-                        }
-                        Object o = getValueAt(rows[row], columns[column]);
-                        // Limit 1 MB/1 Million Characters.
-                        String s = convertToClipboardString(o, 1024 * 1024);
-                        output.append(quoteIfNecessary(s));
-
-                    }
-                    output.append('\n'); //NOI18N
-
-                }
-                return new StringSelection(output.toString());
-            }
-            return null;
-        } catch (ArrayIndexOutOfBoundsException exc) {
-            Exceptions.printStackTrace(exc);
-            return null;
-        }
-    }
-
-    protected void copyRowValues(boolean withHeader) {
-        ExClipboard clipboard = Lookup.getDefault().lookup(ExClipboard.class);
-        StringSelection selection = createTransferableTSV(withHeader);
-        clipboard.setContents(selection, selection);
-    }
-
-    // This is mainly used for set Tooltip for column headers
-    private class JTableHeaderImpl extends JXTableHeader {
-
-        public JTableHeaderImpl(TableColumnModel cm) {
-            super(cm);
-        }
-
-        @Override
-        public String getToolTipText(MouseEvent e) {
-            return getColumnToolTipText(e);
-        }
-
-        @Override
-        protected String getColumnToolTipText(MouseEvent e) {
-            java.awt.Point p = e.getPoint();
-            int index = columnModel.getColumnIndexAtX(p.x);
-            try {
-                int realIndex = columnModel.getColumn(index).getModelIndex();
-                ResultSetTableModel tm = getModel();
-                if (tm != null) {
-                    return tm.getColumnTooltip(realIndex);
-                } else {
-                    return "";
-                }
-            } catch (ArrayIndexOutOfBoundsException aio) {
-                return null;
-            }
-        }
-    }
-
-    private class TableTransferHandler extends TransferHandler
-            implements UIResource {
-
-        /**
-         * Map Transferable to createTransferableTSV from ResultSetJXTable
-         *
-         * This is needed so that CTRL-C Action of JTable gets the same
-         * treatment as the transfer via the copy Methods of DataTableUI
-         */
-        @Override
-        protected Transferable createTransferable(JComponent c) {
-            return createTransferableTSV(false);
-        }
-
-        @Override
-        public int getSourceActions(JComponent c) {
-            return COPY;
-        }
-    }
-
-    private class EditingAwareAction extends AbstractAction {
-
-        private final Action delegate;
-
-        public EditingAwareAction(Action delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            boolean editing = isEditing();
-            delegate.actionPerformed(e);
-            if (editing) {
-                editCellAt(getSelectedRow(), getSelectedColumn());
-            }
-        }
-    }
-
-}
diff --git a/.pc/javaewah-version.patch/o.eclipse.jgit/nbproject/project.xml b/.pc/javaewah-version.patch/o.eclipse.jgit/nbproject/project.xml
deleted file mode 100644
index 897d09c..0000000
--- a/.pc/javaewah-version.patch/o.eclipse.jgit/nbproject/project.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
-            <code-name-base>org.eclipse.jgit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>com.jcraft.jsch</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>0.7.9</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-CommandLineParser.patch/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java b/.pc/netbeans-CommandLineParser.patch/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
deleted file mode 100644
index c3b9a82..0000000
--- a/.pc/netbeans-CommandLineParser.patch/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
+++ /dev/null
@@ -1,1285 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development and
- * Distribution License("CDDL") (collectively, the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy of
- * the License at http://www.netbeans.org/cddl-gplv2.html or
- * nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language
- * governing permissions and limitations under the License. When distributing
- * the software, include this License Header Notice in each file and include
- * the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided by
- * Oracle in the GPL Version 2 section of the License file that accompanied
- * this code. If applicable, add the following below the License Header, with
- * the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you do not indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to its
- * licensees as provided above. However, if you add GPL Version 2 code and
- * therefore, elected the GPL Version 2 license, then the option applies only
- * if the new code is made subject to such option by the copyright holder.
- */
-package org.netbeans.modules.java.api.common.project.ui.customizer.vmo.gen;
-
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.JavaVMOption;
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.SwitchNode;
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.UserPropertyNode;
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.UnrecognizedOption;
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.UnknownOption;
-import org.netbeans.modules.java.api.common.project.ui.customizer.vmo.ParametrizedNode;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
-
-import org.antlr.runtime.tree.*;
-
-public class CommandLineParser extends Parser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "WS", "TEXT", "LETTER", "'-'", "'='", "'\\''", "'\"'"
-    };
-    public static final int EOF=-1;
-    public static final int T__7=7;
-    public static final int T__8=8;
-    public static final int T__9=9;
-    public static final int T__10=10;
-    public static final int WS=4;
-    public static final int TEXT=5;
-    public static final int LETTER=6;
-
-    // delegates
-    // delegators
-
-
-        public CommandLineParser(TokenStream input) {
-            this(input, new RecognizerSharedState());
-        }
-        public CommandLineParser(TokenStream input, RecognizerSharedState state) {
-            super(input, state);
-             
-        }
-        
-    protected TreeAdaptor adaptor = new CommonTreeAdaptor();
-
-    public void setTreeAdaptor(TreeAdaptor adaptor) {
-        this.adaptor = adaptor;
-    }
-    public TreeAdaptor getTreeAdaptor() {
-        return adaptor;
-    }
-
-    public String[] getTokenNames() { return CommandLineParser.tokenNames; }
-    public String getGrammarFileName() { return "/Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g"; }
-
-
-
-    	private static final String SERVER = "server";
-    	private static final String CLIENT = "client";
-    	private static final String ESA = "esa";
-    	private static final String ESA_LONG = "enablesystemassertions";
-    	private static final String DSA = "dsa";
-    	private static final String DSA_LONG = "disablesystemassertions";
-    	private static final String EA = "ea";
-    	private static final String EA_LONG = "enableassertions";
-    	private static final String DA = "da";
-    	private static final String DA_LONG = "disableassertions";
-    	private static final String VERBOSE = "verbose";
-    	private static final String SVERSION = "showversion";
-    	private static final String HELP = "?";
-    	private static final String HELP_LONG = "help";
-    	private static final String X = "X";
-    	private static final String XINT = "Xint";
-    	private static final String XBATCH = "Xbatch";
-    	private static final String XCJNI = "Xcheck";
-    	private static final String XFUTURE = "Xfuture";
-    	private static final String XNOCLSGC = "Xnoclassgc";
-    	private static final String XINCGC = "Xincgc";
-    	private static final String XPROF = "Xprof";
-    	private static final String XRS = "Xrs";
-    	private static final String XSHARE = "Xshare";
-    	private static final String JRE_SEARCH="jre-restrict-search";
-    	private static final String JRE_NO_SEARCH="jre-no-restrict-search";
-    	private static final String SPLASH = "splash";
-    	private static final String XLOGGC = "Xloggc";
-    	private static final String JAVAAGENT = "javaagent";
-    	private static final String AGENTLIB = "agentlib";
-    	private static final String AGENTPATH = "agentpath";
-    	private static final String BOOTCP = "Xbootclasspath";
-    	private static final String BOOTCPAPPEND = "Xbootclasspath/a";
-    	private static final String BOOTCPPREPEND = "Xbootclasspath/p";
-    	private static final String VERSION = "version";
-    	private static final String CLASSPATH = "cp";
-    	private static final String CLASSPATH_LONG = "classpath";
-
-    	private static final Set<String> switchOptions = new HashSet<String>() {
-    	    {
-    	    	this.addAll(Arrays.asList(
-    	    	SERVER,
-    	    	CLIENT,
-    	    	ESA,
-    	    	ESA_LONG,
-    	    	DSA,
-    	    	DSA_LONG,
-    	    	EA,
-    	    	EA_LONG,
-    	    	DA,
-    	    	DA_LONG,
-    	    	SVERSION,
-    	    	HELP,
-    	    	HELP_LONG,
-    	    	X,
-    	    	XINT,
-    	    	XBATCH,
-    	    	XFUTURE,
-    	    	XNOCLSGC,
-    	    	XINCGC,
-    	    	XPROF,
-    	    	XRS,
-    	    	JRE_SEARCH,
-    	    	JRE_NO_SEARCH));
-    	    }
-    	};
-    	
-    	private static final Set<String> paramOptions = new HashSet<String>(){
-    	    {
-    	        addAll(Arrays.asList(
-    	        SPLASH,
-    	        XLOGGC,
-    	        JAVAAGENT,
-    	        AGENTLIB,
-    	        AGENTPATH,
-    	        BOOTCP,
-    	        BOOTCPAPPEND,
-    	        BOOTCPPREPEND
-    	        ));
-    	    }
-    	};
-    	
-    	private static final Pattern memOptions = Pattern.compile("X(m[sx]|ss)\\d+[gGmMkK]");
-    	
-    	private static boolean isParamOption(final String text) {
-    		for (String option : paramOptions) {
-    		    if (text.startsWith(option+':')) {
-    		    	return true;
-    		    }
-    		}
-    		return false;
-    	}
-    	
-    	//xxx: Wrong! Should use TreeGrammer and not to populate customizer with custom nodes
-    	//Should be rewritten but I have no time for this
-    	public List<JavaVMOption<?>> parse() {
-            Set<JavaVMOption<?>> result = new HashSet<JavaVMOption<?>>(); 
-            try {
-                vmOptions_return options_return = vmOptions();
-                CommonTree root = options_return.tree;
-                if (root instanceof JavaVMOption<?>) {
-                    result.add((JavaVMOption<?>) root);
-                } else if (root != null) {
-                    result.addAll(root.getChildren());
-                }                                       
-            } catch (RecognitionException e) {
-                e.printStackTrace();
-            }
-            result.addAll(getAllOptions());
-            return new LinkedList<JavaVMOption<?>>(result); 
-        }
-
-
-        private static enum Kind {
-            SWITCH, D, LOOSEPARAM, EQPARAM, COLUMNPARAM, FOLLOWED
-        }
-
-
-        private static class OptionDefinition {
-            private OptionDefinition(String name, Kind kind) {
-                this.kind = kind;
-                this.name = name;
-            }
-
-            Kind kind;
-            String name;
-        }
-
-        private static OptionDefinition[] optionsTemplates = {
-                new OptionDefinition("client", Kind.SWITCH),
-                new OptionDefinition("server", Kind.SWITCH),
-                new OptionDefinition("ea", Kind.SWITCH),
-                new OptionDefinition("da", Kind.SWITCH),
-                new OptionDefinition("esa", Kind.SWITCH),
-                new OptionDefinition("dsa", Kind.SWITCH),
-                new OptionDefinition("verbose", Kind.SWITCH),
-                new OptionDefinition("verbose:class", Kind.SWITCH),
-                new OptionDefinition("verbose:jni", Kind.SWITCH),
-                new OptionDefinition("verbose:gc", Kind.SWITCH),
-                new OptionDefinition("version", Kind.SWITCH),
-                new OptionDefinition("version", Kind.COLUMNPARAM),
-                new OptionDefinition("showversion", Kind.SWITCH),
-                new OptionDefinition("Xint", Kind.SWITCH),
-                new OptionDefinition("Xbatch", Kind.SWITCH),
-                new OptionDefinition("Xcheck:jni", Kind.SWITCH),
-                new OptionDefinition("Xfuture", Kind.SWITCH),
-                new OptionDefinition("Xnoclassgc", Kind.SWITCH),
-                new OptionDefinition("Xincgc", Kind.SWITCH),
-                new OptionDefinition("Xprof", Kind.SWITCH),
-                new OptionDefinition("Xrs", Kind.SWITCH),
-                new OptionDefinition("Xshare:off", Kind.SWITCH),
-                new OptionDefinition("Xshare:on", Kind.SWITCH),
-                new OptionDefinition("Xshare:auto", Kind.SWITCH),
-                new OptionDefinition("jre-restrict-search", Kind.SWITCH),
-                new OptionDefinition("jre-no-restrict-search", Kind.SWITCH),
-                new OptionDefinition("Xmx", Kind.FOLLOWED),
-                new OptionDefinition("Xms", Kind.FOLLOWED),
-                new OptionDefinition("Xss", Kind.FOLLOWED),
-                new OptionDefinition("splash", Kind.COLUMNPARAM),
-                new OptionDefinition("javaagent", Kind.COLUMNPARAM),
-                new OptionDefinition("agentlib", Kind.COLUMNPARAM),
-                new OptionDefinition("agentpath", Kind.COLUMNPARAM),
-        };
-
-        public static List<JavaVMOption<?>> getAllOptions() {
-            List<JavaVMOption<?>> result = new LinkedList<JavaVMOption<?>>();
-            for (OptionDefinition optionsTemplate : optionsTemplates) {
-                result.add(createOption(optionsTemplate));
-            }
-            return result;
-        }
-
-        private static JavaVMOption<?> createOption(OptionDefinition definition) {
-            switch (definition.kind) {
-                case SWITCH:
-                    return new SwitchNode(definition.name);
-                case D:
-                    return new UserPropertyNode();
-                case FOLLOWED:
-                    return new ParametrizedNode(definition.name, "");
-                case COLUMNPARAM:
-                    return new ParametrizedNode(definition.name, ":");
-                case EQPARAM:
-                    return new ParametrizedNode(definition.name, "=");
-                case LOOSEPARAM:
-                    return new ParametrizedNode(definition.name, " ");
-                default:
-                    throw new IllegalArgumentException("Invalid definition.");
-            }
-        }
-
-
-    public static class vmOptions_return extends ParserRuleReturnScope {
-        CommonTree tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "vmOptions"
-    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:251:1: vmOptions : ( ( WS )? option )* ( WS )? -> ( option )* ;
-    public final CommandLineParser.vmOptions_return vmOptions() throws RecognitionException {
-        CommandLineParser.vmOptions_return retval = new CommandLineParser.vmOptions_return();
-        retval.start = input.LT(1);
-
-        CommonTree root_0 = null;
-
-        Token WS1=null;
-        Token WS3=null;
-        CommandLineParser.option_return option2 = null;
-
-
-        CommonTree WS1_tree=null;
-        CommonTree WS3_tree=null;
-        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
-        RewriteRuleSubtreeStream stream_option=new RewriteRuleSubtreeStream(adaptor,"rule option");
-        try {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:2: ( ( ( WS )? option )* ( WS )? -> ( option )* )
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:4: ( ( WS )? option )* ( WS )?
-            {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:4: ( ( WS )? option )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-
-                if ( (LA2_0==WS) ) {
-                    int LA2_1 = input.LA(2);
-
-                    if ( (LA2_1==TEXT||LA2_1==7) ) {
-                        alt2=1;
-                    }
-
-
-                }
-                else if ( (LA2_0==TEXT||LA2_0==7) ) {
-                    alt2=1;
-                }
-
-
-                switch (alt2) {
-            	case 1 :
-            	    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:5: ( WS )? option
-            	    {
-            	    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:5: ( WS )?
-            	    int alt1=2;
-            	    int LA1_0 = input.LA(1);
-
-            	    if ( (LA1_0==WS) ) {
-            	        alt1=1;
-            	    }
-            	    switch (alt1) {
-            	        case 1 :
-            	            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:5: WS
-            	            {
-            	            WS1=(Token)match(input,WS,FOLLOW_WS_in_vmOptions75);  
-            	            stream_WS.add(WS1);
-
-
-            	            }
-            	            break;
-
-            	    }
-
-            	    pushFollow(FOLLOW_option_in_vmOptions77);
-            	    option2=option();
-
-            	    state._fsp--;
-
-            	    stream_option.add(option2.getTree());
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop2;
-                }
-            } while (true);
-
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:16: ( WS )?
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-
-            if ( (LA3_0==WS) ) {
-                alt3=1;
-            }
-            switch (alt3) {
-                case 1 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:16: WS
-                    {
-                    WS3=(Token)match(input,WS,FOLLOW_WS_in_vmOptions80);  
-                    stream_WS.add(WS3);
-
-
-                    }
-                    break;
-
-            }
-
-
-
-            // AST REWRITE
-            // elements: option
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (CommonTree)adaptor.nil();
-            // 252:20: -> ( option )*
-            {
-                // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:252:23: ( option )*
-                while ( stream_option.hasNext() ) {
-                    adaptor.addChild(root_0, stream_option.nextTree());
-
-                }
-                stream_option.reset();
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (CommonTree)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-    	retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
-
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "vmOptions"
-
-    public static class option_return extends ParserRuleReturnScope {
-        CommonTree tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "option"
-    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:254:1: option : ( '-' switchOption -> switchOption | nonSwitchOption -> nonSwitchOption );
-    public final CommandLineParser.option_return option() throws RecognitionException {
-        CommandLineParser.option_return retval = new CommandLineParser.option_return();
-        retval.start = input.LT(1);
-
-        CommonTree root_0 = null;
-
-        Token char_literal4=null;
-        CommandLineParser.switchOption_return switchOption5 = null;
-
-        CommandLineParser.nonSwitchOption_return nonSwitchOption6 = null;
-
-
-        CommonTree char_literal4_tree=null;
-        RewriteRuleTokenStream stream_7=new RewriteRuleTokenStream(adaptor,"token 7");
-        RewriteRuleSubtreeStream stream_switchOption=new RewriteRuleSubtreeStream(adaptor,"rule switchOption");
-        RewriteRuleSubtreeStream stream_nonSwitchOption=new RewriteRuleSubtreeStream(adaptor,"rule nonSwitchOption");
-        try {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:254:8: ( '-' switchOption -> switchOption | nonSwitchOption -> nonSwitchOption )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
-
-            if ( (LA4_0==7) ) {
-                alt4=1;
-            }
-            else if ( (LA4_0==TEXT) ) {
-                alt4=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
-
-                throw nvae;
-            }
-            switch (alt4) {
-                case 1 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:254:10: '-' switchOption
-                    {
-                    char_literal4=(Token)match(input,7,FOLLOW_7_in_option95);  
-                    stream_7.add(char_literal4);
-
-                    pushFollow(FOLLOW_switchOption_in_option97);
-                    switchOption5=switchOption();
-
-                    state._fsp--;
-
-                    stream_switchOption.add(switchOption5.getTree());
-
-
-                    // AST REWRITE
-                    // elements: switchOption
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 254:27: -> switchOption
-                    {
-                        adaptor.addChild(root_0, stream_switchOption.nextTree());
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 2 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:255:3: nonSwitchOption
-                    {
-                    pushFollow(FOLLOW_nonSwitchOption_in_option107);
-                    nonSwitchOption6=nonSwitchOption();
-
-                    state._fsp--;
-
-                    stream_nonSwitchOption.add(nonSwitchOption6.getTree());
-
-
-                    // AST REWRITE
-                    // elements: nonSwitchOption
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 255:20: -> nonSwitchOption
-                    {
-                        adaptor.addChild(root_0, stream_nonSwitchOption.nextTree());
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            retval.tree = (CommonTree)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-    	retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
-
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "option"
-
-    public static class switchOption_return extends ParserRuleReturnScope {
-        CommonTree tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "switchOption"
-    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:257:1: switchOption : ({...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT '=' eText -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT WS eText -> | t= TEXT ->);
-    public final CommandLineParser.switchOption_return switchOption() throws RecognitionException {
-        CommandLineParser.switchOption_return retval = new CommandLineParser.switchOption_return();
-        retval.start = input.LT(1);
-
-        CommonTree root_0 = null;
-
-        Token t=null;
-        Token char_literal7=null;
-        Token WS9=null;
-        CommandLineParser.eText_return eText8 = null;
-
-        CommandLineParser.eText_return eText10 = null;
-
-
-        CommonTree t_tree=null;
-        CommonTree char_literal7_tree=null;
-        CommonTree WS9_tree=null;
-        RewriteRuleTokenStream stream_WS=new RewriteRuleTokenStream(adaptor,"token WS");
-        RewriteRuleTokenStream stream_TEXT=new RewriteRuleTokenStream(adaptor,"token TEXT");
-        RewriteRuleTokenStream stream_8=new RewriteRuleTokenStream(adaptor,"token 8");
-        RewriteRuleSubtreeStream stream_eText=new RewriteRuleSubtreeStream(adaptor,"rule eText");
-
-        	int index = 0;
-        	String name = null;
-        	String value = null;
-
-        try {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:263:2: ({...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT '=' eText -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT WS eText -> | t= TEXT ->)
-            int alt5=10;
-            alt5 = dfa5.predict(input);
-            switch (alt5) {
-                case 1 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:263:4: {...}? =>t= TEXT
-                    {
-                    if ( !((switchOptions.contains(input.LT(1).getText()))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "switchOptions.contains(input.LT(1).getText())");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption135);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 263:78: ->
-                    {
-                        adaptor.addChild(root_0, new SwitchNode(t));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 2 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:264:3: {...}? =>t= TEXT
-                    {
-                    if ( !((VERBOSE.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERBOSE+':'))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "VERBOSE.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERBOSE+':')");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption166);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 264:107: ->
-                    {
-                        adaptor.addChild(root_0, new SwitchNode(t));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 3 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:265:3: {...}? =>t= TEXT
-                    {
-                    if ( !((VERSION.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERSION+':'))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "VERSION.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERSION+':')");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption186);  
-                    stream_TEXT.add(t);
-
-                    index = t.getText().indexOf(':'); if (index > 0) {name=t.getText().substring(0,index); value = (index+1) == t.getText().length() ? "" : t.getText().substring(index+1);} else {name=t.getText();} 
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 265:304: ->
-                    {
-                        adaptor.addChild(root_0,  index < 0 ? new SwitchNode(t) : new ParametrizedNode(t, name, ":", value));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 4 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:266:3: {...}? =>t= TEXT
-                    {
-                    if ( !((input.LT(1).getText().startsWith(XSHARE+':'))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "input.LT(1).getText().startsWith(XSHARE+':')");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption203);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 266:60: ->
-                    {
-                        adaptor.addChild(root_0, new SwitchNode(t));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 5 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:267:3: {...}? =>t= TEXT
-                    {
-                    if ( !((input.LT(1).getText().startsWith(XCJNI+':'))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "input.LT(1).getText().startsWith(XCJNI+':')");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption218);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 267:61: ->
-                    {
-                        adaptor.addChild(root_0, new SwitchNode(t));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 6 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:268:3: {...}? =>t= TEXT '=' eText
-                    {
-                    if ( !((input.LT(1).getText().charAt(0) == 'D')) ) {
-                        throw new FailedPredicateException(input, "switchOption", "input.LT(1).getText().charAt(0) == 'D'");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption235);  
-                    stream_TEXT.add(t);
-
-                    char_literal7=(Token)match(input,8,FOLLOW_8_in_switchOption237);  
-                    stream_8.add(char_literal7);
-
-                    pushFollow(FOLLOW_eText_in_switchOption239);
-                    eText8=eText();
-
-                    state._fsp--;
-
-                    stream_eText.add(eText8.getTree());
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 268:67: ->
-                    {
-                        adaptor.addChild(root_0, new UserPropertyNode(t, (eText8!=null?input.toString(eText8.start,eText8.stop):null), (t!=null?t.getCharPositionInLine():0)));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 7 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:269:3: {...}? =>t= TEXT
-                    {
-                    if ( !((isParamOption(input.LT(1).getText()))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "isParamOption(input.LT(1).getText())");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption257);  
-                    stream_TEXT.add(t);
-
-                    index = t.getText().indexOf(':'); if (index > 0) {name=t.getText().substring(0,index); value = (index+1) == t.getText().length() ? "" : t.getText().substring(index+1);}
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 269:227: ->
-                    {
-                        adaptor.addChild(root_0, new ParametrizedNode(t, name, ":", value));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 8 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:270:3: {...}? =>t= TEXT
-                    {
-                    if ( !((memOptions.matcher(input.LT(1).getText()).matches())) ) {
-                        throw new FailedPredicateException(input, "switchOption", "memOptions.matcher(input.LT(1).getText()).matches()");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption274);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 270:69: ->
-                    {
-                        adaptor.addChild(root_0, new ParametrizedNode(t, 3));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 9 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:271:3: {...}? =>t= TEXT WS eText
-                    {
-                    if ( !((CLASSPATH.equals(input.LT(1).getText()) || CLASSPATH_LONG.equals(input.LT(1).getText()))) ) {
-                        throw new FailedPredicateException(input, "switchOption", "CLASSPATH.equals(input.LT(1).getText()) || CLASSPATH_LONG.equals(input.LT(1).getText())");
-                    }
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption291);  
-                    stream_TEXT.add(t);
-
-                    WS9=(Token)match(input,WS,FOLLOW_WS_in_switchOption293);  
-                    stream_WS.add(WS9);
-
-                    pushFollow(FOLLOW_eText_in_switchOption295);
-                    eText10=eText();
-
-                    state._fsp--;
-
-                    stream_eText.add(eText10.getTree());
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 271:112: ->
-                    {
-                        adaptor.addChild(root_0, new ParametrizedNode(t, " ", (eText10!=null?input.toString(eText10.start,eText10.stop):null), false));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-                case 10 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:272:3: t= TEXT
-                    {
-                    t=(Token)match(input,TEXT,FOLLOW_TEXT_in_switchOption307);  
-                    stream_TEXT.add(t);
-
-
-
-                    // AST REWRITE
-                    // elements: 
-                    // token labels: 
-                    // rule labels: retval
-                    // token list labels: 
-                    // rule list labels: 
-                    // wildcard labels: 
-                    retval.tree = root_0;
-                    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-                    root_0 = (CommonTree)adaptor.nil();
-                    // 272:10: ->
-                    {
-                        adaptor.addChild(root_0, new UnrecognizedOption(t));
-
-                    }
-
-                    retval.tree = root_0;
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            retval.tree = (CommonTree)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-    	retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
-
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "switchOption"
-
-    public static class eText_return extends ParserRuleReturnScope {
-        CommonTree tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "eText"
-    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:274:1: eText : ( '\\'' TEXT '\\'' | '\"' TEXT '\"' | TEXT );
-    public final CommandLineParser.eText_return eText() throws RecognitionException {
-        CommandLineParser.eText_return retval = new CommandLineParser.eText_return();
-        retval.start = input.LT(1);
-
-        CommonTree root_0 = null;
-
-        Token char_literal11=null;
-        Token TEXT12=null;
-        Token char_literal13=null;
-        Token char_literal14=null;
-        Token TEXT15=null;
-        Token char_literal16=null;
-        Token TEXT17=null;
-
-        CommonTree char_literal11_tree=null;
-        CommonTree TEXT12_tree=null;
-        CommonTree char_literal13_tree=null;
-        CommonTree char_literal14_tree=null;
-        CommonTree TEXT15_tree=null;
-        CommonTree char_literal16_tree=null;
-        CommonTree TEXT17_tree=null;
-
-        try {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:274:7: ( '\\'' TEXT '\\'' | '\"' TEXT '\"' | TEXT )
-            int alt6=3;
-            switch ( input.LA(1) ) {
-            case 9:
-                {
-                alt6=1;
-                }
-                break;
-            case 10:
-                {
-                alt6=2;
-                }
-                break;
-            case TEXT:
-                {
-                alt6=3;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
-
-                throw nvae;
-            }
-
-            switch (alt6) {
-                case 1 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:275:3: '\\'' TEXT '\\''
-                    {
-                    root_0 = (CommonTree)adaptor.nil();
-
-                    char_literal11=(Token)match(input,9,FOLLOW_9_in_eText324); 
-                    char_literal11_tree = (CommonTree)adaptor.create(char_literal11);
-                    adaptor.addChild(root_0, char_literal11_tree);
-
-                    TEXT12=(Token)match(input,TEXT,FOLLOW_TEXT_in_eText326); 
-                    TEXT12_tree = (CommonTree)adaptor.create(TEXT12);
-                    adaptor.addChild(root_0, TEXT12_tree);
-
-                    char_literal13=(Token)match(input,9,FOLLOW_9_in_eText328); 
-                    char_literal13_tree = (CommonTree)adaptor.create(char_literal13);
-                    adaptor.addChild(root_0, char_literal13_tree);
-
-
-                    }
-                    break;
-                case 2 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:276:4: '\"' TEXT '\"'
-                    {
-                    root_0 = (CommonTree)adaptor.nil();
-
-                    char_literal14=(Token)match(input,10,FOLLOW_10_in_eText333); 
-                    char_literal14_tree = (CommonTree)adaptor.create(char_literal14);
-                    adaptor.addChild(root_0, char_literal14_tree);
-
-                    TEXT15=(Token)match(input,TEXT,FOLLOW_TEXT_in_eText335); 
-                    TEXT15_tree = (CommonTree)adaptor.create(TEXT15);
-                    adaptor.addChild(root_0, TEXT15_tree);
-
-                    char_literal16=(Token)match(input,10,FOLLOW_10_in_eText338); 
-                    char_literal16_tree = (CommonTree)adaptor.create(char_literal16);
-                    adaptor.addChild(root_0, char_literal16_tree);
-
-
-                    }
-                    break;
-                case 3 :
-                    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:277:8: TEXT
-                    {
-                    root_0 = (CommonTree)adaptor.nil();
-
-                    TEXT17=(Token)match(input,TEXT,FOLLOW_TEXT_in_eText347); 
-                    TEXT17_tree = (CommonTree)adaptor.create(TEXT17);
-                    adaptor.addChild(root_0, TEXT17_tree);
-
-
-                    }
-                    break;
-
-            }
-            retval.stop = input.LT(-1);
-
-            retval.tree = (CommonTree)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-    	retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
-
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "eText"
-
-    public static class nonSwitchOption_return extends ParserRuleReturnScope {
-        CommonTree tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start "nonSwitchOption"
-    // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:279:1: nonSwitchOption : t= TEXT ->;
-    public final CommandLineParser.nonSwitchOption_return nonSwitchOption() throws RecognitionException {
-        CommandLineParser.nonSwitchOption_return retval = new CommandLineParser.nonSwitchOption_return();
-        retval.start = input.LT(1);
-
-        CommonTree root_0 = null;
-
-        Token t=null;
-
-        CommonTree t_tree=null;
-        RewriteRuleTokenStream stream_TEXT=new RewriteRuleTokenStream(adaptor,"token TEXT");
-
-        try {
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:280:2: (t= TEXT ->)
-            // /Users/tom/Projects/netbeans/jet-main/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/vmo/gen/CommandLine.g:280:4: t= TEXT
-            {
-            t=(Token)match(input,TEXT,FOLLOW_TEXT_in_nonSwitchOption359);  
-            stream_TEXT.add(t);
-
-
-
-            // AST REWRITE
-            // elements: 
-            // token labels: 
-            // rule labels: retval
-            // token list labels: 
-            // rule list labels: 
-            // wildcard labels: 
-            retval.tree = root_0;
-            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
-
-            root_0 = (CommonTree)adaptor.nil();
-            // 280:11: ->
-            {
-                adaptor.addChild(root_0, new UnknownOption(t));
-
-            }
-
-            retval.tree = root_0;
-            }
-
-            retval.stop = input.LT(-1);
-
-            retval.tree = (CommonTree)adaptor.rulePostProcessing(root_0);
-            adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-    	retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
-
-        }
-        finally {
-        }
-        return retval;
-    }
-    // $ANTLR end "nonSwitchOption"
-
-    // Delegated rules
-
-
-    protected DFA5 dfa5 = new DFA5(this);
-    static final String DFA5_eotS =
-        "\14\uffff";
-    static final String DFA5_eofS =
-        "\14\uffff";
-    static final String DFA5_minS =
-        "\1\5\1\4\12\uffff";
-    static final String DFA5_maxS =
-        "\1\5\1\10\12\uffff";
-    static final String DFA5_acceptS =
-        "\2\uffff\1\6\1\11\1\1\1\2\1\3\1\4\1\5\1\7\1\10\1\12";
-    static final String DFA5_specialS =
-        "\1\uffff\1\0\12\uffff}>";
-    static final String[] DFA5_transitionS = {
-            "\1\1",
-            "\1\3\3\uffff\1\2",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            "",
-            ""
-    };
-
-    static final short[] DFA5_eot = DFA.unpackEncodedString(DFA5_eotS);
-    static final short[] DFA5_eof = DFA.unpackEncodedString(DFA5_eofS);
-    static final char[] DFA5_min = DFA.unpackEncodedStringToUnsignedChars(DFA5_minS);
-    static final char[] DFA5_max = DFA.unpackEncodedStringToUnsignedChars(DFA5_maxS);
-    static final short[] DFA5_accept = DFA.unpackEncodedString(DFA5_acceptS);
-    static final short[] DFA5_special = DFA.unpackEncodedString(DFA5_specialS);
-    static final short[][] DFA5_transition;
-
-    static {
-        int numStates = DFA5_transitionS.length;
-        DFA5_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA5_transition[i] = DFA.unpackEncodedString(DFA5_transitionS[i]);
-        }
-    }
-
-    class DFA5 extends DFA {
-
-        public DFA5(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 5;
-            this.eot = DFA5_eot;
-            this.eof = DFA5_eof;
-            this.min = DFA5_min;
-            this.max = DFA5_max;
-            this.accept = DFA5_accept;
-            this.special = DFA5_special;
-            this.transition = DFA5_transition;
-        }
-        public String getDescription() {
-            return "257:1: switchOption : ({...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT '=' eText -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT -> | {...}? =>t= TEXT WS eText -> | t= TEXT ->);";
-        }
-        public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
-            TokenStream input = (TokenStream)_input;
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA5_1 = input.LA(1);
-
-                         
-                        int index5_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA5_1==8) && ((input.LT(1).getText().charAt(0) == 'D'))) {s = 2;}
-
-                        else if ( (LA5_1==WS) && ((CLASSPATH.equals(input.LT(1).getText()) || CLASSPATH_LONG.equals(input.LT(1).getText())))) {s = 3;}
-
-                        else if ( ((switchOptions.contains(input.LT(1).getText()))) ) {s = 4;}
-
-                        else if ( ((VERBOSE.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERBOSE+':'))) ) {s = 5;}
-
-                        else if ( ((VERSION.equals(input.LT(1).getText()) || input.LT(1).getText().startsWith(VERSION+':'))) ) {s = 6;}
-
-                        else if ( ((input.LT(1).getText().startsWith(XSHARE+':'))) ) {s = 7;}
-
-                        else if ( ((input.LT(1).getText().startsWith(XCJNI+':'))) ) {s = 8;}
-
-                        else if ( ((isParamOption(input.LT(1).getText()))) ) {s = 9;}
-
-                        else if ( ((memOptions.matcher(input.LT(1).getText()).matches())) ) {s = 10;}
-
-                        else if ( (true) ) {s = 11;}
-
-                         
-                        input.seek(index5_1);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 5, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
- 
-
-    public static final BitSet FOLLOW_WS_in_vmOptions75 = new BitSet(new long[]{0x00000000000000A0L});
-    public static final BitSet FOLLOW_option_in_vmOptions77 = new BitSet(new long[]{0x00000000000000B2L});
-    public static final BitSet FOLLOW_WS_in_vmOptions80 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_7_in_option95 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_switchOption_in_option97 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_nonSwitchOption_in_option107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption135 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption218 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption235 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_8_in_switchOption237 = new BitSet(new long[]{0x0000000000000620L});
-    public static final BitSet FOLLOW_eText_in_switchOption239 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption257 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption274 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption291 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_WS_in_switchOption293 = new BitSet(new long[]{0x0000000000000620L});
-    public static final BitSet FOLLOW_eText_in_switchOption295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_switchOption307 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_9_in_eText324 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_TEXT_in_eText326 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_9_in_eText328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_10_in_eText333 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_TEXT_in_eText335 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_10_in_eText338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_eText347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEXT_in_nonSwitchOption359 = new BitSet(new long[]{0x0000000000000002L});
-
-}
\ No newline at end of file
diff --git a/.pc/netbeans-build.patch/nbbuild/build.xml b/.pc/netbeans-build.patch/nbbuild/build.xml
deleted file mode 100644
index 90c7a1a..0000000
--- a/.pc/netbeans-build.patch/nbbuild/build.xml
+++ /dev/null
@@ -1,1943 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<project name="nbbuild" default="build-nozip" basedir=".">
-
-  <fail message="Please build using Ant 1.8.0 or higher.">
-    <condition>
-      <not>
-        <antversion atleast="1.8.0"/>
-      </not>
-    </condition>
-  </fail>
-
-  <import file="default.xml"/>
-
-  <!-- To make people happy who want to do `ant clean all': -->
-  <target name="all" depends="build,commit-validation" description="Build the IDE and run basic validation tests."/>
-
-  <target name="all-nozip" depends="build-nozip,commit-validation" description="Build the IDE (no ZIP file, unpacked) and run basic validation tests."/>
-
-  <target name="bootstrap" description="Bootstrap NetBeans-specific Ant extensions."
-          depends="-jdk-init,-load-build-properties">
-    <fail message="You need JDK 7+ to build NetBeans; nbjdk.home=${nbjdk.home} java.home=${java.home}">
-        <condition>
-            <not>
-                <isset property="have-jdk-1.7"/>
-            </not>
-        </condition>
-    </fail>
-
-    <property name="build.ant.classes.dir" location="${nb.build.dir}/antclasses"/>
-    <mkdir dir="${build.ant.classes.dir}"/>
-    <javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.7" target="1.7">
-        <classpath>
-            <pathelement location="${ant.core.lib}"/>
-        </classpath>
-        <include name="org/netbeans/nbbuild/HgExec.java"/>
-        <include name="org/netbeans/nbbuild/ValidateHgConfiguration.java"/>
-        <include name="org/netbeans/nbbuild/extlibs/DeregisterExternalHook.java"/>
-        <include name="org/netbeans/nbbuild/extlibs/DownloadBinaries.java"/>
-        <compilerarg line="-Xlint -Xlint:-serial"/>
-    </javac>
-    <taskdef name="validate-hg-configuration" classname="org.netbeans.nbbuild.ValidateHgConfiguration" classpath="${build.ant.classes.dir}"/>
-    <validate-hg-configuration root=".."/>
-    <taskdef name="deregisterexternalhook" classname="org.netbeans.nbbuild.extlibs.DeregisterExternalHook" classpath="${build.ant.classes.dir}"/>
-    <deregisterexternalhook root=".."/>
-    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${build.ant.classes.dir}"/>
-    <property name="have-downloadbinaries-task" value="true" />
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}">
-            <include name="libs.junit4/external/binaries-list"/>
-            <include name="javahelp/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
-
-    <echo message="Bootstrapping NetBeans-specific Ant extensions..."/>
-    <path id="bootstrap-cp">
-     <pathelement location="${ant.core.lib}"/>
-     <fileset dir="..">
-        <!-- For JavaHelp indexing and link checking: -->
-        <include name="javahelp/external/jhall*.jar"/>
-      </fileset>
-    </path>
-    <javac srcdir="antsrc" destdir="${build.ant.classes.dir}" deprecation="true" debug="${build.compiler.debug}" source="1.7" target="1.7">
-      <classpath refid="bootstrap-cp"/>
-      <compilerarg line="-Xlint -Xlint:-serial"/>
-    </javac>
-    <jar jarfile="${nbantext.jar}">
-      <fileset dir="${build.ant.classes.dir}"/>
-      <fileset dir="antsrc">
-        <exclude name="**/*.java"/>
-        <exclude name="**/package.html"/>
-        <exclude name="package-list"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="download-all-extbins" unless="ext.binaries.downloaded" depends="bootstrap">
-    <echo>Downloading external binaries (*/external/ directories)...</echo>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}">
-            <include name="*/external/binaries-list"/>
-            <include name="contrib/*/external/binaries-list"/>
-            <include name="otherlicenses/*/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
-    <property name="ext.binaries.downloaded" value="true"/>
-  </target>
-
-  <target name="download-selected-extbins" unless="ext.binaries.downloaded" depends="init-module-list">
-    <echo>Downloading external binaries (*/external/ directories) for cluster.config=${cluster.config}...</echo>
-    <pathconvert property="modules.binaries-list" pathsep=",">
-        <path>
-            <dirset dir="${nb_all}" includes="nbbuild,${allmodules}"/>
-        </path>
-        <map from="${nb_all}/" to=""/>
-        <globmapper from="*" to="*/external/binaries-list"/>
-    </pathconvert>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}" includes="${modules.binaries-list}"/>
-    </downloadbinaries>
-  </target>
-
-  <target name="init-module-list" depends="bootstrap,init-tasks">
-    <!-- Define modules. -->
-    <checkmoduleconfigs nbroot=".."/>
-    <resolvelist name="allmodules" list="${nb.clusters.list}"/>
-    <pathconvert property="modules.fullpath" >
-        <path>
-            <dirset dir="${nb_all}" includes="${allmodules}" />
-        </path>
-        <mapper type="identity" />
-    </pathconvert>
-    <sortsuitemodules unsortedmodules="${modules.fullpath}" sortedmodulesproperty="modules.sorted"/>
-  </target>
-
-  <target name="init" depends="init-module-list,set-buildnumber">
-    <fail message="You need to have some modules checked out to build NetBeans. For example, try running the 'checkout' target.">
-        <condition>
-            <not>
-                <available file="../core.startup/"/>
-            </not>
-        </condition>
-    </fail>
-    <taskdef name="nbmerge" classname="org.netbeans.nbbuild.NbMerge" classpath="${nbantext.jar}"/>
-    <taskdef name="getdependsclusters" classname="org.netbeans.nbbuild.GetDependsClusters" classpath="${nbantext.jar}"/>
-    <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat" classpath="${nbantext.jar}"/>
-
-    <!-- Set up automatic all-* targets: -->
-    <taskdef name="insert-module-all-targets" classname="org.netbeans.nbbuild.InsertModuleAllTargets" classpath="${nbantext.jar}"/>
-    <property name="verify.checkout" value="true"/> 
-    <property name="init.use.clusters" value="true"/> 
-    <insert-module-all-targets checkModules="${verify.checkout}" useclusters="${init.use.clusters}"/>
-  </target>
-  
-  <target name="all-installer" description="Dummy target for build system compatibility"/>
-
-  <target name="update" depends="init" description="Downloads binaries from an update center">
-      <subant-junit target="update" failonerror="true">
-          <buildpath path="${modules.sorted}"/>
-      </subant-junit>
-
-      <antcall target="finish-build"/>
-  </target>
-
-  <!-- build NBMs for selected modules -->
-  <target name="build-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="nbms" />
-      <property name="base.nbm.target.dir" location="nbms" />
-      <property name="nbms.fail.on.error" value="true"/>
-      <subant-junit target="nbm" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
-          <buildpath path="${modules.sorted}"/>
-          <property name="base.nbm.target.dir" value="${base.nbm.target.dir}"/>
-      </subant-junit>
-  </target>
-
-  <target name="build-nonsigned-nbms" depends="init,download-selected-extbins" description="Build all NBMs, all modules have to be built before proceed">
-      <mkdir dir="nbms" />
-      <property name="base.nbm.target.dir" location="nbms" />
-      <property name="nbms.fail.on.error" value="true"/>
-      <subant-junit target="nbm-nosignature" failonerror="${nbms.fail.on.error}" report="${nb.build.dir}/build-nbms.xml" inheritall="false">
-          <buildpath path="${modules.sorted}"/>
-          <property name="base.nbm.target.dir" value="${base.nbm.target.dir}"/>
-      </subant-junit>
-  </target>
-
-  <target name="fix-dependencies" depends="init">
-      <pathconvert property="modules.fullpath" >
-          <path>
-              <dirset dir="${nb_all}" includes="${allmodules}" />
-          </path>
-          <mapper type="identity" />
-      </pathconvert>
-
-      <sortsuitemodules unsortedmodules="${modules.fullpath}" sortedmodulesproperty="modules.sorted"/>
-
-      <subant-junit target="fix-dependencies" failonerror="true">
-          <buildpath path="${modules.sorted}"/>
-      </subant-junit>
-  </target>
-
-  <property name="jnlp.signjar.keystore" location="${nb.build.dir}/default.keystore" />
-  <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}" />
-  <target name="jnlp-generate-keystore" depends="init" unless="jnlp.signjar.keystore.exists" >
-    <property name="jnlp.signjar.alias" value="jnlp" />
-    <property name="jnlp.signjar.password" value="netbeans" />
-    <property name="jnlp.signjar.vendor" value="CN=NetBeans, OU=NetBeans, O=netbeans.org, C=US" />
-    
-    <mkdir dir="${jnlp.signjar.keystore}/../" />
-    <echo message="Going to create default keystore in ${jnlp.signjar.keystore}" />
-    <genkey 
-        alias="${jnlp.signjar.alias}"
-        keystore="${jnlp.signjar.keystore}"
-        storepass="${jnlp.signjar.password}"
-        dname="${jnlp.signjar.vendor}"
-    />
-  </target>
-
-  <target name="build-jnlp" depends="init,jnlp-generate-keystore" description="Create a JNLP distribution.">
-      <fail message="Please build using Ant 1.8.4 or higher.">
-        <condition>
-          <not>
-            <antversion atleast="1.8.4"/>
-          </not>
-        </condition>
-      </fail>
-      <property name="jnlp.dest.dir" location="${nb.build.dir}/jnlp" />
-      <mkdir dir="${jnlp.dest.dir}" />
-      <makeurl property="jnlp.codebase" file="${jnlp.dest.dir}"/> <!-- fallback value unless otherwise configured -->
-      <property name="jnlp.fail.on.error" value="true"/>
-      <pathconvert property="jnlp.modules.fullpath">
-          <path>
-              <dirset dir="${nb_all}" includes="${config.jnlp.stable}"/>
-          </path>
-          <mapper type="identity"/>
-      </pathconvert>
-      <sortsuitemodules unsortedmodules="${jnlp.modules.fullpath}" sortedmodulesproperty="jnlp.modules.sorted"/>
-      <subant-junit target="jnlp" failonerror="${jnlp.fail.on.error}" report="${nb.build.dir}/build-all-jnlp.xml">
-          <buildpath path="${jnlp.modules.sorted}"/>
-      </subant-junit>
-      <taskdef name="verifyjnlp" classname="org.netbeans.nbbuild.VerifyJNLP" classpath="${nbantext.jar}"/>
-      <verifyjnlp report="${nb.build.dir}/verify-jnlp.xml" failonerror="jnlp.fail.on.error">
-          <fileset dir="${jnlp.dest.dir}" includes="*.jnlp"/>
-      </verifyjnlp>
-  </target>
-  
-  <target name="build-javadoc">
-      <echo message="Deprecated, use nbbuild/javadoctools/build.xml directly"/>
-      <ant dir="javadoctools" target="build-javadoc"/>
-  </target>
-
-  <!-- build source zips for selected modules - useful for populating maven repository only-->
-  <target name="build-source-zips" depends="init" description="Builds source zips for maven repository inclusion.">
-      <property name="netbeans.zipped.sources.dir" location="${nb.build.dir}/source-zips" />
-      
-      <subant-junit target="sources-zip" failonerror="true">
-          <buildpath path="${modules.sorted}"/>
-      </subant-junit>
-  </target>
-  
-      
-  <target name="check-javahelpbin" depends="init" description="Validate intermodule links in helpsets.">
-      <taskdef name="checkhelpsetsbin" classname="org.netbeans.nbbuild.CheckHelpSetsBin">
-        <classpath>
-          <pathelement location="${nbantext.jar}"/>
-            <fileset dir="${nb_all}/javahelp/external">
-              <include name="jh*.jar"/>
-            </fileset>
-        </classpath>
-      </taskdef>
-      <checkhelpsetsbin>
-        <fileset dir="netbeans">
-          <include name="*/modules/*.jar"/>
-        </fileset>
-      </checkhelpsetsbin>
-  </target>
-
-  <target name="build-messaging" depends="init">
-    <echo message="Starting a build for NetBeans (build ${buildnum}, config '${cluster.config}') ..."/>
-    <echo message="Selected modules: ${modules}"/>
-    <echo message="OS: ${os.name} ${os.version}  Locale: ${user.language}_${user.region}"/>
-    <echo message="Java: ${nbjdk.home}"/>
-  </target>
-  
-  <!-- Use of nbmerge target has the effect of automatically depending on all-X for every module. -->
-  <!-- It also runs deltree(dir=wherever) and copydir(src=../X/netbeans,dest=wherever) to create the IDE install. -->
-
-  <target name="build-nozip" depends="init,download-selected-extbins,clean-cluster-flags,build-clusters,create-netbeans-import,finish-build,add-junit" description="Build the IDE but do not create a final ZIP file."/>
-  <target name="finish-build" depends="init">
-    <loadproperties srcFile="${clusters.list.file}" />
-        
-    <mkdir dir="${netbeans.dest.dir}/bin" />
-    <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
-    <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
-    <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
-    <copy file="../ide/launcher/windows/netbeans64.exe" todir="${netbeans.dest.dir}/bin" />
-    <!-- if anybody knows better place for icons, let me know: jtulach at netbeans.org -->
-
-    <mkdir dir="${netbeans.dest.dir}/etc" />
-    <copy file="../ide/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
-    <copy file="../ide/launcher/netbeans.clusters" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
-
-    <echo message="${netbeans.dest.dir}/${nb.cluster.platform.dir}/lib/nbexec" />
-    <fixcrlf eol="lf" srcdir="${netbeans.dest.dir}" >
-      <include name="etc/netbeans.conf" />
-      <include name="etc/netbeans.clusters" />
-      <include name="bin/netbeans" />      
-      <include name="${nb.cluster.platform.dir}/lib/nbexec" />      
-    </fixcrlf>
-    <mkdir dir="${nb.build.dir}"/>
-    <hgid property="hg.id" file=".."/>
-    <echo file="${nb.build.dir}/build_info">NetBeans dev build
-------------------
-Number:   ${buildnumber}
-Date:     ${buildday}
-Branding:
-Branch:   trunk
-Tag:
-Hg ID:    ${hg.id}
-</echo>
-    <mkdir dir="${netbeans.dest.dir}/${nb.cluster.nb.dir}"/>
-    <copy file="${nb.build.dir}/build_info" tofile="${netbeans.dest.dir}/${nb.cluster.nb.dir}/build_info" failonerror="true"/>
-  </target>
-
-  <target name="add-junit" if="add.junit" description="Add the JUnit plugin to the build (if -Dadd.junit=true).">
-      <ant dir="../libs.junit4" inheritall="false">
-          <property name="cluster" location="${netbeans.dest.dir}/${nb.cluster.platform.dir}"/>
-      </ant>
-      <ant dir="../junitlib" inheritall="false">
-          <property name="cluster" location="${netbeans.dest.dir}/${nb.cluster.java.dir}"/>
-          <property name="nb.cluster.platform" value="libs.junit4"/>
-          <property name="nb.cluster.stableuc" value=""/>
-          <property name="nb.cluster.experimental" value=""/>
-          <property name="do.not.recurse" value="true"/>
-      </ant>
-  </target>
-  <target name="clean-junit">
-      <delete dir="../libs.junit4/build" verbose="true"/>
-      <delete dir="../junitlib/build" verbose="true"/>
-      <delete verbose="true">
-          <fileset dir="${netbeans.dest.dir}">
-              <include name="*/config/Modules/org-netbeans-libs-junit4.xml"/>
-              <include name="*/config/Modules/org-netbeans-modules-junitlib.xml"/>
-              <include name="*/modules/org-netbeans-libs-junit4.jar"/>
-              <include name="*/modules/org-netbeans-modules-junitlib.jar"/>
-              <include name="*/update_tracking/org-netbeans-libs-junit4.xml"/>
-              <include name="*/update_tracking/org-netbeans-modules-junitlib.xml"/>
-              <include name="*/modules/ext/junit*"/>
-              <include name="*/docs/junit*"/>
-          </fileset>
-      </delete>
-  </target>
-  
-  <target name="build" depends="build-nozip"
-          description="Create a complete build including a ZIP distribution (but do not try it).">
-    <delete file="NetBeans-${buildnum}.zip"/>
-    <delete file="NetBeans-${buildnum}-build-extra-data.zip"/>
-    <delete file="NetBeans-${buildnum}-javadoc-web.zip"/> <!-- XXX why? -->
-    <delete file="NetBeans-${buildnum}-javadoc.zip"/> <!-- XXX why? -->
-
-    <property name="nb-extra-files" value="test/**,extra/**"/>
-
-    <antcall target="zip-cluster-config" inheritall="true"/>
-  </target>
-
-  <target name="delete-and-merge" depends="merge-delete,merge" />   
-
-  <target name="merge-delete" depends="init">
-    <delete dir="${netbeans.dest}" />
-  </target>
-  
-  <target name="merge" depends="build-messaging">
-    <mkdir dir="${netbeans.dest.dir}"/>
-    <nbmerge failonerror="${stop.when.broken.modules}" 
-             dest="${netbeans.dest}" 
-             topdir=".." 
-             fixedmodules="${fixedmodules}" 
-             modules="${modules}"
-             builtmodulesproperty="${built.modules.property}" 
-             targetprefix="all-" 
-             mergedependentmodules="${merge.dependent.modules}" >
-    </nbmerge>
-  </target>
-
-
-  <target name="-build-platform" depends="init">
-      <delete file="${netbeans.dest.dir}/nb.cluster.platform.built"/>
-      <delete file="${netbeans.dest.dir}/nb.cluster.harness.built"/>
-      <run-depend-build clusters-to-build="nb.cluster.platform,nb.cluster.harness"/>
-  </target>
-  
-  <target name="build-platform" description="Build the NetBeans Platform (platform and harness clusters).">
-      <mkdir dir="${netbeans.dest.dir}"/>
-      <ant dir="." target="-build-platform" inheritAll="false">
-          <property name="cluster.config" value="platform"/>
-      </ant>
-  </target>
-  
-  <target name="build-cluster" depends="init">
-    <run-depend-build clusters-to-build="${cluster-name}"/>
-  </target>
-
-  <macrodef name="run-depend-build">
-    <attribute name="clusters-to-build"/>
-    <sequential>
-      <repeat target="build-one-cluster" name="one.cluster.name" values="@{clusters-to-build}" /> 
-    </sequential>
-  </macrodef>
-
-  <target name="build-clusters" depends="init">
-     <run-depend-build clusters-to-build="${nb.clusters.list}"/> 
-  </target>
-
-  <target name="build-one-cluster-dependencies-check">
-    <condition property="${one.cluster.name}-hasNoDependencies">
-      <equals arg1="${one.cluster.dependencies}" arg2="" trim="true"/>
-    </condition>
-    <resolve name="test.prop" value="${one.cluster.name}-hasNoDependencies"/>
-  </target>
-
-  <target name="build-one-cluster-dependencies" 
-          depends="build-one-cluster-dependencies-check"
-          unless="${one.cluster.name}-hasNoDependencies">
-    <run-depend-build clusters-to-build="${one.cluster.dependencies}"/> 
-  </target>
-
-  <target name="build-one-cluster-check">
-    <condition property="${one.cluster.name}-is-built">
-      <available file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
-    </condition>
-    <resolve name="test1.prop" value="${one.cluster.name}-is-built"/>
-  </target>
-
-  <target name="build-one-cluster" unless="${one.cluster.name}-is-built" depends="build-one-cluster-check">
-    <echo message="Building ${one.cluster.name} modules"/>
-    <resolve name="one-cluster-modules" value="${one.cluster.name}"/>
-    <resolve name="one-cluster-dependencies" value="${one.cluster.name}.depends"/>
-    <echo>${one-cluster-modules}</echo>
-    <echo>Dependencies: ${one-cluster-dependencies}</echo>
-    <insert-module-all-targets/> <!-- we are in a subproject, so need to reinsert the targets... XXX <antcall> and thus <repeat> apparently reparses the Ant script from disk! -->
-    <antcall target="build-one-cluster-dependencies" inheritAll="false">
-      <param name="one.cluster.dependencies" value="${one-cluster-dependencies}"/>
-      <param name="one.cluster.name" value="${one.cluster.name}"/>
-      <param name="ext.binaries.downloaded" value="true"/>
-    </antcall>
-    <mkdir dir="${netbeans.dest.dir}"/>
-    <nbmerge failonerror="${stop.when.broken.modules}" 
-             dest="${netbeans.dest.dir}" 
-             topdir="${nb_all}" 
-             fixedmodules="${one-cluster-modules}"
-             builtmodulesproperty="${built.modules.property}" 
-             targetprefix="all-" 
-             mergedependentmodules="false">
-    </nbmerge>
-    <touch file="${netbeans.dest.dir}/${one.cluster.name}.built"/>
-  </target>
-
-  <target name="zip-cluster-config" depends="init">
-    <property name="zip.dir" location="."/>
-    <mkdir dir="${zip.dir}"/>
-    <property name="zip.name" location="${zip.dir}/NetBeans-${buildnum}-${cluster.config}.zip"/>
-    <resolvelist name="nb.clusters.dirs" list="${nb.clusters.list}">
-        <mapper type="glob" from="*" to="*.dir"/>
-    </resolvelist>
-    <pathconvert property="nb.clusters.includes" pathsep=",">
-        <dirset dir="${netbeans.dest.dir}" includes="${nb.clusters.dirs},etc,bin"/>
-        <mapper type="regexp" from=".*/([^/\\]*)" to="\1/"/>
-    </pathconvert>
-    <taskdef name="find-executables" classname="org.netbeans.nbbuild.FindExecutables" classpath="${nbantext.jar}"/>
-    <find-executables allmodules="${allmodules}" exeincludeproperty="nb.clusters.exe.includes"/>
-    <!-- package the zip file -->
-    <zip destfile="${zip.name}" update="true" duplicate="preserve">
-      <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${netbeans.dest}"
-        includes="bin/netbeans,${nb.clusters.exe.includes}"
-      />
-      <zipfileset
-        dir="${netbeans.dest.dir}" prefix="${netbeans.dest}"
-        includes="${nb.clusters.includes}" excludes="${nb-extra-files}"
-      />
-      <zipfileset
-        dir="${netbeans.dest.dir}" prefix="${netbeans.dest}">
-            <include name="*.txt"/>
-            <include name="*.css"/>
-            <include name="*.html"/>
-      </zipfileset>
-    </zip>
-  </target>
-
-  <target name="build-nozip-ml" depends="init-module-list" description="Build the Multilanguage IDE but do not create a final ZIP file.">
-    <subant target="netbeans-ml" buildpath="${modules.fullpath}">
-        <property name="netbeans.dest.dir" value="${netbeans.dest.dir}"/>
-    </subant>
-  </target>
-  
-  <target name="build-zip-ml" depends="bootstrap,set-buildnumber,check-locales-set,build-nozip-ml"
-          description="Create a compleate multilanguage build including a ZIP distributions">
-      <fail message="Property locales must be set to reasonable value" unless="locales.is.set"/>
-      <echo message="nb.clusters.list is ${nb.clusters.list}"/>
-      <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat"
-               classpath="${nbantext.jar}"/>
-      <property name="buildnum" value="dev-${buildnumber}"/>
-      <repeat target="pack-one-cluster-ml" name="one.cluster.name.ml" values="${nb.clusters.list}"/>
-  </target>
-  
-  <target name="pack-one-cluster-ml" if="one.cluster.name.ml">
-      <resolve name="one.cluster.dir.ml.pre" value="${one.cluster.name.ml}.dir"/>
-      <pathconvert property="one.cluster.dir.ml" setonempty="false">
-          <path path="${one.cluster.dir.ml.pre}"/>
-          <chainedmapper>
-          <filtermapper>
-              <replacestring from="," to="_"/>
-              <replacestring from="-" to="_"/>
-              <replacestring from="." to="_"/>
-          </filtermapper>
-          <flattenmapper/>
-          </chainedmapper>
-      </pathconvert>
-      <echo message="one.cluster.name.ml is ${one.cluster.name.ml}" level="verbose"/>
-      <echo message="one.cluster.dir.ml is ${one.cluster.dir.ml}" level="verbose"/>
-      <echo message="one.cluster.dir.ml.pre is ${one.cluster.dir.ml.pre}" level="verbose"/>
-      <mkdir dir="${nb.build.dir}/ml"/>
-      <delete file="${nb.build.dir}/ml/NetBeans-${one.cluster.dir.ml}-${buildnum}.zip"/>
-      <repeat target="pack-one-locale-for-cluster" name="one.locale" values="${locales}"/>
-  </target>
-
-  <target name="pack-one-locale-for-cluster" if="one.locale">
-      <echo message="cluster-locale is ${one.cluster.dir.ml}-${one.locale}" level="verbose"/>
-      <zip destfile="${nb.build.dir}/ml/NetBeans-${one.cluster.dir.ml}-${buildnum}.zip" update="true" duplicate="preserve">
-          <zipfileset dir="${netbeans.dest.dir}/${one.cluster.dir.ml.pre}" prefix="${netbeans.dest}">
-              <include name="**/locale/*_${one.locale}.*"/>
-          </zipfileset>
-      </zip>    
-  </target>
-
-  <target name="check-locales-set">
-      <condition property="locales.is.set" value="true">
-          <and>
-              <isset property="locales"/>
-              <length string="${locales}" when="ge" length="2" trim="yes"/>
-          </and>
-      </condition>
-  </target>
-
-  <target name="build-nbms-ml" depends="bootstrap,set-buildnumber,init-tasks">
-      <taskdef name="repeat" classname="org.netbeans.nbbuild.Repeat"
-               classpath="${nbantext.jar}"/>
-      <property name="buildnum" value="dev-${buildnumber}"/>
-      <mkdir dir="${nb.build.dir}/ml/nbms"/>
-      <property name="netbeans.dest.dir.ml" location="${nb.build.dir}/ml/nbms"/>
-      <delete dir="${nb.build.dir}/ml/nbms"/>
-      <mkdir dir="${nb.build.dir}/ml/nbms"/>
-      <copy todir="${nb.build.dir}/ml/nbms">
-          <fileset dir="${nb.build.dir}/ml">
-              <include name="NetBeans-*-${buildnum}.zip"/>
-          </fileset>
-      </copy>
-      <pathconvert property="dlocales" setonempty="false">
-          <path path="${locales}"/>
-          <chainedmapper>
-          <filtermapper>
-              <replacestring from="," to="_"/>
-              <replacestring from="-" to="_"/>
-          </filtermapper>
-          <flattenmapper/>
-          </chainedmapper>
-      </pathconvert>
-      <tstamp>
-      	  <format property="spec.version" pattern="yyyy.M.d.kmm" locale="en" />
-      </tstamp>
-      <echo level="verbose" message="dlocales is ${dlocales}"/>
-      <echo level="verbose" message="locales is ${locales}"/>
-      <echo level="verbose" message="spec.version is ${spec.version}"/>
-      <delete file="${nb.build.dir}/ml/cluster-nbms-ml.properties"/>
-      <repeat target="build-one-nbm-ml" name="one.cluster.name.ml" values="${nb.clusters.list}"/>
-      <antcall target="build-one-nbm-ml" inheritall="false">
-          <param name="is.kit" value="true"/>
-          <param name="locales" value="${locales}"/>
-          <param name="dlocales" value="${dlocales}"/>
-          <param name="one.cluster.name.ml" value="nb.cluster.nb"/>
-          <param name="nb.cluster.nb" value="${nb.cluster.nb}"/>
-          <param name="nb.clusters.list" value="${nb.clusters.list}"/>
-          <param name="spec.version" value="${spec.version}"/>
-          <param name="netbeans.dest.dir.ml" value="${netbeans.dest.dir.ml}"/>
-          <param name="buildnumber" value="${buildnumber}"/>
-      </antcall>
-      <taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc"
-               classpath="${nbantext.jar}"/>
-      <property name="use.license.url.in.catalog" value="true"/>
-      <makeupdatedesc desc="nbms/catalog.xml" distbase="." uselicenseurl="${use.license.url.in.catalog}">
-          <fileset dir="nbms">
-              <include name="*.nbm"/>
-              <include name="*.jar"/>
-          </fileset>
-      </makeupdatedesc>
-  </target>
-
-  <target name="-check-ml-nbm-props">
-      <condition property="run.ml.nbm.build" value="true">
-          <and>
-              <isset property="locales"/>
-              <isset property="dlocales"/>
-              <isset property="one.cluster.name.ml"/>
-              <isset property="nb.clusters.list"/>
-              <isset property="spec.version"/>
-              <isset property="netbeans.dest.dir.ml"/>
-              <isset property="buildnumber"/>
-          </and>
-      </condition>
-  </target>
-  
-  <target name="-unpack-cluster-ml-zipfile" unless="is.kit">
-      <unzip dest="${netbeans.dest.dir.ml}" src="${nb.build.dir}/ml/NetBeans-${cluster.package.dir}-${buildnum}.zip">
-          <mapper type="glob" from="netbeans/*" to="${one.cluster.dir.ml}/*"/>
-      </unzip>
-  </target>
-  
-  <target name="-create-cluster-ml-nbm-metadata" unless="is.kit">
-      <echo file="${nb.build.dir}/ml/nbms/tmp/manifest.mf">OpenIDE-Module: ${code.name}
-OpenIDE-Module-Localizing-Bundle: ${code.name.base.slashes}/Bundle.properties
-OpenIDE-Module-Specification-Version: ${spec.version}
-</echo>
-      <echo file="${nb.build.dir}/ml/nbms/classes/${code.name.base.slashes}/Bundle.properties">
-OpenIDE-Module-Name=NetBeans 6.0 ${one.cluster.dir.ml} cluster localization (${locales})
-OpenIDE-Module-Display-Category=Localization
-OpenIDE-Module-Short-Description=NetBeans 6.0 ${one.cluster.dir.ml} cluster localization (${locales})
-OpenIDE-Module-Long-Description=Delivers ${locales} localization for all modules in ${one.cluster.dir.ml} cluster of NetBeans 6.0
-</echo>
-  </target>
-  
-    <target name="-create-kit-ml-nbm-metadata" if="is.kit">
-      <echo file="${nb.build.dir}/ml/nbms/tmp/manifest.mf">OpenIDE-Module: ${code.name}
-OpenIDE-Module-Localizing-Bundle: ${code.name.base.slashes}/Bundle.properties
-OpenIDE-Module-Specification-Version: ${spec.version}
-OpenIDE-Module-Module-Dependencies: ${kit.deps}
-</echo>
-       <echo file="${nb.build.dir}/ml/nbms/classes/${code.name.base.slashes}/Bundle.properties">
-OpenIDE-Module-Name=NetBeans 6.0 ${locales} localization kit
-OpenIDE-Module-Display-Category=Localization
-OpenIDE-Module-Short-Description=NetBeans 6.0 ${locales} localization kit
-OpenIDE-Module-Long-Description=Delivers ${locales} localization of whole NetBeans 6.0
-</echo>
-  </target>
-
-  <target name="build-one-nbm-ml" depends="init-tasks,-check-ml-nbm-props" if="run.ml.nbm.build">
-      <property file="${nb.build.dir}/ml/cluster-nbms-ml.properties"/>
-      <echo level="verbose" message="kit.deps is ${kit.deps}"/>
-      <echo level="verbose" message="locales is ${locales}"/>
-      <echo level="verbose" message="dlocales is ${dlocales}"/>
-      <echo level="verbose" message="nb.clusters.list is ${nb.clusters.list}"/>
-      <echo level="verbose" message="netbeans.dest.dir.ml is ${netbeans.dest.dir.ml}"/>
-      <echo level="verbose" message="spec.version is ${spec.version}"/>
-
-      <resolve name="one.cluster.dir.ml" value="${one.cluster.name.ml}.dir"/>
-      <pathconvert property="cluster.package.dir" setonempty="false">
-          <path path="${one.cluster.dir.ml}"/>
-          <chainedmapper>
-          <filtermapper>
-              <replacestring from="," to="_"/>
-              <replacestring from="-" to="_"/>
-              <replacestring from="." to="_"/>
-          </filtermapper>
-          <flattenmapper/>
-          </chainedmapper>
-      </pathconvert>
-      <delete dir="${nb.build.dir}/ml/nbms"/>
-      <delete dir="${netbeans.dest.dir.ml}"/>
-      <mkdir dir="${netbeans.dest.dir.ml}"/>
-      <antcall target="-unpack-cluster-ml-zipfile"/>
-      <property name="cluster" location="${netbeans.dest.dir.ml}/${one.cluster.dir.ml}"/>
-      <condition property="code.name.base" value="org.netbeans.localization.${cluster.package.dir}.${dlocales}">
-          <not>
-              <isset property="is.kit"/>
-          </not>
-      </condition>
-      <condition property="code.name.base" value="org.netbeans.localization.kit.${cluster.package.dir}.${dlocales}">
-          <isset property="is.kit"/>
-      </condition>
-
-      <pathconvert property="code.name.base.slashes" setonempty="false">
-          <path path="${code.name.base}"/>
-          <chainedmapper>
-              <flattenmapper/>
-              <filtermapper>
-                  <replacestring from="." to="/"/>
-              </filtermapper>
-          </chainedmapper>
-      </pathconvert>
-      <pathconvert property="code.name.base.dashes" setonempty="false">
-          <path path="${code.name.base}"/>
-          <chainedmapper>
-              <flattenmapper/>
-              <filtermapper>
-                  <replacestring from="." to="-"/>
-              </filtermapper>
-          </chainedmapper>
-      </pathconvert>
-      <property name="public.packages" value="${code.name.base}.*"/>
-      <property name="code.name" value="${code.name.base}/1"/>
-      <mkdir dir="${nb.build.dir}/ml/nbms/classes/${code.name.base.slashes}"/>
-      <mkdir dir="${nb.build.dir}/ml/nbms/tmp"/>
-      <antcall target="-create-cluster-ml-nbm-metadata"/>
-      <antcall target="-create-kit-ml-nbm-metadata"/>
-      <property name="is.autoload" value="false"/>
-      <property name="is.eager" value="false"/>
-      <condition property="module.jar.dir" value="modules">
-          <!-- set module.jar.dir property only when building kit NBM - leads to
-               AutoUpdate-Show-In-Client manifest attribute is set to true -->
-          <isset property="is.kit"/>
-      </condition>
-      <property name="module.jar" value="modules/${code.name.base.dashes}.jar"/>
-      <mkdir dir="${cluster}/modules"/>
-      <jarwithmoduleattributes jarfile="${cluster}/${module.jar}"
-          compress="${build.package.compress}" 
-          index="${build.package.index}" 
-          manifest="${nb.build.dir}/ml/nbms/tmp/manifest.mf">
-          <fileset dir="${nb.build.dir}/ml/nbms/classes"/>
-      </jarwithmoduleattributes>
-      <createmodulexml xmldir="${cluster}/config/Modules">
-          <enabled dir="${cluster}">
-              <include name="${module.jar}"/>
-          </enabled>
-      </createmodulexml>
-      <patternset id="module.files">
-          <!-- include name="${module.jar}"/ -->
-          <include name="**/*.jar"/>
-          <include name="config/Modules/${code.name.base.dashes}.xml"/>
-      </patternset>
-
-      <property name="module.files.toString" refid="module.files"/>
-      <echo level="verbose">Basic matching module files (${code.name.base.dashes}): ${module.files.toString}</echo>
-      <genlist outputfiledir="${cluster}" module="${module.jar}">
-          <fileset dir="${cluster}">
-              <patternset refid="module.files"/>
-          </fileset>
-      </genlist>
-      <property name="license.file.override" location="${nb.build.dir}/ml/nbms/license"/>
-      <property name="extra.license.files" value=""/>
-      <taskdef name="releasefileslicense" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesLicense" classpath="${nbantext.jar}"/>
-      <releasefileslicense license="${license.file.override}" standardlicense="${nb_all}/nbbuild/standard-nbm-license.txt" extralicensefiles="${extra.license.files}"/>
-      <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbantext.jar}"/>
-      <property name="nbm_alias" value="nb_ide"/>
-      <makenbm file="${nb.build.dir}/ml/${code.name.base.dashes}.nbm"
-               productdir="${cluster}"
-               module="${module.jar}"
-               homepage="http://translatedfiles.netbeans.org/"
-               distribution="http://translatedfiles.netbeans.org/"
-               needsrestart="true"
-               global="true"
-               targetcluster="${one.cluster.dir.ml}"
-               releasedate=""
-               moduleauthor="">
-          <license file="${license.file.override}"/>
-          <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
-      </makenbm>
-      <move todir="nbms" file="${nb.build.dir}/ml/${code.name.base.dashes}.nbm"/>
-      <property file="${nb.build.dir}/ml/cluster-nbms-ml.properties"/>
-      <condition property="new.kit.deps" value="${code.name} > ${spec.version}">
-          <and>
-              <not>
-                  <isset property="kit.deps"/>
-              </not>
-              <not>
-                  <isset property="is.kit"/>
-              </not>
-          </and>
-      </condition>
-      <condition property="new.kit.deps" value="${kit.deps},${code.name} > ${spec.version}">
-          <and>
-              <isset property="kit.deps"/>
-              <not>
-                  <isset property="is.kit"/>
-              </not>
-          </and>
-      </condition>
-      <condition property="new.kit.deps" value="${kit.deps}">
-          <isset property="is.kit"/>
-      </condition>
-      <propertyfile file="${nb.build.dir}/ml/cluster-nbms-ml.properties">
-          <entry key="kit.deps" value="${new.kit.deps}"/>
-      </propertyfile>
-  </target>
-
-  <target name="create-rpms-proto">
-    <mkdir dir="${nb.build.dir}/rpms"/>
-    <repeat target="create-one-rpm-proto" name="one.cluster.name" values="${clusters.list}" /> 
-  </target>
-    
-  <target name="create-one-rpm-proto">
-    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="${nbantext.jar}"/>
-    <loadproperties srcFile="cluster.properties" />
-    <loadproperties srcFile="cluster-description.properties" />
-    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
-    <mkdir dir="${nb.build.dir}/rpms"/>
-    
-    <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
-    <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
-    <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
-    <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
-    <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
-    <resolve name="pkg.rpm.name" value="${one.cluster.name}.pkg.rpm.name"/>
-    <resolve name="pkg.rpm.requires" value="${one.cluster.name}.pkg.rpm.requires"/>
-    <resolve name="pkg.rpm.group" value="${one.cluster.name}.pkg.rpm.group"/>
-    <resolve name="pkg.rpm.url" value="${one.cluster.name}.pkg.rpm.url"/>
-    <resolve name="pkg.rpm.copyright" value="${one.cluster.name}.pkg.rpm.copyright"/>
-    <resolve name="pkg.rpm.map" value="${one.cluster.name}.pkg.rpm.map"/>
-    <resolve name="pkg.rpm.prefix" value="${one.cluster.name}.pkg.rpm.prefix"/>
-    
-    <echo file="${nb.build.dir}/rpms/${pkg.rpm.name}.spec">
-%define global_product_version ${pkg.version}
-%define global_product_release 00
-%define _prefix ${pkg.rpm.prefix}
-Version: %{global_product_version}
-Release: %{global_product_release}
-Group: ${pkg.rpm.group}
-Copyright: ${pkg.rpm.copyright}
-Vendor: ${pkg.vendor}
-URL: ${pkg.rpm.url}
-Prefix: %_prefix
-AutoReqProv: no
-Name: ${pkg.rpm.name}
-Summary: ${pkg.name}
-%description 
-${pkg.desc}
-
-%files
-
-%erpm_map ${pkg.rpm.map} nb_destdir
-
-%dir ${pkg.rpm.map}
-
-${pkg.rpm.map}/${one.cluster.dir}</echo>
-  </target>
-
-  <target name="create-svr4s-proto">
-    <mkdir dir="${nb.build.dir}/rpms"/>
-    <repeat target="create-one-svr4-proto" name="one.cluster.name" values="${clusters.list}" /> 
-  </target>
-
-  <target name="create-one-svr4-proto">
-    <taskdef name="setcluster" classname="org.netbeans.nbbuild.SetCluster" classpath="${nbantext.jar}"/>
-    <loadproperties srcFile="cluster.properties" />
-    <loadproperties srcFile="cluster-description.properties" />
-    <setcluster cluster="${one.cluster.name}" name="one.cluster.dir" />
-    <mkdir dir="${nb.build.dir}/svr4s"/>
-    
-    <resolve name="pkg.name" value="${one.cluster.name}.pkg.name"/>
-    <resolve name="pkg.version" value="${one.cluster.name}.pkg.version"/>
-    <resolve name="pkg.desc" value="${one.cluster.name}.pkg.desc"/>
-    <resolve name="pkg.vendor" value="${one.cluster.name}.pkg.vendor"/>
-    <resolve name="pkg.email" value="${one.cluster.name}.pkg.email"/>
-    <resolve name="pkg.svr4.pkg" value="${one.cluster.name}.pkg.svr4.pkg"/>
-    <resolve name="pkg.svr4.maxinst" value="${one.cluster.name}.pkg.svr4.maxinst"/>
-    <resolve name="pkg.svr4.sunw_pkgvers" value="${one.cluster.name}.pkg.svr4.sunw_pkgvers"/>
-    <resolve name="pkg.svr4.hotline" value="${one.cluster.name}.pkg.svr4.hotline"/>
-    <resolve name="pkg.svr4.classes" value="${one.cluster.name}.pkg.svr4.classes"/>
-    <resolve name="pkg.svr4.basedir" value="${one.cluster.name}.pkg.svr4.basedir"/>
-    <resolve name="pkg.svr4.pkginst" value="${one.cluster.name}.pkg.svr4.pkginst"/>
-    <resolve name="pkg.svr4.category" value="${one.cluster.name}.pkg.svr4.category"/>
-<echo file="${nb.build.dir}/svr4s/${pkg.svr4.pkg}.spec">
-PKG=${pkg.svr4.pkg}
-NAME=${pkg.name}
-ARCH=sparc
-VERSION=${pkg.version}
-MAXINST=${pkg.svr4.maxinst}
-CATEGORY=${pkg.svr4.category}
-SUNW_PKGVERS=${pkg.svr4.sunw_pkgvers}
-DESC=${pkg.desc}
-VENDOR=${pkg.vendor}
-HOTLINE=${pkg.svr4.hotline}
-EMAIL=${pkg.email}
-CLASSES=${pkg.svr4.classes}
-BASEDIR=${pkg.svr4.basedir}
-PKGINST=${pkg.svr4.pkginst}</echo>
-  </target>
-    
-    <target name="-testuserdir-delete-init" depends="-load-build-properties">
-      <property name="test.user.dir.lock" location="${test.user.dir}/lock"/>
-      <available property="app.running" file="${test.user.dir.lock}"/>
-    </target>
-    <target name="-testuserdir-delete-ok" depends="-testuserdir-delete-init" unless="app.running">
-      <delete dir="${test.user.dir}"/>
-    </target>
-    <target name="-testuserdir-delete-fail" depends="-testuserdir-delete-init" if="app.running">
-      <!-- #66799: best to warn about this condition... -->
-      <fail>Will not delete ${test.user.dir} because ${test.user.dir.lock} still exists; kill any running process and delete lock file if necessary</fail>
-    </target>
-  <target name="testuserdir-delete" depends="-testuserdir-delete-ok,-testuserdir-delete-fail" description="Clean temporary testing user directory."/>
-
-  <target name="check-for-build"  >
-    <available property="have-build" file="${netbeans.dest.dir}/bin/netbeans"/>
-  </target>
-  <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
-    <ant dir="${basedir}" target="build-nozip"/>
-  </target>
-
-  <target name="tryme-setup-debug-args" if="debug.port" >
-    <property name="debug.pause" value="y" />
-    <property name="debug.server" value="y" />
-    
-    <property name="tryme.debug.args" value="-J-Xdebug -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
-  </target>
-          
-  <target name="tryme-debug" depends="-jdk-presetdef-nbjpdastart" description="Start IDE in debugger. May only be called from within IDE.">
-    <echo>Searching for JARs in ${netbeans.dest.dir}, this may take a moment...</echo>
-    <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
-      <classpath>
-        <fileset dir="${netbeans.dest.dir}">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </nbjpdastart>
-    <property name="debug.server" value="n"/>
-    <antcall target="tryme"/>
-  </target>
-
-  <target name="-profile-check" if="netbeans.home">
-      <condition property="profiler.configured">
-          <or>
-              <contains string="${run.args.ide}" substring="-agentpath:" casesensitive="true"/>
-              <contains string="${run.args.ide}" substring="-javaagent:" casesensitive="true"/>
-          </or>
-      </condition>
-  </target>
-  
-  <target name="-tryme-profile-pre72" depends="-jdk-presetdef-nbprofiledirect" if="profiler.info.jvmargs.agent" description="Start IDE in profiler (pre72 compatibility mode). May only be called from within IDE.">
-    <property name="profiler.roots.path" value="profiler.roots.all" />
-    <fileset id="profiler.roots.all" dir="${netbeans.dest.dir}">
-        <include name="**/*.jar"/>
-    </fileset>
-    <nbprofiledirect 
-        jvmargsprefix="-J" 
-        jvmargsproperty="profiler.jvmargs" 
-        mainclass="org.netbeans.Main"
-    >
-      <classpath>
-        <fileset dir="${netbeans.dest.dir}">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-      <rootspath>
-          <fileset refid="${profiler.roots.path}" />
-      </rootspath>
-    </nbprofiledirect>
-  </target>
-  
-  <target name="tryme-profile" depends="-profile-check,-tryme-profile-pre72" if="profiler.configured" unless="profiler.info.jvmargs.agent" description="Start IDE in profiler. May only be called from within IDE.">
-    <startprofiler/>
-    <property name="tryme.debug.args" value="-J-Dorg.osgi.framework.bootdelegation=org.netbeans.lib.profiler,org.netbeans.lib.profiler.*" />
-    <antcall target="tryme"/>
-  </target>
-  
-  <target name="tryme" depends="-load-build-properties,tryme-setup-debug-args,-jdk-init"
-          description="Try running the IDE interactively.
-It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in debug mode" 
-   >
-    <script language="javascript">
-        v = ''
-        i = new java.util.TreeMap(project.properties).entrySet().iterator()
-        while (i.hasNext()) {
-            e = i.next()
-            if (e.key.startsWith('tryme.arg.')) {
-                v += ' ' + e.value
-            }
-        }
-        project.setNewProperty('tryme.args', v)
-    </script>
-    <property name="tryme.debug.args" value="" />
-    <property environment="env"/>
-    <condition property="run.env.display" value="${env.NBDISPLAY}" else="${env.DISPLAY}">
-	<isset property="env.NBDISPLAY"/>
-    </condition>
-    
-    <!-- architecture of jvm on which app will run -->
-    <condition property="jvm.arch.string" value="64" else="">
-      <available file="${nbjdk.home}\jre\lib\amd64" />
-    </condition>        
-    
-    <property name="run.args.ide" value=""/>
-    <exec osfamily="windows" executable="${netbeans.dest.dir}/bin/netbeans${jvm.arch.string}.exe" failonerror="yes" dir="${java.io.tmpdir}">
-      <arg value="--jdkhome"/>
-      <arg file="${nbjdk.home}"/>
-      <arg value="--userdir"/>
-      <arg file="${test.user.dir}"/>
-      <arg line="${tryme.args}"/>
-      <arg line="${tryme.debug.args}" />
-      <arg line="${run.args.ide}"/>
-    </exec>
-    <exec osfamily="unix" executable="sh" failonerror="yes" dir="${java.io.tmpdir}">
-      <arg value="${netbeans.dest.dir}/bin/netbeans"/>
-      <arg value="--jdkhome"/>
-      <arg file="${nbjdk.home}"/>
-      <arg value="--userdir"/>
-      <arg file="${test.user.dir}"/>
-      <arg line="${tryme.args}"/>
-      <arg line="${tryme.debug.args}" />
-      <arg line="${run.args.ide}"/>
-      <env key="DISPLAY" value="${run.env.display}"/>
-    </exec>
-  </target>
-
-  <target name="move-ide-nbms" depends="init">
-    <property name="nbms.source.location" location="nbms"/>
-    <property name="nbms.target.location" location="ide_nbms"/>
-    <mkdir dir="${nbms.target.location}"/>
-
-    <resolvelist name="nb.clusters.names" list="${clusters.config.full.list}">
-        <mapper type="glob" from="*" to="*.dir"/>
-    </resolvelist>
-    <echo message="dirs: ${nb.clusters.names}"/>
-
-    <repeat target="-move-cluster-nbms" name="nb.cluster.name" values="${nb.clusters.names}"/>
-  </target>
-
-  <target name="-move-cluster-nbms">
-    <echo message="one cluster: ${nb.cluster.name}"/>
-    <echo message="source: ${nbms.target.location}"/>
-    <move todir="${nbms.target.location}">
-      <fileset dir="${nbms.source.location}">
-         <include name="${nb.cluster.name}/"/>
-      </fileset>
-    </move>
-  </target>
-  
-  <target name="all-l10n-kits" depends="l10n-kit">
-  </target>
-  
-  <target name="l10n-kit" depends="bootstrap,set-buildnumber,init-tasks" description="Builds the L10N kit">
-    <taskdef name="l10n" classname="org.netbeans.nbbuild.L10nTask"
-             classpath="${nbantext.jar}"/>
-    <property name="l10n.kit" location="${nb.build.dir}/l10n.zip"/>
-    <property name="nbms.location" location="nbms"/>
-    <property name="locales" value=""/>
-    <l10n nbmsdir="${nbms.location}" tmpdir="tmp" patternsFile="l10n.patterns" kitFile="${l10n.kit}" locales="${locales}"/>
-  </target>
-  
-  <target name="hg-l10n-kit">
-    <property name="l10n.kit" location="${nb.build.dir}/l10n.zip"/>
-    <zip destfile="${l10n.kit}">
-        <fileset dir="${nb_all}" includesfile="${nb_all}/installer/l10n.list"/>
-        <fileset dir="${nb_all}" includesfile="${nb_all}/nbi/l10n.list"/>
-        <fileset dir="${nb_all}" includesfile="${nb_all}/ide.branding/l10n.list"/>
-    </zip>
-  </target>
-
-    <target name="clean-untracked-files" depends="bootstrap" description="Removes files from clusters which are not listed as belonging to any NBM.">
-        <taskdef name="ducf" classname="org.netbeans.nbbuild.DeleteUnreferencedClusterFiles" classpath="${nbantext.jar}"/>
-        <ducf report="${nb.build.dir}/ducf.xml">
-            <clusters dir="${netbeans.dest.dir}">
-                <include name="*"/>
-            </clusters>
-            <selection excludes="build_info"/>
-        </ducf>
-    </target>
-
-  <target name="-cleanall" depends="init-module-list,init-tasks">
-    <taskdef name="cleanall" classname="org.netbeans.nbbuild.CleanAll" classpath="${nbantext.jar}"/>
-    <cleanall topdir=".." 
-              modules="${allmodules}" 
-              targetname="clean"
-              resolvedependencies="${resolve.clean.dependencies}"
-              deptargetprefix="all-"
-              failonerror="${stop.when.clean.error}" />
-  </target>
-
-  <target name="clean" depends="bootstrap" description="Clean everything possible.">
-      <taskdef name="try-else" classname="org.netbeans.nbbuild.TryElse" classpath="${nbantext.jar}"/>
-      <try-else first="-hg-clean" second="-real-clean"/>
-  </target>
-
-  <target name="-clean-external">
-    <subant target="clean">
-      <fileset dir="..">
-        <include name="*/external/build.xml"/>
-        <include name="contrib/*/external/build.xml"/>
-        <include name="otherlicenses/*/external/build.xml"/>
-      </fileset>
-    </subant>
-    <taskdef name="downloadbinaries" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries" classpath="${nbantext.jar}"/>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}" clean="true">
-        <manifest dir="${nb_all}">
-            <include name="*/external/binaries-list"/>
-            <include name="contrib/*/external/binaries-list"/>
-            <include name="otherlicenses/*/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
-  </target>
-
-  <target name="-real-clean" depends="-cleanall,localclean,-clean-external">
-    <echo message="Cleaning old builds..."/>
-    <delete>
-      <fileset dir=".">
-        <include name="NetBeans-*.log"/>
-        <include name="NetBeans-*.zip"/>
-      </fileset>
-    </delete>
-    <echo message="Cleaning scan cache..."/>
-    <delete>
-        <fileset dir="${java.io.tmpdir}" includes="nb-scan-cache-*-standard.ser,nb-scan-cache-*-full.ser"/>
-    </delete>
-    <!-- This step must be last (tries to delete nbantext.jar): -->
-    <delete dir="${nb.build.dir}" quiet="true"/>
-  </target>
-
-  <target name="clean-cluster-flags" unless="do-not-rebuild-clusters">
-    <mkdir dir="${netbeans.dest.dir}"/>
-    <delete includeEmptyDirs="true">
-      <fileset dir="${netbeans.dest.dir}">
-        <include name="*.built"/>
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="localclean" depends="clean-cluster-flags">
-    <delete dir="${test.user.dir}"/>
-    <delete includeEmptyDirs="true">
-      <fileset dir="${nb.build.dir}" erroronmissingdir="false" defaultexcludes="false">
-        <exclude name="nbantext.jar"/>
-      </fileset>
-    </delete>
-    <delete file="moduledefs-tmp.properties"/>
-    <delete dir="nbms" />
-    <delete dir="${netbeans.dest.dir}"/>
-  </target>
-
-  <target name="-hg-clean">
-    <fail message="Not running in a Mercurial checkout.">
-      <condition>
-        <not>
-          <available type="dir" file="../.hg"/>
-        </not>
-      </condition>
-    </fail>
-    <taskdef name="hgexec" classname="org.netbeans.nbbuild.HgExec" classpath="${nbantext.jar}"/>
-    <antcall target="-do-hg-clean">
-      <!-- <include name="."/> does not seem to work in a dirset -->
-      <param name="basedir" location=".."/>
-    </antcall>
-    <subant target="-do-hg-clean" genericantfile="build.xml">
-      <dirset dir="..">
-        <include name="contrib"/>
-        <include name="otherlicenses"/>
-      </dirset>
-    </subant>
-    <delete>
-      <fileset dir="nbproject">
-        <include name="private/scan-cache-*"/>
-      </fileset>
-    </delete>
-  </target>
-  <target name="-do-hg-clean">
-    <echo>Cleaning untracked files in ${basedir}...</echo>
-    <hgexec failonerror="yes" outputproperty="hg.unknown.files">
-      <arg value="--cwd"/>
-      <arg file="."/>
-      <arg value="--config"/>
-      <arg value="defaults.status="/>
-      <arg value="status"/>
-      <arg value="--unknown"/>
-      <arg value="--no-status"/>
-    </hgexec>
-    <fail message="Will not run clean; checkout contains unknown and not ignored files (did you forget to hg add?):
${hg.unknown.files}">
-        <condition>
-            <not>
-                <equals arg1="${hg.unknown.files}" arg2=""/>
-            </not>
-        </condition>
-    </fail>
-    <hgexec failonerror="yes">
-      <arg value="--cwd"/>
-      <arg file="."/>
-      <arg value="--config"/>
-      <arg value="extensions.purge="/>
-      <arg value="clean"/>
-      <arg value="--all"/>
-      <arg value="--exclude"/>
-      <!-- Do not use **/nbproject/private/ as this will match some test/{results,work} dirs: -->
-      <arg value="glob:{*/nbproject/private/**,*/*/nbproject/private/**,**/user.build.properties}"/>
-    </hgexec>
-  </target>
-
-  <target name="rebuild-cluster" depends="init" description="Builds only one cluster with dependencies ; takes e.g. '-Drebuild.cluster.name=nb.cluster.java' as parameter">
-    <delete file="netbeans/${rebuild.cluster.name}.built" failonerror="false"/>
-    <condition property="rebuild.cluster.name" value="nb.cluster.${name}">
-        <isset property="name"/>
-    </condition>
-    <fail unless="rebuild.cluster.name" message="You need to specify e.g.: -Dname=java"/>
-    <antcall target="build-one-cluster">
-      <param name="one.cluster.name" value="${rebuild.cluster.name}"/>
-    </antcall>
-  </target>
-
-    <target name="-localtest-macrodef">
-        <macrodef name="localtest">
-            <element name="test" implicit="true"/>
-            <sequential>
-                <mkdir dir="${nb.build.dir}/test/unit/classes"/>
-                <javac srcdir="test/unit/src" destdir="${nb.build.dir}/test/unit/classes" debug="true" source="1.7">
-                    <classpath path="${test.unit.cp}"/>
-                    <compilerarg line="-Xlint -Xlint:-serial"/>
-                </javac>
-                <copy todir="${nb.build.dir}/test/unit/classes">
-                    <fileset dir="test/unit/src" excludes="**/*.java"/>
-                </copy>
-                <mkdir dir="${nb.build.dir}/test/unit/results"/>
-                <property name="junit.vm.args" value=""/>
-                <junit showoutput="true" fork="true" tempdir="${nb.build.dir}/test/unit/results" filtertrace="false" includeantruntime="false">
-                    <test/>
-                    <classpath>
-                        <pathelement path="${test.unit.cp}"/>
-                        <pathelement location="${nb.build.dir}/test/unit/classes"/>
-                    </classpath>
-                    <sysproperty key="nb_all" file=".."/>
-                    <sysproperty key="netbeans.dest.dir.work" file="${netbeans.dest.dir}"/>
-                    <sysproperty key="nbjunit.workdir" file="${nb.build.dir}/test/unit/work"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-unit-sys-prop."/>
-                        <mapper type="glob" from="test-unit-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${junit.vm.args}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="localtest" depends="bootstrap,-localtest-macrodef">
-        <property name="includes" value="**/*Test.class"/>
-        <localtest>
-            <batchtest todir="${nb.build.dir}/test/unit/results">
-                <fileset dir="${nb.build.dir}/test/unit/classes" includes="${includes}"/>
-            </batchtest>
-        </localtest>
-    </target>
-    <target name="localtest-single" depends="bootstrap,-localtest-macrodef,-localtest-single-nomethod,-localtest-single-method"/>
-    <target name="-localtest-single-nomethod" unless="method">
-        <localtest>
-            <test name="${test.class}" todir="${nb.build.dir}/test/unit/results"/>
-        </localtest>
-    </target>
-    <target name="-localtest-single-method" if="method">
-        <localtest>
-            <test name="${test.class}" methods="${method}" todir="${nb.build.dir}/test/unit/results"/>
-        </localtest>
-    </target>
-    <target name="localtest-single-nb-debug" depends="bootstrap,-jdk-presetdef-nbjpdastart">
-        <nbjpdastart addressproperty="jpda.address" name="nbbuild" transport="dt_socket">
-            <classpath>
-                <pathelement path="${test.unit.cp}"/>
-                <pathelement location="${nb.build.dir}/test/unit/classes"/>
-            </classpath>
-        </nbjpdastart>
-        <antcall target="localtest-single">
-            <param name="junit.vm.args" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-        </antcall>
-    </target>
-
-  <target name="clean-cluster" description="Clean only one cluster - takes clean.cluster.name as parameters">
-    <fail message="specify -Dclean.cluster.name= property" unless="clean.cluster.name"/>
-    <resolve name="modules.to.clean" value="${clean.cluster.name}"/>
-    <antcall target="cleanall" inheritAll="false">
-      <param name="allmodules" value="${modules.to.clean}"/>
-    </antcall>
-    <delete file="netbeans/${clean.cluster.name}.built" failonerror="false"/>
-  </target>
-
-
-<!-- This section contains properties and targets used to build -->
-<!-- Solaris packages.                                          -->
-
-  <property name="solpkg-pkgproto" value="pkgproto"/>
-  <property name="solpkg-pkgmk" value="pkgmk"/>
-  <property name="solpkg-proto-file" value="prototype"/>
-  <property name="solpkg-actual-dir" value="to-be-specified"/>
-  <property name="solpkg-pkg-dir" value="to-be-specified"/>
-  <property name="solpkg-pkg-dest-dir" value="to-be-specified"/>
-
-  <!-- You can run this target to create the prototype file and create -->
-  <!-- the package, or if you need to modify the prototype file before -->
-  <!-- building the package, you can run the two subtargets            -->
-  <!-- separately.                                                     -->
-  <target name="solpkg-build" depends="solpkg-pkgproto,solpkg-pkgmk"
-          description="Generate a prototype file and create a Solaris package."/>
-
-  <!-- This creates the pkg prototype file for a given directory and -->
-  <!-- its files.                                                    -->
-  <target name="solpkg-pkgproto"
-          description="Generate a prototype file.">
-    <exec executable="rm" failonerror="yes">
-      <arg value="-rf"/>
-      <arg value="${solpkg-proto-file}"/>
-    </exec>
-    <exec executable="${solpkg-pkgproto}" output="${solpkg-proto-file}" 
-          failonerror="yes">
-      <arg value="${solpkg-actual-dir}=${solpkg-pkg-dir}"/>
-    </exec>
-  </target>
-
-  <!-- This creates the Solaris pkg for a given prototype file, pkginfo -->
-  <!-- file, and directory.                                             -->
-  <target name="solpkg-pkgmk"
-          description="Create a Solaris package.">
-    <exec executable="${solpkg-pkgmk}" failonerror="yes">
-      <arg value="-o"/>
-      <arg value="-f"/>
-      <arg value="${solpkg-proto-file}"/>
-      <arg value="-r"/>
-      <arg value="${solpkg-actual-dir}"/>
-      <arg value="-d"/>
-      <arg value="${solpkg-pkg-dest-dir}"/>
-    </exec>
-  </target>
-
-<!-- End of Solaris package section. -->
-
-
-<!-- Localized builds -->
-  <target name="all-dutch" depends="set-dutch-locale,all"/>
-  <target name="all-russian" depends="set-russian-locale,all"/>
-  <target name="all-french" depends="set-french-locale,all"/>
-  <target name="all-ja-zh" depends="set-ja-zh_CN-locales,all"/>
-  
-  <target name="set-ja-zh_CN-locales">
-        <property name="locales" value="ja,zh_CN"/>
-        <property name="locjar.locales" value="${locales}"/>
-        <property name="locmakenbm.locales"   value="${locales}"/>
-        <property name="locjhindexer.locales" value="${locales}"/>
-        <property name="localized.build.locales" value="${locales}"/>
-  </target>
-  
-  <target name="set-dutch-locale">
-        <property name="locales" value="nl"/>
-        <property name="locjar.locales" value="${locales}"/>
-        <property name="locmakenbm.locales"   value="${locales}"/>
-        <property name="locjhindexer.locales" value="${locales}"/>
-        <property name="localized.build.locales" value="${locales}"/>
-  </target>
-
-  <target name="set-russian-locale">
-        <property name="locales" value="ru"/>
-        <property name="locjar.locales" value="${locales}"/>
-        <property name="locmakenbm.locales"   value="${locales}"/>
-        <property name="locjhindexer.locales" value="${locales}"/>
-        <property name="localized.build.locales" value="${locales}"/>
-  </target>
-
-  <target name="set-french-locale">
-        <property name="locales" value="fr"/>
-        <property name="locjar.locales" value="${locales}"/>
-        <property name="locmakenbm.locales"   value="${locales}"/>
-        <property name="locjhindexer.locales" value="${locales}"/>
-        <property name="localized.build.locales" value="${locales}"/>
-  </target>
-  
-<!-- end of localized builds -->
-
-
-  <target name="print-selected-modules" depends="init-module-list" description="Prints list of modules to build in selected cluster config.">
-    <echo message="modules=${allmodules}"/>
-  </target>
-
-  <target name="check-commit-validation">
-    <condition property="run.validation" >
-        <and>
-          <or>
-            <not>
-              <isset property="nb.run.validation"/>
-            </not>
-            <istrue value="${nb.run.validation}"/>
-          </or>
-        </and>
-    </condition>
-  </target>
-  
-  <target 
-    name="commit-validation" 
-    depends="commitValidation,no-commit-validation" 
-    description="Runs tests to validate IDE before commit."
-  />
-
-  <target name="all-commitValidation" description="dummy target for build error recognition facility"/>
-  
-  <!-- keep this target name at least for a while for backward compat -jglick -->
-  <target name="commitValidation" depends="all-commitValidation,check-commit-validation" if="run.validation">
-    <property name="build.test.results.dir" location="${nb.build.dir}/test/commit-validation/results"/>
-    <property name="test.type" value="test"/>
-    <delete dir="${build.test.results.dir}"/>
-    <mkdir dir="${build.test.results.dir}"/>
-
-    <taskdef name="resolvelist" classname="org.netbeans.nbbuild.ResolveList" classpath="${nbantext.jar}"/>
-    <resolvelist list="${nb.clusters.list}" name="nb.clusters.validation.list">
-       <mapper type="regexp" from="(.*)" to="validation.\1"/>
-    </resolvelist>
-    
-    <subant target="${test.type}" >
-        <property name="test.config" value="commit"/>
-        <property name="continue.after.failing.tests" value="true"/>
-        <property name="build.test.unit.results.dir" location="${build.test.results.dir}"/>
-        <property name="build.test.qa-functional.results.dir" location="${build.test.results.dir}"/>
-        <property name="test-unit-sys-prop.ignore.random.failures" value="true"/>
-        <property name="test-qa-functional-sys-prop.ignore.random.failures" value="true"/>
-        <dirset dir=".." includes="${nb.clusters.validation.list}"/>
-    </subant>
-    
-    <pathconvert property="failed.tests" pathsep="${line.separator}">
-        <fileset dir="${build.test.results.dir}">
-            <include name="TEST-*.xml"/>
-            <not>
-                <and>
-                    <contains text='errors="0"'/>
-                    <contains text='failures="0"'/>
-                </and>
-            </not>
-        </fileset>
-    </pathconvert>
-    <junitreport todir="${build.test.results.dir}">
-            <fileset dir="${build.test.results.dir}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames" todir="${build.test.results.dir}/html"/>
-    </junitreport>
-    <echo message="Report generated to ${build.test.results.dir}/html/index.html"/>
-    <fail message="There were failed tests:${line.separator}${failed.tests} ${line.separator}${line.separator}Test report html: ${build.test.results.dir}/html/index.html">
-        <condition>
-            <not>
-                <or>
-                    <equals arg1="${failed.tests}" arg2=""/>
-                    <equals arg1="${continue.after.failing.tests}" arg2="true"/>
-                </or>
-            </not>
-        </condition>
-    </fail>
-  </target>
-
-  <target name="no-commit-validation" depends="check-commit-validation" unless="run.validation">
-    <echo>
-        *** WARNING ***
-        You may not commit any changes into the repository without running the commit validation test suite.
-        For more information: http://www.netbeans.org/community/guidelines/commit.html
-    </echo>
-  </target>
-
-    <target name="verify-all-libs-and-licenses" depends="bootstrap,download-all-extbins" description="Verify the contents of third-party libraries and licenses.">
-        <taskdef name="verifylibsandlicenses" classname="org.netbeans.nbbuild.extlibs.VerifyLibsAndLicenses" classpath="${nbantext.jar}"/>
-        <verifylibsandlicenses report="${nb.build.dir}/verifylibsandlicenses.xml" nball=".."/>
-    </target>
-
-    <target name="verify-libs-and-licenses" depends="bootstrap,download-selected-extbins" description="Verify the contents of third-party libraries and licenses in the selected configuration.">
-        <taskdef name="verifylibsandlicenses" classname="org.netbeans.nbbuild.extlibs.VerifyLibsAndLicenses" classpath="${nbantext.jar}"/>
-        <verifylibsandlicenses report="${nb.build.dir}/verifylibsandlicenses.xml" nball=".."/>
-    </target>
-
-    <target name="create-license-summary" depends="bootstrap,download-selected-extbins" description="Create a summary of the licenses used by libraries in the build.">
-        <taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
-        <createlicensesummary report="${nb.build.dir}/createlicensesummary.xml" nball=".." build="${netbeans.dest.dir}" summary="${netbeans.dest.dir}/THIRDPARTYLICENSE-generated.txt"/>
-    </target>
-
-  <target name="build-source-config"
-    depends="init,set-buildnumber"
-    description="Packages sources needed to compile one cluster.config">
-    <property name="buildnum" value="${buildnumber}"/>
-    <echo message="Packaging sources of ${cluster.config} modules"/>
-
-    <resolve name="harness-modules" value="nb.cluster.harness"/>
-    
-    <mkdir dir="${nb.build.dir}"/>
-    <dirset id="source.dirset" dir="${nb_all}"
-            includes="${allmodules},${harness-modules},nbbuild,ide,nbi,libs.antlr3.devel,libs.junit4"
-            excludes="nbi/engine/lib,nbi/infra/build/jvm,nbi/infra/sandbox,nbi/infra/server,nbi/infra/utils"
-    />
-    <pathconvert property="source.dirs" pathsep="," refid="source.dirset">
-      <regexpmapper from="${nb_all}/(.*)$" to="\1/**/*" handledirsep="yes"/>
-    </pathconvert>
-    <downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
-        <manifest dir="${nb_all}">
-            <include name="libs.antlr3.devel/external/binaries-list"/>
-        </manifest>
-    </downloadbinaries>
-    <zip zipfile="${nb.build.dir}/${cluster.config}-src-${buildnum}.zip" duplicate="preserve">
-      <zipfileset dir="${nb_all}" includes="${source.dirs}">
-          <exclude name="*/build/**/*"/>
-          <exclude name="nbbuild/netbeans/**"/>
-      </zipfileset>
-      <zipfileset dir="${nb_all}">
-          <include name="build.xml"/>
-      </zipfileset>
-    </zip>
-  </target>
-
-  <target name="generate-golden-files-init" depends="init,bootstrap" >
-    <property name="generated.files.dir" location="${nb.build.dir}/generated" />
-    <mkdir dir="${generated.files.dir}" />
-  </target>
-  <target name="generate-golden-files" depends="generate-golden-files-init" description="Generate summaries of module dependencies.">
-    <property name="deps.max.friends" value="20"/>
-    
-    <taskdef name="deps" classname="org.netbeans.nbbuild.ModuleDependencies" classpath="${nbantext.jar}"/>
-    
-    <deps>
-      <inputpattern dir="${netbeans.dest.dir}"/>
-      <output type="group-dependencies" file="${generated.files.dir}/cluster-deps.txt" />
-      <output type="group-implementation-dependencies" file="${generated.files.dir}/cluster-impl-deps.txt" />
-      <output type="modules" file="${generated.files.dir}/modules.txt" />
-      <output type="disabled-autoloads" file="${generated.files.dir}/disabled-autoloads.txt"/>
-      <output type="dependencies" file="${generated.files.dir}/deps.txt" />
-      <output type="implementation-dependencies" file="${generated.files.dir}/impl-deps.txt" />
-      <output type="public-packages" file="${generated.files.dir}/public-packages.txt" />
-      <output type="shared-packages" file="${generated.files.dir}/shared-packages.txt" />
-      <output type="friend-packages" file="${generated.files.dir}/friend-packages.txt" />
-      <output type="group-friend-packages" file="${generated.files.dir}/group-friend-packages.txt" />
-      <output type="kits" file="${generated.files.dir}/kits.txt" />
-      <output type="kit-dependencies" file="${generated.files.dir}/kit-deps.txt" />
-      <output type="plugins" file="${generated.files.dir}/plugins.txt"/>
-      <output type="reverse-dependencies" file="${generated.files.dir}/reverse-deps.txt"/>
-    </deps>
-
-    <taskdef name="test-deps" classname="org.netbeans.nbbuild.ModuleTestDependencies" classpath="${nbantext.jar}"/>
-    <test-deps output="${generated.files.dir}/test-deps.txt" reverseOutput="${generated.files.dir}/reverse-test-deps.txt"/>
-  </target>
-  
-  <target name="generate-files-layout" depends="generate-golden-files-init" description="Generate summary of installed files.">
-    <taskdef name="generate-files-layout" classname="org.netbeans.nbbuild.GenerateFilesLayout" classpath="${nbantext.jar}"/>
-    <property name="check.files.layout.generated" location="${generated.files.dir}/files-layout.txt" />
-  
-    <property name="check-file-layout-root" location="${netbeans.dest.dir}" />
-    <generate-files-layout output="${check.files.layout.generated}">
-      <files dir="${check-file-layout-root}" casesensitive="yes" >
-        <exclude name="bin/"/>
-        <exclude name="etc/"/>
-        <exclude name="mobility*/emulators-inst/wtk22_*.zip"/> <!-- XXX #110820 -->
-        <exclude name="*/.lastModified"/>
-      </files>
-    </generate-files-layout>
-  </target>
-
-  <target name="index-layer-paths" depends="generate-golden-files-init" description="Create index of layer paths.">
-      <property name="build" location="netbeans"/>
-      <fail message="You must create a build first.">
-          <condition>
-              <not>
-                  <available file="${build}" type="dir"/>
-              </not>
-          </condition>
-      </fail>
-      <taskdef name="layerindex" classname="org.netbeans.nbbuild.LayerIndex" classpath="${nbantext.jar}"/>
-      <layerindex output="${generated.files.dir}/layers.txt" serviceoutput="${generated.files.dir}/services.txt">
-          <modules dir="${build}">
-              <include name="**/*.jar"/>
-          </modules>
-      </layerindex>
-  </target>
-
-  <target name="summarize-hgmail" depends="generate-golden-files-init" description="Create summary of .hgmail coverage.">
-      <taskdef name="summarize-hgmail" classname="org.netbeans.nbbuild.SummarizeHgmail" classpath="${nbantext.jar}"/>
-      <summarize-hgmail output="${generated.files.dir}/hgmail-summary.txt">
-          <hgmails dir="${nb_all}">
-              <include name=".hgmail"/>
-              <include name="*/.hgmail"/>
-          </hgmails>
-      </summarize-hgmail>
-  </target>
-
-  <target name="display-l10n-list-matches" description="Show which files are actually matched by an l10n.list in some module.">
-    <property name="nbroot" location=".."/>
-    <input addproperty="module">Select a top-level module (e.g. "java") to display results for:</input>
-    <property name="listfile" location="${nbroot}/${module}/l10n.list"/>
-    <echo>${listfile}:1: Matches follow... (click on hyperlinks from IDE!)</echo>
-    <echo>(warning: 'exclude' directives not honored here yet)</echo><!-- XXX use filtersets or something to fix -->
-    <apply parallel="false" executable="sh">
-        <arg value="-c"/>
-        <arg value="echo $0:1"/>
-        <fileset dir="${nbroot}" includesfile="${listfile}"/>
-    </apply>
-  </target>
-  
-  <target name="increment-spec-versions" depends="bootstrap,init-module-list" description="Increment all standard module specification versions. Pass -Dbranch=true if not on the trunk.">
-    <property name="branch" value="false"/>
-    <taskdef name="incrspecvers" classname="org.netbeans.nbbuild.IncrementSpecificationVersions" classpath="${nbantext.jar}"/>
-    <incrspecvers nbroot=".." modules="${allmodules}" branch="${branch}"/>
-  </target>
-
-  <target name="init-test-dist" depends="init">
-      <sortsuitemodules unsortedmodules="${modules.fullpath}" sortedmodulesproperty="test.modules.sorted" sorttests="true"/>
-  </target>
-  <target name="build-test-dist" depends="init-test-dist" description="Build test distribution">
-      <!-- if is 'false' it will ignore compilation error in subant  -->
-     <property name= "test.fail.on.error" value="true"/>
-      <subant-junit buildpath="${test.modules.sorted}" target="test-build" failonerror="${test.fail.on.error}" report="${nb.build.dir}/build-all-tests.xml"/>
-      <!-- adding performance tests to BTD -->
-      <!-- #178009: disabling; has various non-platform dependencies which break BTD in some cluster configs; anyway should be made a normal module!
-      <subant-junit buildpath="${nb_all}${file.separator}performance" target="test-build" failonerror="${test.fail.on.error}" report="${nb.build.dir}/build-performance-tests.xml"/>
-      -->
-      <!-- copy templates -->
-      <copy todir="${test.dist.dir}">
-          <fileset dir="testdist/release"/>
-      </copy>
-      <jar jarfile="${test.dist.dir}/tasks.jar">
-          <fileset dir="${build.ant.classes.dir}">
-              <include name="org/netbeans/nbbuild/testdist/"/>
-          </fileset>
-      </jar>
-      <zip basedir="${test.dist.dir}" destfile="${nb.build.dir}/testdist.zip"/>
-  </target>      
-
-  <target name="gen-sigtests" depends="init-module-list"
-    description="Generates snaphost of API of all modules"
-  >
-    <echo message="Generating signature files for ${cluster.config} modules"/>
-    <property name="sigtest.basedir" location="${nb.build.dir}/sigtest/snapshot"/>
-    <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/generate"/>
-    
-    <subant target="gen-sigtest" buildpath="${modules.fullpath}" failonerror="false">
-      <property name="sigtest.basedir" value="${sigtest.basedir}"/>
-      <property name="sigtest.output.dir" location="${sigtest.output.dir}"/>
-    </subant>
-  </target>
-
-  <target name="gen-sigtests-release" depends="bootstrap"
-    description="Generates signature files into stable API modules directories"
-  >
-    <echo message="Generating signature files into stable API modules directories"/>
-
-    <pathconvert property="modules.fullpath" >
-        <path>
-            <dirset dir="${nb_all}" includes="${config.javadoc.stable},${config.javadoc.devel}" />
-        </path>
-        <mapper type="identity" />
-    </pathconvert>
-    
-    <subant target="gen-sigtest" buildpath="${modules.fullpath}"/>
-  </target>
-  
-  <target name="check-sigtests-release" depends="bootstrap"
-    description="Checks signature files of stable API modules"
-  >
-    <echo message="Checking signature files of stable API modules"/>
-    
-    <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/check-release"/>
-    <property name="fail.on.error" value="true"/>
-    <delete dir="${sigtest.output.dir}"/>
-    <mkdir dir="${sigtest.output.dir}"/>
-    <pathconvert property="modules.fullpath" >
-        <path>
-            <dirset dir="${nb_all}" includes="${config.javadoc.stable}" />
-        </path>
-        <mapper type="identity" />
-    </pathconvert>
-    <subant target="check-sigtest" buildpath="${modules.fullpath}" failonerror="${fail.on.error}">
-        <property name="sigtest.output.dir" value="${sigtest.output.dir}"/>
-    </subant>
-  </target>
-
-  <target name="check-sigtests">
-    <echo message="Checking signature files for ${cluster.config} modules"/>
-    <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/check-snapshot"/>
-    <antcall target="-do-check-sigtests">
-        <param name="sigtest.check.type" value="strictcheck"/>
-        <param name="sigtest.output.dir" value="${sigtest.output.dir}"/>
-    </antcall>
-    <junitreport todir="${sigtest.output.dir}">
-        <fileset dir="${sigtest.output.dir}">
-            <include name="*.xml"/>
-        </fileset>
-        <report todir="${sigtest.output.dir}/html" format="frames"/>
-    </junitreport>
-    <echo message="Report generated to ${sigtest.output.dir}/html/index.html"/>
-  </target>
-
-  <target name="check-sigtests-version">
-    <echo message="Checking version of signature files for ${cluster.config} modules"/>
-    
-    <property name="sigtest.previous.url" value="http://deadlock.netbeans.org/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/build/sigtest/snapshot/*zip*/snapshot.zip"/>
-    <property name="sigtest.prev.dir" location="${nb.build.dir}/sigtest/prev-snapshot"/>
-    <property name="sigtest.output.dir" location="${nb.build.dir}/sigtest/versioncheck"/>
-
-    <mkdir dir="${sigtest.prev.dir}"/>    
-    <get src="${sigtest.previous.url}" dest="${sigtest.prev.dir}/snapshot.zip"/>
-    <unzip src="${sigtest.prev.dir}/snapshot.zip" dest="${sigtest.prev.dir}">
-        <mapper type="flatten"/>
-    </unzip>
-    
-    <antcall target="-do-check-sigtests">
-        <param name="sigtest.check.type" value="versioncheck"/>
-        <param name="sigtest.basedir" location="${sigtest.prev.dir}"/>
-        <param name="sigtest.output.dir" value="${sigtest.output.dir}"/>
-    </antcall>
-    <junitreport todir="${sigtest.output.dir}">
-        <fileset dir="${sigtest.output.dir}">
-            <include name="*.xml"/>
-        </fileset>
-        <report todir="${sigtest.output.dir}/html" format="frames"/>
-    </junitreport>
-    <echo message="Report generated to ${sigtest.output.dir}/html/index.html"/>
-  </target>
-    
-  <target name="-do-check-sigtests" depends="init-module-list">
-    <fail unless="sigtest.check.type"/>
-    <fail unless="sigtest.output.dir"/>
-
-    <property name="sigtest.basedir" location="${nb.build.dir}/sigtest/snapshot"/>
-    <property name="sigtest.fail.on.error" value="false"/>
-    
-    <mkdir dir="${sigtest.basedir}"/>
-    <delete dir="${sigtest.output.dir}"/>
-    <mkdir dir="${sigtest.output.dir}"/>
-    <subant target="check-sigtest" buildpath="${modules.fullpath}" failonerror="${sigtest.fail.on.error}">
-        <property name="sigtest.output.dir" value="${sigtest.output.dir}"/>
-        <property name="sigtest.basedir" value="${sigtest.basedir}"/>
-    </subant>
-  </target>
-
-  <target name="findbugs-cluster" depends="init">
-    <echo message="Running findbugs for ${cluster.config} modules"/>
-    <subant target="findbugs" buildpath="${modules.fullpath}">
-        <property name="findbugs.continue.after.error" value="true"/>
-    </subant>
-  </target>
-
-  <target name="findbugs" depends="init" description="Runs findbugs target in modules specified by ${findbugs.modules}.">
-    <subant target="findbugs">
-       <property name="findbugs.continue.after.error" value="true"/>
-       <dirset dir=".." includes="${findbugs.modules}"/>
-    </subant>
-  </target>
-
-  
-  <target name="generate-uc-catalog" depends="bootstrap">
-    <taskdef name="makeupdatedesc"
-         classname="org.netbeans.nbbuild.MakeUpdateDesc"
-         classpath="${nbantext.jar}"/>
-      <property name="nbms.location" location="nbms"/>
-      <property name="catalog.file" location="${nbms.location}/updates.xml"/>
-      <property name="tasks.file" location="${catalog.file}/../tasks.jar"/>
-      <property name="catalog.base.url" value="."/>
-      <property name="use.license.url.in.catalog" value="true"/>
-      <property name="catalog.notification.message" value=""/>
-      <property name="catalog.notification.url"     value=""/>
-      <property name="catalog.content.description"  value=""/>
-      <property name="catalog.content.description.url" value=""/>
-
-<!--      <genau config="ausrc/modules.setup" nbmLocation="${nbms.location}" catalog="${catalog.file}" catalogDeploymentLocation="${catalog.base.url}"/>-->
-      <makeupdatedesc desc="${catalog.file}" distbase="${catalog.base.url}" automaticgrouping="true" uselicenseurl="${use.license.url.in.catalog}" notificationmessage="${catalog.notification.message}" notificationurl="${catalog.notification.url}" contentdescription="${catalog.content.description}" contentdescriptionurl="${catalog.content.description.url}">
-          <fileset dir="${nbms.location}">
-              <include name="**/*.nbm"/>
-              <include name="**/*.jar"/>
-          </fileset>
-          <updaterjar>
-              <fileset dir="netbeans" includes="platform*/modules/ext/updater.jar"/>
-          </updaterjar>
-      </makeupdatedesc>
-      <gzip src="${catalog.file}" destfile="${catalog.file}.gz"/>
-      <copy tofile="${tasks.file}" file="netbeans/harness/tasks.jar"/>
-  </target>
-
-  <target name="verify-update-descriptor" depends="init">
-      <taskdef name="vuc" classname="org.netbeans.nbbuild.VerifyUpdateCenter" classpath="${nbantext.jar}"/>
-      <echo>Checking synchronic and diachronic consistency of NBMs; see http://wiki.netbeans.org/DevFaqImplementationDependency</echo>
-      <property name="old.updates" value=""/>
-      <property name="nbms.location" location="nbms"/>
-      <vuc updates="${nbms.location}/updates.xml" oldupdatesurl="${old.updates}" report="${nbms.location}/vuc-report.xml">
-          <classpath>
-              <fileset dir="netbeans">
-                  <include name="platform*/lib/*.jar"/>
-                  <include name="platform*/core/*.jar"/>
-              </fileset>
-          </classpath>
-      </vuc>
-  </target>
-
-    <!-- #42157 - Scans all xml layers for OptionsExport folder and creates
-    list of include/exclude patterns for import on the first start.  -->
-    <target name="create-netbeans-import">
-        <taskdef name="optionsimport" classname="org.netbeans.nbbuild.LayerOptionsImport" classpath="${nbantext.jar}"/>
-        <mkdir dir="${netbeans.dest.dir}/etc"/>
-        <optionsimport output="${netbeans.dest.dir}/etc/netbeans.import">
-            <modules dir="${netbeans.dest.dir}">
-                <include name="**/*.jar"/>
-            </modules>
-        </optionsimport>
-    </target>
-
-    <target name="test" description="Runs ${test.type} target in modules specified by ${test.modules}.">
-        <subant target="${test.type}" >
-            <property name="continue.after.failing.tests" value="true"/>
-            <dirset dir=".." includes="${test.modules}"/>
-        </subant>
-    </target>
-
-    <target name="update-copyright-owner">
-        <taskdef name="checklicense" classname="org.netbeans.nbbuild.CheckLicense" classpath="${nbantext.jar}"/>
-        <fileset id="fs" dir="..">
-            <exclude name=".hg/"/> <!-- not sources -->
-            <exclude name="**/*.html"/><exclude name="**/*.css"/> <!-- JavaHelp etc. pages use their own header style -->
-            <exclude name="**/test/**/data/"/> <!-- test data should never be touched -->
-            <exclude name="**/*.orig"/> <!-- result of hg revert -->
-            <exclude name="*/external/"/> <!-- foreign licenses etc. -->
-            <exclude name="otherlicenses/"/> <!-- modules with thirdparty licenses -->
-            <exclude name="contrib/"/><exclude name="l10n/"/><exclude name="misc/"/><exclude name="nb-javac/"/> <!-- subrepos -->
-        </fileset>
-        <property name="prefix" value="^([ \t]*[*#/;%~-]*[ \t]*)?"/>
-        <checklicense>
-            <fileset refid="fs"/>
-            <convert token="${prefix}nbbuild/licenses/CDDL-GPL-2-CP\. +Sun designates this" prefix="true">
-                <line text="nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this"/>
-            </convert>
-            <convert token="${prefix}each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP\. +Sun" prefix="true">
-                <line text="each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle"/>
-            </convert>
-            <convert token="by Sun in the GPL Version 2 section of the License file that">
-                <line text="by Oracle in the GPL Version 2 section of the License file that"/>
-            </convert>
-            <convert token="-\d{4} Sun Microsystems, Inc\. All rights reserved\.">
-                <line text="-2010 Oracle and/or its affiliates. All rights reserved."/>
-                <line text=""/>
-                <line text="Oracle and Java are registered trademarks of Oracle and/or its affiliates."/>
-                <line text="Other names may be trademarks of their respective owners."/>
-            </convert>
-            <convert token="\d{4} Sun Microsystems, Inc\. All rights reserved\.">
-                <line text="2010 Oracle and/or its affiliates. All rights reserved."/>
-                <line text=""/>
-                <line text="Oracle and Java are registered trademarks of Oracle and/or its affiliates."/>
-                <line text="Other names may be trademarks of their respective owners."/>
-            </convert>
-        </checklicense>
-        <checklicense fragment="nbbuild/licenses/CDDL-GPL-2-CP.  Sun" fail="whenpresent">
-            <fileset refid="fs"/>
-        </checklicense>
-        <checklicense fragment="by Sun in the GPL" fail="whenpresent">
-            <fileset refid="fs"/>
-        </checklicense>
-        <!-- Samples: -->
-        <checklicense>
-            <fileset refid="fs"/>
-            <convert token="${prefix}Copyright \(c\) \d+(?:-\d+)?, Sun Microsystems, Inc\." prefix="true">
-                <line text="Copyright (c) 2010, Oracle."/>
-            </convert>
-            <convert token=" \* Neither the name of Sun Microsystems, Inc\. nor the names of its ">
-                <line text=" * Neither the name of Oracle nor the names of its "/>
-            </convert>
-            <convert token=" \* Neither the name of Sun Microsystems nor the names of its contributors">
-                <line text=" * Neither the name of Oracle nor the names of its contributors"/>
-            </convert>
-            <!-- XXX there are other patterns in mobility.midpexamples -->
-        </checklicense>
-        <checklicense fragment=", Sun Microsystems, Inc." fail="whenpresent">
-            <fileset refid="fs"/>
-        </checklicense>
-        <checklicense fragment="the name of Sun Microsystems" fail="whenpresent">
-            <fileset refid="fs"/>
-        </checklicense>
-    </target>
-
-    <target name="refresh-update_tracking-ml" depends="init-tasks">
-
-        <basename property="code.name.base.dashes" file="${nbm.filename}" suffix=".nbm"/>
-
-        <condition property="module" value="tmp/netbeans/lib/boot.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-bootstrap" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/core/core.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-core-startup" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/core/core.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-core-startup-base" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-openide-util-lookup.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-util-lookup" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-openide-util.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-util" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-openide-util-ui.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-util-ui" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/core/org-openide-filesystems.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-filesystems" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/core/org-openide-filesystems-compat8.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-filesystems-compat8" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-openide-modules.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-openide-modules" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-netbeans-libs-asm.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-libs-asm" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/lib/org-netbeans-libs-asm.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-libs-asm" />
-        </condition>
-
-        <condition property="module" value="tmp/netbeans/core/org-netbeans-upgrader.jar">
-            <equals arg1="${code.name.base.dashes}" arg2="org-netbeans-upgrader" />
-        </condition>
-
-        <property name="module" value="tmp/netbeans/modules/${code.name.base.dashes}.jar"/>
-
-        <patternset id="module.files">
-            <!-- include name="${module.jar}"/ -->
-            <include name="**/*.*"/>
-        </patternset>
-
-
-        <genlist outputfiledir="newbuild" module="${module}">
-            <fileset dir="newbuild/tmp/netbeans">
-                <patternset refid="module.files"/>
-            </fileset>
-        </genlist>
-
-    </target>
-
-</project>
diff --git a/.pc/netbeans-cluster-properties.patch/nbbuild/cluster.properties b/.pc/netbeans-cluster-properties.patch/nbbuild/cluster.properties
deleted file mode 100644
index 4d3337a..0000000
--- a/.pc/netbeans-cluster-properties.patch/nbbuild/cluster.properties
+++ /dev/null
@@ -1,1528 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-cluster.config=full
-clusters.prefix=libnb
-
-clusters.config.platform.list=\
-        nb.cluster.harness,\
-        nb.cluster.bootstrap,\
-        nb.cluster.platform
-
-clusters.config.basic.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.apisupport
-
-clusters.config.standard.list=\
-        ${clusters.config.basic.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.full.list=\
-        nb.cluster.cnd,\
-        nb.cluster.cndext,\
-        nb.cluster.dlight,\
-        nb.cluster.groovy,\
-        nb.cluster.javacard,\
-        nb.cluster.mobility,\
-        nb.cluster.php,\
-        ${clusters.config.standard.list},\
-        nb.cluster.ergonomics
-# ergonomics must be last
-
-clusters.config.php.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.php,\
-        nb.cluster.websvccommon,\
-        nb.cluster.nb
-
-clusters.config.groovy.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.groovy
-
-clusters.config.cnd.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.cnd,\
-        nb.cluster.nb,\
-        nb.cluster.dlight
-
-clusters.config.cndext.list=\
-        ${clusters.config.cnd.list},\
-	nb.cluster.cndext,\
-	nb.cluster.extide,\
-        nb.cluster.java
-
-clusters.config.dlight.list=\
-        nb.cluster.platform,\
-        nb.cluster.harness,\
-        nb.cluster.ide,\
-        nb.cluster.dlight,\
-        nb.cluster.nb
-
-clusters.config.java.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.javafx,\
-        nb.cluster.profiler,\
-        nb.cluster.nb
-
-clusters.config.enterprise.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.identity.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.identity
-
-clusters.config.mobility.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.mobility
-
-clusters.config.jdev.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.profiler,\
-        nb.cluster.jira,\
-        nb.cluster.team
-
-clusters.config.bloated.list=\
-        nb.cluster.identity,\
-        ${clusters.config.full.list}
-# ergonomics must be last
-
-# For technical reasons, nb.cluster.experimental is a superset of nb.cluster.betauc and nb.cluster.stableuc, so cannot list at once:
-clusters.config.experimental.list=\
-        ${clusters.config.bloated.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.experimental
-
-clusters.config.stableuc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.stableuc
-# could put ergonomics last, but undesirable to also do so for clusters.config.experimental.list, so exclude stableuc from ergonomics processing
-
-clusters.config.betauc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.betauc
-
-clusters.config.minimal.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.nb
-
-clusters.config.javacard.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.javacard
-
-clusters.config.remote.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.remote
-
-clusters.config.python.list=\
-        ${clusters.config.minimal.list},\
-        nb.cluster.python
-
-clusters.list=\
-        ${clusters.config.full.list}
-
-# Bootstrap 'cluster' serves just to group modules which are needed to process
-# module-auto-deps.xml during compilation; other clusters can then benefit 
-# from autodeps during compilation
-nb.cluster.bootstrap.dir=platform
-nb.cluster.bootstrap.depends=
-nb.cluster.bootstrap=\
-        core.startup,\
-        core.startup.base,\
-        libs.asm,\
-        o.n.bootstrap,\
-        openide.filesystems,\
-        openide.modules,\
-        openide.util,\
-        openide.util.lookup,\
-        openide.util.ui
-
-nb.cluster.platform.dir=platform
-nb.cluster.platform.depends=nb.cluster.bootstrap
-nb.cluster.platform=\
-        api.annotations.common,\
-        api.intent,\
-        api.io,\
-        api.progress,\
-        api.progress.compat8,\
-        api.progress.nb,\
-        api.search,\
-        api.templates,\
-        api.visual,\
-        applemenu,\
-        autoupdate.cli,\
-        autoupdate.services,\
-        autoupdate.ui,\
-        core.execution,\
-        core.io.ui,\
-        core.kit,\
-        core.multitabs,\
-        core.multiview,\
-        core.nativeaccess,\
-        core.netigso,\
-        core.network,\
-        core.osgi,\
-        core.output2,\
-        core.ui,\
-        core.windows,\
-        editor.mimelookup,\
-        editor.mimelookup.impl,\
-        favorites,\
-        javahelp,\
-        junitlib,\
-        keyring,\
-        keyring.fallback,\
-        keyring.impl,\
-        lib.uihandler,\
-        libs.felix,\
-        libs.javafx,\
-        libs.jna,\
-        libs.jna.platform,\
-        libs.jsr223,\
-        libs.junit4,\
-        libs.osgi,\
-        libs.testng,\
-        masterfs,\
-        masterfs.linux,\
-        masterfs.macosx,\
-        masterfs.nio2,\
-        masterfs.ui,\
-        masterfs.windows,\
-        netbinox,\
-        o.jdesktop.layout,\
-        o.n.core,\
-        o.n.swing.outline,\
-        o.n.swing.plaf,\
-        o.n.swing.tabcontrol,\
-        openide.actions,\
-        openide.awt,\
-        openide.compat,\
-        openide.dialogs,\
-        openide.execution,\
-        openide.execution.compat8,\
-        openide.explorer,\
-        openide.filesystems.compat8,\
-        openide.filesystems.nb,\
-        openide.io,\
-        openide.loaders,\
-        openide.nodes,\
-        openide.options,\
-        openide.text,\
-        openide.util.enumerations,\
-        openide.windows,\
-        options.api,\
-        options.keymap,\
-        print,\
-        progress.ui,\
-        queries,\
-        sampler,\
-        sendopts,\
-        settings,\
-        spi.actions,\
-        spi.quicksearch,\
-        templates,\
-        uihandler
-validation.nb.cluster.platform=\
-        o.n.core,\
-        core.windows,\
-        javahelp
-
-nb.cluster.ide.dir=ide
-nb.cluster.ide.depends=\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.ide=\
-        api.debugger,\
-        api.java.classpath,\
-        api.knockout,\
-        api.xml,\
-        api.xml.ui,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugtracking.commons,\
-        bugzilla,\
-        c.googlecode.javaewah.JavaEWAH,\
-        c.jcraft.jsch,\
-        c.jcraft.jzlib,\
-        code.analysis,\
-        core.browser,\
-        core.browser.webview,\
-        core.ide,\
-        core.multitabs.project,\
-        csl.api,\
-        css.editor,\
-        css.lib,\
-        css.model,\
-        css.prep,\
-        css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
-        defaults,\
-        derby,\
-        diff,\
-        dlight.nativeexecution,\
-        dlight.terminal,\
-        editor,\
-        editor.actions,\
-        editor.bookmarks,\
-        editor.bracesmatching,\
-        editor.breadcrumbs,\
-        editor.codetemplates,\
-        editor.completion,\
-        editor.deprecated.pre65formatting,\
-        editor.document,\
-        editor.errorstripe,\
-        editor.errorstripe.api,\
-        editor.fold,\
-        editor.fold.nbui,\
-        editor.global.format,\
-        editor.guards,\
-        editor.indent,\
-        editor.indent.project,\
-        editor.indent.support,\
-        editor.kit,\
-        editor.lib,\
-        editor.lib2,\
-        editor.macros,\
-        editor.plain,\
-        editor.plain.lib,\
-        editor.search,\
-        editor.settings,\
-        editor.settings.lib,\
-        editor.settings.storage,\
-        editor.structure,\
-        editor.tools.storage,\
-        editor.util,\
-        extbrowser,\
-        extexecution,\
-        extexecution.base,\
-        extexecution.impl,\
-        extexecution.process,\
-        git,\
-        gototest,\
-        gsf.codecoverage,\
-        gsf.testrunner,\
-        gsf.testrunner.ui,\
-        html,\
-        html.angular,\
-        html.custom,\
-        html.editor,\
-        html.editor.lib,\
-        html.knockout,\
-        html.lexer,\
-        html.parser,\
-        html.validation,\
-        httpserver,\
-        hudson,\
-        hudson.git,\
-        hudson.mercurial,\
-        hudson.subversion,\
-        hudson.tasklist,\
-	hudson.ui,\
-        ide.kit,\
-        image,\
-        javascript2.debug,\
-        javascript2.editor,\
-        javascript2.extjs,\
-	javascript2.jade,\
-        javascript2.jquery,\
-        javascript2.kit,\
-        javascript2.knockout,\
-	javascript2.nodejs,\
-        javascript2.prototypejs,\
-	javascript2.requirejs,\
-        jellytools.ide,\
-        jumpto,\
-        languages,\
-        languages.diff,\
-        languages.manifest,\
-        languages.yaml,\
-        lexer,\
-        lexer.nbbridge,\
-        lib.terminalemulator,\
-        libs.antlr3.runtime,\
-        libs.bytelist,\
-        libs.commons_net,\
-        libs.freemarker,\
-        libs.git,\
-        libs.ini4j,\
-        libs.jaxb,\
-        libs.jsch.agentproxy,\
-        libs.json_simple,\
-        libs.jvyamlb,\
-        libs.lucene,\
-        libs.nashorn,\
-        libs.smack,\
-        libs.svnClientAdapter,\
-        libs.svnClientAdapter.javahl,\
-        libs.svnClientAdapter.svnkit,\
-        libs.swingx,\
-        libs.xerces,\
-        localhistory,\
-        localtasks,\
-        mercurial,\
-        mylyn.util,\
-        notifications,\
-        o.apache.commons.codec,\
-        o.apache.commons.httpclient,\
-        o.apache.commons.io,\
-        o.apache.commons.lang,\
-        o.apache.commons.logging,\
-        o.apache.ws.commons.util,\
-        o.apache.xml.resolver,\
-        o.apache.xmlrpc,\
-        o.eclipse.core.contenttype,\
-        o.eclipse.core.jobs,\
-        o.eclipse.core.net,\
-        o.eclipse.core.runtime,\
-        o.eclipse.core.runtime.compatibility.auth,\
-        o.eclipse.equinox.app,\
-        o.eclipse.equinox.common,\
-        o.eclipse.equinox.preferences,\
-        o.eclipse.equinox.registry,\
-        o.eclipse.equinox.security,\
-        o.eclipse.jgit,\
-        o.eclipse.jgit.java7,\
-        o.eclipse.mylyn.bugzilla.core,\
-        o.eclipse.mylyn.commons.core,\
-        o.eclipse.mylyn.commons.net,\
-        o.eclipse.mylyn.commons.repositories.core,\
-        o.eclipse.mylyn.commons.xmlrpc,\
-        o.eclipse.mylyn.tasks.core,\
-        o.eclipse.mylyn.wikitext.confluence.core,\
-        o.eclipse.mylyn.wikitext.core,\
-        o.eclipse.mylyn.wikitext.textile.core,\
-        o.n.swing.dirchooser,\
-        o.openidex.util,\
-        options.editor,\
-        parsing.api,\
-        parsing.indexing,\
-        parsing.lucene,\
-        parsing.nb,\
-        parsing.ui,\
-        print.editor,\
-        project.ant,\
-        project.ant.compat8,\
-        project.ant.ui,\
-        project.indexingbridge,\
-        project.libraries,\
-        project.libraries.ui,\
-        project.spi.intern,\
-        project.spi.intern.impl,\
-        projectapi,\
-        projectapi.nb,\
-        projectui,\
-        projectui.buildmenu,\
-        projectuiapi,\
-        projectuiapi.base,\
-        properties,\
-        properties.syntax,\
-        refactoring.api,\
-        schema2beans,\
-        selenium2,\
-        selenium2.server,\
-        server,\
-        servletapi,\
-        spellchecker,\
-        spellchecker.apimodule,\
-        spellchecker.bindings.htmlxml,\
-        spellchecker.bindings.properties,\
-        spellchecker.dictionary_en,\
-        spellchecker.kit,\
-        spi.debugger.ui,\
-        spi.editor.hints,\
-        spi.editor.hints.projects,\
-        spi.navigator,\
-        spi.palette,\
-        spi.tasklist,\
-        spi.viewmodel,\
-        subversion,\
-        swing.validation,\
-        target.iterator,\
-        tasklist.kit,\
-        tasklist.projectint,\
-        tasklist.todo,\
-        tasklist.ui,\
-        team.commons,\
-        team.ide,\
-        terminal,\
-        usersguide,\
-        utilities,\
-        utilities.project,\
-        versioning,\
-        versioning.core,\
-        versioning.indexingbridge,\
-        versioning.masterfs,\
-        versioning.system.cvss.installer,\
-        versioning.ui,\
-        versioning.util,\
-	web.browser.api,\
-        web.common,\
-        web.indent,\
-        web.webkit.debugging,\
-        xml,\
-        xml.axi,\
-        xml.catalog,\
-        xml.catalog.ui,\
-        xml.core,\
-        xml.jaxb.api,\
-        xml.lexer,\
-        xml.multiview,\
-        xml.retriever,\
-        xml.schema.completion,\
-        xml.schema.model,\
-        xml.tax,\
-        xml.text,\
-        xml.tools,\
-        xml.wsdl.model,\
-        xml.xam,\
-        xml.xdm,\
-        xsl
-validation.nb.cluster.ide=\
-        ide.kit
-
-nb.cluster.java.dir=java
-nb.cluster.java.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.java=\
-        ant.browsetask,\
-        ant.debugger,\
-        ant.freeform,\
-        ant.grammar,\
-        ant.kit,\
-        api.debugger.jpda,\
-        api.java,\
-        api.maven,\
-        beans,\
-        classfile,\
-        dbschema,\
-        debugger.jpda,\
-        debugger.jpda.ant,\
-        debugger.jpda.js,\
-        debugger.jpda.kit,\
-        debugger.jpda.projects,\
-        debugger.jpda.projectsui,\
-        debugger.jpda.ui,\
-        debugger.jpda.visual,\
-        findbugs.installer,\
-        form,\
-        form.binding,\
-        form.j2ee,\
-        form.kit,\
-        form.nb,\
-        form.refactoring,\
-        hibernate,\
-        hibernate4lib,\
-        hudson.ant,\
-        hudson.maven,\
-        i18n,\
-        i18n.form,\
-        j2ee.core.utilities,\
-        j2ee.eclipselink,\
-        j2ee.eclipselinkmodelgen,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
-        j2ee.metadata,\
-        j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
-        j2ee.persistenceapi,\
-        java.api.common,\
-        java.completion,\
-        java.debug,\
-        java.editor,\
-        java.editor.base,\
-        java.editor.lib,\
-        java.examples,\
-        java.freeform,\
-        java.guards,\
-        java.hints,\
-        java.hints.declarative,\
-        java.hints.declarative.test,\
-        java.hints.legacy.spi,\
-        java.hints.test,\
-        java.hints.ui,\
-        java.j2sedeploy,\
-        java.j2seembedded,\
-        java.j2seplatform,\
-        java.j2seprofiles,\
-        java.j2seproject,\
-        java.kit,\
-        java.lexer,\
-        java.metrics,\
-        java.navigation,\
-        java.platform,\
-        java.platform.ui,\
-        java.preprocessorbridge,\
-        java.project,\
-        java.project.ui,\
-        java.source,\
-        java.source.ant,\
-        java.source.base,\
-        java.source.compat8,\
-        java.source.queries,\
-        java.source.queriesimpl,\
-        java.sourceui,\
-        java.testrunner,\
-        java.testrunner.ant,\
-        java.testrunner.ui,\
-        javadoc,\
-        javaee.injection,\
-        javawebstart,\
-        jellytools.java,\
-        junit,\
-        junit.ant,\
-        junit.ant.ui,\
-        junit.ui,\
-        lib.nbjavac,\
-        libs.cglib,\
-        libs.javacapi,\
-        libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.checkstyle,\
-        maven.coverage,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.indexer.ui,\
-        maven.junit,\
-        maven.junit.ui,\
-        maven.kit,\
-        maven.model,\
-        maven.osgi,\
-        maven.persistence,\
-        maven.refactoring,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
-        nashorn.execution,\
-        o.jdesktop.beansbinding,\
-        performance,\
-        performance.java,\
-        projectimport.eclipse.core,\
-        projectimport.eclipse.j2se,\
-        refactoring.java,\
-        selenium2.java,\
-        selenium2.maven,\
-        spellchecker.bindings.java,\
-        spi.debugger.jpda.ui,\
-        spi.java.hints,\
-        spring.beans,\
-        testng,\
-        testng.ant,\
-        testng.maven,\
-        testng.ui,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        whitelist,\
-        xml.jaxb,\
-        xml.tools.java
-validation.nb.cluster.java=\
-        java.hints,\
-        java.kit
-
-nb.cluster.apisupport.dir=apisupport
-nb.cluster.apisupport.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.apisupport=\
-        apisupport.ant,\
-        apisupport.crudsample,\
-        apisupport.feedreader,\
-        apisupport.installer,\
-        apisupport.installer.maven,\
-        apisupport.kit,\
-        apisupport.osgidemo,\
-        apisupport.paintapp,\
-        apisupport.project,\
-        apisupport.refactoring,\
-        apisupport.wizards,\
-        maven.apisupport
-
-nb.cluster.enterprise.dir=enterprise
-nb.cluster.enterprise.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.profiler,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.enterprise=\
-        api.web.webmodule,\
-        apisupport.restsample,\
-        cloud.amazon,\
-        cloud.common,\
-        el.lexer,\
-        glassfish.common,\
-        glassfish.eecommon,\
-        glassfish.javaee,\
-        glassfish.tooling,\
-        hibernateweb,\
-        j2ee.ant,\
-        j2ee.api.ejbmodule,\
-        j2ee.clientproject,\
-        j2ee.common,\
-        j2ee.core,\
-        j2ee.dd,\
-        j2ee.dd.webservice,\
-        j2ee.ddloaders,\
-        j2ee.earproject,\
-        j2ee.ejbcore,\
-        j2ee.ejbjarproject,\
-        j2ee.ejbrefactoring,\
-        j2ee.ejbverification,\
-        j2ee.genericserver,\
-        j2ee.jboss4,\
-        j2ee.kit,\
-        j2ee.platform,\
-        j2ee.samples,\
-        j2ee.sun.appsrv,\
-        j2ee.sun.dd,\
-        j2ee.sun.ddui,\
-        j2ee.weblogic9,\
-        j2eeapis,\
-        j2eeserver,\
-        javaee.api,\
-        javaee.beanvalidation,\
-        javaee.project,\
-        javaee.resources,\
-        javaee.specs.support,\
-        javaee.wildfly,\
-        javaee7.api,\
-        jellytools.enterprise,\
-        jsp.lexer,\
-        ko4j.debugging,\
-        libs.amazon,\
-        libs.commons_fileupload,\
-        libs.elimpl,\
-        libs.glassfish_logging,\
-        libs.jstl,\
-        maven.j2ee,\
-        maven.jaxws,\
-        maven.samples,\
-        performance.javaee,\
-        performance.scripting,\
-        performance.web,\
-        profiler.j2ee,\
-        projectimport.eclipse.web,\
-        servletjspapi,\
-        spring.webmvc,\
-        tomcat5,\
-        web.beans,\
-        web.client.rest,\
-        web.core,\
-        web.core.syntax,\
-        web.debug,\
-        web.el,\
-        web.examples,\
-        web.freeform,\
-        web.jsf,\
-        web.jsf.editor,\
-        web.jsf.icefaces,\
-        web.jsf.kit,\
-        web.jsf.navigation,\
-        web.jsf.richfaces,\
-        web.jsf12,\
-        web.jsf12ri,\
-        web.jsf20,\
-        web.jsfapi,\
-        web.jspparser,\
-        web.kit,\
-        web.monitor,\
-        web.primefaces,\
-        web.project,\
-        web.refactoring,\
-        web.struts,\
-        weblogic.common,\
-	websocket,\
-        websvc.clientapi,\
-        websvc.core,\
-        websvc.customization,\
-        websvc.design,\
-        websvc.editor.hints,\
-        websvc.jaxws.lightapi,\
-        websvc.jaxwsapi,\
-        websvc.jaxwsmodel,\
-        websvc.kit,\
-        websvc.manager,\
-        websvc.metro.lib,\
-        websvc.metro.model,\
-        websvc.metro.samples,\
-        websvc.owsm,\
-        websvc.projectapi,\
-        websvc.rest,\
-        websvc.rest.samples,\
-        websvc.restapi,\
-        websvc.restkit,\
-        websvc.restlib,\
-        websvc.saas.codegen.j2ee,\
-        websvc.utilities,\
-        websvc.websvcapi,\
-        websvc.wsitconf,\
-        websvc.wsitmodelext,\
-        websvc.wsstackapi
-
-nb.cluster.ergonomics.dir=ergonomics
-nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform
-nb.cluster.ergonomics=\
-        ide.ergonomics,\
-        performance.ergonomics
-validation.nb.cluster.ergonomics=\
-        ide.ergonomics
-
-nb.cluster.nb.dir=nb
-nb.cluster.nb.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.harness
-nb.cluster.nb=\
-        autoupdate.pluginimporter,\
-        bugzilla.exceptionreporter,\
-        deadlock.detector,\
-        ide.branding,\
-        ide.branding.kit,\
-        o.n.upgrader,\
-        uihandler.exceptionreporter,\
-        updatecenters,\
-        welcome
-
-nb.cluster.harness.dir=harness
-nb.cluster.harness.depends=nb.cluster.platform
-nb.cluster.harness=\
-        apisupport.harness,\
-        jellytools.platform,\
-        jemmy,\
-        nbjunit,\
-        o.n.insane
-
-nb.cluster.profiler.dir=profiler
-nb.cluster.profiler.depends=\
-        nb.cluster.ide,\
-        nb.cluster.java,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.profiler=\
-        debugger.jpda.heapwalk,\
-        lib.profiler,\
-        lib.profiler.charts,\
-        lib.profiler.common,\
-        lib.profiler.ui,\
-        maven.profiler,\
-        profiler,\
-        profiler.api,\
-        profiler.attach,\
-        profiler.freeform,\
-        profiler.heapwalker,\
-        profiler.j2se,\
-        profiler.kit,\
-        profiler.nbimpl,\
-        profiler.nbmodule,\
-        profiler.options,\
-        profiler.oql,\
-        profiler.oql.language,\
-        profiler.ppoints,\
-        profiler.projectsupport,\
-        profiler.snaptracer,\
-        profiler.utilities
-validation.nb.cluster.profiler=\
-        profiler.kit
-
-nb.cluster.php.dir=php
-nb.cluster.php.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon
-nb.cluster.php=\
-        hudson.php,\
-        languages.neon,\
-        libs.javacup,\
-        php.api.annotation,\
-        php.api.documentation,\
-        php.api.editor,\
-        php.api.executable,\
-        php.api.framework,\
-        php.api.phpmodule,\
-        php.api.templates,\
-        php.api.testing,\
-        php.apigen,\
-        php.atoum,\
-        php.code.analysis,\
-        php.codeception,\
-        php.composer,\
-        php.dbgp,\
-        php.doctrine2,\
-        php.editor,\
-        php.kit,\
-        php.latte,\
-        php.nette.tester,\
-        php.nette2,\
-        php.phing,\
-        php.phpdoc,\
-        php.phpdoc.documentation,\
-        php.phpunit,\
-        php.project,\
-        php.refactoring,\
-        php.samples,\
-        php.smarty,\
-        php.symfony,\
-        php.symfony2,\
-        php.twig,\
-        php.zend,\
-        php.zend2,\
-        selenium2.php,\
-        websvc.saas.codegen.php
-validation.nb.cluster.php=\
-        php.editor
-
-nb.cluster.groovy.dir=groovy
-nb.cluster.groovy.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.java
-nb.cluster.groovy=\
-        groovy.antproject,\
-        groovy.editor,\
-        groovy.grails,\
-        groovy.grailsproject,\
-        groovy.gsp,\
-        groovy.kit,\
-        groovy.refactoring,\
-        groovy.samples,\
-        groovy.support,\
-        libs.groovy,\
-        maven.groovy
-
-nb.cluster.mobility.dir=mobility
-nb.cluster.mobility.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.apisupport,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.mobility=\
-        api.mobility,\
-        j2me.common.ant,\
-        j2me.keystore,\
-        j2me.kit,\
-        j2me.project,\
-        mobility.cldcplatform,\
-        mobility.databindingme,\
-        mobility.end2end,\
-        mobility.jsr172,\
-        mobility.licensing,\
-        mobility.project.ant
-
-nb.cluster.identity.dir=identity
-nb.cluster.identity.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.identity=\
-        identity.ant,\
-        identity.kit,\
-        identity.profile.api,\
-        identity.profile.ui,\
-        identity.samples,\
-        identity.server.manager
-
-nb.cluster.cnd.dir=cnd
-nb.cluster.cnd.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.dlight,\
-        nb.cluster.ide
-nb.cluster.cnd=\
-        cnd,\
-        cnd.analysis.api,\
-        cnd.analysis.impl,\
-        cnd.antlr,\
-        cnd.api.model,\
-        cnd.api.project,\
-        cnd.api.remote,\
-        cnd.apt,\
-        cnd.asm,\
-        cnd.callgraph,\
-        cnd.classview,\
-        cnd.cncppunit,\
-        cnd.completion,\
-        cnd.debugger.common2,\
-        cnd.debugger.gdb2,\
-        cnd.discovery,\
-        cnd.dwarfdiscovery,\
-        cnd.dwarfdump,\
-        cnd.editor,\
-        cnd.gotodeclaration,\
-        cnd.highlight,\
-        cnd.indexing,\
-        cnd.kit,\
-        cnd.lexer,\
-        cnd.makeproject,\
-        cnd.makeproject.source.bridge,\
-        cnd.model.jclank.bridge,\
-        cnd.model.services,\
-        cnd.modeldiscovery,\
-        cnd.modelimpl,\
-        cnd.modelui,\
-        cnd.modelutil,\
-        cnd.navigation,\
-        cnd.qnavigator,\
-        cnd.refactoring,\
-        cnd.remote,\
-        cnd.remote.projectui,\
-        cnd.repository,\
-        cnd.repository.api,\
-        cnd.script,\
-        cnd.search,\
-        cnd.simpleunit,\
-        cnd.source,\
-        cnd.spellchecker.bindings,\
-        cnd.testrunner,\
-        cnd.toolchain,\
-        cnd.utils,\
-        jellytools.cnd,\
-        libs.clank
-validation.nb.cluster.cnd=\
-        cnd.kit
-
-nb.cluster.cndext.dir=cndext
-nb.cluster.cndext=\
-	cnd.mixeddev
-
-nb.cluster.cndext.depends=\
-	nb.cluster.cnd,\
-	nb.cluster.extide,\
-	nb.cluster.java
-
-nb.cluster.dlight.dir=dlight
-nb.cluster.dlight.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.dlight=\
-        dlight.kit,\
-        dlight.libs.common,\
-        dlight.remote,\
-        dlight.remote.impl,\
-        dlight.sendto,\
-        git.remote,\
-        git.remote.cli,\
-        mercurial.remote,\
-        remotefs.versioning,\
-        remotefs.versioning.api,\
-        subversion.remote
-
-nb.cluster.jira.dir=extra
-nb.cluster.jira.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.jira=\
-        c.atlassian.connector.eclipse.commons.core,\
-        c.atlassian.connector.eclipse.jira.core,\
-        c.atlassian.connector.eclipse.jira.core.rest,\
-        c.google.guava,\
-        c.s.jersey,\
-        c.s.mail.javax.mail,\
-        javax.servlet,\
-        javax.wsdl,\
-        javax.xml.rpc,\
-        javax.xml.soap,\
-        jira,\
-        jira.rest,\
-        jira.xmlrpc,\
-        libs.jira.rest,\
-        o.apache.axis,\
-        o.apache.commons.discovery,\
-        o.codehaus.jettison,\
-        o.eclipse.mylyn.commons.soap,\
-        o.eclipse.mylyn.monitor.ui.dummy,\
-        o.joda.time
-
-nb.cluster.team.dir=extra
-nb.cluster.team.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.team=\
-        bugtracking.kenai,\
-        c.tasktop.c2c.server.cloud.api,\
-        c.tasktop.c2c.server.common.api,\
-        c.tasktop.c2c.server.profile.api,\
-        c.tasktop.c2c.server.scm.api,\
-        c.tasktop.c2c.server.tasks.api,\
-        c.tasktop.c2c.server.wiki.api,\
-        kenai,\
-        kenai.kit,\
-        kenai.maven,\
-        kenai.ui,\
-        lib.cvsclient,\
-        o.codehaus.jackson.core,\
-        o.codehaus.jackson.mapper,\
-        odcs,\
-        odcs.git,\
-        odcs.hudson,\
-        odcs.kit,\
-        odcs.tasks,\
-        odcs.tasks.bridge,\
-        odcs.ui,\
-        odcs.versioning,\
-        oracle.clouddev.server.profile.activity.client.api,\
-        oracle.clouddev.server.profile.activity.client.rest,\
-        oracle.eclipse.tools.cloud.dev.tasks,\
-        team.server,\
-        team.server.nb,\
-        versioning.kenai,\
-        versioning.system.cvss
-
-nb.cluster.stableuc.dir=extra
-nb.cluster.stableuc.depends=${clusters.config.full.list}
-nb.cluster.stableuc=\
-        apisupport.apidocs,\
-        avatar_js.project,\
-        cloud.oracle,\
-        db.mysql.sakila,\
-        deployment.deviceanywhere,\
-        findbugs,\
-        html.ojet,\
-        j2me.cdc.kit,\
-        j2me.cdc.platform,\
-        j2me.cdc.platform.nokias80,\
-        j2me.cdc.platform.ojec,\
-        j2me.cdc.platform.semc,\
-        j2me.cdc.platform.sjmc,\
-        j2me.cdc.platform.sun,\
-        j2me.cdc.project,\
-        j2me.cdc.project.execui,\
-        j2me.cdc.project.execuiimpl,\
-        j2me.cdc.project.nokiaS80,\
-        j2me.cdc.project.ojec,\
-        j2me.cdc.project.savaje,\
-        j2me.cdc.project.semc,\
-        j2me.cdc.project.sjmc,\
-        jconsole,\
-        jmx,\
-        jmx.common,\
-        libs.aguiswinglayout,\
-        libs.findbugs,\
-        libs.oracle.cloud,\
-        libs.ppawtlayout,\
-        loadgenerator,\
-	maven.util,\
-        mobility.antext,\
-        mobility.cldcplatform.catalog,\
-        mobility.deployment.ftpscp,\
-        mobility.deployment.nokia,\
-        mobility.deployment.sonyericsson,\
-        mobility.deployment.webdav,\
-        mobility.editor,\
-        mobility.j2meunit,\
-        mobility.kit,\
-        mobility.plugins.mpowerplayer,\
-        mobility.project,\
-        mobility.project.bridge,\
-        mobility.project.bridge.impl,\
-        mobility.svgcore,\
-        mvd,\
-        o.apache.tools.ant.module.docs,\
-	o.n.swing.laf.dark,\
-        otherlicenses/mobility.proguard,\
-        profiler.commandrunner,\
-        profiler.loadgen,\
-        svg.perseus,\
-        swingapplib,\
-        vmd.analyzer,\
-        vmd.codegen,\
-        vmd.components.midp,\
-        vmd.components.midp.pda,\
-        vmd.components.midp.wma,\
-        vmd.components.svg,\
-        vmd.componentssupport,\
-        vmd.examples,\
-        vmd.flow,\
-        vmd.game,\
-        vmd.inspector,\
-        vmd.io,\
-        vmd.io.javame,\
-        vmd.kit,\
-        vmd.midp,\
-        vmd.midp.converter,\
-        vmd.midpnb,\
-        vmd.model,\
-        vmd.palette,\
-        vmd.properties,\
-        vmd.screen,\
-        vmd.structure
-
-nb.cluster.betauc.dir=extra
-nb.cluster.betauc.depends=${clusters.config.full.list}
-nb.cluster.betauc=\
-        ${nb.cluster.stableuc},\
-        clearcase,\
-        coherence,\
-        contrib/ant.freeform.samples,\
-        contrib/api.workqueues,\
-        contrib/apisupport.projectinspector,\
-        contrib/autoproject.core,\
-        contrib/autoproject.java,\
-        contrib/autoproject.profiler,\
-        contrib/autoproject.web,\
-        contrib/cnd.debugger.gdbserver,\
-        contrib/docbook,\
-        contrib/docbook.project,\
-        contrib/imagepaste,\
-        contrib/insertunicode,\
-        contrib/j2ee.geronimo2,\
-        contrib/j2ee.jetty,\
-        contrib/libs.selenium,\
-        contrib/libs.selenium.server,\
-        contrib/logmanagement,\
-        contrib/masterfs.suspend,\
-        contrib/modulemanager,\
-        contrib/quickfilechooser,\
-        contrib/selenium,\
-        contrib/selenium.maven,\
-        contrib/selenium.php,\
-        contrib/selenium.server,\
-        o.apache.jmeter.module,\
-        websvc.rest.wadl.design,\
-        websvc.rest.wadl.model
-
-nb.cluster.experimental.dir=extra
-nb.cluster.experimental.depends=${clusters.config.full.list}
-nb.cluster.experimental=\
-        ${nb.cluster.betauc},\
-        c.s.collablet,\
-        c.s.collablet.moxc,\
-        collab.channel.chat,\
-        collab.channel.chat.html,\
-        collab.channel.chat.java,\
-        collab.channel.chat.text,\
-        collab.channel.chat.xml,\
-        collab.channel.filesharing,\
-        collab.channel.output,\
-        collab.kit,\
-        collab.provider.im,\
-        collab.ui,\
-        contrib/a11y,\
-        contrib/accelerators.terminal,\
-        contrib/apisupport.beanbrowser,\
-        contrib/apisupport.tc.cobertura,\
-        contrib/archiver,\
-        contrib/autosave,\
-        contrib/c.ericsson.otp.erlang,\
-        contrib/codetemplatetools,\
-        contrib/de.hunsicker.jalopy.plugin.netbeans,\
-        contrib/editor.deprecated.pre61completion,\
-        contrib/editor.deprecated.pre61settings,\
-        contrib/editor.fold.support,\
-        contrib/editor.hints.i18n,\
-        contrib/editor.nexterror,\
-        contrib/encoding,\
-        contrib/explorefromhere,\
-        contrib/fisheye,\
-        contrib/folder2html,\
-        contrib/formatmany,\
-        contrib/genericnavigator,\
-        contrib/graphicclassview,\
-        contrib/group,\
-        contrib/gsf,\
-        contrib/gsf.api,\
-        contrib/gsfpath.api,\
-        contrib/hexeditor,\
-        contrib/htmlprojects,\
-        contrib/j2ee.oc4j,\
-        contrib/j2ee.sun.ws7,\
-        contrib/java.debugjavac,\
-        contrib/java.ext.editor,\
-        contrib/javahints,\
-        contrib/javanavigators,\
-        contrib/jemmysupport,\
-        contrib/languages.execution,\
-        contrib/languages.prolog,\
-        contrib/languages.tcl,\
-        contrib/languages.velocity,\
-        contrib/libs.commons_lang,\
-        contrib/libs.ical4j,\
-        contrib/libs.jcalendar,\
-        contrib/licensechanger,\
-        contrib/loaderswitcher,\
-        contrib/moduleresolver,\
-        contrib/mount,\
-        contrib/nborgsourcebrowse,\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/o.n.contrib.debuggerretry,\
-        contrib/o.n.erdbeans,\
-        contrib/o.n.misc.diff,\
-        contrib/performance.insane,\
-        contrib/perspective,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner,\
-        contrib/showtodos,\
-        contrib/sysprops,\
-        contrib/tanui,\
-        contrib/websvc.saas.services.rtm,\
-        contrib/whichproject,\
-        debugger.jpda.truffle,\
-        j2ee.websphere6,\
-        j2me.cdc.platform.bdj,\
-        j2me.cdc.project.bdj,\
-        keyring.jps,\
-        languages.refactoring,\
-        libs.xmlbeans,\
-        mercurial.search,\
-        o.n.bluej,\
-        o.n.bluej.ui,\
-        projectimport.jbuilder,\
-        traceio,\
-        uihandler.interactive,\
-        web.domdiff,\
-        web.facelets010114,\
-        web.jsf.extensions,\
-        web.livehtml,\
-        websvc.axis2,\
-        websvc.jaxrpc,\
-        websvc.jaxrpc16,\
-        websvc.jaxrpckit,\
-        websvc.registry
-
-nb.cluster.extide.dir=extide
-nb.cluster.extide.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.extide=\
-        o.apache.tools.ant.module,\
-        options.java
-
-# XXX needs updates to build:
-#        contrib/c.s.fortress,\
-#        contrib/fortress.editing,\
-
-nb.cluster.webcommon.dir=webcommon
-nb.cluster.webcommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.webcommon=\
-        cordova,\
-        cordova.platforms,\
-        cordova.platforms.android,\
-        cordova.platforms.ios,\
-        extbrowser.chrome,\
-        javascript.bower,\
-        javascript.cdnjs,\
-        javascript.grunt,\
-        javascript.gulp,\
-        javascript.jstestdriver,\
-        javascript.karma,\
-        javascript.nodejs,\
-        javascript.v8debug,\
-        languages.apacheconf,\
-        languages.ini,\
-        lib.v8debug,\
-        libs.commons_compress,\
-        libs.jstestdriver,\
-        libs.plist,\
-        netserver,\
-        selenium2.webclient,\
-        selenium2.webclient.mocha,\
-        selenium2.webclient.protractor,\
-        web.client.kit,\
-        web.client.samples,\
-        web.clientproject,\
-        web.clientproject.api,\
-        web.inspect,\
-        web.javascript.debugger,\
-        web.webkit.tooling
-
-nb.cluster.websvccommon.dir=websvccommon
-nb.cluster.websvccommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.websvccommon=\
-        websvc.jaxwsmodelapi,\
-        websvc.saas.api,\
-        websvc.saas.codegen,\
-        websvc.saas.kit,\
-        websvc.saas.services.amazon,\
-        websvc.saas.services.delicious,\
-        websvc.saas.services.flickr,\
-        websvc.saas.services.google,\
-        websvc.saas.services.strikeiron,\
-        websvc.saas.services.weatherbug,\
-        websvc.saas.services.zillow,\
-        websvc.saas.services.zvents,\
-        websvc.saas.ui
-# 225794 -  bundled twitter web service not working
-#        websvc.saas.services.twitter,\
-
-nb.cluster.javacard.dir=javacard
-nb.cluster.javacard.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java
-nb.cluster.javacard=\
-        javacard.apdu.io,\
-        javacard.apdufile,\
-        javacard.common,\
-        javacard.console,\
-        javacard.filemodels,\
-        javacard.kit,\
-        javacard.oberthur,\
-        javacard.platform.ui,\
-        javacard.project,\
-        javacard.ri.bundle,\
-        javacard.ri.platform,\
-        javacard.spi,\
-        properties.based.dataobjects,\
-        simple.project.templates,\
-        swing.customizerlayout
-
-nb.cluster.javafx.dir=javafx
-nb.cluster.javafx.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.javafx=\
-        javafx2.editor,\
-        javafx2.kit,\
-        javafx2.platform,\
-        javafx2.project,\
-        javafx2.samples,\
-        javafx2.scenebuilder
-
-nb.cluster.remote.dir=extra
-nb.cluster.remote.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.remote=\
-       contrib/dew4nb,\
-       contrib/json,\
-       contrib/remote.project.finder,\
-       contrib/remote.server
-
-nb.cluster.python.depends=\
-        nb.cluster.ide
-nb.cluster.python=\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner
diff --git a/.pc/netbeans-com.sun.tools.hc.patch/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java b/.pc/netbeans-com.sun.tools.hc.patch/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
deleted file mode 100644
index a4b8abc..0000000
--- a/.pc/netbeans-com.sun.tools.hc.patch/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2010 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.java.source.parsing;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import java.util.concurrent.Callable;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.tools.FileObject;
-import javax.tools.JavaFileObject;
-import org.netbeans.api.annotations.common.NonNull;
-import org.netbeans.api.annotations.common.NullAllowed;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.openide.util.Exceptions;
-import org.openide.util.Parameters;
-
-/**
- *
- * @author Tomas Zezula
- */
-public final class CachingArchiveClassLoader extends ClassLoader {
-
-    private static final int INI_SIZE = 16384;
-    private static final Logger LOG = Logger.getLogger(CachingArchiveClassLoader.class.getName());
-    //Todo: Performance Trie<File,ReentrantReadWriteLock>
-    private static final ReentrantReadWriteLock LOCK = new ReentrantReadWriteLock();
-
-    private final Archive[] archives;
-    private byte[] buffer;
-
-    private CachingArchiveClassLoader(final @NonNull Archive[] archives, final ClassLoader parent) {
-        super (parent);
-        assert archives != null;
-        this.archives = archives;
-    }
-
-    @Override
-    protected Class<?> findClass(final String name) throws ClassNotFoundException {
-        final StringBuilder sb = new StringBuilder(FileObjects.convertPackage2Folder(name, '/'));
-        sb.append(JavaFileObject.Kind.CLASS.extension);
-        Class<?> c = null;
-        try {
-            c = readAction(new Callable<Class<?>>() {
-                @Override
-                public Class<?> call() throws Exception {
-                    final FileObject file = findFileObject(sb.toString());
-                    if (file != null) {
-                        try {
-                            final int len = readJavaFileObject(file);
-                            int lastDot = name.lastIndexOf('.');
-                            if (lastDot != (-1)) {
-                                String pack = name.substring(0, lastDot);
-                                if (getPackage(pack) == null) {
-                                    definePackage(pack, null, null, null, null, null, null, null);
-                                }
-                            }
-                            return defineClass(
-                                    name,
-                                    com.sun.tools.hc.LambdaMetafactory.translateClassFile(buffer,0,len),
-                                    0,
-                                    len);
-                        } catch (FileNotFoundException fnf) {
-                            LOG.log(Level.FINE, "Resource: {0} does not exist.", file.toUri()); //NOI18N
-                        } catch (IOException ioe) {
-                            LOG.log(Level.INFO, "Resource: {0} cannot be read.", file.toUri()); //NOI18N
-                        }
-                    }
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            Exceptions.printStackTrace(e);
-        }
-        return c != null ?
-            c :
-            super.findClass(name);
-    }
-
-    @Override
-    protected URL findResource(final String name) {
-        FileObject file = null;
-        try {
-            file = readAction(new Callable<FileObject>() {
-                @Override
-                public FileObject call() throws Exception {
-                    return findFileObject(name);
-                }
-            });
-        } catch (Exception e) {
-            Exceptions.printStackTrace(e);
-        }
-        if (file != null) {
-            try {
-                return file.toUri().toURL();
-            } catch (MalformedURLException ex) {
-                LOG.log(Level.INFO, ex.getMessage(), ex);
-            }
-        }
-        return super.findResource(name);
-    }
-
-    @Override
-    protected Enumeration<URL> findResources(final String name) throws IOException {
-        try {
-            return readAction(new Callable<Enumeration<URL>>(){
-                @Override
-                public Enumeration<URL> call() throws Exception {
-                    @SuppressWarnings("UseOfObsoleteCollectionType")
-                    final Vector<URL> v = new Vector<URL>();
-                    for (Archive archive : archives) {
-                        final FileObject file = archive.getFile(name);
-                        if (file != null) {
-                            v.add(file.toUri().toURL());
-                        }
-                    }
-                    return v.elements();
-                }
-            });
-        } catch (Exception ex) {
-            throw new IOException(ex);
-        }
-    }
-
-    private int readJavaFileObject(final FileObject jfo) throws IOException {
-        assert LOCK.getReadLockCount() > 0;
-        if (buffer == null) {
-            buffer = new byte[INI_SIZE];
-        }
-        int len = 0;
-        final InputStream in = jfo.openInputStream();
-        try {
-            while (true) {
-                if (buffer.length == len) {
-                    byte[] nb = new byte[2*buffer.length];
-                    System.arraycopy(buffer, 0, nb, 0, len);
-                    buffer = nb;
-                }
-                int l = in.read(buffer,len,buffer.length-len);
-                if (l<=0) {
-                    break;
-                }
-                len+=l;
-            }
-
-        } finally {
-            in.close();
-        }
-        return len;
-    }
-
-    private FileObject findFileObject(final String resName) {
-        assert LOCK.getReadLockCount() > 0;
-        for (Archive archive : archives) {
-            try {
-                final FileObject file = archive.getFile(resName);
-                if (file != null) {
-                    return file;
-                }
-            } catch (IOException ex) {
-                LOG.log(
-                    Level.INFO,
-                    "Cannot read: " + archive,  //NOI18N
-                    ex);
-            }
-        }
-        return null;
-    }
-
-    public static ClassLoader forClassPath(final @NonNull ClassPath classPath,
-            final @NullAllowed ClassLoader parent) {
-        Parameters.notNull("classPath", classPath); //NOI18N
-        final List<ClassPath.Entry> entries = classPath.entries();
-        final URL[] urls = new URL[entries.size()];
-        final Iterator<ClassPath.Entry> eit = entries.iterator();
-        for (int i=0; eit.hasNext(); i++) {
-            urls[i] = eit.next().getURL();
-        }
-        return forURLs(urls, parent);
-    }
-
-    public static ClassLoader forURLs(final @NonNull URL[] urls,
-            final @NullAllowed ClassLoader parent) {
-        Parameters.notNull("urls", urls);       //NOI18N
-        final List<Archive> archives = new ArrayList<Archive>(urls.length);
-        for (URL url : urls) {
-            final Archive arch = CachingArchiveProvider.getDefault().getArchive(url, false);
-            if (arch != null) {
-                archives.add(arch);
-            }
-        }
-        return new CachingArchiveClassLoader(archives.toArray(new Archive[archives.size()]), parent);
-    }
-
-    public static <T> T readAction(@NonNull final Callable<T> action) throws Exception {
-        Parameters.notNull("action", action);   //NOI18N
-        LOCK.readLock().lock();
-        try {
-            LOG.log(Level.FINE, "Read locked by {0}", Thread.currentThread());  //NOI18N
-            return action.call();
-        } finally {
-            LOCK.readLock().unlock();
-        }
-    }
-
-    public static <T> T writeAction(@NonNull final Callable<T> action) throws Exception {
-        Parameters.notNull("action", action);   //NOI18N
-        LOCK.writeLock().lock();
-        try {
-            LOG.log(Level.FINE, "Write locked by {0}", Thread.currentThread());  //NOI18N
-            return action.call();
-        } finally {
-            LOCK.writeLock().unlock();
-        }
-    }
-
-}
diff --git a/.pc/netbeans-commons-net.patch/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java b/.pc/netbeans-commons-net.patch/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
deleted file mode 100644
index b02755d..0000000
--- a/.pc/netbeans-commons-net.patch/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and
- * Distribution License("CDDL") (collectively, the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy of the
- * License at http://www.netbeans.org/cddl-gplv2.html or
- * nbbuild/licenses/CDDL-GPL-2-CP. See the License for the specific language
- * governing permissions and limitations under the License. When distributing the
- * software, include this License Header Notice in each file and include the
- * License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided by Oracle
- * in the GPL Version 2 section of the License file that accompanied this code.
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL or only
- * the GPL Version 2, indicate your decision by adding "[Contributor] elects to
- * include this software in this distribution under the [CDDL or GPL Version 2]
- * license." If you do not indicate a single choice of license, a recipient has
- * the option to distribute your version of this file under either the CDDL, the
- * GPL Version 2 or to extend the choice of license to its licensees as provided
- * above. However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is made
- * subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2011 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.hudson.ui;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JPanel;
-import org.apache.commons.net.util.Base64;
-import org.netbeans.api.keyring.Keyring;
-import org.netbeans.modules.hudson.api.HudsonManager;
-import org.netbeans.modules.hudson.api.HudsonVersion;
-import org.netbeans.modules.hudson.api.Utilities;
-import org.netbeans.modules.hudson.spi.ConnectionAuthenticator;
-import org.openide.DialogDescriptor;
-import org.openide.DialogDisplayer;
-import org.openide.NotifyDescriptor;
-import org.openide.awt.HtmlBrowser;
-import org.openide.util.NbBundle;
-import org.openide.util.NbBundle.Messages;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- * Supplies HTTP BASIC authentication using an API token.
- * Useful for servers using special authentication modes such as OpenID.
- * Currently works only in Jenkins 1.426+.
- * @see <a href="https://wiki.jenkins-ci.org/display/JENKINS/Authenticating+scripted+clients">Authenticating scripted clients</a>
- */
-public class APITokenConnectionAuthenticator extends JPanel {
-
-    private static final Logger LOG = Logger.getLogger(APITokenConnectionAuthenticator.class.getName());
-
-    /**
-     * Map from home URL to encoded username:password.
-     * @see <a href="http://stackoverflow.com/questions/496651/connecting-to-remote-url-which-requires-authentication-using-java/5137446#5137446">technique</a>
-     */
-    private static final Map</*URL*/String,String> BASIC_AUTH = new HashMap<String,String>();
-
-    @ServiceProvider(service=ConnectionAuthenticator.class, position=200)
-    public static final class Impl implements ConnectionAuthenticator {
-
-        @Override public void prepareRequest(URLConnection conn, URL home) {
-            String auth = BASIC_AUTH.get(home.toString());
-            if (auth != null) {
-                LOG.log(Level.FINER, "have basic auth for {0}", home);
-                conn.setRequestProperty("Authorization", "Basic " + auth);
-            }
-        }
-
-        @Messages({"# {0} - server location", "# {1} - user name", "APITokenConnectionAuthenticator.password_description=API token for {1} on {0}"})
-        @org.netbeans.api.annotations.common.SuppressWarnings("DM_DEFAULT_ENCODING")
-        @Override public URLConnection forbidden(URLConnection conn, URL home) {
-            String version = conn.getHeaderField("X-Jenkins");
-            if (version == null) {
-                if (conn.getHeaderField("X-Hudson") == null) {
-                    LOG.log(Level.FINE, "neither Hudson nor Jenkins headers on {0}, assuming might be Jenkins", home);
-                } else {
-                    LOG.log(Level.FINE, "disabled on non-Jenkins server {0}", home);
-                    return null;
-                }
-            } else if (new HudsonVersion(version).compareTo(new HudsonVersion("1.426")) < 0) {
-                LOG.log(Level.FINE, "disabled on old ({0}) Jenkins server {1}", new Object[] {version, home});
-                return null;
-            } else {
-                LOG.log(Level.FINE, "enabled on {0}", home);
-            }
-            APITokenConnectionAuthenticator panel = new APITokenConnectionAuthenticator();
-            String server = HudsonManager.simplifyServerLocation(home.toString(), true);
-            String key = "tok." + server;
-            String username = FormLogin.loginPrefs().get(server, null);
-            if (username != null) {
-                panel.userField.setText(username);
-                char[] savedToken = Keyring.read(key);
-                if (savedToken != null) {
-                    panel.tokField.setText(new String(savedToken));
-                }
-            }
-            panel.locationField.setText(home.toString());
-            DialogDescriptor dd = new DialogDescriptor(panel, Bundle.FormLogin_log_in());
-            if (DialogDisplayer.getDefault().notify(dd) != NotifyDescriptor.OK_OPTION) {
-                return null;
-            }
-            username = panel.userField.getText();
-            LOG.log(Level.FINE, "trying token for {0} on {1}", new Object[] {username, home});
-            FormLogin.loginPrefs().put(server, username);
-            String token = new String(panel.tokField.getPassword());
-            panel.tokField.setText("");
-            Keyring.save(key, token.toCharArray(), Bundle.APITokenConnectionAuthenticator_password_description(home, username));
-            BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
-            try {
-                return conn.getURL().openConnection();
-            } catch (IOException x) {
-                LOG.log(Level.FINE, null, x);
-                return null;
-            }
-        }
-
-    }
-
-    private APITokenConnectionAuthenticator() {
-        initComponents();
-    }
-
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        locationLabel = new javax.swing.JLabel();
-        locationField = new javax.swing.JTextField();
-        userLabel = new javax.swing.JLabel();
-        userField = new javax.swing.JTextField();
-        tokLabel = new javax.swing.JLabel();
-        tokField = new javax.swing.JPasswordField();
-        tokButton = new javax.swing.JButton();
-
-        locationLabel.setLabelFor(locationField);
-        org.openide.awt.Mnemonics.setLocalizedText(locationLabel, org.openide.util.NbBundle.getMessage(APITokenConnectionAuthenticator.class, "APITokenConnectionAuthenticator.locationLabel.text")); // NOI18N
-
-        locationField.setEditable(false);
-
-        userLabel.setLabelFor(userField);
-        org.openide.awt.Mnemonics.setLocalizedText(userLabel, org.openide.util.NbBundle.getMessage(APITokenConnectionAuthenticator.class, "APITokenConnectionAuthenticator.userLabel.text")); // NOI18N
-
-        tokLabel.setLabelFor(tokField);
-        org.openide.awt.Mnemonics.setLocalizedText(tokLabel, org.openide.util.NbBundle.getMessage(APITokenConnectionAuthenticator.class, "APITokenConnectionAuthenticator.tokLabel.text")); // NOI18N
-
-        org.openide.awt.Mnemonics.setLocalizedText(tokButton, NbBundle.getMessage(APITokenConnectionAuthenticator.class, "APITokenConnectionAuthenticator.tokButton.text")); // NOI18N
-        tokButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                tokButtonActionPerformed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(layout.createSequentialGroup()
-                        .addComponent(locationLabel)
-                        .addGap(36, 36, 36)
-                        .addComponent(locationField, javax.swing.GroupLayout.DEFAULT_SIZE, 279, Short.MAX_VALUE))
-                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(tokLabel)
-                            .addComponent(userLabel))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(userField, javax.swing.GroupLayout.DEFAULT_SIZE, 277, Short.MAX_VALUE)
-                            .addGroup(layout.createSequentialGroup()
-                                .addComponent(tokField)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(tokButton)))))
-                .addContainerGap())
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(locationLabel)
-                    .addComponent(locationField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(18, 18, 18)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(userField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(userLabel))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(tokLabel)
-                    .addComponent(tokField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(tokButton))
-                .addContainerGap())
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void tokButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tokButtonActionPerformed
-        try {
-            HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(locationField.getText() + "user/" + Utilities.uriEncode(userField.getText()) + "/configure"));
-        } catch (MalformedURLException x) {
-            LOG.log(Level.INFO, null, x);
-        }
-    }//GEN-LAST:event_tokButtonActionPerformed
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JTextField locationField;
-    private javax.swing.JLabel locationLabel;
-    private javax.swing.JButton tokButton;
-    private javax.swing.JPasswordField tokField;
-    private javax.swing.JLabel tokLabel;
-    private javax.swing.JTextField userField;
-    private javax.swing.JLabel userLabel;
-    // End of variables declaration//GEN-END:variables
-
-    public @Override void addNotify() {
-        super.addNotify();
-        ((userField.getText().length() > 0) ? tokField : userField).requestFocus();
-    }
-
-}
diff --git a/.pc/netbeans-dlight.nativeexecution.patch/dlight.nativeexecution/nbproject/project.properties b/.pc/netbeans-dlight.nativeexecution.patch/dlight.nativeexecution/nbproject/project.properties
deleted file mode 100644
index 33908a3..0000000
--- a/.pc/netbeans-dlight.nativeexecution.patch/dlight.nativeexecution/nbproject/project.properties
+++ /dev/null
@@ -1,103 +0,0 @@
-is.autoload=true
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-javadoc.arch=${basedir}/arch.xml
-project.license=cddl-netbeans-sun
-nbm.executable.files=bin/nativeexecution/**
-jnlp.indirect.files=bin/nativeexecution/**
-spec.version.base=1.37.1
-
-test.config.stableBTD.includes=**/*Test.class
-test.config.stableBTD.excludes=\
-    **/ConnectionManagerTest.class,\
-    **/DerbyDatabasesTest.class,\
-    **/DerbyOptionsTest.class,\
-    **/EnvironmentTest.class,\
-    **/HostInfoUtilsTest.class,\
-    **/MacroExpanderFactoryTest.class,\
-    **/NativeProcessBuilderTest.class,\
-    **/NativeProcessTest.class,\
-    **/NativeTaskTest.class,\
-    **/RedirectErrorTest.class,\
-    **/RegisterDerbyTest.class,\
-    **/ShellSessionTest.class,\
-    **/TerminalConfigurationProviderTest.class,\
-    **/WindowsSupportTest.class
-
-release.external/exechlp-1.0.zip!/Linux-x86/process_start       = bin/nativeexecution/Linux-x86/process_start
-release.external/exechlp-1.0.zip!/Linux-x86/pty                 = bin/nativeexecution/Linux-x86/pty
-release.external/exechlp-1.0.zip!/Linux-x86/pty_open            = bin/nativeexecution/Linux-x86/pty_open
-release.external/exechlp-1.0.zip!/Linux-x86/sigqueue            = bin/nativeexecution/Linux-x86/sigqueue
-release.external/exechlp-1.0.zip!/Linux-x86/stat                = bin/nativeexecution/Linux-x86/stat
-release.external/exechlp-1.0.zip!/Linux-x86/unbuffer.so         = bin/nativeexecution/Linux-x86/unbuffer.so
-release.external/exechlp-1.0.zip!/Linux-x86/killall             = bin/nativeexecution/Linux-x86/killall
-release.external/exechlp-1.0.zip!/Linux-x86_64/process_start    = bin/nativeexecution/Linux-x86_64/process_start
-release.external/exechlp-1.0.zip!/Linux-x86_64/pty              = bin/nativeexecution/Linux-x86_64/pty
-release.external/exechlp-1.0.zip!/Linux-x86_64/pty_open         = bin/nativeexecution/Linux-x86_64/pty_open
-release.external/exechlp-1.0.zip!/Linux-x86_64/sigqueue         = bin/nativeexecution/Linux-x86_64/sigqueue
-release.external/exechlp-1.0.zip!/Linux-x86_64/stat             = bin/nativeexecution/Linux-x86_64/stat
-release.external/exechlp-1.0.zip!/Linux-x86_64/unbuffer.so      = bin/nativeexecution/Linux-x86_64/unbuffer.so
-release.external/exechlp-1.0.zip!/Linux-x86_64/killall          = bin/nativeexecution/Linux-x86_64/killall
-release.external/exechlp-1.0.zip!/Linux-sparc_64/process_start  = bin/nativeexecution/Linux-sparc_64/process_start
-release.external/exechlp-1.0.zip!/Linux-sparc_64/pty            = bin/nativeexecution/Linux-sparc_64/pty
-release.external/exechlp-1.0.zip!/Linux-sparc_64/pty_open       = bin/nativeexecution/Linux-sparc_64/pty_open
-release.external/exechlp-1.0.zip!/Linux-sparc_64/sigqueue       = bin/nativeexecution/Linux-sparc_64/sigqueue
-release.external/exechlp-1.0.zip!/Linux-sparc_64/stat           = bin/nativeexecution/Linux-sparc_64/stat
-release.external/exechlp-1.0.zip!/Linux-sparc_64/unbuffer.so    = bin/nativeexecution/Linux-sparc_64/unbuffer.so
-release.external/exechlp-1.0.zip!/Linux-sparc_64/killall        = bin/nativeexecution/Linux-sparc_64/killall
-release.external/exechlp-1.0.zip!/Windows-x86/process_start     = bin/nativeexecution/Windows-x86/process_start
-release.external/exechlp-1.0.zip!/Windows-x86/pty               = bin/nativeexecution/Windows-x86/pty
-release.external/exechlp-1.0.zip!/Windows-x86/pty_open          = bin/nativeexecution/Windows-x86/pty_open
-release.external/exechlp-1.0.zip!/Windows-x86/sigqueue          = bin/nativeexecution/Windows-x86/sigqueue
-release.external/exechlp-1.0.zip!/Windows-x86/unbuffer.dll      = bin/nativeexecution/Windows-x86/unbuffer.dll
-release.external/exechlp-1.0.zip!/Windows-x86/killall           = bin/nativeexecution/Windows-x86/killall
-release.external/exechlp-1.0.zip!/Windows-x86_64/process_start  = bin/nativeexecution/Windows-x86_64/process_start
-release.external/exechlp-1.0.zip!/Windows-x86_64/pty            = bin/nativeexecution/Windows-x86_64/pty
-release.external/exechlp-1.0.zip!/Windows-x86_64/pty_open       = bin/nativeexecution/Windows-x86_64/pty_open
-release.external/exechlp-1.0.zip!/Windows-x86_64/sigqueue       = bin/nativeexecution/Windows-x86_64/sigqueue
-release.external/exechlp-1.0.zip!/Windows-x86_64/killall        = bin/nativeexecution/Windows-x86_64/killall
-release.external/exechlp-1.0.zip!/Windows-x86_64/unbuffer.dll   = bin/nativeexecution/Windows-x86_64/unbuffer.dll
-release.external/exechlp-1.0.zip!/MacOSX-x86/process_start      = bin/nativeexecution/MacOSX-x86/process_start
-release.external/exechlp-1.0.zip!/MacOSX-x86/pty                = bin/nativeexecution/MacOSX-x86/pty
-release.external/exechlp-1.0.zip!/MacOSX-x86/pty_open           = bin/nativeexecution/MacOSX-x86/pty_open
-release.external/exechlp-1.0.zip!/MacOSX-x86/stat               = bin/nativeexecution/MacOSX-x86/stat
-release.external/exechlp-1.0.zip!/MacOSX-x86/unbuffer.dylib     = bin/nativeexecution/MacOSX-x86/unbuffer.dylib
-release.external/exechlp-1.0.zip!/MacOSX-x86/killall            = bin/nativeexecution/MacOSX-x86/killall
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/process_start   = bin/nativeexecution/MacOSX-x86_64/process_start
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty             = bin/nativeexecution/MacOSX-x86_64/pty
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty_open        = bin/nativeexecution/MacOSX-x86_64/pty_open
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/stat            = bin/nativeexecution/MacOSX-x86_64/stat
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/unbuffer.dylib  = bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib
-release.external/exechlp-1.0.zip!/MacOSX-x86_64/killall         = bin/nativeexecution/MacOSX-x86_64/killall
-release.external/exechlp-1.0.zip!/SunOS-sparc/privp             = bin/nativeexecution/SunOS-sparc/privp
-release.external/exechlp-1.0.zip!/SunOS-sparc/process_start     = bin/nativeexecution/SunOS-sparc/process_start
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty               = bin/nativeexecution/SunOS-sparc/pty
-release.external/exechlp-1.0.zip!/SunOS-sparc/pty_open          = bin/nativeexecution/SunOS-sparc/pty_open
-release.external/exechlp-1.0.zip!/SunOS-sparc/sigqueue          = bin/nativeexecution/SunOS-sparc/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-sparc/stat              = bin/nativeexecution/SunOS-sparc/stat
-release.external/exechlp-1.0.zip!/SunOS-sparc/unbuffer.so       = bin/nativeexecution/SunOS-sparc/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-sparc/killall           = bin/nativeexecution/SunOS-sparc/killall
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/privp          = bin/nativeexecution/SunOS-sparc_64/privp
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/process_start  = bin/nativeexecution/SunOS-sparc_64/process_start
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty            = bin/nativeexecution/SunOS-sparc_64/pty
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty_open       = bin/nativeexecution/SunOS-sparc_64/pty_open
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/sigqueue       = bin/nativeexecution/SunOS-sparc_64/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/stat           = bin/nativeexecution/SunOS-sparc_64/stat
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/unbuffer.so    = bin/nativeexecution/SunOS-sparc_64/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-sparc_64/killall        = bin/nativeexecution/SunOS-sparc_64/killall
-release.external/exechlp-1.0.zip!/SunOS-x86/privp               = bin/nativeexecution/SunOS-x86/privp
-release.external/exechlp-1.0.zip!/SunOS-x86/process_start       = bin/nativeexecution/SunOS-x86/process_start
-release.external/exechlp-1.0.zip!/SunOS-x86/pty                 = bin/nativeexecution/SunOS-x86/pty
-release.external/exechlp-1.0.zip!/SunOS-x86/pty_open            = bin/nativeexecution/SunOS-x86/pty_open
-release.external/exechlp-1.0.zip!/SunOS-x86/sigqueue            = bin/nativeexecution/SunOS-x86/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-x86/stat                = bin/nativeexecution/SunOS-x86/stat
-release.external/exechlp-1.0.zip!/SunOS-x86/unbuffer.so         = bin/nativeexecution/SunOS-x86/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-x86/killall             = bin/nativeexecution/SunOS-x86/killall
-release.external/exechlp-1.0.zip!/SunOS-x86_64/process_start    = bin/nativeexecution/SunOS-x86_64/process_start
-release.external/exechlp-1.0.zip!/SunOS-x86_64/pty              = bin/nativeexecution/SunOS-x86_64/pty
-release.external/exechlp-1.0.zip!/SunOS-x86_64/pty_open         = bin/nativeexecution/SunOS-x86_64/pty_open
-release.external/exechlp-1.0.zip!/SunOS-x86_64/sigqueue         = bin/nativeexecution/SunOS-x86_64/sigqueue
-release.external/exechlp-1.0.zip!/SunOS-x86_64/stat             = bin/nativeexecution/SunOS-x86_64/stat
-release.external/exechlp-1.0.zip!/SunOS-x86_64/unbuffer.so      = bin/nativeexecution/SunOS-x86_64/unbuffer.so
-release.external/exechlp-1.0.zip!/SunOS-x86_64/killall          = bin/nativeexecution/SunOS-x86_64/killall
-
diff --git a/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.properties b/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.properties
deleted file mode 100644
index 4d9b43c..0000000
--- a/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-is.eager=true
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
-release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
-release.external/processtreekiller-1.0.5.jar=modules/ext/processtreekiller-1.0.5.jar
diff --git a/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.xml b/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.xml
deleted file mode 100644
index 36199b1..0000000
--- a/.pc/netbeans-extexecution.impl.patch/extexecution.process/nbproject/project.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.extexecution.process</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.apache.commons.io</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.jna</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.23</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.extexecution.base</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/winp-1.14-patched.jar</runtime-relative-path>
-                <binary-origin>external/winp-1.14-patched.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/libpam4j-1.1.jar</runtime-relative-path>
-                <binary-origin>external/libpam4j-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/processtreekiller-1.0.5.jar</runtime-relative-path>
-                <binary-origin>external/processtreekiller-1.0.5.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-extexecution.impl.patch/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java b/.pc/netbeans-extexecution.impl.patch/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
deleted file mode 100644
index 8f75676..0000000
--- a/.pc/netbeans-extexecution.impl.patch/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2009 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.extexecution.process;
-
-import java.util.Map;
-import org.netbeans.processtreekiller.ProcessTreeKiller;
-import org.netbeans.spi.extexecution.base.ProcessesImplementation;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author mkleint
- */
- at ServiceProvider(service=ProcessesImplementation.class)
-public class ProcessesImpl implements ProcessesImplementation {
-
-    @Override
-    public void killTree(Process process, Map<String, String> environment) {
-        ProcessTreeKiller.get().kill(process, environment);
-    }
-
-}
diff --git a/.pc/netbeans-ide-launcher.patch/ide/launcher/netbeans.conf b/.pc/netbeans-ide-launcher.patch/ide/launcher/netbeans.conf
deleted file mode 100644
index 3cdd3dc..0000000
--- a/.pc/netbeans-ide-launcher.patch/ide/launcher/netbeans.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-# Default locations of userdir and cachedir:
-# (http://wiki.netbeans.org/FaqWhatIsUserdir)
-#
-# On Windows ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher
-# with "<AppData>\NetBeans" where <AppData> is user's
-# value of "AppData" key in Windows Registry under
-# "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-# and ${DEFAULT_CACHEDIR_ROOT} will be replaced by the launcher
-# with "<Local AppData>\NetBeans\Cache" where <Local AppData> is user's
-# value of "Local AppData" key in Windows Registry under
-# "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders"
-#
-# On Mac ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher
-# with "~/Library/Application Support/NetBeans" and
-# ${DEFAULT_CACHEDIR_ROOT} with "~/Library/Caches/NetBeans"
-#
-# On other systems ${DEFAULT_USERDIR_ROOT} will be replaced by the launcher
-# with "~/.netbeans" and ${DEFAULT_CACHEDIR_ROOT} with "~/.cache/netbeans"
-#
-# You can also use ${HOME} variable which will be replaced with
-# user.home JVM system property value. This variable is valid only in
-# netbeans_default_userdir and netbeans_default_cachedir properties.
-#
-# NOTE: If you specify a non-default userdir path on command line
-# (--userdir option) and don't specify a cachedir path (--cachedir option),
-# cachedir will be in "<userdir>/var/cache".
-#
-# Cachedir must be different from userdir. The same cachedir and userdir
-# would cause problems.
-#
-netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/8.1"
-netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
-
-# Options used by NetBeans launcher by default:
-# (can be overridden by explicit command line switches)
-#
-# Note that default -Xmx is selected for you automatically.
-# You can find these values in var/log/messages.log file in your userdir.
-# The automatically selected value can be overridden by specifying -J-Xmx
-# here or on the command line.
-#
-# If you specify the heap size explicitly, you may also want to enable
-# Concurrent Mark & Sweep garbage collector.
-# (see http://wiki.netbeans.org/FaqGCPauses)
-#
-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true"
-
-# Default location of JDK:
-# (set by installer or commented out if launcher should decide)
-#
-# It can be overridden on command line by using --jdkhome <dir>
-# Be careful when changing jdkhome.
-# There are two NetBeans launchers for Windows (32-bit and 64-bit) and
-# installer points to one of those in the NetBeans application shortcut 
-# based on the Java version selected at installation time.
-#
-#netbeans_jdkhome="/path/to/jdk"
-
-# Additional module clusters:
-# using ${path.separator} (';' on Windows or ':' on Unix):
-#
-#netbeans_extraclusters="/absolute/path/to/cluster1:/absolute/path/to/cluster2"
-
diff --git a/.pc/netbeans-ide-launcher.patch/ide/launcher/unix/netbeans b/.pc/netbeans-ide-launcher.patch/ide/launcher/unix/netbeans
deleted file mode 100644
index 8218c36..0000000
--- a/.pc/netbeans-ide-launcher.patch/ide/launcher/unix/netbeans
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/bin/sh
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-#
-# resolve symlinks
-#
-
-PRG=$0
-
-while [ -h "$PRG" ]; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
-    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
-	PRG="$link"
-    else
-	PRG="`dirname "$PRG"`/$link"
-    fi
-done
-
-progdir=`dirname "$PRG"`
-old=`pwd`
-cd "$progdir"/..
-basedir=`pwd`
-cd "$old"
-
-case "`uname`" in
-    Darwin*)
-        # set default userdir and cachedir on Mac OS X
-        DEFAULT_USERDIR_ROOT="${HOME}/Library/Application Support/NetBeans"
-        DEFAULT_CACHEDIR_ROOT=${HOME}/Library/Caches/NetBeans
-        # set DYLD_LIBRARY_PATH
-        export DYLD_LIBRARY_PATH="$basedir"/webcommon/bin:${DYLD_LIBRARY_PATH}
-        ;;
-    *) 
-        # set default userdir and cachedir on unix systems
-        DEFAULT_USERDIR_ROOT=${HOME}/.netbeans
-        DEFAULT_CACHEDIR_ROOT=${HOME}/.cache/netbeans
-        ;;
-esac
-
-
-if [ -f "$basedir"/etc/netbeans.conf ] ; then
-    . "$basedir"/etc/netbeans.conf
-fi
-
-# following should be done just in RPM or Solaris Launcher
-# if [ -f /etc/netbeans.conf ] ; then
-#     . /etc/netbeans.conf
-# fi
-
-export DEFAULT_USERDIR_ROOT
-
-# #68373: look for userdir, but do not modify "$@"
-userdir="${netbeans_default_userdir}"
-cachedir="${netbeans_default_cachedir}"
-
-founduserdir=""
-for opt in "$@"; do
-    if [ "${founduserdir}" = "yes" ]; then
-        userdir="$opt"
-        break
-    elif [ "$opt" = "--userdir" ]; then
-        founduserdir="yes"
-    fi
-done
-foundcachedir=""
-for opt in "$@"; do
-    if [ "${foundcachedir}" = "yes" ]; then
-        cachedir="$opt"
-        break
-    elif [ "$opt" = "--cachedir" ]; then
-        foundcachedir="yes"
-    fi
-done
-
-if [ -f "${userdir}"/etc/netbeans.conf ] ; then
-    . "${userdir}"/etc/netbeans.conf
-fi
-
-
-if [ ! -f "$basedir"/etc/netbeans.clusters ]; then
-    echo Cannot read cluster file: "$basedir"/etc/netbeans.clusters 1>&2
-    exit 1
-fi
-
-readClusters() {
-    grep -v "^#" "$basedir"/etc/netbeans.clusters | grep -v "^$" | grep -v platform | while read X; do
-        if expr "$X" : "/.*" >/dev/null; then
-            echo "$X"
-        else
-            echo "$basedir/$X"
-        fi
-    done
-}
-
-absolutize_paths() {
-    while read path; do
-        if [ -d "$path" ]; then
-            (cd "$path" 2>/dev/null && pwd)
-        else
-            echo "$path"
-        fi
-    done
-}
-
-netbeans_clusters=`readClusters | absolutize_paths | tr '\012' ':'`
-
-if [ ! -z "$netbeans_extraclusters" ] ; then
-    netbeans_clusters="$netbeans_clusters:$netbeans_extraclusters"
-fi
-
-heap_size () {
-    mem=640
-    case "`uname`" in
-        Linux*)
-        mem=`cat /proc/meminfo | grep MemTotal | tr -d [:space:][:alpha:]:`
-        mem=`expr $mem / 1024`
-        ;;
-    SunOS*)
-        mem=`/usr/sbin/prtconf | grep Memory | /usr/bin/tr -dc '[0-9]'`
-        ;;
-    Darwin*)
-        mem=`/usr/sbin/sysctl hw.memsize | tr -d [:alpha:][:space:].:`
-        mem=`expr $mem / 1048576`
-        ;;
-        *) 
-        ;;
-    esac
-    if [ -z "$mem" ] ; then
-        mem=640
-    fi
-    mem=`expr $mem / 5`
-    if [ $mem -gt 1024 ] ; then
-        mem=1024
-    elif [ $mem -lt 96 ] ; then
-        mem=96
-    fi
-    max_heap_size=$mem
-    return 0
-}
-
-
-if grep -v -- "-J-Xmx" >/dev/null <<EOF ; then
-${netbeans_default_options}
-EOF
-        heap_size
-	netbeans_default_options="-J-Xmx${max_heap_size}m ${netbeans_default_options}"
-fi
-
-if grep -v -- "-J-XX:MaxPermSize" >/dev/null <<EOF ; then
-${netbeans_default_options}
-EOF
-	netbeans_default_options="-L-XX:MaxPermSize=384m ${netbeans_default_options}"
-fi
-
-if grep -v -- "-J-XX:PermSize" >/dev/null <<EOF ; then
-${netbeans_default_options}
-EOF
-	netbeans_default_options="-L-XX:PermSize=32m ${netbeans_default_options}"
-fi
-
-launchNbexec() {
-    nbexec=`grep -v "^#" "$basedir"/etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do
-        if expr "$X" : "/.*" >/dev/null; then
-           echo $X/lib/nbexec
-        elif [ -f "$basedir"/$X/lib/nbexec ]; then
-            echo "$basedir"/$X/lib/nbexec
-        fi
-    done | head -n 1`
-    sh=sh
-    # #73162: Ubuntu uses the ancient Bourne shell, which does not implement trap well.
-    if [ -x /bin/bash ]
-    then
-        sh=/bin/bash
-    fi
-    if [ "${founduserdir}" = "yes" ]; then
-        exec $sh "$nbexec" "$@"
-    else
-        if [ "${foundcachedir}" = "yes" ]; then
-            exec $sh "$nbexec" --userdir "${userdir}" "$@"
-        else
-            exec $sh "$nbexec" --userdir "${userdir}" --cachedir "${cachedir}" "$@"
-        fi
-    fi
-}
-
-# in case of macosx, the apple.laf.useScreenMenuBar property should be ideally in the Info.plist file
-# but it doesn't get propagated into the executed java VM. 
-case "`uname`" in
-    Darwin*)
-        eval launchNbexec \
-            --jdkhome '"$netbeans_jdkhome"' \
-            -J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \
-            -J-Xdock:name=NetBeans \
-            '"-J-Xdock:icon=$basedir/nb/netbeans.icns"' \
-            --branding nb \
-            --clusters '"$netbeans_clusters"' \
-            -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
-            ${netbeans_default_options} \
-            '"$@"'
-        ;;
-    *)
-        eval launchNbexec \
-            --jdkhome '"$netbeans_jdkhome"' \
-            --branding nb \
-            --clusters '"$netbeans_clusters"' \
-            -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
-            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
-            ${netbeans_default_options} \
-            '"$@"'
-        ;;
-esac
diff --git a/.pc/netbeans-javacc.patch/db.sql.visualeditor/build.xml b/.pc/netbeans-javacc.patch/db.sql.visualeditor/build.xml
deleted file mode 100644
index 456f782..0000000
--- a/.pc/netbeans-javacc.patch/db.sql.visualeditor/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="db.sql.visualeditor" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.netbeans.modules.db.sql.visualeditor.</description>
-    <import file="../nbbuild/templates/projectized.xml"/>
-
-    <target name="clean" depends="projectized-common.clean">
-      <delete>
-	<fileset dir="src/org/netbeans/modules/db/sql/visualeditor/parser">
-	  <include name="*.java" />
-        </fileset>
-      </delete>
-    </target>
-
-    <target name="sql">
-      <mkdir dir="build"/>
-      <copy file="external/javacc-3.2.jar" tofile="build/javacc.jar"/>
-      <javacc target="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj"
-	   javacchome="build">
-      </javacc>
-    </target>
-
-    <!-- Obsolete method for generating parser files; now use javacc command -->
-    <!--
-    <target name="init-sql">
-      <uptodate property="sql.gen.done"
-		targetfile="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.java"
-		srcfile="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj"/>
-    </target>
-    <target name="sql" depends="init-sql" unless="sql.gen.done">
-      <java fork="true" classname="org.javacc.parser.Main"
-        classpath="external/javacc-3.2.jar">
-        <arg value="-OUTPUT_DIRECTORY=src/org/netbeans/modules/db/sql/visualeditor/parser" />
-        <arg value="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj" />
-      </java>
-    </target>
-    -->
-
-    <target name="compile" depends="sql,projectized-common.compile"/>
-
-</project>
diff --git a/.pc/netbeans-jemmy.patch/jemmy/nbproject/project.properties b/.pc/netbeans-jemmy.patch/jemmy/nbproject/project.properties
deleted file mode 100644
index ab73fe9..0000000
--- a/.pc/netbeans-jemmy.patch/jemmy/nbproject/project.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-is.autoload=true
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
-release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar
-release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
-release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
-sigtest.gen.fail.on.error=false
-
diff --git a/.pc/netbeans-libs.jaxb.patch/libs.jaxb/nbproject/project.properties b/.pc/netbeans-libs.jaxb.patch/libs.jaxb/nbproject/project.properties
deleted file mode 100644
index 299cbe2..0000000
--- a/.pc/netbeans-libs.jaxb.patch/libs.jaxb/nbproject/project.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-
-jnlp.indirect.jars=\
-    modules/ext/jaxb/jaxb-impl.jar,\
-    modules/ext/jaxb/jaxb1-impl.jar,\
-    modules/ext/jaxb/jaxb-xjc.jar,\
-    docs/jaxb-api-doc.zip
-
-# pack200 bug in JDK 7 (#7131266)
-pack200.excludes=modules/ext/jaxb/jaxb-xjc.jar
-
-release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
-release.external/jaxb1-impl.jar=modules/ext/jaxb/jaxb1-impl.jar
-release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
-
-# JAXB Javadoc
-release.external/jaxb-api-doc.zip=docs/jaxb-api-doc.zip
-
-sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-nocopy.patch/css.editor/nbproject/project.properties b/.pc/netbeans-nocopy.patch/css.editor/nbproject/project.properties
deleted file mode 100644
index 35a1046..0000000
--- a/.pc/netbeans-nocopy.patch/css.editor/nbproject/project.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-release.external/css21-spec.zip=docs/css21-spec.zip
-release.external/css3-spec.zip=docs/css3-spec.zip
-
-jnlp.indirect.files=\
-    docs/css21-spec.zip,\
-    docs/css3-spec.zip
-
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
-
-test.config.stableBTD.includes=**/*Test.class
-test.config.stableBTD.excludes=\
-    **/indent/CssIndenterTest.class,\
-    **/module/main/AnimationsModuleTest.class,\
-    **/module/main/StandardPropertiesHelpResolverTest.class,\
-    **/properties/parser/PropertyValueTest.class,\
-    **/CssBracketCompleterTest.class
diff --git a/.pc/netbeans-nocopy.patch/db.drivers/nbproject/project.properties b/.pc/netbeans-nocopy.patch/db.drivers/nbproject/project.properties
deleted file mode 100644
index 929aa22..0000000
--- a/.pc/netbeans-nocopy.patch/db.drivers/nbproject/project.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2021 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
-release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
-release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
-jnlp.indirect.jars=\
-    modules/ext/mysql-connector-java-5.1.23-bin.jar,\
-    modules/ext/postgresql-9.2-1002.jdbc4.jar
diff --git a/.pc/netbeans-nocopy.patch/derby/nbproject/project.properties b/.pc/netbeans-nocopy.patch/derby/nbproject/project.properties
deleted file mode 100644
index 4039fad..0000000
--- a/.pc/netbeans-nocopy.patch/derby/nbproject/project.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-javac.source=1.7
-javac.compilerargs=-Xlint:unchecked
-
-release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
-jnlp.indirect.jars=\
-    modules/ext/derbysampledb.zip
-
-test.config.stableBTD.includes=**/*Test.class
-test.config.stableBTD.excludes=\
-    org/netbeans/test/**/*,\
-    **/DerbyDatabasesTest.class,\
-    **/DerbyOptionsTest.class,\
-    **/RegisterDerbyTest.class
diff --git a/.pc/netbeans-nocopy.patch/html.editor/nbproject/project.properties b/.pc/netbeans-nocopy.patch/html.editor/nbproject/project.properties
deleted file mode 100644
index bd9151b..0000000
--- a/.pc/netbeans-nocopy.patch/html.editor/nbproject/project.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-release.external/html-4.01.zip=docs/html-4.01.zip
-
-javac.compilerargs=-Xlint:unchecked
-javac.source=1.7
-jnlp.verify.excludes=docs/html-4.01.zip
-
-test.config.stableBTD.includes=**/*Test.class
-test.config.stableBTD.excludes=\
-    **/CssEmbeddingProviderTest.class,\
-    **/Html5CompletionQueryTest.class,\
-    **/NavigationSideBarTest.class,\
-    **/HtmlIndenterTest.class
diff --git a/.pc/netbeans-nocopy.patch/j2ee.eclipselink/nbproject/project.properties b/.pc/netbeans-nocopy.patch/j2ee.eclipselink/nbproject/project.properties
deleted file mode 100644
index 53059dc..0000000
--- a/.pc/netbeans-nocopy.patch/j2ee.eclipselink/nbproject/project.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
-jnlp.indirect.jars=\
-    modules/ext/eclipselink/eclipselink.jar,\
-    modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar,\
-    modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar,\
-    modules/ext/docs/javax.persistence-2.1.0-doc.zip
-
-release.external/eclipselink.jar=modules/ext/eclipselink/eclipselink.jar
-release.external/javax.persistence_2.1.0.v201304241213.jar=modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar
-release.external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
\ No newline at end of file
diff --git a/.pc/netbeans-nocopy.patch/libs.swingx/nbproject/project.properties b/.pc/netbeans-nocopy.patch/libs.swingx/nbproject/project.properties
deleted file mode 100644
index 077a5ea..0000000
--- a/.pc/netbeans-nocopy.patch/libs.swingx/nbproject/project.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-release.external/swingx-all-1.6.4.jar=modules/ext/swingx-all-1.6.4.jar
-sigtest.gen.fail.on.error=false
-
diff --git a/.pc/netbeans-nocopy.patch/o.jdesktop.beansbinding/nbproject/project.properties b/.pc/netbeans-nocopy.patch/o.jdesktop.beansbinding/nbproject/project.properties
deleted file mode 100644
index d2951bb..0000000
--- a/.pc/netbeans-nocopy.patch/o.jdesktop.beansbinding/nbproject/project.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
-jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
-spec.version.base=1.26.1
diff --git a/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/build.xml b/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/build.xml
deleted file mode 100644
index 9d8a0d7..0000000
--- a/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/build.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<project name="o.apache.tools.ant.module" default="netbeans" basedir=".">
-
-    <import file="../nbbuild/templates/projectized.xml"/>
-
-    <target name="build-init" depends="projectized.build-init">
-        <ant dir="external" target="unzip"/>
-        <property name="src-bridge.cp" value="${module.classpath}:${src-bridge.cp.extra}"/>
-    </target>
-
-    <target name="compile-bridge" depends="init,compile">
-        <mkdir dir="build/bridge-classes"/>
-        <depend srcdir="src-bridge" destdir="build/bridge-classes" cache="build/depcache-bridge">
-            <classpath>
-                <path path="${src-bridge.cp}"/>
-            </classpath>
-        </depend>
-        <javac srcdir="src-bridge" destdir="build/bridge-classes" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.6" target="1.6" includeantruntime="false">
-            <classpath>
-                <path path="${src-bridge.cp}"/>
-            </classpath>
-            <compilerarg line="${javac.compilerargs}"/>
-        </javac>
-        <copy todir="build/bridge-classes">
-            <fileset dir="src-bridge" excludes="${jar-excludes}"/>
-        </copy>
-    </target>
-
-    <target name="jar-bridge" depends="compile-bridge">
-        <mkdir dir="${cluster}/ant/nblib"/>
-        <jar jarfile="${cluster}/ant/nblib/bridge.jar" compress="false">
-            <fileset dir="build/bridge-classes"/>
-        </jar>
-    </target>
-
-    <target name="netbeans-extra" depends="jar-bridge">
-        <mkdir dir="${cluster}/ant/lib"/>
-        <copy todir="${cluster}/ant/lib">
-            <fileset dir="external/lib"/>
-        </copy>
-        <unzip dest="${cluster}/ant">
-            <fileset dir="external">
-                <include name="ant-misc-*.zip"/>
-            </fileset>
-        </unzip>
-    </target>
-
-    <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
-
-    <target name="jnlp" depends="netbeans,-jnlp-init">
-        <property name="dir" location="${jnlp.dest.dir}/org-apache-tools-ant-module"/>
-        <mkdir dir="${dir}"/>
-        <copy todir="${dir}" flatten="true">
-            <fileset dir="${cluster}">
-                <include name="${module.jar}"/>
-                <include name="ant/patches/*.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${dir}">
-            <fileset dir="${cluster}">
-                <include name="ant/lib/*.jar"/>
-            </fileset>
-            <mapper type="glob" from="ant${file.separator}lib${file.separator}*.jar" to="apache-*-1.9.4.jar"/>
-        </copy>
-        <copy file="${cluster}/ant/nblib/bridge.jar" tofile="${dir}/org-apache-tools-ant-module-bridge.jar"/>
-        <!-- XXX ought to only do this in case jnlp.sign.jars=true -->
-        <signjar alias="${jnlp.signjar.alias}" storepass="${jnlp.signjar.password}" keystore="${jnlp.signjar.keystore}">
-            <fileset dir="${dir}">
-                <include name="org-apache-tools-ant-module.jar"/>
-                <include name="org-apache-tools-ant-module-bridge.jar"/>
-                <include name="apache-ant*.jar"/>
-            </fileset>
-        </signjar>
-        <pathconvert property="ant-jar-resources" pathsep="'/>
    <jar href='org-apache-tools-ant-module/">
-            <path>
-                <fileset dir="${dir}">
-                    <include name="apache-ant*.jar"/>
-                </fileset>
-            </path>
-            <mapper type="glob" from="${dir}${file.separator}*" to="*"/>
-        </pathconvert>
-        <echo file="${jnlp.dest.dir}/org-apache-tools-ant-module.jnlp"><![CDATA[<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
-<jnlp spec='1.0+' codebase='${jnlp.codebase}'>
-  <information>
-   <title>Apache Ant Integration</title>
-   <vendor>NetBeans</vendor>
-   <description kind='one-line'>Bundles Apache Ant.</description>
-   <description kind='short'>This module bundles the Apache Ant build tool.</description>
-  </information>
-  <security><all-permissions/></security>
-  <resources>
-    <jar href='org-apache-tools-ant-module/org-apache-tools-ant-module.jar'/>
-    <jar href='org-apache-tools-ant-module/org-apache-tools-ant-module-bridge.jar'/>
-    <jar href='org-apache-tools-ant-module/${ant-jar-resources}'/>
-  </resources>
-  <component-desc/>
-</jnlp>
-            ]]>
-        </echo>
-    </target>
-
-    <!-- For use when making new releases: -->
-    <target name="release-helper" depends="clean" description="Help do some things useful when bundling a new Ant release.">
-        <ant dir="external" target="clean"/>
-        <condition property="all.defined">
-            <and>
-                <isset property="release.version"/>
-                <available file="${release.path}" type="dir"/>
-            </and>
-        </condition>
-        <fail unless="all.defined">
-            You need to set the following properties first:
-            release.version: version of Ant being bundled, e.g. "1.6"
-            release.path: full path to the Ant binary distribution, e.g. "/tmp/apache-ant-1.6.0"
-        </fail>
-        <property name="orig.manual" location="${release.path}/manual"/>
-        <echo>2.  Creating the Ant manual from ${orig.manual}...</echo>
-        <property name="online.manual" location="build/release-work/online-manual"/>
-        <delete dir="${online.manual}"/>
-        <mkdir dir="${online.manual}"/>
-        <copy todir="${online.manual}">
-            <fileset dir="${orig.manual}">
-                <!-- Included as a separate Javadoc mount: -->
-                <exclude name="api/"/>
-            </fileset>
-        </copy>
-        <property name="ant-docs" location="../o.apache.tools.ant.module.docs"/>
-        <property name="ant-docs.zip" location="${ant-docs}/external/ant-docs-${release.version}.zip"/>
-        <zip zipfile="${ant-docs.zip}" compress="true">
-            <fileset dir="${online.manual}"/>
-        </zip>
-        <property name="here" location="."/>
-        <property name="ant-libs.zip" location="external/ant-libs-${release.version}.zip"/>
-        <echo>3.  Creating ${ant-libs.zip}...</echo>
-        <zip zipfile="${ant-libs.zip}" compress="true">
-            <fileset dir="${release.path}/lib">
-                <include name="ant*.jar"/>
-            </fileset>
-        </zip>
-        <property name="ant-misc.zip" location="external/ant-misc-${release.version}.zip"/>
-        <echo>4.  Creating ${ant-misc.zip}...</echo>
-        <zip zipfile="${ant-misc.zip}" compress="true">
-            <fileset dir="${release.path}">
-                <include name="bin/"/>
-                <include name="etc/"/>
-            </fileset>
-        </zip>
-        <echo>Now some (currently) manual steps for you:
-5.  Mention that the Ant version is ${release.version} in all files in ${here}, e.g.:
-    - ${ant-docs}/antsrc/MakeManual.java
-    - ${ant-docs}/src/org/apache/tools/ant/module/docs/Bundle.properties
-    - ../java.helpset/javahelp/org/netbeans/modules/java/helpset/docs/ant/*.html
-    - nbproject/project.properties
-    - ${ant-docs}/nbproject/project.properties
-    - build.xml
-    - arch.xml
-    - external/build.xml
-    and rename external/ant-*-license.txt (and update the version numbers mentioned in it)
-    and fix external/binaries-list
-    (last two steps also in ${ant-docs}/external)
-6.  Run: ant -f ${ant-docs}/build.xml preview-javahelp
-    You can ignore links to api/org/apache/... which will be broken, as well as a few other things.
-    But for real problems in the HTML, commit fixes to docs/manual/ in the ant.apache.org SVN trunk.
-    Sanity-check the helpset and adjust ${ant-docs}/antsrc/MakeManual.java as needed.
-7.  Increase spec versions in nbproject/project.properties and ${ant-docs}/manifest.mf.
-8.  Test everything, including at least:
-    ant -f ${here}/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean netbeans test-unit
-    ant -f ${ant-docs}/build.xml clean netbeans
-    ant -f ${here}/../java.project/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit
-    ant -f ${here}/../java.j2seproject/build.xml -Dtest-unit-sys-prop.ignore.random.failures=true clean test-unit
-    ant -f ${here}/../build.xml commit-validation
-9.  Submit a patch for https://svn.apache.org/repos/asf/ant/core/branches/ANT_SITE/xdocs/external.xml
-    mentioning that the bundled version in NB is now ${release.version}.
-10. Edit these instructions in build.xml according to anything you had to do differently.
-
-After that you should be done!
-        </echo>
-    </target>
-
-</project>
diff --git a/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/external/build.xml b/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/external/build.xml
deleted file mode 100644
index 3629c6b..0000000
--- a/.pc/netbeans-o.apache.tools.ant.module.patch/o.apache.tools.ant.module/external/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
-    <target name="unzip">
-        <unzip src="ant-libs-1.9.4.zip" dest="lib"/>
-    </target>
-    <target name="clean">
-        <delete dir="lib"/>
-    </target>
-</project>
diff --git a/.pc/netbeans-o.n.bootstrap.patch/o.n.bootstrap/nbproject/project.properties b/.pc/netbeans-o.n.bootstrap.patch/o.n.bootstrap/nbproject/project.properties
deleted file mode 100644
index bc67095..0000000
--- a/.pc/netbeans-o.n.bootstrap.patch/o.n.bootstrap/nbproject/project.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
-module.jar.dir=lib
-module.jar.basename=boot.jar
-release.launcher/unix/nbexec=lib/nbexec
-release.launcher/windows/nbexec.exe=lib/nbexec.exe
-release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
-release.launcher/windows/nbexec.dll=lib/nbexec.dll
-release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
-nbm.executable.files=lib/nbexec
-
-javadoc.arch=${basedir}/arch.xml
-javadoc.apichanges=${basedir}/apichanges.xml
-
-# When changing this list, change 'verifyexcludes' param. of 'makejnlp' task in apisupport.harness/release/jnlp.xml as well
-jnlp.verify.excludes=lib/nbexec,lib/nbexec.exe,lib/nbexec64.exe,lib/nbexec.dll,lib/nbexec64.dll
diff --git a/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/build.properties b/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/build.properties
deleted file mode 100644
index 8e3826a..0000000
--- a/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/build.properties
+++ /dev/null
@@ -1,254 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-netbeans.dest=netbeans
-test.dist.dir=build/testdist
-
-test.user.dir=testuserdir
-nb.run.validation=true
-build.compiler.debug=on
-# Options to pass to NetBeans when starting it with "ant tryme":
-tryme.arg.hack=-J-Dnetbeans.full.hack=true
-
-# Information about branch of previous release
-# needed to help us generate list of changes since then
-previous.release.year=2014
-previous.release.month=7
-previous.release.day=31
-
-# Useful for "always successful" build, when you don't care of some
-# particular (and currently broken) modules
-stop.when.broken.modules=true
-
-# resolve compile time dependencies and merge all dependent modules
-# set to true and command `ant -Dmodules=javacvs` will build IDE
-# with working module javacvs
-merge.dependent.modules=true
-
-# usefull for NBM build. <nbmerge> can set it to the list
-# of successfuly built modules => can create NBM for them
-# the most powerful combination is to set value to "modules"
-# and set stop.when.broken.modules to false
-built.modules.property=
-
-# resolve compile-time dependencies during cleaning working repository
-# set it to true if you want to clean also modules, your module(s) depends on
-resolve.clean.dependencies=false
-
-# stop, if the module have got wrong "clean" target
-# if set to false, clean build never fail on calls of the clean targets.
-stop.when.clean.error=true
-
-test.unit.cp=\
-    ../libs.junit4/external/junit-4.12.jar:\
-    netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
-    netbeans/harness/modules/org-netbeans-insane.jar:\
-    ${ant.home}/lib/ant-junit.jar:\
-    ${ant.home}/lib/ant-junit4.jar:\
-    ${ant.home}/lib/ant-launcher.jar:\
-    ${ant.home}/lib/ant.jar:\
-    ${nbantext.jar}
-
-# make javadoc for these packages
-# - the list will be shared for signature API tests!
-# - for javadoc you may specify org.foo.*, the trailing ".*"
-#     will be stripped for signature API tests
-javadoc.packages=\
-    org.netbeans.api.*,\
-    org.netbeans.spi.*
-
-# List of modules that provide stable javadoc
-config.javadoc.stable=\
-    api.annotations.common,\
-    api.htmlui,\
-    api.intent,\
-    api.io,\
-    api.knockout,\
-    api.maven,\
-    api.templates,\
-    autoupdate.services,\
-    autoupdate.ui,\
-    core.ide,\
-    core.multiview,\
-    openide.util,\
-    openide.util.lookup,\
-    openide.util.ui,\
-    openide.actions,\
-    openide.awt,\
-    openide.dialogs,\
-    openide.nodes,\
-    openide.explorer,\
-    openide.filesystems,\
-    openide.filesystems.nb,\
-    openide.modules,\
-    openide.text,\
-    openide.windows,\
-    openide.loaders,\
-    openide.io,\
-    parsing.api,\
-    parsing.indexing,\
-    api.progress,\
-    api.progress.nb,\
-    sendopts,\
-    settings,\
-    javahelp,\
-    keyring,\
-    spi.palette,\
-    options.api,\
-    spi.tasklist,\
-    openide.execution,\
-    queries,\
-    editor.codetemplates,\
-    editor.errorstripe.api,\
-    editor.guards,\
-    editor.lib2,\
-    editor.mimelookup,\
-    editor.settings,\
-    spi.navigator,\
-    diff,\
-    projectapi,\
-    projectuiapi,\
-    projectuiapi.base,\
-    project.libraries,\
-    project.libraries.ui,\
-    api.debugger,\
-    spi.viewmodel,\
-    spi.debugger.ui,\
-    api.debugger.jpda,\
-    project.ant,\
-    project.ant.ui,\
-    api.visual,\
-    api.java,\
-    api.java.classpath,\
-    api.search,\
-    java.platform,\
-    java.platform.ui,\
-    java.project,\
-    java.project.ui,\
-    java.source,\
-    java.source.base,\
-    java.sourceui,\
-    editor.fold,\
-    editor.completion,\
-    lexer,\
-    api.xml,\
-    o.apache.tools.ant.module,\
-    db,\
-    spi.quicksearch,\
-    print,\
-    extexecution,\
-    lib.uihandler,\
-    uihandler
-
-#FIXME: changes for retouche merge:
-#   editor/codetemplates,\
-
-# List of javadocs under development
-config.javadoc.devel=\
-    nbjunit,\
-    jellytools.platform,\
-    jellytools.ide,\
-    core.multitabs,\
-    core.netigso,\
-    o.n.swing.outline,\
-    o.n.swing.tabcontrol,\
-    editor.indent,\
-    editor.indent.support,\
-    editor.bracesmatching,\
-    j2ee.metadata,\
-    libs.git,\
-    refactoring.api,\
-    refactoring.java,\
-    server,\
-    versioning,\
-    bugtracking,\
-    sampler,\
-    spi.editor.hints,\
-    spi.java.hints,\
-    java.hints.test,\
-    api.web.webmodule,\
-    xml.xam,\
-    xml.xdm
-
-# List of javadocs dedicated just for friend usage
-config.javadoc.friend=\
-    o.n.bootstrap,\
-    o.n.core,\
-    code.analysis,\
-    core.startup,\
-    classfile,\
-    o.n.swing.plaf,\
-    editor.util,\
-    editor.settings.storage,\
-    editor.lib,\
-    editor,\
-    j2ee.dd,\
-    j2eeserver,\
-    java.api.common,\
-    java.j2seproject,\
-    junit,\
-    lib.v8debug,\
-    versioning.core,\
-    masterfs,\
-    masterfs.ui,\
-    projectui
-
-# List of old and deprecated APIs for building complete javadoc
-
-config.javadoc.deprecated=\
-    openide.compat,\
-    openide.options,\
-    o.openidex.util,\
-    openide.util.enumerations
-
-# List of all javadocs for development version
-# is composed from the javadocs split by stability
-# categories, for release it shall contain just stable ones
-config.javadoc.all=\
-    ${config.javadoc.stable}
-
-# list of modules for jnlp:
-config.jnlp.stable=\
-    ${nb.cluster.platform},\
-    ${nb.cluster.ide},\
-    ${nb.cluster.extide},\
-    ${nb.cluster.java}
diff --git a/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/cluster.properties b/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/cluster.properties
deleted file mode 100644
index 9b1177a..0000000
--- a/.pc/netbeans-platform-disable-net.java-modules.patch/nbbuild/cluster.properties
+++ /dev/null
@@ -1,1540 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-cluster.config=full
-clusters.prefix=libnb
-
-clusters.config.platform.list=\
-        nb.cluster.harness,\
-        nb.cluster.bootstrap,\
-        nb.cluster.platform
-
-clusters.config.basic.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.apisupport
-
-clusters.config.standard.list=\
-        ${clusters.config.basic.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.full.list=\
-        nb.cluster.cnd,\
-        nb.cluster.cndext,\
-        nb.cluster.dlight,\
-        nb.cluster.groovy,\
-        nb.cluster.javacard,\
-        nb.cluster.mobility,\
-        nb.cluster.php,\
-        ${clusters.config.standard.list},\
-        nb.cluster.ergonomics
-# ergonomics must be last
-
-clusters.config.php.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.php,\
-        nb.cluster.websvccommon,\
-        nb.cluster.nb
-
-clusters.config.groovy.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.groovy
-
-clusters.config.cnd.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.cnd,\
-        nb.cluster.nb,\
-        nb.cluster.dlight
-
-clusters.config.cndext.list=\
-        ${clusters.config.cnd.list},\
-	nb.cluster.cndext,\
-	nb.cluster.extide,\
-        nb.cluster.java
-
-clusters.config.dlight.list=\
-        nb.cluster.platform,\
-        nb.cluster.harness,\
-        nb.cluster.ide,\
-        nb.cluster.dlight,\
-        nb.cluster.nb
-
-clusters.config.java.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.javafx,\
-        nb.cluster.profiler,\
-        nb.cluster.nb
-
-clusters.config.enterprise.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.identity.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.identity
-
-clusters.config.mobility.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.mobility
-
-clusters.config.jdev.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.profiler,\
-        nb.cluster.jira,\
-        nb.cluster.team
-
-clusters.config.bloated.list=\
-        nb.cluster.identity,\
-        ${clusters.config.full.list}
-# ergonomics must be last
-
-# For technical reasons, nb.cluster.experimental is a superset of nb.cluster.betauc and nb.cluster.stableuc, so cannot list at once:
-clusters.config.experimental.list=\
-        ${clusters.config.bloated.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.experimental
-
-clusters.config.stableuc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.stableuc
-# could put ergonomics last, but undesirable to also do so for clusters.config.experimental.list, so exclude stableuc from ergonomics processing
-
-clusters.config.betauc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.betauc
-
-clusters.config.minimal.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.nb
-
-clusters.config.javacard.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.javacard
-
-clusters.config.remote.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.remote
-
-clusters.config.python.list=\
-        ${clusters.config.minimal.list},\
-        nb.cluster.python
-
-clusters.list=\
-        ${clusters.config.full.list}
-
-# Bootstrap 'cluster' serves just to group modules which are needed to process
-# module-auto-deps.xml during compilation; other clusters can then benefit 
-# from autodeps during compilation
-nb.cluster.bootstrap.dir=platform
-nb.cluster.bootstrap.depends=
-nb.cluster.bootstrap=\
-        core.startup,\
-        core.startup.base,\
-        libs.asm,\
-        o.n.bootstrap,\
-        openide.filesystems,\
-        openide.modules,\
-        openide.util,\
-        openide.util.lookup,\
-        openide.util.ui
-
-nb.cluster.platform.dir=platform
-nb.cluster.platform.depends=nb.cluster.bootstrap
-nb.cluster.platform=\
-        api.annotations.common,\
-        api.htmlui,\
-        api.intent,\
-        api.io,\
-        api.progress,\
-        api.progress.compat8,\
-        api.progress.nb,\
-        api.search,\
-        api.templates,\
-        api.visual,\
-        applemenu,\
-        autoupdate.cli,\
-        autoupdate.services,\
-        autoupdate.ui,\
-        core.execution,\
-        core.io.ui,\
-        core.kit,\
-        core.multitabs,\
-        core.multiview,\
-        core.nativeaccess,\
-        core.netigso,\
-        core.network,\
-        core.osgi,\
-        core.output2,\
-        core.ui,\
-        core.windows,\
-        editor.mimelookup,\
-        editor.mimelookup.impl,\
-        favorites,\
-        javahelp,\
-        junitlib,\
-        keyring,\
-        keyring.fallback,\
-        keyring.impl,\
-        lib.uihandler,\
-        libs.felix,\
-        libs.javafx,\
-        libs.jna,\
-        libs.jna.platform,\
-        libs.jsr223,\
-        libs.junit4,\
-        libs.osgi,\
-        libs.testng,\
-        masterfs,\
-        masterfs.linux,\
-        masterfs.macosx,\
-        masterfs.nio2,\
-        masterfs.ui,\
-        masterfs.windows,\
-        net.java.html,\
-        net.java.html.boot,\
-        net.java.html.boot.fx,\
-        net.java.html.boot.script,\
-        net.java.html.geo,\
-        net.java.html.json,\
-        net.java.html.sound,\
-        netbinox,\
-        o.jdesktop.layout,\
-        o.n.core,\
-        o.n.html.ko4j,\
-        o.n.swing.outline,\
-        o.n.swing.plaf,\
-        o.n.swing.tabcontrol,\
-        openide.actions,\
-        openide.awt,\
-        openide.compat,\
-        openide.dialogs,\
-        openide.execution,\
-        openide.execution.compat8,\
-        openide.explorer,\
-        openide.filesystems.compat8,\
-        openide.filesystems.nb,\
-        openide.io,\
-        openide.loaders,\
-        openide.nodes,\
-        openide.options,\
-        openide.text,\
-        openide.util.enumerations,\
-        openide.windows,\
-        options.api,\
-        options.keymap,\
-        print,\
-        progress.ui,\
-        queries,\
-        sampler,\
-        sendopts,\
-        settings,\
-        spi.actions,\
-        spi.quicksearch,\
-        templates,\
-        templatesui,\
-        uihandler
-validation.nb.cluster.platform=\
-        o.n.core,\
-        core.windows,\
-        javahelp
-
-nb.cluster.ide.dir=ide
-nb.cluster.ide.depends=\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.ide=\
-        api.debugger,\
-        api.java.classpath,\
-        api.knockout,\
-        api.xml,\
-        api.xml.ui,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugtracking.commons,\
-        bugzilla,\
-        c.googlecode.javaewah.JavaEWAH,\
-        c.jcraft.jsch,\
-        c.jcraft.jzlib,\
-        code.analysis,\
-        core.browser,\
-        core.browser.webview,\
-        core.ide,\
-        core.multitabs.project,\
-        csl.api,\
-        css.editor,\
-        css.lib,\
-        css.model,\
-        css.prep,\
-        css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
-        defaults,\
-        derby,\
-        diff,\
-        dlight.nativeexecution,\
-        dlight.terminal,\
-        editor,\
-        editor.actions,\
-        editor.bookmarks,\
-        editor.bracesmatching,\
-        editor.breadcrumbs,\
-        editor.codetemplates,\
-        editor.completion,\
-        editor.deprecated.pre65formatting,\
-        editor.document,\
-        editor.errorstripe,\
-        editor.errorstripe.api,\
-        editor.fold,\
-        editor.fold.nbui,\
-        editor.global.format,\
-        editor.guards,\
-        editor.indent,\
-        editor.indent.project,\
-        editor.indent.support,\
-        editor.kit,\
-        editor.lib,\
-        editor.lib2,\
-        editor.macros,\
-        editor.plain,\
-        editor.plain.lib,\
-        editor.search,\
-        editor.settings,\
-        editor.settings.lib,\
-        editor.settings.storage,\
-        editor.structure,\
-        editor.tools.storage,\
-        editor.util,\
-        extbrowser,\
-        extexecution,\
-        extexecution.base,\
-        extexecution.impl,\
-        extexecution.process,\
-        git,\
-        gototest,\
-        gsf.codecoverage,\
-        gsf.testrunner,\
-        gsf.testrunner.ui,\
-        html,\
-        html.angular,\
-        html.custom,\
-        html.editor,\
-        html.editor.lib,\
-        html.knockout,\
-        html.lexer,\
-        html.parser,\
-        html.validation,\
-        httpserver,\
-        hudson,\
-        hudson.git,\
-        hudson.mercurial,\
-        hudson.subversion,\
-        hudson.tasklist,\
-	hudson.ui,\
-        ide.kit,\
-        image,\
-        javascript2.debug,\
-        javascript2.editor,\
-        javascript2.extjs,\
-	javascript2.jade,\
-        javascript2.jquery,\
-        javascript2.kit,\
-        javascript2.knockout,\
-	javascript2.nodejs,\
-        javascript2.prototypejs,\
-	javascript2.requirejs,\
-        jellytools.ide,\
-        jumpto,\
-        languages,\
-        languages.diff,\
-        languages.manifest,\
-        languages.yaml,\
-        lexer,\
-        lexer.nbbridge,\
-        lib.terminalemulator,\
-        libs.antlr3.runtime,\
-        libs.bytelist,\
-        libs.commons_net,\
-        libs.freemarker,\
-        libs.git,\
-        libs.ini4j,\
-        libs.jaxb,\
-        libs.jsch.agentproxy,\
-        libs.json_simple,\
-        libs.jvyamlb,\
-        libs.lucene,\
-        libs.nashorn,\
-        libs.smack,\
-        libs.svnClientAdapter,\
-        libs.svnClientAdapter.javahl,\
-        libs.svnClientAdapter.svnkit,\
-        libs.swingx,\
-        libs.xerces,\
-        localhistory,\
-        localtasks,\
-        mercurial,\
-        mylyn.util,\
-        notifications,\
-        o.apache.commons.codec,\
-        o.apache.commons.httpclient,\
-        o.apache.commons.io,\
-        o.apache.commons.lang,\
-        o.apache.commons.logging,\
-        o.apache.ws.commons.util,\
-        o.apache.xml.resolver,\
-        o.apache.xmlrpc,\
-        o.eclipse.core.contenttype,\
-        o.eclipse.core.jobs,\
-        o.eclipse.core.net,\
-        o.eclipse.core.runtime,\
-        o.eclipse.core.runtime.compatibility.auth,\
-        o.eclipse.equinox.app,\
-        o.eclipse.equinox.common,\
-        o.eclipse.equinox.preferences,\
-        o.eclipse.equinox.registry,\
-        o.eclipse.equinox.security,\
-        o.eclipse.jgit,\
-        o.eclipse.jgit.java7,\
-        o.eclipse.mylyn.bugzilla.core,\
-        o.eclipse.mylyn.commons.core,\
-        o.eclipse.mylyn.commons.net,\
-        o.eclipse.mylyn.commons.repositories.core,\
-        o.eclipse.mylyn.commons.xmlrpc,\
-        o.eclipse.mylyn.tasks.core,\
-        o.eclipse.mylyn.wikitext.confluence.core,\
-        o.eclipse.mylyn.wikitext.core,\
-        o.eclipse.mylyn.wikitext.textile.core,\
-        o.n.swing.dirchooser,\
-        o.openidex.util,\
-        options.editor,\
-        parsing.api,\
-        parsing.indexing,\
-        parsing.lucene,\
-        parsing.nb,\
-        parsing.ui,\
-        print.editor,\
-        project.ant,\
-        project.ant.compat8,\
-        project.ant.ui,\
-        project.indexingbridge,\
-        project.libraries,\
-        project.libraries.ui,\
-        project.spi.intern,\
-        project.spi.intern.impl,\
-        projectapi,\
-        projectapi.nb,\
-        projectui,\
-        projectui.buildmenu,\
-        projectuiapi,\
-        projectuiapi.base,\
-        properties,\
-        properties.syntax,\
-        refactoring.api,\
-        schema2beans,\
-        selenium2,\
-        selenium2.server,\
-        server,\
-        servletapi,\
-        spellchecker,\
-        spellchecker.apimodule,\
-        spellchecker.bindings.htmlxml,\
-        spellchecker.bindings.properties,\
-        spellchecker.dictionary_en,\
-        spellchecker.kit,\
-        spi.debugger.ui,\
-        spi.editor.hints,\
-        spi.editor.hints.projects,\
-        spi.navigator,\
-        spi.palette,\
-        spi.tasklist,\
-        spi.viewmodel,\
-        subversion,\
-        swing.validation,\
-        target.iterator,\
-        tasklist.kit,\
-        tasklist.projectint,\
-        tasklist.todo,\
-        tasklist.ui,\
-        team.commons,\
-        team.ide,\
-        terminal,\
-        usersguide,\
-        utilities,\
-        utilities.project,\
-        versioning,\
-        versioning.core,\
-        versioning.indexingbridge,\
-        versioning.masterfs,\
-        versioning.system.cvss.installer,\
-        versioning.ui,\
-        versioning.util,\
-	web.browser.api,\
-        web.common,\
-        web.indent,\
-        web.webkit.debugging,\
-        xml,\
-        xml.axi,\
-        xml.catalog,\
-        xml.catalog.ui,\
-        xml.core,\
-        xml.jaxb.api,\
-        xml.lexer,\
-        xml.multiview,\
-        xml.retriever,\
-        xml.schema.completion,\
-        xml.schema.model,\
-        xml.tax,\
-        xml.text,\
-        xml.tools,\
-        xml.wsdl.model,\
-        xml.xam,\
-        xml.xdm,\
-        xsl
-validation.nb.cluster.ide=\
-        ide.kit
-
-nb.cluster.java.dir=java
-nb.cluster.java.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.java=\
-        ant.browsetask,\
-        ant.debugger,\
-        ant.freeform,\
-        ant.grammar,\
-        ant.kit,\
-        api.debugger.jpda,\
-        api.java,\
-        api.maven,\
-        beans,\
-        classfile,\
-        dbschema,\
-        debugger.jpda,\
-        debugger.jpda.ant,\
-        debugger.jpda.js,\
-        debugger.jpda.kit,\
-        debugger.jpda.projects,\
-        debugger.jpda.projectsui,\
-        debugger.jpda.ui,\
-        debugger.jpda.visual,\
-        findbugs.installer,\
-        form,\
-        form.binding,\
-        form.j2ee,\
-        form.kit,\
-        form.nb,\
-        form.refactoring,\
-        hibernate,\
-        hibernate4lib,\
-        hudson.ant,\
-        hudson.maven,\
-        i18n,\
-        i18n.form,\
-        j2ee.core.utilities,\
-        j2ee.eclipselink,\
-        j2ee.eclipselinkmodelgen,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
-        j2ee.metadata,\
-        j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
-        j2ee.persistenceapi,\
-        java.api.common,\
-        java.completion,\
-        java.debug,\
-        java.editor,\
-        java.editor.base,\
-        java.editor.lib,\
-        java.examples,\
-        java.freeform,\
-        java.guards,\
-        java.hints,\
-        java.hints.declarative,\
-        java.hints.declarative.test,\
-        java.hints.legacy.spi,\
-        java.hints.test,\
-        java.hints.ui,\
-        java.j2sedeploy,\
-        java.j2seembedded,\
-        java.j2seplatform,\
-        java.j2seprofiles,\
-        java.j2seproject,\
-        java.kit,\
-        java.lexer,\
-        java.metrics,\
-        java.navigation,\
-        java.platform,\
-        java.platform.ui,\
-        java.preprocessorbridge,\
-        java.project,\
-        java.project.ui,\
-        java.source,\
-        java.source.ant,\
-        java.source.base,\
-        java.source.compat8,\
-        java.source.queries,\
-        java.source.queriesimpl,\
-        java.sourceui,\
-        java.testrunner,\
-        java.testrunner.ant,\
-        java.testrunner.ui,\
-        javadoc,\
-        javaee.injection,\
-        javawebstart,\
-        jellytools.java,\
-        junit,\
-        junit.ant,\
-        junit.ant.ui,\
-        junit.ui,\
-        lib.nbjavac,\
-        libs.cglib,\
-        libs.javacapi,\
-        libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.checkstyle,\
-        maven.coverage,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.indexer.ui,\
-        maven.junit,\
-        maven.junit.ui,\
-        maven.kit,\
-        maven.model,\
-        maven.osgi,\
-        maven.persistence,\
-        maven.refactoring,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
-        nashorn.execution,\
-        o.jdesktop.beansbinding,\
-        performance,\
-        performance.java,\
-        projectimport.eclipse.core,\
-        projectimport.eclipse.j2se,\
-        refactoring.java,\
-        selenium2.java,\
-        selenium2.maven,\
-        spellchecker.bindings.java,\
-        spi.debugger.jpda.ui,\
-        spi.java.hints,\
-        spring.beans,\
-        testng,\
-        testng.ant,\
-        testng.maven,\
-        testng.ui,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        whitelist,\
-        xml.jaxb,\
-        xml.tools.java
-validation.nb.cluster.java=\
-        java.hints,\
-        java.kit
-
-nb.cluster.apisupport.dir=apisupport
-nb.cluster.apisupport.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.apisupport=\
-        apisupport.ant,\
-        apisupport.crudsample,\
-        apisupport.feedreader,\
-        apisupport.installer,\
-        apisupport.installer.maven,\
-        apisupport.kit,\
-        apisupport.osgidemo,\
-        apisupport.paintapp,\
-        apisupport.project,\
-        apisupport.refactoring,\
-        apisupport.wizards,\
-        maven.apisupport
-
-nb.cluster.enterprise.dir=enterprise
-nb.cluster.enterprise.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.profiler,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.enterprise=\
-        api.web.webmodule,\
-        apisupport.restsample,\
-        cloud.amazon,\
-        cloud.common,\
-        el.lexer,\
-        glassfish.common,\
-        glassfish.eecommon,\
-        glassfish.javaee,\
-        glassfish.tooling,\
-        hibernateweb,\
-        j2ee.ant,\
-        j2ee.api.ejbmodule,\
-        j2ee.clientproject,\
-        j2ee.common,\
-        j2ee.core,\
-        j2ee.dd,\
-        j2ee.dd.webservice,\
-        j2ee.ddloaders,\
-        j2ee.earproject,\
-        j2ee.ejbcore,\
-        j2ee.ejbjarproject,\
-        j2ee.ejbrefactoring,\
-        j2ee.ejbverification,\
-        j2ee.genericserver,\
-        j2ee.jboss4,\
-        j2ee.kit,\
-        j2ee.platform,\
-        j2ee.samples,\
-        j2ee.sun.appsrv,\
-        j2ee.sun.dd,\
-        j2ee.sun.ddui,\
-        j2ee.weblogic9,\
-        j2eeapis,\
-        j2eeserver,\
-        javaee.api,\
-        javaee.beanvalidation,\
-        javaee.project,\
-        javaee.resources,\
-        javaee.specs.support,\
-        javaee.wildfly,\
-        javaee7.api,\
-        jellytools.enterprise,\
-        jsp.lexer,\
-        ko4j.debugging,\
-        libs.amazon,\
-        libs.commons_fileupload,\
-        libs.elimpl,\
-        libs.glassfish_logging,\
-        libs.jstl,\
-        maven.j2ee,\
-        maven.jaxws,\
-        maven.samples,\
-        performance.javaee,\
-        performance.scripting,\
-        performance.web,\
-        profiler.j2ee,\
-        projectimport.eclipse.web,\
-        servletjspapi,\
-        spring.webmvc,\
-        tomcat5,\
-        web.beans,\
-        web.client.rest,\
-        web.core,\
-        web.core.syntax,\
-        web.debug,\
-        web.el,\
-        web.examples,\
-        web.freeform,\
-        web.jsf,\
-        web.jsf.editor,\
-        web.jsf.icefaces,\
-        web.jsf.kit,\
-        web.jsf.navigation,\
-        web.jsf.richfaces,\
-        web.jsf12,\
-        web.jsf12ri,\
-        web.jsf20,\
-        web.jsfapi,\
-        web.jspparser,\
-        web.kit,\
-        web.monitor,\
-        web.primefaces,\
-        web.project,\
-        web.refactoring,\
-        web.struts,\
-        weblogic.common,\
-	websocket,\
-        websvc.clientapi,\
-        websvc.core,\
-        websvc.customization,\
-        websvc.design,\
-        websvc.editor.hints,\
-        websvc.jaxws.lightapi,\
-        websvc.jaxwsapi,\
-        websvc.jaxwsmodel,\
-        websvc.kit,\
-        websvc.manager,\
-        websvc.metro.lib,\
-        websvc.metro.model,\
-        websvc.metro.samples,\
-        websvc.owsm,\
-        websvc.projectapi,\
-        websvc.rest,\
-        websvc.rest.samples,\
-        websvc.restapi,\
-        websvc.restkit,\
-        websvc.restlib,\
-        websvc.saas.codegen.j2ee,\
-        websvc.utilities,\
-        websvc.websvcapi,\
-        websvc.wsitconf,\
-        websvc.wsitmodelext,\
-        websvc.wsstackapi
-
-nb.cluster.ergonomics.dir=ergonomics
-nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform
-nb.cluster.ergonomics=\
-        ide.ergonomics,\
-        performance.ergonomics
-validation.nb.cluster.ergonomics=\
-        ide.ergonomics
-
-nb.cluster.nb.dir=nb
-nb.cluster.nb.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.harness
-nb.cluster.nb=\
-        autoupdate.pluginimporter,\
-        bugzilla.exceptionreporter,\
-        deadlock.detector,\
-        ide.branding,\
-        ide.branding.kit,\
-        o.n.upgrader,\
-        uihandler.exceptionreporter,\
-        updatecenters,\
-        welcome
-
-nb.cluster.harness.dir=harness
-nb.cluster.harness.depends=nb.cluster.platform
-nb.cluster.harness=\
-        apisupport.harness,\
-        jellytools.platform,\
-        jemmy,\
-        libs.nbi.ant,\
-        libs.nbi.engine,\
-        nbjunit,\
-        o.n.insane
-
-nb.cluster.profiler.dir=profiler
-nb.cluster.profiler.depends=\
-        nb.cluster.ide,\
-        nb.cluster.java,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.profiler=\
-        debugger.jpda.heapwalk,\
-        lib.profiler,\
-        lib.profiler.charts,\
-        lib.profiler.common,\
-        lib.profiler.ui,\
-        maven.profiler,\
-        profiler,\
-        profiler.api,\
-        profiler.attach,\
-        profiler.freeform,\
-        profiler.heapwalker,\
-        profiler.j2se,\
-        profiler.kit,\
-        profiler.nbimpl,\
-        profiler.nbmodule,\
-        profiler.options,\
-        profiler.oql,\
-        profiler.oql.language,\
-        profiler.ppoints,\
-        profiler.projectsupport,\
-        profiler.snaptracer,\
-        profiler.utilities
-validation.nb.cluster.profiler=\
-        profiler.kit
-
-nb.cluster.php.dir=php
-nb.cluster.php.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon
-nb.cluster.php=\
-        hudson.php,\
-        languages.neon,\
-        libs.javacup,\
-        php.api.annotation,\
-        php.api.documentation,\
-        php.api.editor,\
-        php.api.executable,\
-        php.api.framework,\
-        php.api.phpmodule,\
-        php.api.templates,\
-        php.api.testing,\
-        php.apigen,\
-        php.atoum,\
-        php.code.analysis,\
-        php.codeception,\
-        php.composer,\
-        php.dbgp,\
-        php.doctrine2,\
-        php.editor,\
-        php.kit,\
-        php.latte,\
-        php.nette.tester,\
-        php.nette2,\
-        php.phing,\
-        php.phpdoc,\
-        php.phpdoc.documentation,\
-        php.phpunit,\
-        php.project,\
-        php.refactoring,\
-        php.samples,\
-        php.smarty,\
-        php.symfony,\
-        php.symfony2,\
-        php.twig,\
-        php.zend,\
-        php.zend2,\
-        selenium2.php,\
-        websvc.saas.codegen.php
-validation.nb.cluster.php=\
-        php.editor
-
-nb.cluster.groovy.dir=groovy
-nb.cluster.groovy.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.java
-nb.cluster.groovy=\
-        groovy.antproject,\
-        groovy.editor,\
-        groovy.grails,\
-        groovy.grailsproject,\
-        groovy.gsp,\
-        groovy.kit,\
-        groovy.refactoring,\
-        groovy.samples,\
-        groovy.support,\
-        libs.groovy,\
-        maven.groovy
-
-nb.cluster.mobility.dir=mobility
-nb.cluster.mobility.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.apisupport,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.mobility=\
-        api.mobility,\
-        j2me.common.ant,\
-        j2me.keystore,\
-        j2me.kit,\
-        j2me.project,\
-        mobility.cldcplatform,\
-        mobility.databindingme,\
-        mobility.end2end,\
-        mobility.jsr172,\
-        mobility.licensing,\
-        mobility.project.ant
-
-nb.cluster.identity.dir=identity
-nb.cluster.identity.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.identity=\
-        identity.ant,\
-        identity.kit,\
-        identity.profile.api,\
-        identity.profile.ui,\
-        identity.samples,\
-        identity.server.manager
-
-nb.cluster.cnd.dir=cnd
-nb.cluster.cnd.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.dlight,\
-        nb.cluster.ide
-nb.cluster.cnd=\
-        cnd,\
-        cnd.analysis.api,\
-        cnd.analysis.impl,\
-        cnd.antlr,\
-        cnd.api.model,\
-        cnd.api.project,\
-        cnd.api.remote,\
-        cnd.apt,\
-        cnd.asm,\
-        cnd.callgraph,\
-        cnd.classview,\
-        cnd.cncppunit,\
-        cnd.completion,\
-        cnd.debugger.common2,\
-        cnd.debugger.gdb2,\
-        cnd.discovery,\
-        cnd.dwarfdiscovery,\
-        cnd.dwarfdump,\
-        cnd.editor,\
-        cnd.gotodeclaration,\
-        cnd.highlight,\
-        cnd.indexing,\
-        cnd.kit,\
-        cnd.lexer,\
-        cnd.makeproject,\
-        cnd.makeproject.source.bridge,\
-        cnd.model.jclank.bridge,\
-        cnd.model.services,\
-        cnd.modeldiscovery,\
-        cnd.modelimpl,\
-        cnd.modelui,\
-        cnd.modelutil,\
-        cnd.navigation,\
-        cnd.qnavigator,\
-        cnd.refactoring,\
-        cnd.remote,\
-        cnd.remote.projectui,\
-        cnd.repository,\
-        cnd.repository.api,\
-        cnd.script,\
-        cnd.search,\
-        cnd.simpleunit,\
-        cnd.source,\
-        cnd.spellchecker.bindings,\
-        cnd.testrunner,\
-        cnd.toolchain,\
-        cnd.utils,\
-        jellytools.cnd,\
-        libs.clank
-validation.nb.cluster.cnd=\
-        cnd.kit
-
-nb.cluster.cndext.dir=cndext
-nb.cluster.cndext=\
-	cnd.mixeddev
-
-nb.cluster.cndext.depends=\
-	nb.cluster.cnd,\
-	nb.cluster.extide,\
-	nb.cluster.java
-
-nb.cluster.dlight.dir=dlight
-nb.cluster.dlight.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.dlight=\
-        dlight.kit,\
-        dlight.libs.common,\
-        dlight.remote,\
-        dlight.remote.impl,\
-        dlight.sendto,\
-        git.remote,\
-        git.remote.cli,\
-        mercurial.remote,\
-        remotefs.versioning,\
-        remotefs.versioning.api,\
-        subversion.remote
-
-nb.cluster.jira.dir=extra
-nb.cluster.jira.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.jira=\
-        c.atlassian.connector.eclipse.commons.core,\
-        c.atlassian.connector.eclipse.jira.core,\
-        c.atlassian.connector.eclipse.jira.core.rest,\
-        c.google.guava,\
-        c.s.jersey,\
-        c.s.mail.javax.mail,\
-        javax.servlet,\
-        javax.wsdl,\
-        javax.xml.rpc,\
-        javax.xml.soap,\
-        jira,\
-        jira.rest,\
-        jira.xmlrpc,\
-        libs.jira.rest,\
-        o.apache.axis,\
-        o.apache.commons.discovery,\
-        o.codehaus.jettison,\
-        o.eclipse.mylyn.commons.soap,\
-        o.eclipse.mylyn.monitor.ui.dummy,\
-        o.joda.time
-
-nb.cluster.team.dir=extra
-nb.cluster.team.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.team=\
-        bugtracking.kenai,\
-        c.tasktop.c2c.server.cloud.api,\
-        c.tasktop.c2c.server.common.api,\
-        c.tasktop.c2c.server.profile.api,\
-        c.tasktop.c2c.server.scm.api,\
-        c.tasktop.c2c.server.tasks.api,\
-        c.tasktop.c2c.server.wiki.api,\
-        kenai,\
-        kenai.kit,\
-        kenai.maven,\
-        kenai.ui,\
-        lib.cvsclient,\
-        o.codehaus.jackson.core,\
-        o.codehaus.jackson.mapper,\
-        odcs,\
-        odcs.git,\
-        odcs.hudson,\
-        odcs.kit,\
-        odcs.tasks,\
-        odcs.tasks.bridge,\
-        odcs.ui,\
-        odcs.versioning,\
-        oracle.clouddev.server.profile.activity.client.api,\
-        oracle.clouddev.server.profile.activity.client.rest,\
-        oracle.eclipse.tools.cloud.dev.tasks,\
-        team.server,\
-        team.server.nb,\
-        versioning.kenai,\
-        versioning.system.cvss
-
-nb.cluster.stableuc.dir=extra
-nb.cluster.stableuc.depends=${clusters.config.full.list}
-nb.cluster.stableuc=\
-        apisupport.apidocs,\
-        avatar_js.project,\
-        cloud.oracle,\
-        db.mysql.sakila,\
-        deployment.deviceanywhere,\
-        findbugs,\
-        html.ojet,\
-        j2me.cdc.kit,\
-        j2me.cdc.platform,\
-        j2me.cdc.platform.nokias80,\
-        j2me.cdc.platform.ojec,\
-        j2me.cdc.platform.semc,\
-        j2me.cdc.platform.sjmc,\
-        j2me.cdc.platform.sun,\
-        j2me.cdc.project,\
-        j2me.cdc.project.execui,\
-        j2me.cdc.project.execuiimpl,\
-        j2me.cdc.project.nokiaS80,\
-        j2me.cdc.project.ojec,\
-        j2me.cdc.project.savaje,\
-        j2me.cdc.project.semc,\
-        j2me.cdc.project.sjmc,\
-        jconsole,\
-        jmx,\
-        jmx.common,\
-        libs.aguiswinglayout,\
-        libs.findbugs,\
-        libs.oracle.cloud,\
-        libs.ppawtlayout,\
-        loadgenerator,\
-	maven.util,\
-        mobility.antext,\
-        mobility.cldcplatform.catalog,\
-        mobility.deployment.ftpscp,\
-        mobility.deployment.nokia,\
-        mobility.deployment.sonyericsson,\
-        mobility.deployment.webdav,\
-        mobility.editor,\
-        mobility.j2meunit,\
-        mobility.kit,\
-        mobility.plugins.mpowerplayer,\
-        mobility.project,\
-        mobility.project.bridge,\
-        mobility.project.bridge.impl,\
-        mobility.svgcore,\
-        mvd,\
-        o.apache.tools.ant.module.docs,\
-	o.n.swing.laf.dark,\
-        otherlicenses/mobility.proguard,\
-        profiler.commandrunner,\
-        profiler.loadgen,\
-        svg.perseus,\
-        swingapplib,\
-        vmd.analyzer,\
-        vmd.codegen,\
-        vmd.components.midp,\
-        vmd.components.midp.pda,\
-        vmd.components.midp.wma,\
-        vmd.components.svg,\
-        vmd.componentssupport,\
-        vmd.examples,\
-        vmd.flow,\
-        vmd.game,\
-        vmd.inspector,\
-        vmd.io,\
-        vmd.io.javame,\
-        vmd.kit,\
-        vmd.midp,\
-        vmd.midp.converter,\
-        vmd.midpnb,\
-        vmd.model,\
-        vmd.palette,\
-        vmd.properties,\
-        vmd.screen,\
-        vmd.structure
-
-nb.cluster.betauc.dir=extra
-nb.cluster.betauc.depends=${clusters.config.full.list}
-nb.cluster.betauc=\
-        ${nb.cluster.stableuc},\
-        clearcase,\
-        coherence,\
-        contrib/ant.freeform.samples,\
-        contrib/api.workqueues,\
-        contrib/apisupport.projectinspector,\
-        contrib/autoproject.core,\
-        contrib/autoproject.java,\
-        contrib/autoproject.profiler,\
-        contrib/autoproject.web,\
-        contrib/cnd.debugger.gdbserver,\
-        contrib/docbook,\
-        contrib/docbook.project,\
-        contrib/imagepaste,\
-        contrib/insertunicode,\
-        contrib/j2ee.geronimo2,\
-        contrib/j2ee.jetty,\
-        contrib/libs.selenium,\
-        contrib/libs.selenium.server,\
-        contrib/logmanagement,\
-        contrib/masterfs.suspend,\
-        contrib/modulemanager,\
-        contrib/quickfilechooser,\
-        contrib/selenium,\
-        contrib/selenium.maven,\
-        contrib/selenium.php,\
-        contrib/selenium.server,\
-        o.apache.jmeter.module,\
-        websvc.rest.wadl.design,\
-        websvc.rest.wadl.model
-
-nb.cluster.experimental.dir=extra
-nb.cluster.experimental.depends=${clusters.config.full.list}
-nb.cluster.experimental=\
-        ${nb.cluster.betauc},\
-        c.s.collablet,\
-        c.s.collablet.moxc,\
-        collab.channel.chat,\
-        collab.channel.chat.html,\
-        collab.channel.chat.java,\
-        collab.channel.chat.text,\
-        collab.channel.chat.xml,\
-        collab.channel.filesharing,\
-        collab.channel.output,\
-        collab.kit,\
-        collab.provider.im,\
-        collab.ui,\
-        contrib/a11y,\
-        contrib/accelerators.terminal,\
-        contrib/apisupport.beanbrowser,\
-        contrib/apisupport.tc.cobertura,\
-        contrib/archiver,\
-        contrib/autosave,\
-        contrib/c.ericsson.otp.erlang,\
-        contrib/codetemplatetools,\
-        contrib/de.hunsicker.jalopy.plugin.netbeans,\
-        contrib/editor.deprecated.pre61completion,\
-        contrib/editor.deprecated.pre61settings,\
-        contrib/editor.fold.support,\
-        contrib/editor.hints.i18n,\
-        contrib/editor.nexterror,\
-        contrib/encoding,\
-        contrib/explorefromhere,\
-        contrib/fisheye,\
-        contrib/folder2html,\
-        contrib/formatmany,\
-        contrib/genericnavigator,\
-        contrib/graphicclassview,\
-        contrib/group,\
-        contrib/gsf,\
-        contrib/gsf.api,\
-        contrib/gsfpath.api,\
-        contrib/hexeditor,\
-        contrib/htmlprojects,\
-        contrib/j2ee.oc4j,\
-        contrib/j2ee.sun.ws7,\
-        contrib/java.debugjavac,\
-        contrib/java.ext.editor,\
-        contrib/javahints,\
-        contrib/javanavigators,\
-        contrib/jemmysupport,\
-        contrib/languages.execution,\
-        contrib/languages.prolog,\
-        contrib/languages.tcl,\
-        contrib/languages.velocity,\
-        contrib/libs.commons_lang,\
-        contrib/libs.ical4j,\
-        contrib/libs.jcalendar,\
-        contrib/licensechanger,\
-        contrib/loaderswitcher,\
-        contrib/moduleresolver,\
-        contrib/mount,\
-        contrib/nborgsourcebrowse,\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/o.n.contrib.debuggerretry,\
-        contrib/o.n.erdbeans,\
-        contrib/o.n.misc.diff,\
-        contrib/performance.insane,\
-        contrib/perspective,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner,\
-        contrib/showtodos,\
-        contrib/sysprops,\
-        contrib/tanui,\
-        contrib/websvc.saas.services.rtm,\
-        contrib/whichproject,\
-        debugger.jpda.truffle,\
-        j2ee.websphere6,\
-        j2me.cdc.platform.bdj,\
-        j2me.cdc.project.bdj,\
-        keyring.jps,\
-        languages.refactoring,\
-        libs.xmlbeans,\
-        mercurial.search,\
-        o.n.bluej,\
-        o.n.bluej.ui,\
-        projectimport.jbuilder,\
-        traceio,\
-        uihandler.interactive,\
-        web.domdiff,\
-        web.facelets010114,\
-        web.jsf.extensions,\
-        web.livehtml,\
-        websvc.axis2,\
-        websvc.jaxrpc,\
-        websvc.jaxrpc16,\
-        websvc.jaxrpckit,\
-        websvc.registry
-
-nb.cluster.extide.dir=extide
-nb.cluster.extide.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.extide=\
-        o.apache.tools.ant.module,\
-        options.java
-
-# XXX needs updates to build:
-#        contrib/c.s.fortress,\
-#        contrib/fortress.editing,\
-
-nb.cluster.webcommon.dir=webcommon
-nb.cluster.webcommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.webcommon=\
-        cordova,\
-        cordova.platforms,\
-        cordova.platforms.android,\
-        cordova.platforms.ios,\
-        extbrowser.chrome,\
-        javascript.bower,\
-        javascript.cdnjs,\
-        javascript.grunt,\
-        javascript.gulp,\
-        javascript.jstestdriver,\
-        javascript.karma,\
-        javascript.nodejs,\
-        javascript.v8debug,\
-        languages.apacheconf,\
-        languages.ini,\
-        lib.v8debug,\
-        libs.commons_compress,\
-        libs.jstestdriver,\
-        libs.plist,\
-        netserver,\
-        selenium2.webclient,\
-        selenium2.webclient.mocha,\
-        selenium2.webclient.protractor,\
-        web.client.kit,\
-        web.client.samples,\
-        web.clientproject,\
-        web.clientproject.api,\
-        web.inspect,\
-        web.javascript.debugger,\
-        web.webkit.tooling
-
-nb.cluster.websvccommon.dir=websvccommon
-nb.cluster.websvccommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.websvccommon=\
-        websvc.jaxwsmodelapi,\
-        websvc.saas.api,\
-        websvc.saas.codegen,\
-        websvc.saas.kit,\
-        websvc.saas.services.amazon,\
-        websvc.saas.services.delicious,\
-        websvc.saas.services.flickr,\
-        websvc.saas.services.google,\
-        websvc.saas.services.strikeiron,\
-        websvc.saas.services.weatherbug,\
-        websvc.saas.services.zillow,\
-        websvc.saas.services.zvents,\
-        websvc.saas.ui
-# 225794 -  bundled twitter web service not working
-#        websvc.saas.services.twitter,\
-
-nb.cluster.javacard.dir=javacard
-nb.cluster.javacard.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java
-nb.cluster.javacard=\
-        javacard.apdu.io,\
-        javacard.apdufile,\
-        javacard.common,\
-        javacard.console,\
-        javacard.filemodels,\
-        javacard.kit,\
-        javacard.oberthur,\
-        javacard.platform.ui,\
-        javacard.project,\
-        javacard.ri.bundle,\
-        javacard.ri.platform,\
-        javacard.spi,\
-        properties.based.dataobjects,\
-        simple.project.templates,\
-        swing.customizerlayout
-
-nb.cluster.javafx.dir=javafx
-nb.cluster.javafx.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.javafx=\
-        javafx2.editor,\
-        javafx2.kit,\
-        javafx2.platform,\
-        javafx2.project,\
-        javafx2.samples,\
-        javafx2.scenebuilder
-
-nb.cluster.remote.dir=extra
-nb.cluster.remote.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.remote=\
-       contrib/dew4nb,\
-       contrib/json,\
-       contrib/remote.project.finder,\
-       contrib/remote.server
-
-nb.cluster.python.depends=\
-        nb.cluster.ide
-nb.cluster.python=\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner
diff --git a/.pc/netbeans-platform-disable-net.java-modules.patch/net.java.html/build.xml b/.pc/netbeans-platform-disable-net.java-modules.patch/net.java.html/build.xml
deleted file mode 100644
index 9d4bc83..0000000
--- a/.pc/netbeans-platform-disable-net.java-modules.patch/net.java.html/build.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="net.java.html" default="netbeans" basedir=".">
-    <import file="../nbbuild/templates/projectized.xml"/>
-    <target name="jar"/>
-</project>
diff --git a/.pc/netbeans-platform-junitlib.patch/junitlib/nbproject/project.properties b/.pc/netbeans-platform-junitlib.patch/junitlib/nbproject/project.properties
deleted file mode 100644
index e6f478f..0000000
--- a/.pc/netbeans-platform-junitlib.patch/junitlib/nbproject/project.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-is.autoload=true
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar
-release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar
-nbm.target.cluster=java
-nbm.is.global=false
-jnlp.indirect.jars=\
-    docs/junit-4.12-sources.jar,\
-    docs/junit-4.12-javadoc.jar
diff --git a/.pc/netbeans-platform-nbi.patch/nbbuild/cluster.properties b/.pc/netbeans-platform-nbi.patch/nbbuild/cluster.properties
deleted file mode 100644
index 36b0988..0000000
--- a/.pc/netbeans-platform-nbi.patch/nbbuild/cluster.properties
+++ /dev/null
@@ -1,1532 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-cluster.config=full
-clusters.prefix=libnb
-
-clusters.config.platform.list=\
-        nb.cluster.harness,\
-        nb.cluster.bootstrap,\
-        nb.cluster.platform
-
-clusters.config.basic.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.apisupport
-
-clusters.config.standard.list=\
-        ${clusters.config.basic.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.full.list=\
-        nb.cluster.cnd,\
-        nb.cluster.cndext,\
-        nb.cluster.dlight,\
-        nb.cluster.groovy,\
-        nb.cluster.javacard,\
-        nb.cluster.mobility,\
-        nb.cluster.php,\
-        ${clusters.config.standard.list},\
-        nb.cluster.ergonomics
-# ergonomics must be last
-
-clusters.config.php.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.php,\
-        nb.cluster.websvccommon,\
-        nb.cluster.nb
-
-clusters.config.groovy.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.groovy
-
-clusters.config.cnd.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.cnd,\
-        nb.cluster.nb,\
-        nb.cluster.dlight
-
-clusters.config.cndext.list=\
-        ${clusters.config.cnd.list},\
-	nb.cluster.cndext,\
-	nb.cluster.extide,\
-        nb.cluster.java
-
-clusters.config.dlight.list=\
-        nb.cluster.platform,\
-        nb.cluster.harness,\
-        nb.cluster.ide,\
-        nb.cluster.dlight,\
-        nb.cluster.nb
-
-clusters.config.java.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.javafx,\
-        nb.cluster.profiler,\
-        nb.cluster.nb
-
-clusters.config.enterprise.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.identity.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.identity
-
-clusters.config.mobility.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.mobility
-
-clusters.config.jdev.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.profiler,\
-        nb.cluster.jira,\
-        nb.cluster.team
-
-clusters.config.bloated.list=\
-        nb.cluster.identity,\
-        ${clusters.config.full.list}
-# ergonomics must be last
-
-# For technical reasons, nb.cluster.experimental is a superset of nb.cluster.betauc and nb.cluster.stableuc, so cannot list at once:
-clusters.config.experimental.list=\
-        ${clusters.config.bloated.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.experimental
-
-clusters.config.stableuc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.stableuc
-# could put ergonomics last, but undesirable to also do so for clusters.config.experimental.list, so exclude stableuc from ergonomics processing
-
-clusters.config.betauc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.betauc
-
-clusters.config.minimal.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.nb
-
-clusters.config.javacard.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.javacard
-
-clusters.config.remote.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.remote
-
-clusters.config.python.list=\
-        ${clusters.config.minimal.list},\
-        nb.cluster.python
-
-clusters.list=\
-        ${clusters.config.full.list}
-
-# Bootstrap 'cluster' serves just to group modules which are needed to process
-# module-auto-deps.xml during compilation; other clusters can then benefit 
-# from autodeps during compilation
-nb.cluster.bootstrap.dir=platform
-nb.cluster.bootstrap.depends=
-nb.cluster.bootstrap=\
-        core.startup,\
-        core.startup.base,\
-        libs.asm,\
-        o.n.bootstrap,\
-        openide.filesystems,\
-        openide.modules,\
-        openide.util,\
-        openide.util.lookup,\
-        openide.util.ui
-
-nb.cluster.platform.dir=platform
-nb.cluster.platform.depends=nb.cluster.bootstrap
-nb.cluster.platform=\
-        api.annotations.common,\
-        api.intent,\
-        api.io,\
-        api.progress,\
-        api.progress.compat8,\
-        api.progress.nb,\
-        api.search,\
-        api.templates,\
-        api.visual,\
-        applemenu,\
-        autoupdate.cli,\
-        autoupdate.services,\
-        autoupdate.ui,\
-        core.execution,\
-        core.io.ui,\
-        core.kit,\
-        core.multitabs,\
-        core.multiview,\
-        core.nativeaccess,\
-        core.netigso,\
-        core.network,\
-        core.osgi,\
-        core.output2,\
-        core.ui,\
-        core.windows,\
-        editor.mimelookup,\
-        editor.mimelookup.impl,\
-        favorites,\
-        javahelp,\
-        junitlib,\
-        keyring,\
-        keyring.fallback,\
-        keyring.impl,\
-        lib.uihandler,\
-        libs.felix,\
-        libs.javafx,\
-        libs.jna,\
-        libs.jna.platform,\
-        libs.jsr223,\
-        libs.junit4,\
-        libs.osgi,\
-        libs.testng,\
-        masterfs,\
-        masterfs.linux,\
-        masterfs.macosx,\
-        masterfs.nio2,\
-        masterfs.ui,\
-        masterfs.windows,\
-        netbinox,\
-        o.jdesktop.layout,\
-        o.n.core,\
-        o.n.html.ko4j,\
-        o.n.swing.outline,\
-        o.n.swing.plaf,\
-        o.n.swing.tabcontrol,\
-        openide.actions,\
-        openide.awt,\
-        openide.compat,\
-        openide.dialogs,\
-        openide.execution,\
-        openide.execution.compat8,\
-        openide.explorer,\
-        openide.filesystems.compat8,\
-        openide.filesystems.nb,\
-        openide.io,\
-        openide.loaders,\
-        openide.nodes,\
-        openide.options,\
-        openide.text,\
-        openide.util.enumerations,\
-        openide.windows,\
-        options.api,\
-        options.keymap,\
-        print,\
-        progress.ui,\
-        queries,\
-        sampler,\
-        sendopts,\
-        settings,\
-        spi.actions,\
-        spi.quicksearch,\
-        templates,\
-        templatesui,\
-        uihandler
-validation.nb.cluster.platform=\
-        o.n.core,\
-        core.windows,\
-        javahelp
-
-nb.cluster.ide.dir=ide
-nb.cluster.ide.depends=\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.ide=\
-        api.debugger,\
-        api.java.classpath,\
-        api.knockout,\
-        api.xml,\
-        api.xml.ui,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugtracking.commons,\
-        bugzilla,\
-        c.googlecode.javaewah.JavaEWAH,\
-        c.jcraft.jsch,\
-        c.jcraft.jzlib,\
-        code.analysis,\
-        core.browser,\
-        core.browser.webview,\
-        core.ide,\
-        core.multitabs.project,\
-        csl.api,\
-        css.editor,\
-        css.lib,\
-        css.model,\
-        css.prep,\
-        css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
-        defaults,\
-        derby,\
-        diff,\
-        dlight.nativeexecution,\
-        dlight.terminal,\
-        editor,\
-        editor.actions,\
-        editor.bookmarks,\
-        editor.bracesmatching,\
-        editor.breadcrumbs,\
-        editor.codetemplates,\
-        editor.completion,\
-        editor.deprecated.pre65formatting,\
-        editor.document,\
-        editor.errorstripe,\
-        editor.errorstripe.api,\
-        editor.fold,\
-        editor.fold.nbui,\
-        editor.global.format,\
-        editor.guards,\
-        editor.indent,\
-        editor.indent.project,\
-        editor.indent.support,\
-        editor.kit,\
-        editor.lib,\
-        editor.lib2,\
-        editor.macros,\
-        editor.plain,\
-        editor.plain.lib,\
-        editor.search,\
-        editor.settings,\
-        editor.settings.lib,\
-        editor.settings.storage,\
-        editor.structure,\
-        editor.tools.storage,\
-        editor.util,\
-        extbrowser,\
-        extexecution,\
-        extexecution.base,\
-        extexecution.impl,\
-        extexecution.process,\
-        git,\
-        gototest,\
-        gsf.codecoverage,\
-        gsf.testrunner,\
-        gsf.testrunner.ui,\
-        html,\
-        html.angular,\
-        html.custom,\
-        html.editor,\
-        html.editor.lib,\
-        html.knockout,\
-        html.lexer,\
-        html.parser,\
-        html.validation,\
-        httpserver,\
-        hudson,\
-        hudson.git,\
-        hudson.mercurial,\
-        hudson.subversion,\
-        hudson.tasklist,\
-	hudson.ui,\
-        ide.kit,\
-        image,\
-        javascript2.debug,\
-        javascript2.editor,\
-        javascript2.extjs,\
-	javascript2.jade,\
-        javascript2.jquery,\
-        javascript2.kit,\
-        javascript2.knockout,\
-	javascript2.nodejs,\
-        javascript2.prototypejs,\
-	javascript2.requirejs,\
-        jellytools.ide,\
-        jumpto,\
-        languages,\
-        languages.diff,\
-        languages.manifest,\
-        languages.yaml,\
-        lexer,\
-        lexer.nbbridge,\
-        lib.terminalemulator,\
-        libs.antlr3.runtime,\
-        libs.bytelist,\
-        libs.commons_net,\
-        libs.freemarker,\
-        libs.git,\
-        libs.ini4j,\
-        libs.jaxb,\
-        libs.jsch.agentproxy,\
-        libs.json_simple,\
-        libs.jvyamlb,\
-        libs.lucene,\
-        libs.nashorn,\
-        libs.smack,\
-        libs.svnClientAdapter,\
-        libs.svnClientAdapter.javahl,\
-        libs.svnClientAdapter.svnkit,\
-        libs.swingx,\
-        libs.xerces,\
-        localhistory,\
-        localtasks,\
-        mercurial,\
-        mylyn.util,\
-        notifications,\
-        o.apache.commons.codec,\
-        o.apache.commons.httpclient,\
-        o.apache.commons.io,\
-        o.apache.commons.lang,\
-        o.apache.commons.logging,\
-        o.apache.ws.commons.util,\
-        o.apache.xml.resolver,\
-        o.apache.xmlrpc,\
-        o.eclipse.core.contenttype,\
-        o.eclipse.core.jobs,\
-        o.eclipse.core.net,\
-        o.eclipse.core.runtime,\
-        o.eclipse.core.runtime.compatibility.auth,\
-        o.eclipse.equinox.app,\
-        o.eclipse.equinox.common,\
-        o.eclipse.equinox.preferences,\
-        o.eclipse.equinox.registry,\
-        o.eclipse.equinox.security,\
-        o.eclipse.jgit,\
-        o.eclipse.jgit.java7,\
-        o.eclipse.mylyn.bugzilla.core,\
-        o.eclipse.mylyn.commons.core,\
-        o.eclipse.mylyn.commons.net,\
-        o.eclipse.mylyn.commons.repositories.core,\
-        o.eclipse.mylyn.commons.xmlrpc,\
-        o.eclipse.mylyn.tasks.core,\
-        o.eclipse.mylyn.wikitext.confluence.core,\
-        o.eclipse.mylyn.wikitext.core,\
-        o.eclipse.mylyn.wikitext.textile.core,\
-        o.n.swing.dirchooser,\
-        o.openidex.util,\
-        options.editor,\
-        parsing.api,\
-        parsing.indexing,\
-        parsing.lucene,\
-        parsing.nb,\
-        parsing.ui,\
-        print.editor,\
-        project.ant,\
-        project.ant.compat8,\
-        project.ant.ui,\
-        project.indexingbridge,\
-        project.libraries,\
-        project.libraries.ui,\
-        project.spi.intern,\
-        project.spi.intern.impl,\
-        projectapi,\
-        projectapi.nb,\
-        projectui,\
-        projectui.buildmenu,\
-        projectuiapi,\
-        projectuiapi.base,\
-        properties,\
-        properties.syntax,\
-        refactoring.api,\
-        schema2beans,\
-        selenium2,\
-        selenium2.server,\
-        server,\
-        servletapi,\
-        spellchecker,\
-        spellchecker.apimodule,\
-        spellchecker.bindings.htmlxml,\
-        spellchecker.bindings.properties,\
-        spellchecker.dictionary_en,\
-        spellchecker.kit,\
-        spi.debugger.ui,\
-        spi.editor.hints,\
-        spi.editor.hints.projects,\
-        spi.navigator,\
-        spi.palette,\
-        spi.tasklist,\
-        spi.viewmodel,\
-        subversion,\
-        swing.validation,\
-        target.iterator,\
-        tasklist.kit,\
-        tasklist.projectint,\
-        tasklist.todo,\
-        tasklist.ui,\
-        team.commons,\
-        team.ide,\
-        terminal,\
-        usersguide,\
-        utilities,\
-        utilities.project,\
-        versioning,\
-        versioning.core,\
-        versioning.indexingbridge,\
-        versioning.masterfs,\
-        versioning.system.cvss.installer,\
-        versioning.ui,\
-        versioning.util,\
-	web.browser.api,\
-        web.common,\
-        web.indent,\
-        web.webkit.debugging,\
-        xml,\
-        xml.axi,\
-        xml.catalog,\
-        xml.catalog.ui,\
-        xml.core,\
-        xml.jaxb.api,\
-        xml.lexer,\
-        xml.multiview,\
-        xml.retriever,\
-        xml.schema.completion,\
-        xml.schema.model,\
-        xml.tax,\
-        xml.text,\
-        xml.tools,\
-        xml.wsdl.model,\
-        xml.xam,\
-        xml.xdm,\
-        xsl
-validation.nb.cluster.ide=\
-        ide.kit
-
-nb.cluster.java.dir=java
-nb.cluster.java.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.java=\
-        ant.browsetask,\
-        ant.debugger,\
-        ant.freeform,\
-        ant.grammar,\
-        ant.kit,\
-        api.debugger.jpda,\
-        api.java,\
-        api.maven,\
-        beans,\
-        classfile,\
-        dbschema,\
-        debugger.jpda,\
-        debugger.jpda.ant,\
-        debugger.jpda.js,\
-        debugger.jpda.kit,\
-        debugger.jpda.projects,\
-        debugger.jpda.projectsui,\
-        debugger.jpda.ui,\
-        debugger.jpda.visual,\
-        findbugs.installer,\
-        form,\
-        form.binding,\
-        form.j2ee,\
-        form.kit,\
-        form.nb,\
-        form.refactoring,\
-        hibernate,\
-        hibernate4lib,\
-        hudson.ant,\
-        hudson.maven,\
-        i18n,\
-        i18n.form,\
-        j2ee.core.utilities,\
-        j2ee.eclipselink,\
-        j2ee.eclipselinkmodelgen,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
-        j2ee.metadata,\
-        j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
-        j2ee.persistenceapi,\
-        java.api.common,\
-        java.completion,\
-        java.debug,\
-        java.editor,\
-        java.editor.base,\
-        java.editor.lib,\
-        java.examples,\
-        java.freeform,\
-        java.guards,\
-        java.hints,\
-        java.hints.declarative,\
-        java.hints.declarative.test,\
-        java.hints.legacy.spi,\
-        java.hints.test,\
-        java.hints.ui,\
-        java.j2sedeploy,\
-        java.j2seembedded,\
-        java.j2seplatform,\
-        java.j2seprofiles,\
-        java.j2seproject,\
-        java.kit,\
-        java.lexer,\
-        java.metrics,\
-        java.navigation,\
-        java.platform,\
-        java.platform.ui,\
-        java.preprocessorbridge,\
-        java.project,\
-        java.project.ui,\
-        java.source,\
-        java.source.ant,\
-        java.source.base,\
-        java.source.compat8,\
-        java.source.queries,\
-        java.source.queriesimpl,\
-        java.sourceui,\
-        java.testrunner,\
-        java.testrunner.ant,\
-        java.testrunner.ui,\
-        javadoc,\
-        javaee.injection,\
-        javawebstart,\
-        jellytools.java,\
-        junit,\
-        junit.ant,\
-        junit.ant.ui,\
-        junit.ui,\
-        lib.nbjavac,\
-        libs.cglib,\
-        libs.javacapi,\
-        libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.checkstyle,\
-        maven.coverage,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.indexer.ui,\
-        maven.junit,\
-        maven.junit.ui,\
-        maven.kit,\
-        maven.model,\
-        maven.osgi,\
-        maven.persistence,\
-        maven.refactoring,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
-        nashorn.execution,\
-        o.jdesktop.beansbinding,\
-        performance,\
-        performance.java,\
-        projectimport.eclipse.core,\
-        projectimport.eclipse.j2se,\
-        refactoring.java,\
-        selenium2.java,\
-        selenium2.maven,\
-        spellchecker.bindings.java,\
-        spi.debugger.jpda.ui,\
-        spi.java.hints,\
-        spring.beans,\
-        testng,\
-        testng.ant,\
-        testng.maven,\
-        testng.ui,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        whitelist,\
-        xml.jaxb,\
-        xml.tools.java
-validation.nb.cluster.java=\
-        java.hints,\
-        java.kit
-
-nb.cluster.apisupport.dir=apisupport
-nb.cluster.apisupport.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.apisupport=\
-        apisupport.ant,\
-        apisupport.crudsample,\
-        apisupport.feedreader,\
-        apisupport.installer,\
-        apisupport.installer.maven,\
-        apisupport.kit,\
-        apisupport.osgidemo,\
-        apisupport.paintapp,\
-        apisupport.project,\
-        apisupport.refactoring,\
-        apisupport.wizards,\
-        maven.apisupport
-
-nb.cluster.enterprise.dir=enterprise
-nb.cluster.enterprise.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.profiler,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.enterprise=\
-        api.web.webmodule,\
-        apisupport.restsample,\
-        cloud.amazon,\
-        cloud.common,\
-        el.lexer,\
-        glassfish.common,\
-        glassfish.eecommon,\
-        glassfish.javaee,\
-        glassfish.tooling,\
-        hibernateweb,\
-        j2ee.ant,\
-        j2ee.api.ejbmodule,\
-        j2ee.clientproject,\
-        j2ee.common,\
-        j2ee.core,\
-        j2ee.dd,\
-        j2ee.dd.webservice,\
-        j2ee.ddloaders,\
-        j2ee.earproject,\
-        j2ee.ejbcore,\
-        j2ee.ejbjarproject,\
-        j2ee.ejbrefactoring,\
-        j2ee.ejbverification,\
-        j2ee.genericserver,\
-        j2ee.jboss4,\
-        j2ee.kit,\
-        j2ee.platform,\
-        j2ee.samples,\
-        j2ee.sun.appsrv,\
-        j2ee.sun.dd,\
-        j2ee.sun.ddui,\
-        j2ee.weblogic9,\
-        j2eeapis,\
-        j2eeserver,\
-        javaee.api,\
-        javaee.beanvalidation,\
-        javaee.project,\
-        javaee.resources,\
-        javaee.specs.support,\
-        javaee.wildfly,\
-        javaee7.api,\
-        jellytools.enterprise,\
-        jsp.lexer,\
-        ko4j.debugging,\
-        libs.amazon,\
-        libs.commons_fileupload,\
-        libs.elimpl,\
-        libs.glassfish_logging,\
-        libs.jstl,\
-        maven.j2ee,\
-        maven.jaxws,\
-        maven.samples,\
-        performance.javaee,\
-        performance.scripting,\
-        performance.web,\
-        profiler.j2ee,\
-        projectimport.eclipse.web,\
-        servletjspapi,\
-        spring.webmvc,\
-        tomcat5,\
-        web.beans,\
-        web.client.rest,\
-        web.core,\
-        web.core.syntax,\
-        web.debug,\
-        web.el,\
-        web.examples,\
-        web.freeform,\
-        web.jsf,\
-        web.jsf.editor,\
-        web.jsf.icefaces,\
-        web.jsf.kit,\
-        web.jsf.navigation,\
-        web.jsf.richfaces,\
-        web.jsf12,\
-        web.jsf12ri,\
-        web.jsf20,\
-        web.jsfapi,\
-        web.jspparser,\
-        web.kit,\
-        web.monitor,\
-        web.primefaces,\
-        web.project,\
-        web.refactoring,\
-        web.struts,\
-        weblogic.common,\
-	websocket,\
-        websvc.clientapi,\
-        websvc.core,\
-        websvc.customization,\
-        websvc.design,\
-        websvc.editor.hints,\
-        websvc.jaxws.lightapi,\
-        websvc.jaxwsapi,\
-        websvc.jaxwsmodel,\
-        websvc.kit,\
-        websvc.manager,\
-        websvc.metro.lib,\
-        websvc.metro.model,\
-        websvc.metro.samples,\
-        websvc.owsm,\
-        websvc.projectapi,\
-        websvc.rest,\
-        websvc.rest.samples,\
-        websvc.restapi,\
-        websvc.restkit,\
-        websvc.restlib,\
-        websvc.saas.codegen.j2ee,\
-        websvc.utilities,\
-        websvc.websvcapi,\
-        websvc.wsitconf,\
-        websvc.wsitmodelext,\
-        websvc.wsstackapi
-
-nb.cluster.ergonomics.dir=ergonomics
-nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform
-nb.cluster.ergonomics=\
-        ide.ergonomics,\
-        performance.ergonomics
-validation.nb.cluster.ergonomics=\
-        ide.ergonomics
-
-nb.cluster.nb.dir=nb
-nb.cluster.nb.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.harness
-nb.cluster.nb=\
-        autoupdate.pluginimporter,\
-        bugzilla.exceptionreporter,\
-        deadlock.detector,\
-        ide.branding,\
-        ide.branding.kit,\
-        o.n.upgrader,\
-        uihandler.exceptionreporter,\
-        updatecenters,\
-        welcome
-
-nb.cluster.harness.dir=harness
-nb.cluster.harness.depends=nb.cluster.platform
-nb.cluster.harness=\
-        apisupport.harness,\
-        jellytools.platform,\
-        jemmy,\
-        libs.nbi.ant,\
-        libs.nbi.engine,\
-        nbjunit,\
-        o.n.insane
-
-nb.cluster.profiler.dir=profiler
-nb.cluster.profiler.depends=\
-        nb.cluster.ide,\
-        nb.cluster.java,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.profiler=\
-        debugger.jpda.heapwalk,\
-        lib.profiler,\
-        lib.profiler.charts,\
-        lib.profiler.common,\
-        lib.profiler.ui,\
-        maven.profiler,\
-        profiler,\
-        profiler.api,\
-        profiler.attach,\
-        profiler.freeform,\
-        profiler.heapwalker,\
-        profiler.j2se,\
-        profiler.kit,\
-        profiler.nbimpl,\
-        profiler.nbmodule,\
-        profiler.options,\
-        profiler.oql,\
-        profiler.oql.language,\
-        profiler.ppoints,\
-        profiler.projectsupport,\
-        profiler.snaptracer,\
-        profiler.utilities
-validation.nb.cluster.profiler=\
-        profiler.kit
-
-nb.cluster.php.dir=php
-nb.cluster.php.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon
-nb.cluster.php=\
-        hudson.php,\
-        languages.neon,\
-        libs.javacup,\
-        php.api.annotation,\
-        php.api.documentation,\
-        php.api.editor,\
-        php.api.executable,\
-        php.api.framework,\
-        php.api.phpmodule,\
-        php.api.templates,\
-        php.api.testing,\
-        php.apigen,\
-        php.atoum,\
-        php.code.analysis,\
-        php.codeception,\
-        php.composer,\
-        php.dbgp,\
-        php.doctrine2,\
-        php.editor,\
-        php.kit,\
-        php.latte,\
-        php.nette.tester,\
-        php.nette2,\
-        php.phing,\
-        php.phpdoc,\
-        php.phpdoc.documentation,\
-        php.phpunit,\
-        php.project,\
-        php.refactoring,\
-        php.samples,\
-        php.smarty,\
-        php.symfony,\
-        php.symfony2,\
-        php.twig,\
-        php.zend,\
-        php.zend2,\
-        selenium2.php,\
-        websvc.saas.codegen.php
-validation.nb.cluster.php=\
-        php.editor
-
-nb.cluster.groovy.dir=groovy
-nb.cluster.groovy.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.java
-nb.cluster.groovy=\
-        groovy.antproject,\
-        groovy.editor,\
-        groovy.grails,\
-        groovy.grailsproject,\
-        groovy.gsp,\
-        groovy.kit,\
-        groovy.refactoring,\
-        groovy.samples,\
-        groovy.support,\
-        libs.groovy,\
-        maven.groovy
-
-nb.cluster.mobility.dir=mobility
-nb.cluster.mobility.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.apisupport,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.mobility=\
-        api.mobility,\
-        j2me.common.ant,\
-        j2me.keystore,\
-        j2me.kit,\
-        j2me.project,\
-        mobility.cldcplatform,\
-        mobility.databindingme,\
-        mobility.end2end,\
-        mobility.jsr172,\
-        mobility.licensing,\
-        mobility.project.ant
-
-nb.cluster.identity.dir=identity
-nb.cluster.identity.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.identity=\
-        identity.ant,\
-        identity.kit,\
-        identity.profile.api,\
-        identity.profile.ui,\
-        identity.samples,\
-        identity.server.manager
-
-nb.cluster.cnd.dir=cnd
-nb.cluster.cnd.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.dlight,\
-        nb.cluster.ide
-nb.cluster.cnd=\
-        cnd,\
-        cnd.analysis.api,\
-        cnd.analysis.impl,\
-        cnd.antlr,\
-        cnd.api.model,\
-        cnd.api.project,\
-        cnd.api.remote,\
-        cnd.apt,\
-        cnd.asm,\
-        cnd.callgraph,\
-        cnd.classview,\
-        cnd.cncppunit,\
-        cnd.completion,\
-        cnd.debugger.common2,\
-        cnd.debugger.gdb2,\
-        cnd.discovery,\
-        cnd.dwarfdiscovery,\
-        cnd.dwarfdump,\
-        cnd.editor,\
-        cnd.gotodeclaration,\
-        cnd.highlight,\
-        cnd.indexing,\
-        cnd.kit,\
-        cnd.lexer,\
-        cnd.makeproject,\
-        cnd.makeproject.source.bridge,\
-        cnd.model.jclank.bridge,\
-        cnd.model.services,\
-        cnd.modeldiscovery,\
-        cnd.modelimpl,\
-        cnd.modelui,\
-        cnd.modelutil,\
-        cnd.navigation,\
-        cnd.qnavigator,\
-        cnd.refactoring,\
-        cnd.remote,\
-        cnd.remote.projectui,\
-        cnd.repository,\
-        cnd.repository.api,\
-        cnd.script,\
-        cnd.search,\
-        cnd.simpleunit,\
-        cnd.source,\
-        cnd.spellchecker.bindings,\
-        cnd.testrunner,\
-        cnd.toolchain,\
-        cnd.utils,\
-        jellytools.cnd,\
-        libs.clank
-validation.nb.cluster.cnd=\
-        cnd.kit
-
-nb.cluster.cndext.dir=cndext
-nb.cluster.cndext=\
-	cnd.mixeddev
-
-nb.cluster.cndext.depends=\
-	nb.cluster.cnd,\
-	nb.cluster.extide,\
-	nb.cluster.java
-
-nb.cluster.dlight.dir=dlight
-nb.cluster.dlight.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.dlight=\
-        dlight.kit,\
-        dlight.libs.common,\
-        dlight.remote,\
-        dlight.remote.impl,\
-        dlight.sendto,\
-        git.remote,\
-        git.remote.cli,\
-        mercurial.remote,\
-        remotefs.versioning,\
-        remotefs.versioning.api,\
-        subversion.remote
-
-nb.cluster.jira.dir=extra
-nb.cluster.jira.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.jira=\
-        c.atlassian.connector.eclipse.commons.core,\
-        c.atlassian.connector.eclipse.jira.core,\
-        c.atlassian.connector.eclipse.jira.core.rest,\
-        c.google.guava,\
-        c.s.jersey,\
-        c.s.mail.javax.mail,\
-        javax.servlet,\
-        javax.wsdl,\
-        javax.xml.rpc,\
-        javax.xml.soap,\
-        jira,\
-        jira.rest,\
-        jira.xmlrpc,\
-        libs.jira.rest,\
-        o.apache.axis,\
-        o.apache.commons.discovery,\
-        o.codehaus.jettison,\
-        o.eclipse.mylyn.commons.soap,\
-        o.eclipse.mylyn.monitor.ui.dummy,\
-        o.joda.time
-
-nb.cluster.team.dir=extra
-nb.cluster.team.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.team=\
-        bugtracking.kenai,\
-        c.tasktop.c2c.server.cloud.api,\
-        c.tasktop.c2c.server.common.api,\
-        c.tasktop.c2c.server.profile.api,\
-        c.tasktop.c2c.server.scm.api,\
-        c.tasktop.c2c.server.tasks.api,\
-        c.tasktop.c2c.server.wiki.api,\
-        kenai,\
-        kenai.kit,\
-        kenai.maven,\
-        kenai.ui,\
-        lib.cvsclient,\
-        o.codehaus.jackson.core,\
-        o.codehaus.jackson.mapper,\
-        odcs,\
-        odcs.git,\
-        odcs.hudson,\
-        odcs.kit,\
-        odcs.tasks,\
-        odcs.tasks.bridge,\
-        odcs.ui,\
-        odcs.versioning,\
-        oracle.clouddev.server.profile.activity.client.api,\
-        oracle.clouddev.server.profile.activity.client.rest,\
-        oracle.eclipse.tools.cloud.dev.tasks,\
-        team.server,\
-        team.server.nb,\
-        versioning.kenai,\
-        versioning.system.cvss
-
-nb.cluster.stableuc.dir=extra
-nb.cluster.stableuc.depends=${clusters.config.full.list}
-nb.cluster.stableuc=\
-        apisupport.apidocs,\
-        avatar_js.project,\
-        cloud.oracle,\
-        db.mysql.sakila,\
-        deployment.deviceanywhere,\
-        findbugs,\
-        html.ojet,\
-        j2me.cdc.kit,\
-        j2me.cdc.platform,\
-        j2me.cdc.platform.nokias80,\
-        j2me.cdc.platform.ojec,\
-        j2me.cdc.platform.semc,\
-        j2me.cdc.platform.sjmc,\
-        j2me.cdc.platform.sun,\
-        j2me.cdc.project,\
-        j2me.cdc.project.execui,\
-        j2me.cdc.project.execuiimpl,\
-        j2me.cdc.project.nokiaS80,\
-        j2me.cdc.project.ojec,\
-        j2me.cdc.project.savaje,\
-        j2me.cdc.project.semc,\
-        j2me.cdc.project.sjmc,\
-        jconsole,\
-        jmx,\
-        jmx.common,\
-        libs.aguiswinglayout,\
-        libs.findbugs,\
-        libs.oracle.cloud,\
-        libs.ppawtlayout,\
-        loadgenerator,\
-	maven.util,\
-        mobility.antext,\
-        mobility.cldcplatform.catalog,\
-        mobility.deployment.ftpscp,\
-        mobility.deployment.nokia,\
-        mobility.deployment.sonyericsson,\
-        mobility.deployment.webdav,\
-        mobility.editor,\
-        mobility.j2meunit,\
-        mobility.kit,\
-        mobility.plugins.mpowerplayer,\
-        mobility.project,\
-        mobility.project.bridge,\
-        mobility.project.bridge.impl,\
-        mobility.svgcore,\
-        mvd,\
-        o.apache.tools.ant.module.docs,\
-	o.n.swing.laf.dark,\
-        otherlicenses/mobility.proguard,\
-        profiler.commandrunner,\
-        profiler.loadgen,\
-        svg.perseus,\
-        swingapplib,\
-        vmd.analyzer,\
-        vmd.codegen,\
-        vmd.components.midp,\
-        vmd.components.midp.pda,\
-        vmd.components.midp.wma,\
-        vmd.components.svg,\
-        vmd.componentssupport,\
-        vmd.examples,\
-        vmd.flow,\
-        vmd.game,\
-        vmd.inspector,\
-        vmd.io,\
-        vmd.io.javame,\
-        vmd.kit,\
-        vmd.midp,\
-        vmd.midp.converter,\
-        vmd.midpnb,\
-        vmd.model,\
-        vmd.palette,\
-        vmd.properties,\
-        vmd.screen,\
-        vmd.structure
-
-nb.cluster.betauc.dir=extra
-nb.cluster.betauc.depends=${clusters.config.full.list}
-nb.cluster.betauc=\
-        ${nb.cluster.stableuc},\
-        clearcase,\
-        coherence,\
-        contrib/ant.freeform.samples,\
-        contrib/api.workqueues,\
-        contrib/apisupport.projectinspector,\
-        contrib/autoproject.core,\
-        contrib/autoproject.java,\
-        contrib/autoproject.profiler,\
-        contrib/autoproject.web,\
-        contrib/cnd.debugger.gdbserver,\
-        contrib/docbook,\
-        contrib/docbook.project,\
-        contrib/imagepaste,\
-        contrib/insertunicode,\
-        contrib/j2ee.geronimo2,\
-        contrib/j2ee.jetty,\
-        contrib/libs.selenium,\
-        contrib/libs.selenium.server,\
-        contrib/logmanagement,\
-        contrib/masterfs.suspend,\
-        contrib/modulemanager,\
-        contrib/quickfilechooser,\
-        contrib/selenium,\
-        contrib/selenium.maven,\
-        contrib/selenium.php,\
-        contrib/selenium.server,\
-        o.apache.jmeter.module,\
-        websvc.rest.wadl.design,\
-        websvc.rest.wadl.model
-
-nb.cluster.experimental.dir=extra
-nb.cluster.experimental.depends=${clusters.config.full.list}
-nb.cluster.experimental=\
-        ${nb.cluster.betauc},\
-        c.s.collablet,\
-        c.s.collablet.moxc,\
-        collab.channel.chat,\
-        collab.channel.chat.html,\
-        collab.channel.chat.java,\
-        collab.channel.chat.text,\
-        collab.channel.chat.xml,\
-        collab.channel.filesharing,\
-        collab.channel.output,\
-        collab.kit,\
-        collab.provider.im,\
-        collab.ui,\
-        contrib/a11y,\
-        contrib/accelerators.terminal,\
-        contrib/apisupport.beanbrowser,\
-        contrib/apisupport.tc.cobertura,\
-        contrib/archiver,\
-        contrib/autosave,\
-        contrib/c.ericsson.otp.erlang,\
-        contrib/codetemplatetools,\
-        contrib/de.hunsicker.jalopy.plugin.netbeans,\
-        contrib/editor.deprecated.pre61completion,\
-        contrib/editor.deprecated.pre61settings,\
-        contrib/editor.fold.support,\
-        contrib/editor.hints.i18n,\
-        contrib/editor.nexterror,\
-        contrib/encoding,\
-        contrib/explorefromhere,\
-        contrib/fisheye,\
-        contrib/folder2html,\
-        contrib/formatmany,\
-        contrib/genericnavigator,\
-        contrib/graphicclassview,\
-        contrib/group,\
-        contrib/gsf,\
-        contrib/gsf.api,\
-        contrib/gsfpath.api,\
-        contrib/hexeditor,\
-        contrib/htmlprojects,\
-        contrib/j2ee.oc4j,\
-        contrib/j2ee.sun.ws7,\
-        contrib/java.debugjavac,\
-        contrib/java.ext.editor,\
-        contrib/javahints,\
-        contrib/javanavigators,\
-        contrib/jemmysupport,\
-        contrib/languages.execution,\
-        contrib/languages.prolog,\
-        contrib/languages.tcl,\
-        contrib/languages.velocity,\
-        contrib/libs.commons_lang,\
-        contrib/libs.ical4j,\
-        contrib/libs.jcalendar,\
-        contrib/licensechanger,\
-        contrib/loaderswitcher,\
-        contrib/moduleresolver,\
-        contrib/mount,\
-        contrib/nborgsourcebrowse,\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/o.n.contrib.debuggerretry,\
-        contrib/o.n.erdbeans,\
-        contrib/o.n.misc.diff,\
-        contrib/performance.insane,\
-        contrib/perspective,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner,\
-        contrib/showtodos,\
-        contrib/sysprops,\
-        contrib/tanui,\
-        contrib/websvc.saas.services.rtm,\
-        contrib/whichproject,\
-        debugger.jpda.truffle,\
-        j2ee.websphere6,\
-        j2me.cdc.platform.bdj,\
-        j2me.cdc.project.bdj,\
-        keyring.jps,\
-        languages.refactoring,\
-        libs.xmlbeans,\
-        mercurial.search,\
-        o.n.bluej,\
-        o.n.bluej.ui,\
-        projectimport.jbuilder,\
-        traceio,\
-        uihandler.interactive,\
-        web.domdiff,\
-        web.facelets010114,\
-        web.jsf.extensions,\
-        web.livehtml,\
-        websvc.axis2,\
-        websvc.jaxrpc,\
-        websvc.jaxrpc16,\
-        websvc.jaxrpckit,\
-        websvc.registry
-
-nb.cluster.extide.dir=extide
-nb.cluster.extide.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.extide=\
-        o.apache.tools.ant.module,\
-        options.java
-
-# XXX needs updates to build:
-#        contrib/c.s.fortress,\
-#        contrib/fortress.editing,\
-
-nb.cluster.webcommon.dir=webcommon
-nb.cluster.webcommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.webcommon=\
-        cordova,\
-        cordova.platforms,\
-        cordova.platforms.android,\
-        cordova.platforms.ios,\
-        extbrowser.chrome,\
-        javascript.bower,\
-        javascript.cdnjs,\
-        javascript.grunt,\
-        javascript.gulp,\
-        javascript.jstestdriver,\
-        javascript.karma,\
-        javascript.nodejs,\
-        javascript.v8debug,\
-        languages.apacheconf,\
-        languages.ini,\
-        lib.v8debug,\
-        libs.commons_compress,\
-        libs.jstestdriver,\
-        libs.plist,\
-        netserver,\
-        selenium2.webclient,\
-        selenium2.webclient.mocha,\
-        selenium2.webclient.protractor,\
-        web.client.kit,\
-        web.client.samples,\
-        web.clientproject,\
-        web.clientproject.api,\
-        web.inspect,\
-        web.javascript.debugger,\
-        web.webkit.tooling
-
-nb.cluster.websvccommon.dir=websvccommon
-nb.cluster.websvccommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.websvccommon=\
-        websvc.jaxwsmodelapi,\
-        websvc.saas.api,\
-        websvc.saas.codegen,\
-        websvc.saas.kit,\
-        websvc.saas.services.amazon,\
-        websvc.saas.services.delicious,\
-        websvc.saas.services.flickr,\
-        websvc.saas.services.google,\
-        websvc.saas.services.strikeiron,\
-        websvc.saas.services.weatherbug,\
-        websvc.saas.services.zillow,\
-        websvc.saas.services.zvents,\
-        websvc.saas.ui
-# 225794 -  bundled twitter web service not working
-#        websvc.saas.services.twitter,\
-
-nb.cluster.javacard.dir=javacard
-nb.cluster.javacard.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java
-nb.cluster.javacard=\
-        javacard.apdu.io,\
-        javacard.apdufile,\
-        javacard.common,\
-        javacard.console,\
-        javacard.filemodels,\
-        javacard.kit,\
-        javacard.oberthur,\
-        javacard.platform.ui,\
-        javacard.project,\
-        javacard.ri.bundle,\
-        javacard.ri.platform,\
-        javacard.spi,\
-        properties.based.dataobjects,\
-        simple.project.templates,\
-        swing.customizerlayout
-
-nb.cluster.javafx.dir=javafx
-nb.cluster.javafx.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.javafx=\
-        javafx2.editor,\
-        javafx2.kit,\
-        javafx2.platform,\
-        javafx2.project,\
-        javafx2.samples,\
-        javafx2.scenebuilder
-
-nb.cluster.remote.dir=extra
-nb.cluster.remote.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.remote=\
-       contrib/dew4nb,\
-       contrib/json,\
-       contrib/remote.project.finder,\
-       contrib/remote.server
-
-nb.cluster.python.depends=\
-        nb.cluster.ide
-nb.cluster.python=\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner
diff --git a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna.platform/nbproject/project.properties b/.pc/netbeans-platform-nojnabinaries.patch/libs.jna.platform/nbproject/project.properties
deleted file mode 100644
index b8afdb4..0000000
--- a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna.platform/nbproject/project.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-javac.source=1.6
-release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
-sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/nbproject/project.properties b/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/nbproject/project.properties
deleted file mode 100644
index c6de368..0000000
--- a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/nbproject/project.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-javac.source=1.6
-release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
-# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
-release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-jnlp.verify.excludes=\
-    modules/lib/amd64/jnidispatch-410.dll,\
-    modules/lib/amd64/linux/libjnidispatch-410.so,\
-    modules/lib/i386/linux/libjnidispatch-410.so,\
-    modules/lib/x86/jnidispatch-410.dll,\
-    modules/lib/libjnidispatch-410.jnilib
-sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/src/org/netbeans/libs/jna/Installer.java b/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/src/org/netbeans/libs/jna/Installer.java
deleted file mode 100644
index cf306a7..0000000
--- a/.pc/netbeans-platform-nojnabinaries.patch/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2012 Sun Microsystems, Inc.
- */
-package org.netbeans.libs.jna;
-
-import org.openide.modules.ModuleInstall;
-import org.openide.util.Utilities;
-
-public class Installer extends ModuleInstall {
-
-    @Override
-    public void validate() {
-        super.validate();
-        //#211655
-        System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
-    }
-}
diff --git a/.pc/netbeans-platform-o.n.html.ko4j.patch/nbbuild/cluster.properties b/.pc/netbeans-platform-o.n.html.ko4j.patch/nbbuild/cluster.properties
deleted file mode 100644
index 776c7d4..0000000
--- a/.pc/netbeans-platform-o.n.html.ko4j.patch/nbbuild/cluster.properties
+++ /dev/null
@@ -1,1530 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-cluster.config=full
-clusters.prefix=libnb
-
-clusters.config.platform.list=\
-        nb.cluster.harness,\
-        nb.cluster.bootstrap,\
-        nb.cluster.platform
-
-clusters.config.basic.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.apisupport
-
-clusters.config.standard.list=\
-        ${clusters.config.basic.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.full.list=\
-        nb.cluster.cnd,\
-        nb.cluster.cndext,\
-        nb.cluster.dlight,\
-        nb.cluster.groovy,\
-        nb.cluster.javacard,\
-        nb.cluster.mobility,\
-        nb.cluster.php,\
-        ${clusters.config.standard.list},\
-        nb.cluster.ergonomics
-# ergonomics must be last
-
-clusters.config.php.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.php,\
-        nb.cluster.websvccommon,\
-        nb.cluster.nb
-
-clusters.config.groovy.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.groovy
-
-clusters.config.cnd.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.cnd,\
-        nb.cluster.nb,\
-        nb.cluster.dlight
-
-clusters.config.cndext.list=\
-        ${clusters.config.cnd.list},\
-	nb.cluster.cndext,\
-	nb.cluster.extide,\
-        nb.cluster.java
-
-clusters.config.dlight.list=\
-        nb.cluster.platform,\
-        nb.cluster.harness,\
-        nb.cluster.ide,\
-        nb.cluster.dlight,\
-        nb.cluster.nb
-
-clusters.config.java.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.javafx,\
-        nb.cluster.profiler,\
-        nb.cluster.nb
-
-clusters.config.enterprise.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.webcommon,\
-        nb.cluster.enterprise
-
-clusters.config.identity.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.identity
-
-clusters.config.mobility.list=\
-        ${clusters.config.enterprise.list},\
-        nb.cluster.mobility
-
-clusters.config.jdev.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.websvccommon,\
-        nb.cluster.java,\
-        nb.cluster.profiler,\
-        nb.cluster.jira,\
-        nb.cluster.team
-
-clusters.config.bloated.list=\
-        nb.cluster.identity,\
-        ${clusters.config.full.list}
-# ergonomics must be last
-
-# For technical reasons, nb.cluster.experimental is a superset of nb.cluster.betauc and nb.cluster.stableuc, so cannot list at once:
-clusters.config.experimental.list=\
-        ${clusters.config.bloated.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.experimental
-
-clusters.config.stableuc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.stableuc
-# could put ergonomics last, but undesirable to also do so for clusters.config.experimental.list, so exclude stableuc from ergonomics processing
-
-clusters.config.betauc.list=\
-        ${clusters.config.full.list},\
-        nb.cluster.jira,\
-        nb.cluster.team,\
-        nb.cluster.betauc
-
-clusters.config.minimal.list=\
-        ${clusters.config.platform.list},\
-        nb.cluster.ide,\
-        nb.cluster.nb
-
-clusters.config.javacard.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.javacard
-
-clusters.config.remote.list=\
-        ${clusters.config.java.list},\
-        nb.cluster.remote
-
-clusters.config.python.list=\
-        ${clusters.config.minimal.list},\
-        nb.cluster.python
-
-clusters.list=\
-        ${clusters.config.full.list}
-
-# Bootstrap 'cluster' serves just to group modules which are needed to process
-# module-auto-deps.xml during compilation; other clusters can then benefit 
-# from autodeps during compilation
-nb.cluster.bootstrap.dir=platform
-nb.cluster.bootstrap.depends=
-nb.cluster.bootstrap=\
-        core.startup,\
-        core.startup.base,\
-        libs.asm,\
-        o.n.bootstrap,\
-        openide.filesystems,\
-        openide.modules,\
-        openide.util,\
-        openide.util.lookup,\
-        openide.util.ui
-
-nb.cluster.platform.dir=platform
-nb.cluster.platform.depends=nb.cluster.bootstrap
-nb.cluster.platform=\
-        api.annotations.common,\
-        api.intent,\
-        api.io,\
-        api.progress,\
-        api.progress.compat8,\
-        api.progress.nb,\
-        api.search,\
-        api.templates,\
-        api.visual,\
-        applemenu,\
-        autoupdate.cli,\
-        autoupdate.services,\
-        autoupdate.ui,\
-        core.execution,\
-        core.io.ui,\
-        core.kit,\
-        core.multitabs,\
-        core.multiview,\
-        core.nativeaccess,\
-        core.netigso,\
-        core.network,\
-        core.osgi,\
-        core.output2,\
-        core.ui,\
-        core.windows,\
-        editor.mimelookup,\
-        editor.mimelookup.impl,\
-        favorites,\
-        javahelp,\
-        junitlib,\
-        keyring,\
-        keyring.fallback,\
-        keyring.impl,\
-        lib.uihandler,\
-        libs.felix,\
-        libs.javafx,\
-        libs.jna,\
-        libs.jna.platform,\
-        libs.jsr223,\
-        libs.junit4,\
-        libs.osgi,\
-        libs.testng,\
-        masterfs,\
-        masterfs.linux,\
-        masterfs.macosx,\
-        masterfs.nio2,\
-        masterfs.ui,\
-        masterfs.windows,\
-        netbinox,\
-        o.jdesktop.layout,\
-        o.n.core,\
-        o.n.html.ko4j,\
-        o.n.swing.outline,\
-        o.n.swing.plaf,\
-        o.n.swing.tabcontrol,\
-        openide.actions,\
-        openide.awt,\
-        openide.compat,\
-        openide.dialogs,\
-        openide.execution,\
-        openide.execution.compat8,\
-        openide.explorer,\
-        openide.filesystems.compat8,\
-        openide.filesystems.nb,\
-        openide.io,\
-        openide.loaders,\
-        openide.nodes,\
-        openide.options,\
-        openide.text,\
-        openide.util.enumerations,\
-        openide.windows,\
-        options.api,\
-        options.keymap,\
-        print,\
-        progress.ui,\
-        queries,\
-        sampler,\
-        sendopts,\
-        settings,\
-        spi.actions,\
-        spi.quicksearch,\
-        templates,\
-        templatesui,\
-        uihandler
-validation.nb.cluster.platform=\
-        o.n.core,\
-        core.windows,\
-        javahelp
-
-nb.cluster.ide.dir=ide
-nb.cluster.ide.depends=\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.ide=\
-        api.debugger,\
-        api.java.classpath,\
-        api.knockout,\
-        api.xml,\
-        api.xml.ui,\
-        bugtracking,\
-        bugtracking.bridge,\
-        bugtracking.commons,\
-        bugzilla,\
-        c.googlecode.javaewah.JavaEWAH,\
-        c.jcraft.jsch,\
-        c.jcraft.jzlib,\
-        code.analysis,\
-        core.browser,\
-        core.browser.webview,\
-        core.ide,\
-        core.multitabs.project,\
-        csl.api,\
-        css.editor,\
-        css.lib,\
-        css.model,\
-        css.prep,\
-        css.visual,\
-        db,\
-        db.core,\
-        db.dataview,\
-        db.drivers,\
-        db.kit,\
-        db.metadata.model,\
-        db.mysql,\
-        db.sql.editor,\
-        db.sql.visualeditor,\
-        dbapi,\
-        defaults,\
-        derby,\
-        diff,\
-        dlight.nativeexecution,\
-        dlight.terminal,\
-        editor,\
-        editor.actions,\
-        editor.bookmarks,\
-        editor.bracesmatching,\
-        editor.breadcrumbs,\
-        editor.codetemplates,\
-        editor.completion,\
-        editor.deprecated.pre65formatting,\
-        editor.document,\
-        editor.errorstripe,\
-        editor.errorstripe.api,\
-        editor.fold,\
-        editor.fold.nbui,\
-        editor.global.format,\
-        editor.guards,\
-        editor.indent,\
-        editor.indent.project,\
-        editor.indent.support,\
-        editor.kit,\
-        editor.lib,\
-        editor.lib2,\
-        editor.macros,\
-        editor.plain,\
-        editor.plain.lib,\
-        editor.search,\
-        editor.settings,\
-        editor.settings.lib,\
-        editor.settings.storage,\
-        editor.structure,\
-        editor.tools.storage,\
-        editor.util,\
-        extbrowser,\
-        extexecution,\
-        extexecution.base,\
-        extexecution.impl,\
-        extexecution.process,\
-        git,\
-        gototest,\
-        gsf.codecoverage,\
-        gsf.testrunner,\
-        gsf.testrunner.ui,\
-        html,\
-        html.angular,\
-        html.custom,\
-        html.editor,\
-        html.editor.lib,\
-        html.knockout,\
-        html.lexer,\
-        html.parser,\
-        html.validation,\
-        httpserver,\
-        hudson,\
-        hudson.git,\
-        hudson.mercurial,\
-        hudson.subversion,\
-        hudson.tasklist,\
-	hudson.ui,\
-        ide.kit,\
-        image,\
-        javascript2.debug,\
-        javascript2.editor,\
-        javascript2.extjs,\
-	javascript2.jade,\
-        javascript2.jquery,\
-        javascript2.kit,\
-        javascript2.knockout,\
-	javascript2.nodejs,\
-        javascript2.prototypejs,\
-	javascript2.requirejs,\
-        jellytools.ide,\
-        jumpto,\
-        languages,\
-        languages.diff,\
-        languages.manifest,\
-        languages.yaml,\
-        lexer,\
-        lexer.nbbridge,\
-        lib.terminalemulator,\
-        libs.antlr3.runtime,\
-        libs.bytelist,\
-        libs.commons_net,\
-        libs.freemarker,\
-        libs.git,\
-        libs.ini4j,\
-        libs.jaxb,\
-        libs.jsch.agentproxy,\
-        libs.json_simple,\
-        libs.jvyamlb,\
-        libs.lucene,\
-        libs.nashorn,\
-        libs.smack,\
-        libs.svnClientAdapter,\
-        libs.svnClientAdapter.javahl,\
-        libs.svnClientAdapter.svnkit,\
-        libs.swingx,\
-        libs.xerces,\
-        localhistory,\
-        localtasks,\
-        mercurial,\
-        mylyn.util,\
-        notifications,\
-        o.apache.commons.codec,\
-        o.apache.commons.httpclient,\
-        o.apache.commons.io,\
-        o.apache.commons.lang,\
-        o.apache.commons.logging,\
-        o.apache.ws.commons.util,\
-        o.apache.xml.resolver,\
-        o.apache.xmlrpc,\
-        o.eclipse.core.contenttype,\
-        o.eclipse.core.jobs,\
-        o.eclipse.core.net,\
-        o.eclipse.core.runtime,\
-        o.eclipse.core.runtime.compatibility.auth,\
-        o.eclipse.equinox.app,\
-        o.eclipse.equinox.common,\
-        o.eclipse.equinox.preferences,\
-        o.eclipse.equinox.registry,\
-        o.eclipse.equinox.security,\
-        o.eclipse.jgit,\
-        o.eclipse.jgit.java7,\
-        o.eclipse.mylyn.bugzilla.core,\
-        o.eclipse.mylyn.commons.core,\
-        o.eclipse.mylyn.commons.net,\
-        o.eclipse.mylyn.commons.repositories.core,\
-        o.eclipse.mylyn.commons.xmlrpc,\
-        o.eclipse.mylyn.tasks.core,\
-        o.eclipse.mylyn.wikitext.confluence.core,\
-        o.eclipse.mylyn.wikitext.core,\
-        o.eclipse.mylyn.wikitext.textile.core,\
-        o.n.swing.dirchooser,\
-        o.openidex.util,\
-        options.editor,\
-        parsing.api,\
-        parsing.indexing,\
-        parsing.lucene,\
-        parsing.nb,\
-        parsing.ui,\
-        print.editor,\
-        project.ant,\
-        project.ant.compat8,\
-        project.ant.ui,\
-        project.indexingbridge,\
-        project.libraries,\
-        project.libraries.ui,\
-        project.spi.intern,\
-        project.spi.intern.impl,\
-        projectapi,\
-        projectapi.nb,\
-        projectui,\
-        projectui.buildmenu,\
-        projectuiapi,\
-        projectuiapi.base,\
-        properties,\
-        properties.syntax,\
-        refactoring.api,\
-        schema2beans,\
-        selenium2,\
-        selenium2.server,\
-        server,\
-        servletapi,\
-        spellchecker,\
-        spellchecker.apimodule,\
-        spellchecker.bindings.htmlxml,\
-        spellchecker.bindings.properties,\
-        spellchecker.dictionary_en,\
-        spellchecker.kit,\
-        spi.debugger.ui,\
-        spi.editor.hints,\
-        spi.editor.hints.projects,\
-        spi.navigator,\
-        spi.palette,\
-        spi.tasklist,\
-        spi.viewmodel,\
-        subversion,\
-        swing.validation,\
-        target.iterator,\
-        tasklist.kit,\
-        tasklist.projectint,\
-        tasklist.todo,\
-        tasklist.ui,\
-        team.commons,\
-        team.ide,\
-        terminal,\
-        usersguide,\
-        utilities,\
-        utilities.project,\
-        versioning,\
-        versioning.core,\
-        versioning.indexingbridge,\
-        versioning.masterfs,\
-        versioning.system.cvss.installer,\
-        versioning.ui,\
-        versioning.util,\
-	web.browser.api,\
-        web.common,\
-        web.indent,\
-        web.webkit.debugging,\
-        xml,\
-        xml.axi,\
-        xml.catalog,\
-        xml.catalog.ui,\
-        xml.core,\
-        xml.jaxb.api,\
-        xml.lexer,\
-        xml.multiview,\
-        xml.retriever,\
-        xml.schema.completion,\
-        xml.schema.model,\
-        xml.tax,\
-        xml.text,\
-        xml.tools,\
-        xml.wsdl.model,\
-        xml.xam,\
-        xml.xdm,\
-        xsl
-validation.nb.cluster.ide=\
-        ide.kit
-
-nb.cluster.java.dir=java
-nb.cluster.java.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.java=\
-        ant.browsetask,\
-        ant.debugger,\
-        ant.freeform,\
-        ant.grammar,\
-        ant.kit,\
-        api.debugger.jpda,\
-        api.java,\
-        api.maven,\
-        beans,\
-        classfile,\
-        dbschema,\
-        debugger.jpda,\
-        debugger.jpda.ant,\
-        debugger.jpda.js,\
-        debugger.jpda.kit,\
-        debugger.jpda.projects,\
-        debugger.jpda.projectsui,\
-        debugger.jpda.ui,\
-        debugger.jpda.visual,\
-        findbugs.installer,\
-        form,\
-        form.binding,\
-        form.j2ee,\
-        form.kit,\
-        form.nb,\
-        form.refactoring,\
-        hibernate,\
-        hibernate4lib,\
-        hudson.ant,\
-        hudson.maven,\
-        i18n,\
-        i18n.form,\
-        j2ee.core.utilities,\
-        j2ee.eclipselink,\
-        j2ee.eclipselinkmodelgen,\
-        j2ee.jpa.refactoring,\
-        j2ee.jpa.verification,\
-        j2ee.metadata,\
-        j2ee.metadata.model.support,\
-        j2ee.persistence,\
-        j2ee.persistence.kit,\
-        j2ee.persistenceapi,\
-        java.api.common,\
-        java.completion,\
-        java.debug,\
-        java.editor,\
-        java.editor.base,\
-        java.editor.lib,\
-        java.examples,\
-        java.freeform,\
-        java.guards,\
-        java.hints,\
-        java.hints.declarative,\
-        java.hints.declarative.test,\
-        java.hints.legacy.spi,\
-        java.hints.test,\
-        java.hints.ui,\
-        java.j2sedeploy,\
-        java.j2seembedded,\
-        java.j2seplatform,\
-        java.j2seprofiles,\
-        java.j2seproject,\
-        java.kit,\
-        java.lexer,\
-        java.metrics,\
-        java.navigation,\
-        java.platform,\
-        java.platform.ui,\
-        java.preprocessorbridge,\
-        java.project,\
-        java.project.ui,\
-        java.source,\
-        java.source.ant,\
-        java.source.base,\
-        java.source.compat8,\
-        java.source.queries,\
-        java.source.queriesimpl,\
-        java.sourceui,\
-        java.testrunner,\
-        java.testrunner.ant,\
-        java.testrunner.ui,\
-        javadoc,\
-        javaee.injection,\
-        javawebstart,\
-        jellytools.java,\
-        junit,\
-        junit.ant,\
-        junit.ant.ui,\
-        junit.ui,\
-        lib.nbjavac,\
-        libs.cglib,\
-        libs.javacapi,\
-        libs.javacimpl,\
-        libs.springframework,\
-        maven,\
-        maven.checkstyle,\
-        maven.coverage,\
-        maven.embedder,\
-        maven.grammar,\
-        maven.graph,\
-        maven.hints,\
-        maven.indexer,\
-        maven.indexer.ui,\
-        maven.junit,\
-        maven.junit.ui,\
-        maven.kit,\
-        maven.model,\
-        maven.osgi,\
-        maven.persistence,\
-        maven.refactoring,\
-        maven.repository,\
-        maven.search,\
-        maven.spring,\
-        nashorn.execution,\
-        o.jdesktop.beansbinding,\
-        performance,\
-        performance.java,\
-        projectimport.eclipse.core,\
-        projectimport.eclipse.j2se,\
-        refactoring.java,\
-        selenium2.java,\
-        selenium2.maven,\
-        spellchecker.bindings.java,\
-        spi.debugger.jpda.ui,\
-        spi.java.hints,\
-        spring.beans,\
-        testng,\
-        testng.ant,\
-        testng.maven,\
-        testng.ui,\
-        websvc.jaxws21,\
-        websvc.jaxws21api,\
-        websvc.saas.codegen.java,\
-        whitelist,\
-        xml.jaxb,\
-        xml.tools.java
-validation.nb.cluster.java=\
-        java.hints,\
-        java.kit
-
-nb.cluster.apisupport.dir=apisupport
-nb.cluster.apisupport.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.apisupport=\
-        apisupport.ant,\
-        apisupport.crudsample,\
-        apisupport.feedreader,\
-        apisupport.installer,\
-        apisupport.installer.maven,\
-        apisupport.kit,\
-        apisupport.osgidemo,\
-        apisupport.paintapp,\
-        apisupport.project,\
-        apisupport.refactoring,\
-        apisupport.wizards,\
-        maven.apisupport
-
-nb.cluster.enterprise.dir=enterprise
-nb.cluster.enterprise.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.profiler,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.enterprise=\
-        api.web.webmodule,\
-        apisupport.restsample,\
-        cloud.amazon,\
-        cloud.common,\
-        el.lexer,\
-        glassfish.common,\
-        glassfish.eecommon,\
-        glassfish.javaee,\
-        glassfish.tooling,\
-        hibernateweb,\
-        j2ee.ant,\
-        j2ee.api.ejbmodule,\
-        j2ee.clientproject,\
-        j2ee.common,\
-        j2ee.core,\
-        j2ee.dd,\
-        j2ee.dd.webservice,\
-        j2ee.ddloaders,\
-        j2ee.earproject,\
-        j2ee.ejbcore,\
-        j2ee.ejbjarproject,\
-        j2ee.ejbrefactoring,\
-        j2ee.ejbverification,\
-        j2ee.genericserver,\
-        j2ee.jboss4,\
-        j2ee.kit,\
-        j2ee.platform,\
-        j2ee.samples,\
-        j2ee.sun.appsrv,\
-        j2ee.sun.dd,\
-        j2ee.sun.ddui,\
-        j2ee.weblogic9,\
-        j2eeapis,\
-        j2eeserver,\
-        javaee.api,\
-        javaee.beanvalidation,\
-        javaee.project,\
-        javaee.resources,\
-        javaee.specs.support,\
-        javaee.wildfly,\
-        javaee7.api,\
-        jellytools.enterprise,\
-        jsp.lexer,\
-        ko4j.debugging,\
-        libs.amazon,\
-        libs.commons_fileupload,\
-        libs.elimpl,\
-        libs.glassfish_logging,\
-        libs.jstl,\
-        maven.j2ee,\
-        maven.jaxws,\
-        maven.samples,\
-        performance.javaee,\
-        performance.scripting,\
-        performance.web,\
-        profiler.j2ee,\
-        projectimport.eclipse.web,\
-        servletjspapi,\
-        spring.webmvc,\
-        tomcat5,\
-        web.beans,\
-        web.client.rest,\
-        web.core,\
-        web.core.syntax,\
-        web.debug,\
-        web.el,\
-        web.examples,\
-        web.freeform,\
-        web.jsf,\
-        web.jsf.editor,\
-        web.jsf.icefaces,\
-        web.jsf.kit,\
-        web.jsf.navigation,\
-        web.jsf.richfaces,\
-        web.jsf12,\
-        web.jsf12ri,\
-        web.jsf20,\
-        web.jsfapi,\
-        web.jspparser,\
-        web.kit,\
-        web.monitor,\
-        web.primefaces,\
-        web.project,\
-        web.refactoring,\
-        web.struts,\
-        weblogic.common,\
-	websocket,\
-        websvc.clientapi,\
-        websvc.core,\
-        websvc.customization,\
-        websvc.design,\
-        websvc.editor.hints,\
-        websvc.jaxws.lightapi,\
-        websvc.jaxwsapi,\
-        websvc.jaxwsmodel,\
-        websvc.kit,\
-        websvc.manager,\
-        websvc.metro.lib,\
-        websvc.metro.model,\
-        websvc.metro.samples,\
-        websvc.owsm,\
-        websvc.projectapi,\
-        websvc.rest,\
-        websvc.rest.samples,\
-        websvc.restapi,\
-        websvc.restkit,\
-        websvc.restlib,\
-        websvc.saas.codegen.j2ee,\
-        websvc.utilities,\
-        websvc.websvcapi,\
-        websvc.wsitconf,\
-        websvc.wsitmodelext,\
-        websvc.wsstackapi
-
-nb.cluster.ergonomics.dir=ergonomics
-nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform
-nb.cluster.ergonomics=\
-        ide.ergonomics,\
-        performance.ergonomics
-validation.nb.cluster.ergonomics=\
-        ide.ergonomics
-
-nb.cluster.nb.dir=nb
-nb.cluster.nb.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.harness
-nb.cluster.nb=\
-        autoupdate.pluginimporter,\
-        bugzilla.exceptionreporter,\
-        deadlock.detector,\
-        ide.branding,\
-        ide.branding.kit,\
-        o.n.upgrader,\
-        uihandler.exceptionreporter,\
-        updatecenters,\
-        welcome
-
-nb.cluster.harness.dir=harness
-nb.cluster.harness.depends=nb.cluster.platform
-nb.cluster.harness=\
-        apisupport.harness,\
-        jellytools.platform,\
-        jemmy,\
-        nbjunit,\
-        o.n.insane
-
-nb.cluster.profiler.dir=profiler
-nb.cluster.profiler.depends=\
-        nb.cluster.ide,\
-        nb.cluster.java,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.profiler=\
-        debugger.jpda.heapwalk,\
-        lib.profiler,\
-        lib.profiler.charts,\
-        lib.profiler.common,\
-        lib.profiler.ui,\
-        maven.profiler,\
-        profiler,\
-        profiler.api,\
-        profiler.attach,\
-        profiler.freeform,\
-        profiler.heapwalker,\
-        profiler.j2se,\
-        profiler.kit,\
-        profiler.nbimpl,\
-        profiler.nbmodule,\
-        profiler.options,\
-        profiler.oql,\
-        profiler.oql.language,\
-        profiler.ppoints,\
-        profiler.projectsupport,\
-        profiler.snaptracer,\
-        profiler.utilities
-validation.nb.cluster.profiler=\
-        profiler.kit
-
-nb.cluster.php.dir=php
-nb.cluster.php.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.webcommon,\
-        nb.cluster.websvccommon
-nb.cluster.php=\
-        hudson.php,\
-        languages.neon,\
-        libs.javacup,\
-        php.api.annotation,\
-        php.api.documentation,\
-        php.api.editor,\
-        php.api.executable,\
-        php.api.framework,\
-        php.api.phpmodule,\
-        php.api.templates,\
-        php.api.testing,\
-        php.apigen,\
-        php.atoum,\
-        php.code.analysis,\
-        php.codeception,\
-        php.composer,\
-        php.dbgp,\
-        php.doctrine2,\
-        php.editor,\
-        php.kit,\
-        php.latte,\
-        php.nette.tester,\
-        php.nette2,\
-        php.phing,\
-        php.phpdoc,\
-        php.phpdoc.documentation,\
-        php.phpunit,\
-        php.project,\
-        php.refactoring,\
-        php.samples,\
-        php.smarty,\
-        php.symfony,\
-        php.symfony2,\
-        php.twig,\
-        php.zend,\
-        php.zend2,\
-        selenium2.php,\
-        websvc.saas.codegen.php
-validation.nb.cluster.php=\
-        php.editor
-
-nb.cluster.groovy.dir=groovy
-nb.cluster.groovy.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.java
-nb.cluster.groovy=\
-        groovy.antproject,\
-        groovy.editor,\
-        groovy.grails,\
-        groovy.grailsproject,\
-        groovy.gsp,\
-        groovy.kit,\
-        groovy.refactoring,\
-        groovy.samples,\
-        groovy.support,\
-        libs.groovy,\
-        maven.groovy
-
-nb.cluster.mobility.dir=mobility
-nb.cluster.mobility.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.apisupport,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.mobility=\
-        api.mobility,\
-        j2me.common.ant,\
-        j2me.keystore,\
-        j2me.kit,\
-        j2me.project,\
-        mobility.cldcplatform,\
-        mobility.databindingme,\
-        mobility.end2end,\
-        mobility.jsr172,\
-        mobility.licensing,\
-        mobility.project.ant
-
-nb.cluster.identity.dir=identity
-nb.cluster.identity.depends=\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.enterprise,\
-        nb.cluster.extide
-nb.cluster.identity=\
-        identity.ant,\
-        identity.kit,\
-        identity.profile.api,\
-        identity.profile.ui,\
-        identity.samples,\
-        identity.server.manager
-
-nb.cluster.cnd.dir=cnd
-nb.cluster.cnd.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.dlight,\
-        nb.cluster.ide
-nb.cluster.cnd=\
-        cnd,\
-        cnd.analysis.api,\
-        cnd.analysis.impl,\
-        cnd.antlr,\
-        cnd.api.model,\
-        cnd.api.project,\
-        cnd.api.remote,\
-        cnd.apt,\
-        cnd.asm,\
-        cnd.callgraph,\
-        cnd.classview,\
-        cnd.cncppunit,\
-        cnd.completion,\
-        cnd.debugger.common2,\
-        cnd.debugger.gdb2,\
-        cnd.discovery,\
-        cnd.dwarfdiscovery,\
-        cnd.dwarfdump,\
-        cnd.editor,\
-        cnd.gotodeclaration,\
-        cnd.highlight,\
-        cnd.indexing,\
-        cnd.kit,\
-        cnd.lexer,\
-        cnd.makeproject,\
-        cnd.makeproject.source.bridge,\
-        cnd.model.jclank.bridge,\
-        cnd.model.services,\
-        cnd.modeldiscovery,\
-        cnd.modelimpl,\
-        cnd.modelui,\
-        cnd.modelutil,\
-        cnd.navigation,\
-        cnd.qnavigator,\
-        cnd.refactoring,\
-        cnd.remote,\
-        cnd.remote.projectui,\
-        cnd.repository,\
-        cnd.repository.api,\
-        cnd.script,\
-        cnd.search,\
-        cnd.simpleunit,\
-        cnd.source,\
-        cnd.spellchecker.bindings,\
-        cnd.testrunner,\
-        cnd.toolchain,\
-        cnd.utils,\
-        jellytools.cnd,\
-        libs.clank
-validation.nb.cluster.cnd=\
-        cnd.kit
-
-nb.cluster.cndext.dir=cndext
-nb.cluster.cndext=\
-	cnd.mixeddev
-
-nb.cluster.cndext.depends=\
-	nb.cluster.cnd,\
-	nb.cluster.extide,\
-	nb.cluster.java
-
-nb.cluster.dlight.dir=dlight
-nb.cluster.dlight.depends=\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.dlight=\
-        dlight.kit,\
-        dlight.libs.common,\
-        dlight.remote,\
-        dlight.remote.impl,\
-        dlight.sendto,\
-        git.remote,\
-        git.remote.cli,\
-        mercurial.remote,\
-        remotefs.versioning,\
-        remotefs.versioning.api,\
-        subversion.remote
-
-nb.cluster.jira.dir=extra
-nb.cluster.jira.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.jira=\
-        c.atlassian.connector.eclipse.commons.core,\
-        c.atlassian.connector.eclipse.jira.core,\
-        c.atlassian.connector.eclipse.jira.core.rest,\
-        c.google.guava,\
-        c.s.jersey,\
-        c.s.mail.javax.mail,\
-        javax.servlet,\
-        javax.wsdl,\
-        javax.xml.rpc,\
-        javax.xml.soap,\
-        jira,\
-        jira.rest,\
-        jira.xmlrpc,\
-        libs.jira.rest,\
-        o.apache.axis,\
-        o.apache.commons.discovery,\
-        o.codehaus.jettison,\
-        o.eclipse.mylyn.commons.soap,\
-        o.eclipse.mylyn.monitor.ui.dummy,\
-        o.joda.time
-
-nb.cluster.team.dir=extra
-nb.cluster.team.depends=\
-        nb.cluster.harness,\
-        nb.cluster.platform,\
-        nb.cluster.ide
-nb.cluster.team=\
-        bugtracking.kenai,\
-        c.tasktop.c2c.server.cloud.api,\
-        c.tasktop.c2c.server.common.api,\
-        c.tasktop.c2c.server.profile.api,\
-        c.tasktop.c2c.server.scm.api,\
-        c.tasktop.c2c.server.tasks.api,\
-        c.tasktop.c2c.server.wiki.api,\
-        kenai,\
-        kenai.kit,\
-        kenai.maven,\
-        kenai.ui,\
-        lib.cvsclient,\
-        o.codehaus.jackson.core,\
-        o.codehaus.jackson.mapper,\
-        odcs,\
-        odcs.git,\
-        odcs.hudson,\
-        odcs.kit,\
-        odcs.tasks,\
-        odcs.tasks.bridge,\
-        odcs.ui,\
-        odcs.versioning,\
-        oracle.clouddev.server.profile.activity.client.api,\
-        oracle.clouddev.server.profile.activity.client.rest,\
-        oracle.eclipse.tools.cloud.dev.tasks,\
-        team.server,\
-        team.server.nb,\
-        versioning.kenai,\
-        versioning.system.cvss
-
-nb.cluster.stableuc.dir=extra
-nb.cluster.stableuc.depends=${clusters.config.full.list}
-nb.cluster.stableuc=\
-        apisupport.apidocs,\
-        avatar_js.project,\
-        cloud.oracle,\
-        db.mysql.sakila,\
-        deployment.deviceanywhere,\
-        findbugs,\
-        html.ojet,\
-        j2me.cdc.kit,\
-        j2me.cdc.platform,\
-        j2me.cdc.platform.nokias80,\
-        j2me.cdc.platform.ojec,\
-        j2me.cdc.platform.semc,\
-        j2me.cdc.platform.sjmc,\
-        j2me.cdc.platform.sun,\
-        j2me.cdc.project,\
-        j2me.cdc.project.execui,\
-        j2me.cdc.project.execuiimpl,\
-        j2me.cdc.project.nokiaS80,\
-        j2me.cdc.project.ojec,\
-        j2me.cdc.project.savaje,\
-        j2me.cdc.project.semc,\
-        j2me.cdc.project.sjmc,\
-        jconsole,\
-        jmx,\
-        jmx.common,\
-        libs.aguiswinglayout,\
-        libs.findbugs,\
-        libs.oracle.cloud,\
-        libs.ppawtlayout,\
-        loadgenerator,\
-	maven.util,\
-        mobility.antext,\
-        mobility.cldcplatform.catalog,\
-        mobility.deployment.ftpscp,\
-        mobility.deployment.nokia,\
-        mobility.deployment.sonyericsson,\
-        mobility.deployment.webdav,\
-        mobility.editor,\
-        mobility.j2meunit,\
-        mobility.kit,\
-        mobility.plugins.mpowerplayer,\
-        mobility.project,\
-        mobility.project.bridge,\
-        mobility.project.bridge.impl,\
-        mobility.svgcore,\
-        mvd,\
-        o.apache.tools.ant.module.docs,\
-	o.n.swing.laf.dark,\
-        otherlicenses/mobility.proguard,\
-        profiler.commandrunner,\
-        profiler.loadgen,\
-        svg.perseus,\
-        swingapplib,\
-        vmd.analyzer,\
-        vmd.codegen,\
-        vmd.components.midp,\
-        vmd.components.midp.pda,\
-        vmd.components.midp.wma,\
-        vmd.components.svg,\
-        vmd.componentssupport,\
-        vmd.examples,\
-        vmd.flow,\
-        vmd.game,\
-        vmd.inspector,\
-        vmd.io,\
-        vmd.io.javame,\
-        vmd.kit,\
-        vmd.midp,\
-        vmd.midp.converter,\
-        vmd.midpnb,\
-        vmd.model,\
-        vmd.palette,\
-        vmd.properties,\
-        vmd.screen,\
-        vmd.structure
-
-nb.cluster.betauc.dir=extra
-nb.cluster.betauc.depends=${clusters.config.full.list}
-nb.cluster.betauc=\
-        ${nb.cluster.stableuc},\
-        clearcase,\
-        coherence,\
-        contrib/ant.freeform.samples,\
-        contrib/api.workqueues,\
-        contrib/apisupport.projectinspector,\
-        contrib/autoproject.core,\
-        contrib/autoproject.java,\
-        contrib/autoproject.profiler,\
-        contrib/autoproject.web,\
-        contrib/cnd.debugger.gdbserver,\
-        contrib/docbook,\
-        contrib/docbook.project,\
-        contrib/imagepaste,\
-        contrib/insertunicode,\
-        contrib/j2ee.geronimo2,\
-        contrib/j2ee.jetty,\
-        contrib/libs.selenium,\
-        contrib/libs.selenium.server,\
-        contrib/logmanagement,\
-        contrib/masterfs.suspend,\
-        contrib/modulemanager,\
-        contrib/quickfilechooser,\
-        contrib/selenium,\
-        contrib/selenium.maven,\
-        contrib/selenium.php,\
-        contrib/selenium.server,\
-        o.apache.jmeter.module,\
-        websvc.rest.wadl.design,\
-        websvc.rest.wadl.model
-
-nb.cluster.experimental.dir=extra
-nb.cluster.experimental.depends=${clusters.config.full.list}
-nb.cluster.experimental=\
-        ${nb.cluster.betauc},\
-        c.s.collablet,\
-        c.s.collablet.moxc,\
-        collab.channel.chat,\
-        collab.channel.chat.html,\
-        collab.channel.chat.java,\
-        collab.channel.chat.text,\
-        collab.channel.chat.xml,\
-        collab.channel.filesharing,\
-        collab.channel.output,\
-        collab.kit,\
-        collab.provider.im,\
-        collab.ui,\
-        contrib/a11y,\
-        contrib/accelerators.terminal,\
-        contrib/apisupport.beanbrowser,\
-        contrib/apisupport.tc.cobertura,\
-        contrib/archiver,\
-        contrib/autosave,\
-        contrib/c.ericsson.otp.erlang,\
-        contrib/codetemplatetools,\
-        contrib/de.hunsicker.jalopy.plugin.netbeans,\
-        contrib/editor.deprecated.pre61completion,\
-        contrib/editor.deprecated.pre61settings,\
-        contrib/editor.fold.support,\
-        contrib/editor.hints.i18n,\
-        contrib/editor.nexterror,\
-        contrib/encoding,\
-        contrib/explorefromhere,\
-        contrib/fisheye,\
-        contrib/folder2html,\
-        contrib/formatmany,\
-        contrib/genericnavigator,\
-        contrib/graphicclassview,\
-        contrib/group,\
-        contrib/gsf,\
-        contrib/gsf.api,\
-        contrib/gsfpath.api,\
-        contrib/hexeditor,\
-        contrib/htmlprojects,\
-        contrib/j2ee.oc4j,\
-        contrib/j2ee.sun.ws7,\
-        contrib/java.debugjavac,\
-        contrib/java.ext.editor,\
-        contrib/javahints,\
-        contrib/javanavigators,\
-        contrib/jemmysupport,\
-        contrib/languages.execution,\
-        contrib/languages.prolog,\
-        contrib/languages.tcl,\
-        contrib/languages.velocity,\
-        contrib/libs.commons_lang,\
-        contrib/libs.ical4j,\
-        contrib/libs.jcalendar,\
-        contrib/licensechanger,\
-        contrib/loaderswitcher,\
-        contrib/moduleresolver,\
-        contrib/mount,\
-        contrib/nborgsourcebrowse,\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/o.n.contrib.debuggerretry,\
-        contrib/o.n.erdbeans,\
-        contrib/o.n.misc.diff,\
-        contrib/performance.insane,\
-        contrib/perspective,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner,\
-        contrib/showtodos,\
-        contrib/sysprops,\
-        contrib/tanui,\
-        contrib/websvc.saas.services.rtm,\
-        contrib/whichproject,\
-        debugger.jpda.truffle,\
-        j2ee.websphere6,\
-        j2me.cdc.platform.bdj,\
-        j2me.cdc.project.bdj,\
-        keyring.jps,\
-        languages.refactoring,\
-        libs.xmlbeans,\
-        mercurial.search,\
-        o.n.bluej,\
-        o.n.bluej.ui,\
-        projectimport.jbuilder,\
-        traceio,\
-        uihandler.interactive,\
-        web.domdiff,\
-        web.facelets010114,\
-        web.jsf.extensions,\
-        web.livehtml,\
-        websvc.axis2,\
-        websvc.jaxrpc,\
-        websvc.jaxrpc16,\
-        websvc.jaxrpckit,\
-        websvc.registry
-
-nb.cluster.extide.dir=extide
-nb.cluster.extide.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.extide=\
-        o.apache.tools.ant.module,\
-        options.java
-
-# XXX needs updates to build:
-#        contrib/c.s.fortress,\
-#        contrib/fortress.editing,\
-
-nb.cluster.webcommon.dir=webcommon
-nb.cluster.webcommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform
-nb.cluster.webcommon=\
-        cordova,\
-        cordova.platforms,\
-        cordova.platforms.android,\
-        cordova.platforms.ios,\
-        extbrowser.chrome,\
-        javascript.bower,\
-        javascript.cdnjs,\
-        javascript.grunt,\
-        javascript.gulp,\
-        javascript.jstestdriver,\
-        javascript.karma,\
-        javascript.nodejs,\
-        javascript.v8debug,\
-        languages.apacheconf,\
-        languages.ini,\
-        lib.v8debug,\
-        libs.commons_compress,\
-        libs.jstestdriver,\
-        libs.plist,\
-        netserver,\
-        selenium2.webclient,\
-        selenium2.webclient.mocha,\
-        selenium2.webclient.protractor,\
-        web.client.kit,\
-        web.client.samples,\
-        web.clientproject,\
-        web.clientproject.api,\
-        web.inspect,\
-        web.javascript.debugger,\
-        web.webkit.tooling
-
-nb.cluster.websvccommon.dir=websvccommon
-nb.cluster.websvccommon.depends=\
-        nb.cluster.ide,\
-        nb.cluster.platform
-nb.cluster.websvccommon=\
-        websvc.jaxwsmodelapi,\
-        websvc.saas.api,\
-        websvc.saas.codegen,\
-        websvc.saas.kit,\
-        websvc.saas.services.amazon,\
-        websvc.saas.services.delicious,\
-        websvc.saas.services.flickr,\
-        websvc.saas.services.google,\
-        websvc.saas.services.strikeiron,\
-        websvc.saas.services.weatherbug,\
-        websvc.saas.services.zillow,\
-        websvc.saas.services.zvents,\
-        websvc.saas.ui
-# 225794 -  bundled twitter web service not working
-#        websvc.saas.services.twitter,\
-
-nb.cluster.javacard.dir=javacard
-nb.cluster.javacard.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java
-nb.cluster.javacard=\
-        javacard.apdu.io,\
-        javacard.apdufile,\
-        javacard.common,\
-        javacard.console,\
-        javacard.filemodels,\
-        javacard.kit,\
-        javacard.oberthur,\
-        javacard.platform.ui,\
-        javacard.project,\
-        javacard.ri.bundle,\
-        javacard.ri.platform,\
-        javacard.spi,\
-        properties.based.dataobjects,\
-        simple.project.templates,\
-        swing.customizerlayout
-
-nb.cluster.javafx.dir=javafx
-nb.cluster.javafx.depends=\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.java,\
-        nb.cluster.websvccommon,\
-        nb.cluster.harness
-nb.cluster.javafx=\
-        javafx2.editor,\
-        javafx2.kit,\
-        javafx2.platform,\
-        javafx2.project,\
-        javafx2.samples,\
-        javafx2.scenebuilder
-
-nb.cluster.remote.dir=extra
-nb.cluster.remote.depends=\
-        nb.cluster.java,\
-        nb.cluster.ide,\
-        nb.cluster.extide,\
-        nb.cluster.platform,\
-        nb.cluster.harness
-nb.cluster.remote=\
-       contrib/dew4nb,\
-       contrib/json,\
-       contrib/remote.project.finder,\
-       contrib/remote.server
-
-nb.cluster.python.depends=\
-        nb.cluster.ide
-nb.cluster.python=\
-        contrib/o.jython,\
-        contrib/o.jython.distro,\
-        contrib/python.console,\
-        contrib/python.core,\
-        contrib/python.debugger,\
-        contrib/python.editor,\
-        contrib/python.help,\
-        contrib/python.hints,\
-        contrib/python.kit,\
-        contrib/python.options,\
-        contrib/python.platform,\
-        contrib/python.project,\
-        contrib/python.project2,\
-        contrib/python.samples,\
-        contrib/python.source,\
-        contrib/python.testrunner
diff --git a/.pc/netbeans-platform-properties.patch/libs.testng/nbproject/project.properties b/.pc/netbeans-platform-properties.patch/libs.testng/nbproject/project.properties
deleted file mode 100644
index 4d3caca..0000000
--- a/.pc/netbeans-platform-properties.patch/libs.testng/nbproject/project.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
-release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
-sigtest.skip.check=true
-sigtest.fail.on.error=false
-jnlp.indirect.jars=\
-    docs/testng-6.8.1-javadoc.zip,\
-    modules/ext/testng-6.8.1-dist.jar
diff --git a/.pc/netbeans-platform-properties.patch/o.jdesktop.layout/nbproject/project.properties b/.pc/netbeans-platform-properties.patch/o.jdesktop.layout/nbproject/project.properties
deleted file mode 100644
index bf2a43b..0000000
--- a/.pc/netbeans-platform-properties.patch/o.jdesktop.layout/nbproject/project.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
-jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
diff --git a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/Makefile b/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/Makefile
deleted file mode 100644
index c7d6f5e..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-#  Main targets can be executed directly, and they are:
-#  
-#     build                    build a specific configuration
-#     clean                    remove built files from a configuration
-#     clobber                  remove all built files
-#     all                      build all configurations
-#     help                     print help mesage
-#  
-#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
-#  .help-impl are implemented in nbproject/makefile-impl.mk.
-#
-# NOCDDL
-
-
-
-# Environment 
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-
-
-
-# build
-build: .build-post
-
-.build-pre: .build-pre-$(CONF)
-# Add your pre 'build' code here...
-
-.build-pre-app.exe: app.rc
-	windres -oapp.res -Ocoff app.rc
-
-.build-pre-app64.exe: app.rc
-	x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
-
-.build-post: .build-impl
-# Add your post 'build' code here...	
-
-
-
-# clean
-clean: .clean-post
-
-.clean-pre:
-# Add your pre 'clean' code here...
-
-.clean-post: .clean-impl
-# Add your post 'clean' code here...
-
-
-
-# clobber
-clobber: .clobber-post
-
-.clobber-pre:
-# Add your pre 'clobber' code here...
-
-.clobber-post: .clobber-impl
-# Add your post 'clobber' code here...
-
-
-
-# all
-all: .all-post
-
-.all-pre:
-# Add your pre 'all' code here...
-
-.all-post: .all-impl
-# Add your post 'all' code here...
-
-
-
-# help
-help: .help-post
-
-.help-pre:
-# Add your pre 'help' code here...
-
-.help-post: .help-impl
-# Add your post 'help' code here...
-
-
-
-# include project implementation makefile
-include nbproject/Makefile-impl.mk
diff --git a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
deleted file mode 100644
index c96635b..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc.exe
-CCC=g++.exe
-CXX=g++.exe
-FC=gfortran
-AS=as.exe
-
-# Macros
-CND_PLATFORM=Cygwin-Windows
-CND_DLIB_EXT=dll
-CND_CONF=app.exe
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
-	${OBJECTDIR}/applauncher.o \
-	${OBJECTDIR}/_ext/493252820/utilsfuncs.o \
-	${OBJECTDIR}/_ext/216238457/nblauncher.o \
-	${OBJECTDIR}/app.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=-m32 -mno-cygwin
-CXXFLAGS=-m32 -mno-cygwin
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=app.res
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ../release/launchers/app.exe
-
-../release/launchers/app.exe: ${OBJECTFILES}
-	${MKDIR} -p ../release/launchers
-	${LINK.cc} -mwindows -o ../release/launchers/app.exe ${OBJECTFILES} ${LDLIBSOPTIONS} 
-
-${OBJECTDIR}/applauncher.o: applauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-
-${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp 
-	${MKDIR} -p ${OBJECTDIR}/_ext/493252820
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-
-${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}/_ext/216238457
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-
-${OBJECTDIR}/app.o: app.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
-	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ../release/launchers/app.exe
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
deleted file mode 100644
index e35d1ac..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=x86_64-w64-mingw32-gcc.exe
-CCC=x86_64-w64-mingw32-g++.exe
-CXX=x86_64-w64-mingw32-g++.exe
-FC=gfortran
-AS=as.exe
-
-# Macros
-CND_PLATFORM=Cygwin64-Windows
-CND_DLIB_EXT=dll
-CND_CONF=app64.exe
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
-	${OBJECTDIR}/applauncher.o \
-	${OBJECTDIR}/_ext/493252820/utilsfuncs.o \
-	${OBJECTDIR}/_ext/216238457/nblauncher.o \
-	${OBJECTDIR}/app.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=app64.res
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ../release/launchers/app64.exe
-
-../release/launchers/app64.exe: ${OBJECTFILES}
-	${MKDIR} -p ../release/launchers
-	${LINK.cc} -mwindows -o ../release/launchers/app64.exe ${OBJECTFILES} ${LDLIBSOPTIONS} 
-
-${OBJECTDIR}/applauncher.o: applauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
-
-${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp 
-	${MKDIR} -p ${OBJECTDIR}/_ext/493252820
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
-
-${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}/_ext/216238457
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
-
-${OBJECTDIR}/app.o: app.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
-	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} ../release/launchers/app64.exe
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/.pc/netbeans-platform-windowslauncher.patch/ide/launcher/windows/nblauncher.cpp b/.pc/netbeans-platform-windowslauncher.patch/ide/launcher/windows/nblauncher.cpp
deleted file mode 100644
index 97c15ba..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/ide/launcher/windows/nblauncher.cpp
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Author: Tomas Holy
- */
-
-#ifndef _WIN32_WINNT        
-#define _WIN32_WINNT 0x05010100
-#endif
-
-#include <shlobj.h>
-#include "nblauncher.h"
-#include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
-#include "../../../o.n.bootstrap/launcher/windows/argnames.h"
-#include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h"
-
-using namespace std;
-
-const char *NbLauncher::NBEXEC_FILE_PATH = NBEXEC_DLL;
-const char *NbLauncher::OPT_NB_DEFAULT_USER_DIR = "netbeans_default_userdir=";
-const char *NbLauncher::OPT_NB_DEFAULT_CACHE_DIR = "netbeans_default_cachedir=";
-const char *NbLauncher::OPT_NB_DEFAULT_OPTIONS = "netbeans_default_options=";
-const char *NbLauncher::OPT_NB_EXTRA_CLUSTERS = "netbeans_extraclusters=";
-const char *NbLauncher::OPT_NB_JDK_HOME = "netbeans_jdkhome=";
-const char *NbLauncher::ENV_USER_PROFILE = "USERPROFILE";
-const char *NbLauncher::HOME_TOKEN = "${HOME}";
-const char *NbLauncher::DEFAULT_USERDIR_ROOT_TOKEN = "${DEFAULT_USERDIR_ROOT}";
-const char *NbLauncher::DEFAULT_CACHEDIR_ROOT_TOKEN = "${DEFAULT_CACHEDIR_ROOT}";
-const char *NbLauncher::NETBEANS_DIRECTORY = "\\NetBeans\\";
-const char *NbLauncher::NETBEANS_CACHES_DIRECTORY = "\\NetBeans\\Cache\\";
-
-const char *NbLauncher::CON_ATTACH_MSG = 
-"\n\nThe launcher has determined that the parent process has a console and will reuse it for its own console output.\n"
-"Closing the console will result in termination of the running program.\n"
-"Use '--console suppress' to suppress console output.\n"
-"Use '--console new' to create a separate console window.\n";
-
-const char *NbLauncher::staticOptions[] = {
-    "-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade",
-    "-J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense",
-    "--branding",
-    "nb"
-};
-
-NbLauncher::NbLauncher() {
-}
-
-NbLauncher::NbLauncher(const NbLauncher& orig) {
-}
-
-NbLauncher::~NbLauncher() {
-}
-
-int NbLauncher::start(char *cmdLine) {
-    CmdArgs args(50);
-    args.addCmdLine(cmdLine);
-    return start(args.getCount(), args.getArgs());
-}
-
-int NbLauncher::start(int argc, char *argv[]) {
-    SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
-    
-    DWORD parentProcID = 0;
-    if (!checkLoggingArg(argc, argv, true) || !setupProcess(argc, argv, parentProcID, CON_ATTACH_MSG) || !initBaseNames() || !readClusterFile()) {
-        return -1;
-    }
-
-    parseConfigFile((baseDir + "\\etc\\" + getAppName() + ".conf").c_str());
-
-    if (!parseArgs(argc, argv)) {
-        return -1;
-    }
-    string oldUserDir = userDir;
-    parseConfigFile((userDir + "\\etc\\" + getAppName() + ".conf").c_str());
-    userDir = oldUserDir;
-
-    adjustHeapAndPermGenSize();
-    addExtraClusters();
-    string nbexecPath;
-    SetDllDirectory(baseDir.c_str());
-    if (dirExists(platformDir.c_str())) {
-        nbexecPath = platformDir;
-    } else {
-        nbexecPath = baseDir + '\\' + platformDir;
-    }
-    if (!dirExists(nbexecPath.c_str())) {
-        logErr(false, true, "Could not find platform cluster:\n%s", nbexecPath.c_str());
-        return false;
-    }
-
-    CmdArgs newArgs(argc + 20);
-    addSpecificOptions(newArgs);
-    
-    if (!clusters.empty()) {
-        newArgs.add(ARG_NAME_CLUSTERS);
-        newArgs.add(clusters.c_str());
-    }
-    if (!userDir.empty()) {
-        newArgs.add(ARG_NAME_USER_DIR);
-        newArgs.add(userDir.c_str());
-    }
-    if (!defUserDirRoot.empty()) {
-        newArgs.add(ARG_DEFAULT_USER_DIR_ROOT);
-        newArgs.add(defUserDirRoot.c_str());
-    }
-    if (!cacheDir.empty() && !customUserDirFound) {
-        newArgs.add(ARG_NAME_CACHE_DIR);
-        newArgs.add(cacheDir.c_str());
-    }
-    if (!nbOptions.empty()) {
-        newArgs.addCmdLine(nbOptions.c_str());
-    }
-    for (int i = 0; i < argc; i++) {
-        newArgs.add(argv[i]);
-    }
-    if (!jdkHome.empty()) {
-        newArgs.add(ARG_NAME_JDKHOME);
-        newArgs.add(jdkHome.c_str());
-    }
-    if (parentProcID) {
-        newArgs.add(ARG_NAME_LA_PPID);
-        char tmp[16] = "";
-        newArgs.add(itoa(parentProcID, tmp, 10));
-    }
-    nbexecPath += NBEXEC_FILE_PATH;
-
-    const char *curDir = getCurrentDir();
-    if (curDir) {
-        char olddir[MAX_PATH];
-        DWORD rc = GetCurrentDirectory(MAX_PATH, olddir);
-        if (rc == 0) {
-            logErr(true, false, "Failed to get current directory");
-        } else {
-            string od = string(olddir);
-            od.insert(0, "-J-Dnetbeans.user.dir=");
-            newArgs.add(od.c_str());
-        }
-        logMsg("Changing current directory to: \"%s\"", curDir);
-        SetCurrentDirectory(curDir);
-    }
-
-    NBExecLoader loader;
-    return loader.start(nbexecPath.c_str(), newArgs.getCount(), newArgs.getArgs());
-}
-
-bool NbLauncher::initBaseNames() {
-    char path[MAX_PATH] = "";
-    getCurrentModulePath(path, MAX_PATH);
-    logMsg("Executable: %s", path);
-    char *bslash = strrchr(path, '\\');
-    if (!bslash) {
-        return false;
-    }
-    appName = bslash + 1;
-    appName.erase(appName.rfind('.'));
-    
-    if (ARCHITECTURE == 64) {
-        appName = appName.erase(appName.length() - 2);
-    }
-    
-    logMsg("Application name: %s", appName.c_str());
-
-    *bslash = '\0';
-    bslash = strrchr(path, '\\');
-    if (!bslash) {
-        return false;
-    }
-    *bslash = '\0';        
-
-    baseDir = path;
-    
-    //check baseDir for non-ASCII chars
-    for (size_t i = 0; i < baseDir.size(); ++i) {
-        if (!(baseDir[i]>=' ' && baseDir[i]<='~')) {
-            logErr(false, true, "Cannot be run from folder that contains non-ASCII characters in path.");
-            return false;
-        }
-    }
-    
-    logMsg("Base dir: %s", baseDir.c_str());
-    return true;
-}
-
-void NbLauncher::addCluster(const char *cluster) {
-
-    class SetCurDir {
-    public:
-        SetCurDir(const char *dir) {
-            oldCurDir[0] = '\0';
-            DWORD rc = GetCurrentDirectory(MAX_PATH, oldCurDir);
-            if (rc == 0) {
-                logErr(true, false, "Failed to get current directory");
-                return;
-            }
-            if (rc > MAX_PATH) {
-                logMsg("Failed to get current directory, buffer is too small.");
-                return;
-            }
-            if (!SetCurrentDirectory(dir)) {
-                logErr(true, true, "Failed to set current directory to \"%s\"", dir);
-                oldCurDir[0] = '\0';
-            }
-        }
-
-        ~SetCurDir() {
-            if (oldCurDir[0]) {
-                if (!SetCurrentDirectory(oldCurDir)) {
-                    logErr(true, true, "Failed to set current directory to \"%s\"", oldCurDir);
-                }
-            }
-        }
-    private:
-        char oldCurDir[MAX_PATH];
-    };
-
-    logMsg("addCluster: %s", cluster);
-    SetCurDir setCurDir(baseDir.c_str());
-    char clusterPath[MAX_PATH + 1] = {0};
-    strncpy(clusterPath, cluster, MAX_PATH);
-    if (!normalizePath(clusterPath, MAX_PATH)) {
-        logMsg("Invalid cluster path: %s", cluster);
-        return;
-    }
-    if (!clusters.empty()) {
-        clusters += ';';
-    }
-    logMsg("Adding cluster %s", clusterPath);
-    clusters += clusterPath;
-}
-
-void NbLauncher::addExtraClusters() {
-    logMsg("addExtraClusters()");
-    const char delim = ';';
-    string::size_type start = extraClusters.find_first_not_of(delim, 0);
-    string::size_type end = extraClusters.find_first_of(delim, start);
-    while (string::npos != end || string::npos != start) {
-        string cluster = extraClusters.substr(start, end - start);
-        addCluster(cluster.c_str());
-        start = extraClusters.find_first_not_of(delim, end);
-        end = extraClusters.find_first_of(delim, start);
-    }
-}
-
-bool NbLauncher::readClusterFile() {
-    clusters = "";
-    string clusterFile = baseDir + "\\etc\\" + getAppName() + ".clusters";
-    logMsg("readClusterFile() file: %s", clusterFile.c_str());
-
-    FILE* file = fopen(clusterFile.c_str(), "r");
-    if (!file) {
-        logErr(true, true, "Cannot open file \"%s\" for reading.", clusterFile.c_str());
-        return false;
-    }
-
-    char line[4096] = "";
-    while (fgets(line, sizeof(line), file)) {
-        char *str = skipWhitespaces(line);
-        if (*str == '#' || *str == '\0') {
-            continue;
-        }
-        char *pc = str;
-        while (*pc != '\0' && *pc != '\t' && *pc != '\n' && *pc != '\r') {
-            pc++;
-        }
-        *pc = '\0';
-
-        if (platformDir.empty()) {
-            char *slash = strrchr(str, '\\');
-            if (!slash) {
-                slash = strrchr(str, '/');
-            }
-            char *dir = slash ? slash + 1 : str;
-            if (strncmp(dir, "platform", strlen("platform")) == 0) {
-                platformDir = str;
-            } else {
-                addCluster(str);
-            }
-        } else {
-            addCluster(str);
-        }
-    }
-    bool ok = ferror(file) == 0;
-    if (!ok) {
-        logErr(true, true, "Error while reading file \"%s\".", clusterFile.c_str());
-    }
-    fclose(file);
-    return ok;
-}
-
-bool NbLauncher::parseArgs(int argc, char *argv[]) {
-#define CHECK_ARG \
-    if (i+1 == argc) {\
-        logErr(false, true, "Argument is missing for \"%s\" option.", argv[i]);\
-        return false;\
-    }
-
-    logMsg("parseArgs():");
-    for (int i = 0; i < argc; i++) {
-        logMsg("\t%s", argv[i]);
-    }
-    customUserDirFound = 0;
-    for (int i = 0; i < argc; i++) {
-        if (strcmp(ARG_NAME_USER_DIR, argv[i]) == 0) {
-            CHECK_ARG;
-            char tmp[MAX_PATH + 1] = {0};
-            strncpy(tmp, argv[++i], MAX_PATH);
-            if (!normalizePath(tmp, MAX_PATH)) {
-                logErr(false, true, "User directory path \"%s\" is not valid.", argv[i]);
-                return false;
-            }
-            customUserDirFound = 1;
-            userDir = tmp;
-            logMsg("User dir: %s", userDir.c_str());
-        }
-        if (strcmp(ARG_NAME_CACHE_DIR, argv[i]) == 0) {
-            CHECK_ARG;
-            char tmp[MAX_PATH + 1] = {0};
-            strncpy(tmp, argv[++i], MAX_PATH);
-            if (!normalizePath(tmp, MAX_PATH)) {
-                logErr(false, true, "Cache directory path \"%s\" is not valid.", argv[i]);
-                return false;
-            }
-            cacheDir = tmp;
-            logMsg("Cache dir: %s", cacheDir.c_str());
-        }
-    }
-    logMsg("parseArgs() finished");
-    return true;
-}
-
-bool NbLauncher::findUserDir(const char *str) {
-    logMsg("NbLauncher::findUserDir()");    
-    if (strncmp(str, HOME_TOKEN, strlen(HOME_TOKEN)) == 0) {
-        if (userHome.empty()) {
-            char *userProfile = getenv(ENV_USER_PROFILE);
-            if (userProfile) {
-                userHome = userProfile;
-            } else {
-                TCHAR userHomeChar[MAX_PATH]; 
-                if (FAILED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, userHomeChar))) {    
-                    return false;
-                }
-                userHome = userHomeChar;
-                userHome.erase(userHome.rfind('\\'));
-            }
-            logMsg("User home: %s", userHome.c_str());
-        }
-        userDir = userHome + (str + strlen(HOME_TOKEN));
-    } else if (strncmp(str, DEFAULT_USERDIR_ROOT_TOKEN, strlen(DEFAULT_USERDIR_ROOT_TOKEN)) == 0) {       
-        userDir = getDefaultUserDirRoot() + (str + strlen(DEFAULT_USERDIR_ROOT_TOKEN));
-    } else {
-        getDefaultUserDirRoot();
-        userDir = str;
-    }
-    return true;
-}
-
-bool NbLauncher::findCacheDir(const char *str) {
-    logMsg("NbLauncher::findCacheDir()");
-    if (strncmp(str, HOME_TOKEN, strlen(HOME_TOKEN)) == 0) {
-        if (userHome.empty()) {
-            char *userProfile = getenv(ENV_USER_PROFILE);
-            if (userProfile) {
-                userHome = userProfile;
-            } else {
-                TCHAR userHomeChar[MAX_PATH]; 
-                if (FAILED(SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, 0, userHomeChar))) {    
-                    return false;
-                }
-                userHome = userHomeChar;
-                userHome.erase(userHome.rfind('\\'));
-            }
-            logMsg("User home: %s", userHome.c_str());
-        }
-        cacheDir = userHome + (str + strlen(HOME_TOKEN));
-    } else if (strncmp(str, DEFAULT_CACHEDIR_ROOT_TOKEN, strlen(DEFAULT_CACHEDIR_ROOT_TOKEN)) == 0) {        
-        cacheDir = getDefaultCacheDirRoot() + (str + strlen(DEFAULT_CACHEDIR_ROOT_TOKEN));
-    } else {
-        getDefaultCacheDirRoot();
-        cacheDir = str;
-    }
-    return true;
-}
-
-string NbLauncher::getDefaultUserDirRoot() {
-    TCHAR defUserDirRootChar[MAX_PATH];
-    if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, defUserDirRootChar))) {
-        return false;
-    }
-    defUserDirRoot = ((string) defUserDirRootChar) + NETBEANS_DIRECTORY;
-    defUserDirRoot.erase(defUserDirRoot.rfind('\\'));
-    logMsg("Default Userdir Root: %s", defUserDirRoot.c_str());
-    return defUserDirRoot;
-}
-
-string NbLauncher::getDefaultCacheDirRoot() {
-    TCHAR defCacheDirRootChar[MAX_PATH];
-    if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, defCacheDirRootChar))) {
-        return false;
-    }
-    defCacheDirRoot = ((string) defCacheDirRootChar) + NETBEANS_CACHES_DIRECTORY;
-    defCacheDirRoot.erase(defCacheDirRoot.rfind('\\'));
-    logMsg("Default Cachedir Root: %s", defCacheDirRoot.c_str());
-    return defCacheDirRoot;
-}
-
-bool NbLauncher::getOption(char *&str, const char *opt) {
-    if (strncmp(str, opt, strlen(opt)) == 0) {
-        str += strlen(opt);
-        char *end = trimWhitespaces(str);
-        if (*str == '"') {
-            str++;
-        }
-        if (end >= str && *end == '"') {
-            *end = '\0';
-        }
-        logMsg("Option found: %s%s", opt, str);
-        return true;
-    }
-    return false;
-}
-
-bool NbLauncher::parseConfigFile(const char* path) {
-    logMsg("parseConfigFile(%s)", path);
-    FILE *file = fopen(path, "r");
-    if (!file) {
-        logErr(true, false, "Cannot open file \"%s\" for reading.", path);
-        return false;
-    }
-    
-    char line[4096] = "";
-    while (fgets(line, sizeof(line), file)) {
-        char *str = skipWhitespaces(line);
-        if (*str == '#') {
-            continue;
-        }
-        if (getOption(str, getDefUserDirOptName())) {
-             findUserDir(str);
-             logMsg("User dir: %s", userDir.c_str());
-        } else if (getOption(str, getDefCacheDirOptName())) {
-             findCacheDir(str);
-             logMsg("Cache dir: %s", cacheDir.c_str());
-        } else if (getOption(str, getDefOptionsOptName())) {
-            // replace \" by "
-            int len = strlen(str);
-            int k = 0;
-            for (int i = 0; i < len; i++) {
-                if (str[i] == '\\' && str[i+1] == '\"') {
-                    continue;
-                }
-                str[k++] = str[i];
-            }
-            str[k] = '\0';
-            nbOptions = str;
-            logMsg("After replacement: %s", nbOptions.c_str());
-
-        } else if (getOption(str, getExtraClustersOptName())) {
-            extraClusters = str;
-        } else if (getOption(str, getJdkHomeOptName())) {
-            jdkHome = str;
-        }
-    }
-    bool ok = ferror(file) == 0;
-    if (!ok) {
-        logErr(true, false, "Error while reading file \"%s\".", path);
-    }
-    fclose(file);
-    return true;
-}
-
-typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
-
-bool NbLauncher::areWeOn32bits() {
-    // find out if we are on 32-bit Windows
-    SYSTEM_INFO siSysInfo;
-    PGNSI pGNSI;
-    pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
-            "GetNativeSystemInfo");
-    if (NULL != pGNSI)
-        pGNSI(&siSysInfo);
-    else
-        GetSystemInfo(&siSysInfo);
-    logMsg("NbLauncher::areWeOn32bits returns (0=false, 1=true)? %i", ((siSysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) ||
-            (strstr(NBEXEC_FILE_PATH, "64") == NULL)));
-    return ((siSysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) ||
-            (strstr(NBEXEC_FILE_PATH, "64") == NULL));
-}
-
-// Search if -Xmx and -XX:MaxPermSize are specified in existing arguments
-// If it isn't compute default values based on 32/64-bits and available RAM
-void NbLauncher::adjustHeapAndPermGenSize() {
-    if (nbOptions.find("-J-Xmx") == string::npos) {
-        int maxheap;
-        if (areWeOn32bits())
-            maxheap = 512;
-        else
-            maxheap = 1024;
-        // find how much memory we have and add -Xmx as 1/5 of the memory
-        MEMORYSTATUS ms = {0};
-        GlobalMemoryStatus(&ms);
-        int memory = (int)((ms.dwTotalPhys / 1024 / 1024) / 5);
-        if (memory < 96) {
-            memory = 96;
-        }
-        else if (memory > maxheap) {
-            memory = maxheap;
-        }
-        char tmp[32];
-        snprintf(tmp, 32, " -J-Xmx%dm", memory);
-        logMsg("Memory settings: -J-Xmx%dm", memory);
-        nbOptions += tmp;
-    }
-    // -XX:MaxPermSize and -XX:PermSize are passed to nbexec as
-    // launcher options, to apply them only for JDK 7. JDK 8 and
-    // newer do not support these arguments.
-    if (nbOptions.find("-J-XX:MaxPermSize") == string::npos) {
-        int memory;
-        if (areWeOn32bits())
-            memory = 256;
-        else
-            memory = 384;
-        char tmp[32];
-        logMsg("Memory settings: -L-XX:MaxPermSize=%dm", memory);
-        snprintf(tmp, 32, " -L-XX:MaxPermSize=%dm", memory);
-        nbOptions += tmp;
-    }
-    if (nbOptions.find("-J-XX:PermSize") == string::npos) {
-        int memory = 32;
-        char tmp[32];
-        logMsg("Memory settings: -L-XX:PermSize=%dm", memory);
-        snprintf(tmp, 32, " -L-XX:PermSize=%dm", memory);
-        nbOptions += tmp;
-    }
-}
-
-const char * NbLauncher::getAppName() {
-    return "netbeans";
-}
-
-void NbLauncher::addSpecificOptions(CmdArgs &args) {
-    for (unsigned i = 0; i < sizeof (staticOptions) / sizeof (char*); i++) {
-        args.add(staticOptions[i]);
-    }
-}
-
-const char * NbLauncher::getDefUserDirOptName() {
-    return OPT_NB_DEFAULT_USER_DIR;
-}
-
-const char * NbLauncher::getDefCacheDirOptName() {
-    return OPT_NB_DEFAULT_CACHE_DIR;
-}
-
-
-const char * NbLauncher::getDefOptionsOptName() {
-    return OPT_NB_DEFAULT_OPTIONS;
-}
-
-const char * NbLauncher::getExtraClustersOptName() {
-    return OPT_NB_EXTRA_CLUSTERS;
-}
-
-const char * NbLauncher::getJdkHomeOptName() {
-    return OPT_NB_JDK_HOME;
-}
-
-const char * NbLauncher::getCurrentDir() {
-    return 0;
-}
diff --git a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/Makefile b/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/Makefile
deleted file mode 100644
index 990aafa..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#  Main targets can be executed directly, and they are:
-#  
-#     build                    build a specific configuration
-#     clean                    remove built files from a configuration
-#     clobber                  remove all built files
-#     all                      build all configurations
-#     help                     print help mesage
-#  
-#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
-#  .help-impl are implemented in nbproject/makefile-impl.mk.
-#
-# NOCDDL
-
-# Environment 
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-
-
-
-# build
-build: .build-post-$(CONF)
-
-.build-pre:
-# Add your pre 'build' code here...
-
-.build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-	windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
-	g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-	cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
-	cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
-	
-.build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-	x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res 
-	x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe 
-	cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
-	cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
-
-
-
-# clean
-clean: .clean-post-$(CONF)
-
-.clean-pre:
-# Add your pre 'clean' code here...
-
-.clean-post-nbexec: .clean-impl
-	rm -f nbexec_exe32.res nbexec32.exe
-	
-.clean-post-nbexec64: .clean-impl
-	rm -f nbexec_exe64.res nbexec64.exe
-
-
-
-# clobber
-clobber: .clobber-post
-
-.clobber-pre:
-# Add your pre 'clobber' code here...
-
-.clobber-post: .clobber-impl
-# Add your post 'clobber' code here...
-
-
-
-# all
-all: .all-post
-
-.all-pre:
-# Add your pre 'all' code here...
-
-.all-post: .all-impl
-# Add your post 'all' code here...
-
-
-
-# help
-help: .help-post
-
-.help-pre:
-# Add your pre 'help' code here...
-
-.help-post: .help-impl
-# Add your post 'help' code here...
-
-
-
-# include project implementation makefile
-include nbproject/Makefile-impl.mk
diff --git a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
deleted file mode 100644
index 7b5163b..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
-FC=gfortran
-AS=as
-
-# Macros
-CND_PLATFORM=Cygwin-Windows
-CND_DLIB_EXT=dll
-CND_CONF=nbexec
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
-	${OBJECTDIR}/jvmlauncher.o \
-	${OBJECTDIR}/nbexec.o \
-	${OBJECTDIR}/nbexecexe.o \
-	${OBJECTDIR}/platformlauncher.o \
-	${OBJECTDIR}/utilsfuncs.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=-m32 -mno-cygwin
-CXXFLAGS=-m32 -mno-cygwin
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk nbexec.dll
-
-nbexec.dll: ${OBJECTDIR}/nbexec.res
-
-nbexec.dll: ${OBJECTFILES}
-	${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
-
-${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
-${OBJECTDIR}/nbexec.o: nbexec.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
-${OBJECTDIR}/nbexec.res: nbexec.rc version.h
-	${MKDIR} -p ${OBJECTDIR}
-	@echo Compiling Resource files...
-	windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-
-: nbexec_exe.rc 
-	@echo 
-	
-
-${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
-${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
-${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
-	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} nbexec.dll
-	${RM} ${OBJECTDIR}/nbexec.res
-	${RM} 
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
deleted file mode 100644
index 7fb819e..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-GREP=grep
-NM=nm
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=x86_64-w64-mingw32-gcc
-CCC=x86_64-w64-mingw32-g++
-CXX=x86_64-w64-mingw32-g++
-FC=gfortran
-AS=as
-
-# Macros
-CND_PLATFORM=Cygwin64-Windows
-CND_DLIB_EXT=dll
-CND_CONF=nbexec64
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-
-# Include project Makefile
-include Makefile
-
-# Object Directory
-OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
-
-# Object Files
-OBJECTFILES= \
-	${OBJECTDIR}/jvmlauncher.o \
-	${OBJECTDIR}/nbexec.o \
-	${OBJECTDIR}/nbexecexe.o \
-	${OBJECTDIR}/platformlauncher.o \
-	${OBJECTDIR}/utilsfuncs.o
-
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Assembler Flags
-ASFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk nbexec64.dll
-
-nbexec64.dll: ${OBJECTDIR}/nbexec64.res
-
-nbexec64.dll: ${OBJECTFILES}
-	${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
-
-${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
-
-${OBJECTDIR}/nbexec.o: nbexec.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
-
-${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
-	${MKDIR} -p ${OBJECTDIR}
-	@echo Compiling Resource files...
-	x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
-
-: nbexec_exe.rc 
-	@echo 
-	
-
-${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
-
-${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
-
-${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp 
-	${MKDIR} -p ${OBJECTDIR}
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
-	${RM} -r ${CND_BUILDDIR}/${CND_CONF}
-	${RM} nbexec64.dll
-	${RM} ${OBJECTDIR}/nbexec64.res
-	${RM} 
-
-# Subprojects
-.clean-subprojects:
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-include .dep.inc
diff --git a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
deleted file mode 100644
index 21f947f..0000000
--- a/.pc/netbeans-platform-windowslauncher.patch/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Author: Tomas Holy
- */
-
-#ifndef KEY_WOW64_64KEY
-#define KEY_WOW64_64KEY 0x0100
-#endif
-
-#include "utilsfuncs.h"
-#include "argnames.h"
-#include <tlhelp32.h>
-#include <windows.h>
-
-using namespace std;
-
-bool disableFolderVirtualization(HANDLE hProcess) {
-    OSVERSIONINFO osvi = {0};
-    osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-    if (GetVersionEx(&osvi) && osvi.dwMajorVersion == 6) // check it is Win VISTA
-    {
-        HANDLE hToken;
-        if (OpenProcessToken(hProcess, TOKEN_ALL_ACCESS, &hToken)) {
-            DWORD tokenInfoVal = 0;
-            if (!SetTokenInformation(hToken, (TOKEN_INFORMATION_CLASS) 24, &tokenInfoVal, sizeof (DWORD))) {
-                // invalid token information class (24) is OK, it means there is no folder virtualization on current system
-                if (GetLastError() != ERROR_INVALID_PARAMETER) {
-                    logErr(true, true, "Failed to set token information.");
-                    return false;
-                }
-            }
-            CloseHandle(hToken);
-        } else {
-            logErr(true, true, "Failed to open process token.");
-            return false;
-        }
-    }
-    return true;
-}
-
-bool getStringFromRegistry(HKEY rootKey, const char *keyName, const char *valueName, string &value) {
-    return getStringFromRegistryEx(rootKey, keyName, valueName, value, false);
-}
-
-bool getStringFromRegistry64bit(HKEY rootKey, const char *keyName, const char *valueName, string &value) {
-    return getStringFromRegistryEx(rootKey, keyName, valueName, value, true);
-}
-
-
-
-bool getStringFromRegistryEx(HKEY rootKey, const char *keyName, const char *valueName, string &value, bool read64bit) {
-    logMsg("getStringFromRegistry()\n\tkeyName: %s\n\tvalueName: %s", keyName, valueName);
-    HKEY hKey = 0;
-    if (RegOpenKeyEx(rootKey, keyName, 0, KEY_READ | (read64bit ? KEY_WOW64_64KEY : 0), &hKey) == ERROR_SUCCESS) {
-        DWORD valSize = 4096;
-        DWORD type = 0;
-        char val[4096] = "";
-        if (RegQueryValueEx(hKey, valueName, 0, &type, (BYTE *) val, &valSize) == ERROR_SUCCESS
-                && type == REG_SZ) {
-            logMsg("%s: %s", valueName, val);
-            RegCloseKey(hKey);
-            value = val;
-            return true;
-        } else {
-            logErr(true, false, "RegQueryValueEx() failed.");
-        }
-        RegCloseKey(hKey);
-    } else {
-        logErr(true, false, "RegOpenKeyEx() failed.");
-    }
-    return false;
-}
-
-bool getDwordFromRegistry(HKEY rootKey, const char *keyName, const char *valueName, DWORD &value) {
-    logMsg("getDwordFromRegistry()\n\tkeyName: %s\n\tvalueName: %s", keyName, valueName);
-    HKEY hKey = 0;
-    if (RegOpenKeyEx(rootKey, keyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) {
-        DWORD valSize = sizeof(DWORD);
-        DWORD type = 0;
-        if (RegQueryValueEx(hKey, valueName, 0, &type, (BYTE *) &value, &valSize) == ERROR_SUCCESS
-                && type == REG_DWORD) {
-            logMsg("%s: %u", valueName, value);
-            RegCloseKey(hKey);
-            return true;
-        } else {
-            logErr(true, false, "RegQueryValueEx() failed.");
-        }
-        RegCloseKey(hKey);
-    } else {
-        logErr(true, false, "RegOpenKeyEx() failed.");
-    }
-    return false;
-}
-
-bool dirExists(const char *path) {
-    WIN32_FIND_DATA fd = {0};
-    HANDLE hFind = 0;
-    hFind = FindFirstFile(path, &fd);
-    if (hFind == INVALID_HANDLE_VALUE) {
-        logMsg("Dir \"%s\" does not exist", path);
-        return false;
-    }
-    logMsg("Dir \"%s\" exists", path);
-    FindClose(hFind);
-    return (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-}
-
-bool fileExists(const char *path) {
-    WIN32_FIND_DATA fd = {0};
-    HANDLE hFind = 0;
-    hFind = FindFirstFile(path, &fd);
-    if (hFind == INVALID_HANDLE_VALUE) {
-        logMsg("File \"%s\" does not exist", path);
-        return false;
-    }
-
-    logMsg("File \"%s\" exists", path);
-    FindClose(hFind);
-    return true;
-}
-
-bool normalizePath(char *path, int len) {
-    char tmp[MAX_PATH] = "";
-    int i = 0;
-    while (path[i] && i < MAX_PATH - 1) {
-        tmp[i] = path[i] == '/' ? '\\' : path[i];
-        i++;
-    }
-    tmp[i] = '\0';
-    return _fullpath(path, tmp, len) != NULL;
-}
-
-bool createPath(const char *path) {
-    logMsg("Creating directory \"%s\"", path);
-    char dir[MAX_PATH] = "";
-    const char *sep = strchr(path, '\\');
-    while (sep) {
-        strncpy(dir, path, sep - path);
-        if (!CreateDirectory(dir, 0) && GetLastError() != ERROR_ALREADY_EXISTS) {
-            logErr(true, false, "Failed to create directory %s", dir);
-            return false;
-        }
-        sep = strchr(sep + 1, '\\');
-    }
-    return true;
-}
-
-
-char * getCurrentModulePath(char *path, int pathLen) {
-    MEMORY_BASIC_INFORMATION mbi;
-    static int dummy;
-    VirtualQuery(&dummy, &mbi, sizeof (mbi));
-    HMODULE hModule = (HMODULE) mbi.AllocationBase;
-    GetModuleFileName(hModule, path, pathLen);
-    return path;
-}
-
-char * skipWhitespaces(char *str) {
-    while (*str != '\0' && (*str == ' ' || *str == '\t' || *str == '\n' || *str == '\r')) {
-        str++;
-    }
-    return str;
-}
-
-char * trimWhitespaces(char *str) {
-    char *end = str + strlen(str) - 1;
-    while (end >= str && (*end == ' ' || *end == '\t' || *end == '\n' || *end == '\r')) {
-        *end = '\0';
-        end--;
-    }
-    return end;
-}
-
-char* getSysError(char *str, int strSize) {
-    int err = GetLastError();
-    LPTSTR lpMsgBuf;
-    FormatMessage(
-            FORMAT_MESSAGE_ALLOCATE_BUFFER |
-            FORMAT_MESSAGE_FROM_SYSTEM |
-            FORMAT_MESSAGE_IGNORE_INSERTS,
-            NULL,
-            err,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            (LPTSTR) & lpMsgBuf,
-            0,
-            NULL
-            );
-    LPTSTR tmp = strchr(lpMsgBuf, '\r');
-    if (tmp != NULL) {
-        *tmp = '\0';
-    }
-
-    _snprintf(str, strSize, " %s (%u)", lpMsgBuf, err);
-    LocalFree(lpMsgBuf);
-    return str;
-}
-
-string gLogFileName;
-
-void logV(bool appendSysError, bool showMsgBox, const char *format, va_list args) {
-    char msg[4096] = "";
-    vsnprintf(msg, 4096, format, args);
-
-    if (appendSysError) {
-        char sysErr[512] = "";
-        getSysError(sysErr, 512);
-        strncat(msg, sysErr, 4096 - strlen(msg));
-    }
-
-    if (!gLogFileName.empty()) {
-        FILE *file = fopen(gLogFileName.c_str(), "a");
-        if (file) {
-            fprintf(file, "%s\n", msg);
-            fclose(file);
-        }
-    }
-
-    if (showMsgBox) {
-        ::MessageBox(NULL, msg, "Error", MB_OK | MB_ICONSTOP);
-    }
-}
-
-void logErr(bool appendSysError, bool showMsgBox, const char *format, ...) {
-    va_list args;
-    va_start(args, format);
-    logV(appendSysError, showMsgBox, format, args);
-}
-
-void logMsg(const char *format, ...) {
-    va_list args;
-    va_start(args, format);
-    logV(false, false, format, args);
-}
-
-bool restarting(int argc, char *argv[]) {
-    for (int i = 0; i < argc; i++) {
-        if (strcmp(ARG_NAME_LA_START_APP, argv[i]) == 0 || strcmp(ARG_NAME_LA_START_AU, argv[i]) == 0) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool checkLoggingArg(int argc, char *argv[], bool delFile) {
-    for (int i = 0; i < argc; i++) {
-        if (strcmp(ARG_NAME_LAUNCHER_LOG, argv[i]) == 0) {
-            if (i + 1 == argc) {
-                logErr(false, true, "Argument is missing for \"%s\" option.", argv[i]);
-                return false;
-            }
-            gLogFileName = argv[++i];
-            // if we are restarting, keep log file
-            if (delFile && !restarting(argc, argv)) {
-                DeleteFile(gLogFileName.c_str());
-            }
-            break;
-        }
-    }
-    return true;
-}
-
-bool setupProcess(int &argc, char *argv[], DWORD &parentProcID, const char *attachMsg) {
-#define CHECK_ARG \
-    if (i+1 == argc) {\
-        logErr(false, true, "Argument is missing for \"%s\" option.", argv[i]);\
-        return false;\
-    }
-
-    parentProcID = 0;
-    DWORD cmdLineArgPPID = 0;
-    for (int i = 0; i < argc; i++) {
-        if (strcmp(ARG_NAME_CONSOLE, argv[i]) == 0) {
-            CHECK_ARG;
-            if (strcmp("new", argv[i + 1]) == 0){
-                AllocConsole();
-            } else if (strcmp("suppress", argv[i + 1]) == 0) {
-                // nothing, no console should be attached
-            } else {
-                logErr(false, true, "Invalid argument for \"%s\" option.", argv[i]);
-                return false;
-            }
-            // remove options
-            for (int k = i + 2; k < argc; k++) {
-                argv[k-2] = argv[k];
-            }
-            argc -= 2;
-            return true;
-        } else if (strcmp(ARG_NAME_LA_PPID, argv[i]) == 0) {
-            CHECK_ARG;
-            char *end = 0;
-            cmdLineArgPPID = strtoul(argv[++i], &end, 10);
-            if (cmdLineArgPPID == 0 && *end != '\0') {
-                logErr(false, true, "Invalid parameter for option %s", ARG_NAME_LA_PPID);
-                return false;
-            }
-            logMsg("Command line arg PPID: %u", cmdLineArgPPID);
-            break;
-        }
-    }
-#undef CHECK_ARG
-
-    // default, attach to parent process console if exists
-    // AttachConsole exists since WinXP, so be nice and do it dynamically
-    typedef BOOL (WINAPI *LPFAC)(DWORD  dwProcessId);
-    HINSTANCE hKernel32 = GetModuleHandle("kernel32");
-    if (hKernel32) {
-        LPFAC attachConsole = (LPFAC) GetProcAddress(hKernel32, "AttachConsole");
-        if (attachConsole) {
-            if (cmdLineArgPPID) {
-                if (!attachConsole(cmdLineArgPPID)) {
-                    logErr(true, false, "AttachConsole of PPID: %u failed.", cmdLineArgPPID);
-                }
-            } else {
-                if (!attachConsole((DWORD) -1)) {
-                    logErr(true, false, "AttachConsole of PP failed.");
-                } else {
-                    getParentProcessID(parentProcID);
-                    if (attachMsg) {
-                        printToConsole(attachMsg);
-                    }
-                }
-            }
-        } else {
-            logErr(true, false, "GetProcAddress() for AttachConsole failed.");
-        }
-    }
-    return true;
-}
-
-bool isConsoleAttached() {
-    typedef HWND (WINAPI *GetConsoleWindowT)();
-    HINSTANCE hKernel32 = GetModuleHandle("kernel32");
-    if (hKernel32) {
-        GetConsoleWindowT getConsoleWindow = (GetConsoleWindowT) GetProcAddress(hKernel32, "GetConsoleWindow");
-        if (getConsoleWindow) {
-            if (getConsoleWindow() != NULL) {
-                logMsg("Console is attached.");
-                return true;
-            }
-        } else {
-            logErr(true, false, "GetProcAddress() for GetConsoleWindow failed.");
-        }
-    }
-    return false;
-}
-
-bool printToConsole(const char *msg) {
-    FILE *console = fopen("CON", "a");
-    if (!console) {
-        return false;
-    }
-    fprintf(console, "%s", msg);
-    fclose(console);
-    return false;
-}
-
-bool getParentProcessID(DWORD &id) {
-    typedef HANDLE (WINAPI * CreateToolhelp32SnapshotT)(DWORD, DWORD);
-    typedef BOOL (WINAPI * Process32FirstT)(HANDLE, LPPROCESSENTRY32);
-    typedef BOOL (WINAPI * Process32NextT)(HANDLE, LPPROCESSENTRY32);
-
-    HINSTANCE hKernel32 = GetModuleHandle("kernel32");
-    if (!hKernel32) {
-        return false;
-    }
-
-    CreateToolhelp32SnapshotT createToolhelp32Snapshot = (CreateToolhelp32SnapshotT) GetProcAddress(hKernel32, "CreateToolhelp32Snapshot");
-    Process32FirstT process32First = (Process32FirstT) GetProcAddress(hKernel32, "Process32First");
-    Process32NextT process32Next = (Process32NextT) GetProcAddress(hKernel32, "Process32Next");
-
-    if (createToolhelp32Snapshot == NULL || process32First == NULL || process32Next == NULL) {
-        logErr(true, false, "Failed to obtain Toolhelp32 functions.");
-        return false;
-    }
-
-    HANDLE hSnapshot = createToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (hSnapshot == INVALID_HANDLE_VALUE) {
-        logErr(true, false, "Failed to obtain process snapshot.");
-        return false;
-    }
-
-    PROCESSENTRY32 entry = {0};
-    entry.dwSize = sizeof (PROCESSENTRY32);
-    if (!process32First(hSnapshot, &entry)) {
-        CloseHandle(hSnapshot);
-        return false;
-    }
-
-    DWORD curID = GetCurrentProcessId();
-    logMsg("Current process ID: %u", curID);
-
-    do {
-        if (entry.th32ProcessID == curID) {
-            id = entry.th32ParentProcessID;
-            logMsg("Parent process ID: %u", id);
-            CloseHandle(hSnapshot);
-            return true;
-        }
-    } while (process32Next(hSnapshot, &entry));
-
-    CloseHandle(hSnapshot);
-    return false;
-}
-
-bool isWow64()
-{
-    BOOL IsWow64 = FALSE;
-    typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
-    LPFN_ISWOW64PROCESS fnIsWow64Process;
-
-    fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress(GetModuleHandle(TEXT("kernel32")),"IsWow64Process");
-  
-    if (NULL != fnIsWow64Process)
-    {
-        if (!fnIsWow64Process(GetCurrentProcess(),&IsWow64))
-        {
-            // handle error
-        }
-    }
-    return IsWow64;
-}
-
-int convertAnsiToUtf8(const char *ansi, char *utf8, int utf8Len) {
-    const int len = 32*1024;
-    WCHAR tmp[len] = L"";
-    if (MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, ansi, -1, tmp, len) == 0)
-        return -1;
-    if (WideCharToMultiByte(CP_UTF8, 0, tmp, -1, utf8, utf8Len, NULL, NULL) == 0)
-        return -1;
-    return 0;
-}
-
diff --git a/.pc/netbeans-slf4j.dummy.patch/o.eclipse.jgit/nbproject/project.xml b/.pc/netbeans-slf4j.dummy.patch/o.eclipse.jgit/nbproject/project.xml
deleted file mode 100644
index f31a978..0000000
--- a/.pc/netbeans-slf4j.dummy.patch/o.eclipse.jgit/nbproject/project.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
-            <code-name-base>org.eclipse.jgit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>com.jcraft.jsch</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>0.6.12</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/build.xml b/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/build.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/manifest.mf b/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/manifest.mf
deleted file mode 100644
index e69de29..0000000
diff --git a/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/nbproject/project.xml b/.pc/netbeans-slf4j.dummy.patch/slf4j.dummy/nbproject/project.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/.pc/netbeans-small-ide.patch/apisupport.kit/nbproject/project.xml b/.pc/netbeans-small-ide.patch/apisupport.kit/nbproject/project.xml
deleted file mode 100644
index a2f9bc8..0000000
--- a/.pc/netbeans-small-ide.patch/apisupport.kit/nbproject/project.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.apisupport.kit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.ant</code-name-base>
-                    <run-dependency>
-                        <specification-version>2.31</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.crudsample</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.harness</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.10</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.installer</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.33</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.apisupport.wizards</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-small-ide.patch/editor.kit/nbproject/project.xml b/.pc/netbeans-small-ide.patch/editor.kit/nbproject/project.xml
deleted file mode 100644
index ca4a1bd..0000000
--- a/.pc/netbeans-small-ide.patch/editor.kit/nbproject/project.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.css.visual</code-name-base>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>3.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.actions</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.search</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.html</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.23</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.html.parser</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.html.validation</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.image</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.19</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.javascript2.kit</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>0.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.languages.manifest</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.languages.yaml</code-name-base>
-                    <run-dependency>
-                        <specification-version>2.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>9.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.properties</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.21</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.core</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.13</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.schema.completion</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.text</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.16</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.tools</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.13</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xsl</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.13</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.spi.editor.hints.projects</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-small-ide.patch/ide.kit/nbproject/project.xml b/.pc/netbeans-small-ide.patch/ide.kit/nbproject/project.xml
deleted file mode 100644
index 16d140e..0000000
--- a/.pc/netbeans-small-ide.patch/ide.kit/nbproject/project.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.ide.kit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.core.ide</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.10</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.core.multitabs</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.core.multitabs.project</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.core.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.28</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.defaults</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.dlight.terminal</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.bookmarks</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
-                    <run-dependency>
-                        <release-version>0</release-version>
-                        <specification-version>1.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.codetemplates</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.5</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.9</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.errorstripe</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.fold</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.35</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.fold.nbui</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.indent</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.5</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.macros</code-name-base>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.plain</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.plain.lib</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.settings.storage</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.49</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.settings.lib</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.49</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.structure</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.14</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.editor.util</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.17</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.extbrowser</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.11</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.httpserver</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.jumpto</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.options.editor</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.print.editor</code-name-base>
-                    <run-dependency>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.49</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectui</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.12</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.tasklist.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.usersguide</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.utilities</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.25</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.catalog</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
-                    <run-dependency>
-                        <release-version>0</release-version>
-                        <specification-version>1.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.swing.dirchooser</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>qa-functional</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.bootstrap</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.autoupdate.services</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.ide</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jemmy</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.sampler</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.modules</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.text</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.ui</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.lookup</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.windows</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-small-ide.patch/java.kit/nbproject/project.xml b/.pc/netbeans-small-ide.patch/java.kit/nbproject/project.xml
deleted file mode 100644
index e2acd54..0000000
--- a/.pc/netbeans-small-ide.patch/java.kit/nbproject/project.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2010-2012 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 2008 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.java.kit</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.java</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.18</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.ant.kit</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.beans</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.19</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.findbugs.installer</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.i18n</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.22</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
-                    <run-dependency>
-                        <release-version>0</release-version>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.debug</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.editor</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.8</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.editor.lib</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.9</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.examples</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.6</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.freeform</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.hints</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.hints.declarative</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.hints.ui</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.j2sedeploy</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.j2seembedded</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.j2seplatform</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.j2seprofiles</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.j2seproject</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.12</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.navigation</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.platform</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.9</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.project</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.62</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.source</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>0.141</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.source.ant</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.javadoc</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.javawebstart</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.junit</code-name-base>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.23</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectimport.eclipse.core</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.4</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.refactoring.java</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.spellchecker.bindings.java</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.8</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.websvc.jaxws21api</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.tools.java</code-name-base>
-                    <run-dependency>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.nashorn.execution</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>qa-functional</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.ide.kit</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.java.source</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.java.sourceui</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.ide</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.java</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jellytools.platform</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.jemmy</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectapi</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.filesystems</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.ui</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.util.lookup</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.windows</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-small-ide.patch/xsl/nbproject/project.xml b/.pc/netbeans-small-ide.patch/xsl/nbproject/project.xml
deleted file mode 100644
index 16e1d5f..0000000
--- a/.pc/netbeans-small-ide.patch/xsl/nbproject/project.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.xsl</code-name-base>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.xml</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.41</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.api.xml.ui</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.41</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.core.multiview</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.25</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.78</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.78</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.queries</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.10</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.servletapi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.14</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.xml.text</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.16</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.actions</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.8</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.execution</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.loaders</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.61</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.text</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.16</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.ui</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.45</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.httpserver</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
-                        <recursive/>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
-            <public-packages/>
-        </data>
-    </configuration>
-</project>
diff --git a/.pc/netbeans-spi.java.hints.patch/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java b/.pc/netbeans-spi.java.hints.patch/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
deleted file mode 100644
index 8b98f4f..0000000
--- a/.pc/netbeans-spi.java.hints.patch/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
+++ /dev/null
@@ -1,1623 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2008-2010 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2008-2010 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.java.hints.spiimpl;
-
-import com.sun.source.tree.AnnotationTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionStatementTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.LiteralTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.ModifiersTree;
-import com.sun.source.tree.NewArrayTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.Scope;
-import com.sun.source.tree.StatementTree;
-import com.sun.source.tree.SwitchTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.Tree.Kind;
-import com.sun.source.tree.TypeParameterTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.api.JavacScope;
-import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.api.JavacTrees;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Symtab;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.comp.Attr;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Enter;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.comp.Todo;
-import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.parser.JavacParser;
-import com.sun.tools.javac.parser.Lexer;
-import com.sun.tools.javac.parser.Parser;
-import com.sun.tools.javac.parser.ParserFactory;
-import com.sun.tools.javac.parser.Scanner;
-import com.sun.tools.javac.parser.ScannerFactory;
-import com.sun.tools.javac.parser.Tokens.Token;
-import com.sun.tools.javac.parser.Tokens.TokenKind;
-import com.sun.tools.javac.tree.EndPosTable;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCCase;
-import com.sun.tools.javac.tree.JCTree.JCCatch;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCStatement;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.Names;
-import com.sun.tools.javadoc.Messager;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.IOException;
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.net.URI;
-import java.nio.CharBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
-import javax.lang.model.element.AnnotationValueVisitor;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.Elements;
-import javax.tools.Diagnostic;
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import org.netbeans.api.annotations.common.CheckForNull;
-import org.netbeans.api.annotations.common.NonNull;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.java.platform.JavaPlatform;
-import org.netbeans.api.java.platform.JavaPlatformManager;
-import org.netbeans.api.java.queries.SourceForBinaryQuery;
-import org.netbeans.api.java.queries.SourceForBinaryQuery.Result2;
-import org.netbeans.api.java.source.ClasspathInfo;
-import org.netbeans.api.java.source.CompilationInfo;
-import org.netbeans.api.java.source.CompilationInfo.CacheClearPolicy;
-import org.netbeans.api.java.source.SourceUtils;
-import org.netbeans.api.java.source.TreeMaker;
-import org.netbeans.modules.java.hints.providers.spi.ClassPathBasedHintProvider;
-import org.netbeans.modules.java.hints.providers.spi.HintDescription;
-import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription;
-import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.CatchWildcard;
-import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.VariableWildcard;
-import org.netbeans.modules.java.source.JavaSourceAccessor;
-import org.netbeans.modules.java.source.builder.TreeFactory;
-import org.netbeans.lib.nbjavac.services.CancelService;
-import org.netbeans.lib.nbjavac.services.NBParserFactory.NBJavacParser;
-import org.netbeans.lib.nbjavac.services.NBParserFactory;
-import org.netbeans.lib.nbjavac.services.NBResolve;
-import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.AnnotationWildcard;
-import org.netbeans.modules.java.hints.spiimpl.JackpotTrees.FakeBlock;
-import org.netbeans.modules.java.source.parsing.FileObjects;
-import org.netbeans.modules.java.source.pretty.ImportAnalysis2;
-import org.netbeans.modules.java.source.transform.ImmutableTreeTranslator;
-import org.netbeans.spi.editor.hints.Severity;
-import org.netbeans.spi.java.classpath.support.ClassPathSupport;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.util.Lookup;
-import org.openide.util.NbCollections;
-import org.openide.util.WeakListeners;
-import org.openide.util.lookup.ServiceProvider;
-
-/**
- *
- * @author Jan Lahoda
- */
-public class Utilities {
-
-    private Utilities() {}
-    
-    public static Set<Severity> disableErrors(FileObject file) {
-        if (file.getAttribute(DISABLE_ERRORS) != null) {
-            return EnumSet.allOf(Severity.class);
-        }
-        if (!file.canWrite() && FileUtil.getArchiveFile(file) != null) {
-            return EnumSet.allOf(Severity.class);
-        }
-
-        return EnumSet.noneOf(Severity.class);
-    }
-
-    private static final String DISABLE_ERRORS = "disable-java-errors";
-    
-
-    public static <E> Iterable<E> checkedIterableByFilter(final Iterable raw, final Class<E> type, final boolean strict) {
-        return new Iterable<E>() {
-            public Iterator<E> iterator() {
-                return NbCollections.checkedIteratorByFilter(raw.iterator(), type, strict);
-            }
-        };
-    }
-    
-//    public static AnnotationTree constructConstraint(WorkingCopy wc, String name, TypeMirror tm) {
-//        TreeMaker make = wc.getTreeMaker();
-//        ExpressionTree variable = prepareAssignment(make, "variable", make.Literal(name));
-//        ExpressionTree type     = prepareAssignment(make, "type", make.MemberSelect((ExpressionTree) make.Type(wc.getTypes().erasure(tm)), "class"));
-//        TypeElement constraint  = wc.getElements().getTypeElement(Annotations.CONSTRAINT.toFQN());
-//
-//        return make.Annotation(make.QualIdent(constraint), Arrays.asList(variable, type));
-//    }
-
-    public static ExpressionTree prepareAssignment(TreeMaker make, String name, ExpressionTree value) {
-        return make.Assignment(make.Identifier(name), value);
-    }
-
-    public static ExpressionTree findValue(AnnotationTree m, String name) {
-        for (ExpressionTree et : m.getArguments()) {
-            if (et.getKind() == Kind.ASSIGNMENT) {
-                AssignmentTree at = (AssignmentTree) et;
-                String varName = ((IdentifierTree) at.getVariable()).getName().toString();
-
-                if (varName.equals(name)) {
-                    return at.getExpression();
-                }
-            }
-
-            if (et instanceof LiteralTree/*XXX*/ && "value".equals(name)) {
-                return et;
-            }
-        }
-
-        return null;
-    }
-
-    public static List<AnnotationTree> findArrayValue(AnnotationTree at, String name) {
-        ExpressionTree fixesArray = findValue(at, name);
-        List<AnnotationTree> fixes = new LinkedList<AnnotationTree>();
-
-        if (fixesArray != null && fixesArray.getKind() == Kind.NEW_ARRAY) {
-            NewArrayTree trees = (NewArrayTree) fixesArray;
-
-            for (ExpressionTree fix : trees.getInitializers()) {
-                if (fix.getKind() == Kind.ANNOTATION) {
-                    fixes.add((AnnotationTree) fix);
-                }
-            }
-        }
-
-        if (fixesArray != null && fixesArray.getKind() == Kind.ANNOTATION) {
-            fixes.add((AnnotationTree) fixesArray);
-        }
-        
-        return fixes;
-    }
-
-    public static boolean isPureMemberSelect(Tree mst, boolean allowVariables) {
-        switch (mst.getKind()) {
-            case IDENTIFIER: return allowVariables || ((IdentifierTree) mst).getName().charAt(0) != '$';
-            case MEMBER_SELECT: return isPureMemberSelect(((MemberSelectTree) mst).getExpression(), allowVariables);
-            default: return false;
-        }
-    }
-
-    public static Map<String, Collection<HintDescription>> sortOutHints(Iterable<? extends HintDescription> hints, Map<String, Collection<HintDescription>> output) {
-        for (HintDescription d : hints) {
-            Collection<HintDescription> h = output.get(d.getMetadata().displayName);
-
-            if (h == null) {
-                output.put(d.getMetadata().displayName, h = new LinkedList<HintDescription>());
-            }
-
-            h.add(d);
-        }
-
-        return output;
-    }
-
-    public static List<HintDescription> listAllHints(Set<ClassPath> cps) {
-        List<HintDescription> result = new LinkedList<HintDescription>();
-
-        for (Collection<? extends HintDescription> hints : RulesManager.getInstance().readHints(null, cps, new AtomicBoolean()).values()) {
-            for (HintDescription hd : hints) {
-                if (!(hd.getTrigger() instanceof PatternDescription)) continue; //TODO: only pattern based hints are currently supported
-                result.add(hd);
-            }
-        }
-
-        result.addAll(listClassPathHints(Collections.<ClassPath>emptySet(), cps));
-
-        return result;
-    }
-
-    public static List<HintDescription> listClassPathHints(Set<ClassPath> sourceCPs, Set<ClassPath> binaryCPs) {
-        List<HintDescription> result = new LinkedList<HintDescription>();
-        Set<FileObject> roots = new HashSet<FileObject>();
-
-        for (ClassPath cp : binaryCPs) {
-            for (FileObject r : cp.getRoots()) {
-                Result2 src = SourceForBinaryQuery.findSourceRoots2(r.toURL());
-
-                if (src != null && src.preferSources()) {
-                    roots.addAll(Arrays.asList(src.getRoots()));
-                } else {
-                    roots.add(r);
-                }
-            }
-        }
-
-        Set<ClassPath> cps = new HashSet<ClassPath>(sourceCPs);
-
-        cps.add(ClassPathSupport.createClassPath(roots.toArray(new FileObject[0])));
-
-        ClassPath cp = ClassPathSupport.createProxyClassPath(cps.toArray(new ClassPath[0]));
-
-        for (ClassPathBasedHintProvider p : Lookup.getDefault().lookupAll(ClassPathBasedHintProvider.class)) {
-            result.addAll(p.computeHints(cp, new AtomicBoolean()));
-        }
-
-        return result;
-    }
-    
-    public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope) {
-        return parseAndAttribute(info, pattern, scope, null);
-    }
-
-    public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        return parseAndAttribute(info, JavaSourceAccessor.getINSTANCE().getJavacTask(info), pattern, scope, errors);
-    }
-
-    public static Tree parseAndAttribute(CompilationInfo info, String pattern, Scope scope, SourcePositions[] sourcePositions, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        return parseAndAttribute(info, JavaSourceAccessor.getINSTANCE().getJavacTask(info), pattern, scope, sourcePositions, errors);
-    }
-
-    public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern) {
-        return parseAndAttribute(jti, pattern, null);
-    }
-
-    public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        return parseAndAttribute(null, jti, pattern, null, errors);
-    }
-
-    public static Tree parseAndAttribute(JavacTaskImpl jti, String pattern, SourcePositions[] sourcePositions, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        return parseAndAttribute(null, jti, pattern, null, sourcePositions, errors);
-    }
-
-    private static Tree parseAndAttribute(CompilationInfo info, JavacTaskImpl jti, String pattern, Scope scope, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        return parseAndAttribute(info, jti, pattern, scope, new SourcePositions[1], errors);
-    }
-
-    private static Tree parseAndAttribute(CompilationInfo info, JavacTaskImpl jti, String pattern, Scope scope, SourcePositions[] sourcePositions, Collection<Diagnostic<? extends JavaFileObject>> errors) {
-        Context c = jti.getContext();
-        TreeFactory make = TreeFactory.instance(c);
-        List<Diagnostic<? extends JavaFileObject>> patternTreeErrors = new LinkedList<Diagnostic<? extends JavaFileObject>>();
-        Tree toAttribute;
-        Tree patternTree = toAttribute = !isStatement(pattern) ? parseExpression(c, pattern, true, sourcePositions, patternTreeErrors) : null;
-        int offset = 0;
-        boolean expression = true;
-        boolean classMember = false;
-
-        if (pattern.startsWith("case ")) {//XXX: should be a lexer token
-            List<Diagnostic<? extends JavaFileObject>> currentPatternTreeErrors = new LinkedList<Diagnostic<? extends JavaFileObject>>();
-            Tree switchTree = parseStatement(c, "switch ($$foo) {" + pattern + "}", sourcePositions, currentPatternTreeErrors);
-
-            offset = "switch ($$foo) {".length();
-            patternTreeErrors = currentPatternTreeErrors;
-            toAttribute =  switchTree;
-            patternTree = ((SwitchTree) switchTree).getCases().get(0);
-        }
-
-        if (patternTree == null || isErrorTree(patternTree)) {
-            SourcePositions[] currentPatternTreePositions = new SourcePositions[1];
-            List<Diagnostic<? extends JavaFileObject>> currentPatternTreeErrors = new LinkedList<Diagnostic<? extends JavaFileObject>>();
-            Tree currentPatternTree = parseStatement(c, "{" + pattern + "}", currentPatternTreePositions, currentPatternTreeErrors);
-
-            assert currentPatternTree.getKind() == Kind.BLOCK : currentPatternTree.getKind();
-
-            List<? extends StatementTree> statements = ((BlockTree) currentPatternTree).getStatements();
-
-            if (statements.size() == 1) {
-                currentPatternTree = statements.get(0);
-            } else {
-                com.sun.tools.javac.util.List<JCStatement> newStatements = com.sun.tools.javac.util.List.<JCStatement>nil();
-
-                if (!statements.isEmpty() && !Utilities.isMultistatementWildcardTree(statements.get(0)))
-                    newStatements = newStatements.append((JCStatement) make.ExpressionStatement(make.Identifier("$$1$")));
-                for (StatementTree st : statements) {
-                    newStatements = newStatements.append((JCStatement) st);
-                }
-                if (!statements.isEmpty() && !Utilities.isMultistatementWildcardTree(statements.get(statements.size() - 1)))
-                    newStatements = newStatements.append((JCStatement) make.ExpressionStatement(make.Identifier("$$2$")));
-
-                currentPatternTree = new FakeBlock(0L, newStatements);
-            }
-
-            if (!currentPatternTreeErrors.isEmpty() || containsError(currentPatternTree)) {
-                //maybe a class member?
-                SourcePositions[] classPatternTreePositions = new SourcePositions[1];
-                List<Diagnostic<? extends JavaFileObject>> classPatternTreeErrors = new LinkedList<Diagnostic<? extends JavaFileObject>>();
-                Tree classPatternTree = parseExpression(c, "new Object() {" + pattern + "}", false, classPatternTreePositions, classPatternTreeErrors);
-
-                if (!containsError(classPatternTree)) {
-                    sourcePositions[0] = classPatternTreePositions[0];
-                    offset = "new Object() {".length();
-                    patternTreeErrors = classPatternTreeErrors;
-                    patternTree = toAttribute = classPatternTree;
-                    classMember = true;
-                } else {
-                    offset = 1;
-                    sourcePositions[0] = currentPatternTreePositions[0];
-                    VariableTree var;
-                    Names names = Names.instance(jti.getContext());
-                    if (currentPatternTree.getKind() == Kind.VARIABLE && (var = ((VariableTree) currentPatternTree)).getType().getKind() == Kind.ERRONEOUS && var.getName() == names.error && var.getInitializer() == null && var.getModifiers().getAnnotations().size() == 1 && !containsError(var.getModifiers().getAnnotations().get(0))) {
-                        patternTreeErrors = currentPatternTreeErrors; //TODO: the errors are incorrect
-                        toAttribute = currentPatternTree;
-                        patternTree = var.getModifiers().getAnnotations().get(0);
-                    } else {
-                        patternTreeErrors = currentPatternTreeErrors;
-                        patternTree = toAttribute = currentPatternTree;
-                    }
-                }
-            } else {
-                sourcePositions[0] = currentPatternTreePositions[0];
-                offset = 1;
-                patternTreeErrors = currentPatternTreeErrors;
-                patternTree = toAttribute = currentPatternTree;
-            }
-
-            expression = false;
-        }
-
-        if (scope != null) {
-            TypeMirror type = attributeTree(jti, toAttribute, scope, patternTreeErrors);
-
-            if (isError(type) && expression) {
-                //maybe type?
-                if (Utilities.isPureMemberSelect(patternTree, false)) {
-                    SourcePositions[] varPositions = new SourcePositions[1];
-                    List<Diagnostic<? extends JavaFileObject>> varErrors = new LinkedList<Diagnostic<? extends JavaFileObject>>();
-                    Tree var = parseExpression(c, pattern + ".Class.class;", false, varPositions, varErrors);
-
-                    attributeTree(jti, var, scope, varErrors);
-
-                    ExpressionTree typeTree = ((MemberSelectTree) ((MemberSelectTree) var).getExpression()).getExpression();
-                    final Symtab symtab = Symtab.instance(c);
-                    final Elements el = jti.getElements();
-                    final Trees trees = JavacTrees.instance(c);
-                    CompilationUnitTree cut = ((JavacScope) scope).getEnv().toplevel;
-                    final boolean[] found = new boolean[1];
-
-                    new TreePathScanner<Void, Void>() {
-                        @Override public Void visitMemberSelect(MemberSelectTree node, Void p) {
-                            Element currentElement = trees.getElement(getCurrentPath());
-
-                            if (!isError(currentElement)) {
-                                if (currentElement.getKind() == ElementKind.PACKAGE && el.getPackageElement(node.toString()) == null) {
-                                    ((JCFieldAccess) node).sym = symtab.errSymbol;
-                                    ((JCFieldAccess) node).type = symtab.errType;
-                                } else {
-                                    found[0] = true;
-                                    return null;
-                                }
-                            }
-
-                            return super.visitMemberSelect(node, p);
-                        }
-                        @Override public Void visitIdentifier(IdentifierTree node, Void p) {
-                            Element currentElement = trees.getElement(getCurrentPath());
-
-                            if (!isError(currentElement)) {
-                                if (currentElement.getKind() == ElementKind.PACKAGE && el.getPackageElement(node.toString()) == null) {
-                                    ((JCIdent) node).sym = symtab.errSymbol;
-                                    ((JCIdent) node).type = symtab.errType;
-                                } else {
-                                    found[0] = true;
-                                    return null;
-                                }
-                            }
-                            return super.visitIdentifier(node, p);
-                        }
-
-                    }.scan(new TreePath(new TreePath(cut), typeTree), null);
-
-                    if (found[0]) {
-                        sourcePositions[0] = varPositions[0];
-                        offset = 0;
-                        patternTreeErrors = varErrors;
-                        patternTree = typeTree;
-                    }
-                }
-            }
-        }
-
-        if (classMember) {
-            List<? extends Tree> members = ((NewClassTree) patternTree).getClassBody().getMembers();
-            
-            int syntheticOffset = !members.isEmpty() && members.get(0).getKind() == Kind.METHOD && (((JCMethodDecl) members.get(0)).mods.flags & Flags.GENERATEDCONSTR) != 0 ? 1 : 0;
-
-            if (members.size() > 1 + syntheticOffset) {
-                ModifiersTree mt = make.Modifiers(EnumSet.noneOf(Modifier.class));
-                List<Tree> newMembers = new LinkedList<Tree>();
-
-                newMembers.add(make.ExpressionStatement(make.Identifier("$$1$")));
-                newMembers.addAll(members.subList(syntheticOffset, members.size()));
-
-                patternTree = make.Class(mt, "$", Collections.<TypeParameterTree>emptyList(), null, Collections.<Tree>emptyList(), newMembers);
-            } else {
-                patternTree = members.get(0 + syntheticOffset);
-            }
-        }
-
-        if (errors != null) {
-            for (Diagnostic<? extends JavaFileObject> d : patternTreeErrors) {
-                if (d.getCode().equals("compiler.err.cant.resolve")) { // NOI18N
-                    String msg = d.getMessage(Locale.ENGLISH);
-                    if (msg != null) {
-                        int symIdx = msg.indexOf("symbol: "); // NOI18N
-                        if (symIdx > 0) {
-                            symIdx += 8;
-                            // ignore errors for $ placeholders; may be identified as classnames as well
-                            if (msg.charAt(symIdx) == '$' || msg.substring(symIdx, symIdx + 7).equals("class $")) { // NOI18N
-                                continue;
-                            }
-                        }
-                    }
-                }
-                if (d.getStartPosition() == -1 || d.getEndPosition() == -1) {
-                    continue;
-                }
-                errors.add(new OffsetDiagnostic<JavaFileObject>(d, sourcePositions[0], -offset));
-            }
-        }
-
-        sourcePositions[0] = new OffsetSourcePositions(sourcePositions[0], -offset);
-        
-        return patternTree;
-    }
-
-    static boolean isError(Element el) {
-        return (el == null || (el.getKind() == ElementKind.CLASS) && isError(((TypeElement) el).asType()));
-    }
-
-    private static boolean isError(TypeMirror type) {
-        return type == null || type.getKind() == TypeKind.ERROR;
-    }
-
-    private static boolean isStatement(String pattern) {
-        return pattern.trim().endsWith(";");
-    }
-
-    private static boolean isErrorTree(Tree t) {
-        return t.getKind() == Kind.ERRONEOUS || (t.getKind() == Kind.IDENTIFIER && ((IdentifierTree) t).getName().contentEquals("<error>")); //TODO: <error>...
-    }
-    
-    private static boolean containsError(Tree t) {
-        return new TreeScanner<Boolean, Void>() {
-            @Override
-            public Boolean scan(Tree node, Void p) {
-                if (node != null && isErrorTree(node)) {
-                    return true;
-                }
-                return super.scan(node, p) ==Boolean.TRUE;
-            }
-            @Override
-            public Boolean reduce(Boolean r1, Boolean r2) {
-                return r1 == Boolean.TRUE || r2 == Boolean.TRUE;
-            }
-        }.scan(t, null);
-    }
-
-    private static JCStatement parseStatement(Context context, CharSequence stmt, SourcePositions[] pos, final List<Diagnostic<? extends JavaFileObject>> errors) {
-        if (stmt == null || (pos != null && pos.length != 1))
-            throw new IllegalArgumentException();
-        JavaCompiler compiler = JavaCompiler.instance(context);
-        JavaFileObject prev = compiler.log.useSource(new DummyJFO());
-        Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log) {
-            @Override
-            public void report(JCDiagnostic diag) {
-                errors.add(diag);
-            }            
-        };
-        try {
-            CharBuffer buf = CharBuffer.wrap((stmt+"\u0000").toCharArray(), 0, stmt.length());
-            ParserFactory factory = ParserFactory.instance(context);
-            ScannerFactory scannerFactory = ScannerFactory.instance(context);
-            Names names = Names.instance(context);
-            Parser parser = new JackpotJavacParser(context, (NBParserFactory) factory, scannerFactory.newScanner(buf, false), false, false, CancelService.instance(context), names);
-            if (parser instanceof JavacParser) {
-                if (pos != null)
-                    pos[0] = new ParserSourcePositions((JavacParser)parser);
-                return parser.parseStatement();
-            }
-            return null;
-        } finally {
-            compiler.log.useSource(prev);
-            compiler.log.popDiagnosticHandler(discardHandler);
-        }
-    }
-
-    private static JCExpression parseExpression(Context context, CharSequence expr, boolean onlyFullInput, SourcePositions[] pos, final List<Diagnostic<? extends JavaFileObject>> errors) {
-        if (expr == null || (pos != null && pos.length != 1))
-            throw new IllegalArgumentException();
-        JavaCompiler compiler = JavaCompiler.instance(context);
-        JavaFileObject prev = compiler.log.useSource(new DummyJFO());
-        Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log) {
-            @Override
-            public void report(JCDiagnostic diag) {
-                errors.add(diag);
-            }            
-        };
-        try {
-            CharBuffer buf = CharBuffer.wrap((expr+"\u0000").toCharArray(), 0, expr.length());
-            ParserFactory factory = ParserFactory.instance(context);
-            ScannerFactory scannerFactory = ScannerFactory.instance(context);
-            Names names = Names.instance(context);
-            Scanner scanner = scannerFactory.newScanner(buf, false);
-            Parser parser = new JackpotJavacParser(context, (NBParserFactory) factory, scanner, false, false, CancelService.instance(context), names);
-            if (parser instanceof JavacParser) {
-                if (pos != null)
-                    pos[0] = new ParserSourcePositions((JavacParser)parser);
-                JCExpression result = parser.parseExpression();
-
-                if (!onlyFullInput || scanner.token().kind == TokenKind.EOF) {
-                    return result;
-                }
-            }
-            return null;
-        } finally {
-            compiler.log.useSource(prev);
-            compiler.log.popDiagnosticHandler(discardHandler);
-        }
-    }
-
-    private static TypeMirror attributeTree(JavacTaskImpl jti, Tree tree, Scope scope, final List<Diagnostic<? extends JavaFileObject>> errors) {
-        Log log = Log.instance(jti.getContext());
-        JavaFileObject prev = log.useSource(new DummyJFO());
-        Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(log) {
-            @Override
-            public void report(JCDiagnostic diag) {
-                errors.add(diag);
-            }            
-        };
-        NBResolve resolve = NBResolve.instance(jti.getContext());
-        resolve.disableAccessibilityChecks();
-        Enter enter = Enter.instance(jti.getContext());
-        enter.shadowTypeEnvs(true);
-        try {
-            Attr attr = Attr.instance(jti.getContext());
-            Env<AttrContext> env = ((JavacScope) scope).getEnv();
-            if (tree instanceof JCExpression)
-                return attr.attribExpr((JCTree) tree,env, Type.noType);
-            return attr.attribStat((JCTree) tree,env);
-        } finally {
-            log.useSource(prev);
-            log.popDiagnosticHandler(discardHandler);
-            resolve.restoreAccessbilityChecks();
-            enter.shadowTypeEnvs(false);
-        }
-    }
-
-    public static @CheckForNull CharSequence getWildcardTreeName(@NonNull Tree t) {
-        if (t.getKind() == Kind.EXPRESSION_STATEMENT && ((ExpressionStatementTree) t).getExpression().getKind() == Kind.IDENTIFIER) {
-            IdentifierTree identTree = (IdentifierTree) ((ExpressionStatementTree) t).getExpression();
-            
-            return identTree.getName().toString();
-        }
-
-        if (t.getKind() == Kind.IDENTIFIER) {
-            IdentifierTree identTree = (IdentifierTree) t;
-            String name = identTree.getName().toString();
-
-            if (name.startsWith("$")) {
-                return name;
-            }
-        }
-        
-        if (t.getKind() == Kind.TYPE_PARAMETER) {
-            String name = ((TypeParameterTree) t).getName().toString();
-
-            if (name.startsWith("$")) {
-                return name;
-            }
-        }
-
-        return null;
-    }
-
-    public static boolean isMultistatementWildcard(@NonNull CharSequence name) {
-        return name.charAt(name.length() - 1) == '$';
-    }
-
-    public static boolean isMultistatementWildcardTree(Tree tree) {
-        CharSequence name = Utilities.getWildcardTreeName(tree);
-
-        return name != null && Utilities.isMultistatementWildcard(name);
-    }
-
-    private static long inc;
-
-    public static Scope constructScope(CompilationInfo info, Map<String, TypeMirror> constraints) {
-        return constructScope(info, constraints, Collections.<String>emptyList());
-    }
-
-    public static Scope constructScope(CompilationInfo info, Map<String, TypeMirror> constraints, Iterable<? extends String> auxiliaryImports) {
-        ScopeDescription desc = new ScopeDescription(constraints, auxiliaryImports);
-        Scope result = (Scope) info.getCachedValue(desc);
-
-        if (result != null) return result;
-        
-        StringBuilder clazz = new StringBuilder();
-
-        clazz.append("package $;");
-
-        for (String i : auxiliaryImports) {
-            clazz.append(i);
-        }
-
-        long count = inc++;
-
-        clazz.append("public class $" + count + "{");
-
-        for (Entry<String, TypeMirror> e : constraints.entrySet()) {
-            if (e.getValue() != null) {
-                clazz.append("private ");
-                clazz.append(e.getValue().toString()); //XXX
-                clazz.append(" ");
-                clazz.append(e.getKey());
-                clazz.append(";\n");
-            }
-        }
-
-        clazz.append("private void test() {\n");
-        clazz.append("}\n");
-        clazz.append("}\n");
-
-        JavacTaskImpl jti = JavaSourceAccessor.getINSTANCE().getJavacTask(info);
-        Context context = jti.getContext();
-        JavaCompiler compiler = JavaCompiler.instance(context);
-        Log log = Log.instance(context);
-        NBResolve resolve = NBResolve.instance(context);
-        Log.DiagnosticHandler discardHandler = new Log.DiscardDiagnosticHandler(compiler.log);
-
-        JavaFileObject jfo = FileObjects.memoryFileObject("$", "$", new File("/tmp/$" + count + ".java").toURI(), System.currentTimeMillis(), clazz.toString());
-
-        boolean oldSkipAPs = compiler.skipAnnotationProcessing;
-
-        try {
-            compiler.skipAnnotationProcessing = true;
-            resolve.disableAccessibilityChecks();
-            
-            JCCompilationUnit cut = compiler.parse(jfo);
-
-            compiler.enterTrees(com.sun.tools.javac.util.List.of(cut));
-
-            Todo todo = compiler.todo;
-            ListBuffer<Env<AttrContext>> defer = new ListBuffer<Env<AttrContext>>();
-            
-            while (todo.peek() != null) {
-                Env<AttrContext> env = todo.remove();
-
-                if (env.toplevel == cut)
-                    compiler.attribute(env);
-                else
-                    defer = defer.append(env);
-            }
-
-            todo.addAll(defer);
-
-            Scope res = new ScannerImpl().scan(cut, info);
-
-            info.putCachedValue(desc, res, CacheClearPolicy.ON_SIGNATURE_CHANGE);
-
-            return res;
-        } finally {
-            resolve.restoreAccessbilityChecks();
-            log.popDiagnosticHandler(discardHandler);
-            compiler.skipAnnotationProcessing = oldSkipAPs;
-        }
-    }
-
-    private static final class ScannerImpl extends TreePathScanner<Scope, CompilationInfo> {
-
-        @Override
-        public Scope visitBlock(BlockTree node, CompilationInfo p) {
-            return p.getTrees().getScope(getCurrentPath());
-        }
-
-        @Override
-        public Scope visitMethod(MethodTree node, CompilationInfo p) {
-            if (node.getReturnType() == null) {
-                return null;
-            }
-            return super.visitMethod(node, p);
-        }
-
-        @Override
-        public Scope reduce(Scope r1, Scope r2) {
-            return r1 != null ? r1 : r2;
-        }
-
-    }
-
-    private static final class ScopeDescription {
-        private final Map<String, TypeMirror> constraints;
-        private final Iterable<? extends String> auxiliaryImports;
-
-        public ScopeDescription(Map<String, TypeMirror> constraints, Iterable<? extends String> auxiliaryImports) {
-            this.constraints = constraints;
-            this.auxiliaryImports = auxiliaryImports;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            final ScopeDescription other = (ScopeDescription) obj;
-            if (this.constraints != other.constraints && (this.constraints == null || !this.constraints.equals(other.constraints))) {
-                return false;
-            }
-            if (this.auxiliaryImports != other.auxiliaryImports && (this.auxiliaryImports == null || !this.auxiliaryImports.equals(other.auxiliaryImports))) {
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 7;
-            hash = 47 * hash + (this.constraints != null ? this.constraints.hashCode() : 0);
-            hash = 47 * hash + (this.auxiliaryImports != null ? this.auxiliaryImports.hashCode() : 0);
-            return hash;
-        }
-
-    }
-
-//    private static Scope constructScope2(CompilationInfo info, Map<String, TypeMirror> constraints) {
-//        JavacScope s = (JavacScope) info.getTrees().getScope(new TreePath(info.getCompilationUnit()));
-//        Env<AttrContext> env = s.getEnv();
-//
-//        env = env.dup(env.tree);
-//
-//        env.info.
-//    }
-
-    public static String toHumanReadableTime(double d) {
-        StringBuilder result = new StringBuilder();
-        long inSeconds = (long) (d / 1000);
-        int seconds = (int) (inSeconds % 60);
-        long inMinutes = inSeconds / 60;
-        int minutes = (int) (inMinutes % 60);
-        long inHours = inMinutes / 60;
-
-        if (inHours > 0) {
-            result.append(inHours);
-            result.append("h");
-        }
-
-        if (minutes > 0) {
-            result.append(minutes);
-            result.append("m");
-        }
-        
-        result.append(seconds);
-        result.append("s");
-
-        return result.toString();
-    }
-
-    public static ClasspathInfo createUniversalCPInfo() {
-        return Lookup.getDefault().lookup(SPI.class).createUniversalCPInfo();
-    }
-
-    @SuppressWarnings("deprecation")
-    public static void waitScanFinished() throws InterruptedException {
-        SourceUtils.waitScanFinished();
-    }
-
-    public static Set<? extends String> findSuppressedWarnings(CompilationInfo info, TreePath path) {
-        //TODO: cache?
-        Set<String> keys = new HashSet<String>();
-
-        while (path != null) {
-            Tree leaf = path.getLeaf();
-
-            switch (leaf.getKind()) {
-                case METHOD:
-                    handleSuppressWarnings(info, path, ((MethodTree) leaf).getModifiers(), keys);
-                    break;
-                case CLASS:
-                    handleSuppressWarnings(info, path, ((ClassTree) leaf).getModifiers(), keys);
-                    break;
-                case VARIABLE:
-                    handleSuppressWarnings(info, path, ((VariableTree) leaf).getModifiers(), keys);
-                    break;
-            }
-
-            path = path.getParentPath();
-        }
-
-        return Collections.unmodifiableSet(keys);
-    }
-
-    private static void handleSuppressWarnings(CompilationInfo info, TreePath path, ModifiersTree modifiers, final Set<String> keys) {
-        Element el = info.getTrees().getElement(path);
-
-        if (el == null) {
-            return ;
-        }
-
-        for (AnnotationMirror am : el.getAnnotationMirrors()) {
-            Name fqn = ((TypeElement) am.getAnnotationType().asElement()).getQualifiedName();
-            
-            if (!fqn.contentEquals("java.lang.SuppressWarnings")) {
-                continue;
-            }
-
-            for (Entry<? extends ExecutableElement, ? extends AnnotationValue> e : am.getElementValues().entrySet()) {
-                if (!e.getKey().getSimpleName().contentEquals("value"))
-                    continue;
-
-                e.getValue().accept(new AnnotationValueVisitor<Void, Void>() {
-                    public Void visit(AnnotationValue av, Void p) {
-                        av.accept(this, p);
-                        return null;
-                    }
-                    public Void visit(AnnotationValue av) {
-                        av.accept(this, null);
-                        return null;
-                    }
-                    public Void visitBoolean(boolean b, Void p) {
-                        return null;
-                    }
-                    public Void visitByte(byte b, Void p) {
-                        return null;
-                    }
-                    public Void visitChar(char c, Void p) {
-                        return null;
-                    }
-                    public Void visitDouble(double d, Void p) {
-                        return null;
-                    }
-                    public Void visitFloat(float f, Void p) {
-                        return null;
-                    }
-                    public Void visitInt(int i, Void p) {
-                        return null;
-                    }
-                    public Void visitLong(long i, Void p) {
-                        return null;
-                    }
-                    public Void visitShort(short s, Void p) {
-                        return null;
-                    }
-                    public Void visitString(String s, Void p) {
-                        keys.add(s);
-                        return null;
-                    }
-                    public Void visitType(TypeMirror t, Void p) {
-                        return null;
-                    }
-                    public Void visitEnumConstant(VariableElement c, Void p) {
-                        return null;
-                    }
-                    public Void visitAnnotation(AnnotationMirror a, Void p) {
-                        return null;
-                    }
-                    public Void visitArray(List<? extends AnnotationValue> vals, Void p) {
-                        for (AnnotationValue av : vals) {
-                            av.accept(this, p);
-                        }
-                        return null;
-                    }
-                    public Void visitUnknown(AnnotationValue av, Void p) {
-                        return null;
-                    }
-                }, null);
-            }
-        }
-    }
-
-    public static Tree generalizePattern(CompilationInfo info, TreePath original) {
-        return generalizePattern(JavaSourceAccessor.getINSTANCE().getJavacTask(info), original);
-    }
-
-    public static Tree generalizePattern(CompilationTask task, TreePath original) {
-        JavacTaskImpl jti = (JavacTaskImpl) task;
-        com.sun.tools.javac.util.Context c = jti.getContext();
-        TreeFactory make = TreeFactory.instance(c);
-        Trees javacTrees = Trees.instance(task);
-        GeneralizePattern gp = new GeneralizePattern(javacTrees, make);
-
-        gp.scan(original, null);
-
-        GeneralizePatternITT itt = new GeneralizePatternITT(gp.tree2Variable);
-
-        itt.attach(c, new NoImports(c), null);
-
-        return itt.translate(original.getLeaf());
-    }
-
-    public static Tree generalizePattern(CompilationInfo info, TreePath original, int firstStatement, int lastStatement) {
-        JavacTaskImpl jti = JavaSourceAccessor.getINSTANCE().getJavacTask(info);
-        com.sun.tools.javac.util.Context c = jti.getContext();
-        TreeFactory make = TreeFactory.instance(c);
-        Tree translated = Utilities.generalizePattern(jti, original);
-
-        assert translated.getKind() == Kind.BLOCK;
-
-        List<StatementTree> newStatements = new LinkedList<StatementTree>();
-        BlockTree block = (BlockTree) translated;
-
-        if (firstStatement != lastStatement) {
-            newStatements.add(make.ExpressionStatement(make.Identifier("$s0$")));
-            newStatements.addAll(block.getStatements().subList(firstStatement, lastStatement + 1));
-            newStatements.add(make.ExpressionStatement(make.Identifier("$s1$")));
-
-            translated = make.Block(newStatements, block.isStatic());
-        } else {
-            translated = block.getStatements().get(firstStatement);
-        }
-
-        return translated;
-    }
-
-    public interface SPI {
-        public ClasspathInfo createUniversalCPInfo();
-    }
-
-    @ServiceProvider(service=SPI.class)
-    public static final class NbSPIImpl implements SPI, PropertyChangeListener {
-        
-        /**
-         * Cached reference to the ClasspathInfo created from the platform.
-         */
-        private volatile Reference<ClasspathInfo>    cached = new WeakReference<>(null);
-        
-        // @GuardedBy(this)
-        private PropertyChangeListener weakL;
-
-        public synchronized ClasspathInfo createUniversalCPInfo() {
-            Reference<ClasspathInfo> r = cached;
-            if (r != null) {
-                ClasspathInfo c = r.get();
-                if (c != null) {
-                    return c;
-                }
-            }
-            JavaPlatform select = JavaPlatform.getDefault();
-            final JavaPlatformManager man = JavaPlatformManager.getDefault();
-            if (select.getSpecification().getVersion() != null) {
-                for (JavaPlatform p : JavaPlatformManager.getDefault().getInstalledPlatforms()) {
-                    if (!"j2se".equals(p.getSpecification().getName()) || p.getSpecification().getVersion() == null) continue;
-                    if (p.getSpecification().getVersion().compareTo(select.getSpecification().getVersion()) > 0) {
-                        select = p;
-                    }
-                }
-            }
-            final ClasspathInfo result = ClasspathInfo.create(select.getBootstrapLibraries(), ClassPath.EMPTY, ClassPath.EMPTY);
-            if (cached != null) {
-                    this.cached = new WeakReference<>(result);
-            }
-            if (weakL == null) {
-                man.addPropertyChangeListener(weakL = WeakListeners.propertyChange(this, man));
-            }
-            return result;
-        }
-
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            cached = null;
-        }
-    }
-    
-    private static final class GeneralizePattern extends TreePathScanner<Void, Void> {
-
-        public final Map<Tree, Tree> tree2Variable = new HashMap<Tree, Tree>();
-        private final Map<Element, String> element2Variable = new HashMap<Element, String>();
-        private final Trees javacTrees;
-        private final TreeFactory make;
-
-        private int currentVariableIndex = 0;
-
-        public GeneralizePattern(Trees javacTrees, TreeFactory make) {
-            this.javacTrees = javacTrees;
-            this.make = make;
-        }
-
-        private @NonNull String getVariable(@NonNull Element el) {
-            String var = element2Variable.get(el);
-
-            if (var == null) {
-                element2Variable.put(el, var = "$" + currentVariableIndex++);
-            }
-
-            return var;
-        }
-
-        private boolean shouldBeGeneralized(@NonNull Element el) {
-            if (el.getModifiers().contains(Modifier.PRIVATE)) {
-                return true;
-            }
-
-            switch (el.getKind()) {
-                case LOCAL_VARIABLE:
-                case EXCEPTION_PARAMETER:
-                case PARAMETER:
-                    return true;
-            }
-
-            return false;
-        }
-
-        @Override
-        public Void visitIdentifier(IdentifierTree node, Void p) {
-            Element e = javacTrees.getElement(getCurrentPath());
-
-            if (e != null && shouldBeGeneralized(e)) {
-                tree2Variable.put(node, make.Identifier(getVariable(e)));
-            }
-
-            return super.visitIdentifier(node, p);
-        }
-
-        @Override
-        public Void visitVariable(VariableTree node, Void p) {
-            Element e = javacTrees.getElement(getCurrentPath());
-
-            if (e != null && shouldBeGeneralized(e)) {
-                VariableTree nue = make.Variable(node.getModifiers(), getVariable(e), node.getType(), node.getInitializer());
-
-                tree2Variable.put(node, nue);
-            }
-
-            return super.visitVariable(node, p);
-        }
-
-        @Override
-        public Void visitNewClass(NewClassTree node, Void p) {
-            //XXX:
-            if (node.getEnclosingExpression() != null) {
-                tree2Variable.put(node, make.Identifier("$" + currentVariableIndex++));
-                return null;
-            }
-
-            NewClassTree nue = make.NewClass(node.getEnclosingExpression(), Collections.<ExpressionTree>singletonList(make.Identifier("$" + currentVariableIndex++ + "$")), make.Identifier("$" + currentVariableIndex++), Collections.<ExpressionTree>singletonList(make.Identifier("$" + currentVariableIndex++ + "$")), null);
-
-            tree2Variable.put(node, nue);
-
-            return null;
-        }
-
-    }
-
-    private static final class GeneralizePatternITT extends ImmutableTreeTranslator {
-
-        private final Map<Tree, Tree> tree2Variable;
-
-        public GeneralizePatternITT(Map<Tree, Tree> tree2Variable) {
-            super(null);
-            this.tree2Variable = tree2Variable;
-        }
-
-        @Override
-        public Tree translate(Tree tree) {
-            Tree var = tree2Variable.remove(tree);
-
-            if (var != null) {
-                return super.translate(var);
-            }
-
-            return super.translate(tree);
-        }
-
-    }
-
-    private static final class NoImports extends ImportAnalysis2 {
-
-        public NoImports(Context env) {
-            super(env);
-        }
-
-        @Override
-        public void classEntered(ClassTree clazz) {}
-
-        @Override
-        public void enterVisibleThroughClasses(ClassTree clazz) {}
-
-        @Override
-        public void classLeft() {}
-
-        @Override
-        public ExpressionTree resolveImport(MemberSelectTree orig, Element element) {
-            return orig;
-        }
-
-        @Override
-        public void setCompilationUnit(CompilationUnitTree cut) {}
-
-        @Override
-        public void setImports(List<? extends ImportTree> importsToAdd) {}
-
-        @Override
-        public Set<? extends Element> getImports() {
-            return Collections.emptySet();
-        }
-
-        @Override
-        public void setPackage(ExpressionTree packageNameTree) {}
-
-    }
-
-    public static long patternValue(Tree pattern) {
-        class VisitorImpl extends TreeScanner<Void, Void> {
-            private int value;
-            @Override
-            public Void scan(Tree node, Void p) {
-                if (node != null) value++;
-                return super.scan(node, p);
-            }
-            @Override
-            public Void visitIdentifier(IdentifierTree node, Void p) {
-                if (node.getName().toString().startsWith("$")) value--;
-                
-                return super.visitIdentifier(node, p);
-            }
-            @Override
-            public Void visitNewClass(NewClassTree node, Void p) {
-                return null;
-            }
-        }
-
-        VisitorImpl vi = new VisitorImpl();
-
-        vi.scan(pattern, null);
-
-        return vi.value;
-    }
-
-    public static boolean containsMultistatementTrees(List<? extends Tree> statements) {
-        for (Tree t : statements) {
-            if (Utilities.isMultistatementWildcardTree(t)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean isJavadocSupported(CompilationInfo info) {
-        Context c = JavaSourceAccessor.getINSTANCE().getJavacTask(info).getContext();
-
-        try {
-        return c.get(Log.logKey) instanceof Messager;
-        } catch (NoClassDefFoundError e) {
-            return false;
-        }
-    }
-
-    private static class JackpotJavacParser extends NBJavacParser {
-
-        private final Context ctx;
-        private final com.sun.tools.javac.util.Name dollar;
-        public JackpotJavacParser(Context ctx, NBParserFactory fac,
-                         Lexer S,
-                         boolean keepDocComments,
-                         boolean keepLineMap,
-                         CancelService cancelService,
-                         Names names) {
-            super(fac, S, keepDocComments, keepLineMap, true, cancelService);
-            this.ctx = ctx;
-            this.dollar = names.fromString("$");
-        }
-
-        @Override
-        protected JCModifiers modifiersOpt(JCModifiers partial) {
-            if (token.kind == TokenKind.IDENTIFIER) {
-                String ident = token.name().toString();
-
-                if (Utilities.isMultistatementWildcard(ident)) {
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    nextToken();
-                    
-                    JCModifiers result = super.modifiersOpt(partial);
-                    
-                    result.annotations = result.annotations.prepend(new AnnotationWildcard(name, F.Ident(name)));
-
-                    return result;
-                }
-            }
-
-            return super.modifiersOpt(partial);
-        }
-
-        @Override
-        public JCVariableDecl formalParameter(boolean lambdaParam) {
-            if (token.kind == TokenKind.IDENTIFIER) {
-                if (token.name().startsWith(dollar)) {
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    Token peeked = S.token(1);
-
-                    if (peeked.kind == TokenKind.COMMA || peeked.kind == TokenKind.RPAREN) {
-                        nextToken();
-                        return new VariableWildcard(ctx, name, F.Ident(name));
-                    }
-                }
-            }
-
-            return super.formalParameter(lambdaParam);
-        }
-
-        @Override
-        protected JCVariableDecl implicitParameter() {
-            if (token.kind == TokenKind.IDENTIFIER) {
-                if (token.name().startsWith(dollar)) {
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    Token peeked = S.token(1);
-
-                    if (peeked.kind == TokenKind.COMMA || peeked.kind == TokenKind.RPAREN) {
-                        nextToken();
-                        return new VariableWildcard(ctx, name, F.Ident(name));
-                    }
-                }
-            }
-
-            return super.implicitParameter();
-        }
-        
-        @Override
-        protected JCCatch catchClause() {
-            if (token.kind == TokenKind.CATCH) {
-                Token peeked = S.token(1);
-                
-                if (   peeked.kind == TokenKind.IDENTIFIER
-                    && Utilities.isMultistatementWildcard(peeked.name().toString())) {
-                    accept(TokenKind.CATCH);
-                    
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    accept(TokenKind.IDENTIFIER);
-
-                    return new CatchWildcard(ctx, name, F.Ident(name));
-                } else {
-                    nextToken();
-                }
-            }
-            return super.catchClause();
-        }
-
-        @Override
-        public com.sun.tools.javac.util.List<JCTree> classOrInterfaceBodyDeclaration(com.sun.tools.javac.util.Name className, boolean isInterface) {
-            if (token.kind == TokenKind.IDENTIFIER) {
-                if (token.name().startsWith(dollar)) {
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    Token peeked = S.token(1);
-
-                    if (peeked.kind == TokenKind.SEMI) {
-                        nextToken();
-                        nextToken();
-                        
-                        return com.sun.tools.javac.util.List.<JCTree>of(F.Ident(name));
-                    }
-                }
-            }
-            return super.classOrInterfaceBodyDeclaration(className, isInterface);
-        }
-        
-        @Override
-        protected JCExpression checkExprStat(JCExpression t) {
-            if (t.getTag() == JCTree.Tag.IDENT) {
-                if (((IdentifierTree) t).getName().toString().startsWith("$")) {
-                    return t;
-                }
-            }
-            return super.checkExprStat(t);
-        }
-
-        @Override
-        protected JCCase switchBlockStatementGroup() {
-            if (token.kind == TokenKind.CASE) {
-                Token peeked = S.token(1);
-
-                if (peeked.kind == TokenKind.IDENTIFIER) {
-                    String ident = peeked.name().toString();
-
-                    if (ident.startsWith("$") && ident.endsWith("$")) {
-                        nextToken();
-                        
-                        int pos = token.pos;
-                        com.sun.tools.javac.util.Name name = token.name();
-
-                        nextToken();
-
-                        if (token.kind == TokenKind.SEMI) {
-                            nextToken();
-                        }
-
-                        return new JackpotTrees.CaseWildcard(ctx, name, F.at(pos).Ident(name));
-                    }
-                }
-            }
-
-            return super.switchBlockStatementGroup();
-        }
-
-
-        @Override
-        protected JCTree resource() {
-            if (token.kind == TokenKind.IDENTIFIER && token.name().startsWith(dollar)) {
-                Token peeked = S.token(1);
-
-                if (peeked.kind == TokenKind.SEMI || peeked.kind == TokenKind.RPAREN) {
-                    int pos = token.pos;
-                    com.sun.tools.javac.util.Name name = token.name();
-
-                    nextToken();
-
-                    return F.at(pos).Ident(name);
-                }
-            }
-            return super.resource();
-        }
-
-    }
-
-    private static final class DummyJFO extends SimpleJavaFileObject {
-        private DummyJFO() {
-            super(URI.create("dummy.java"), JavaFileObject.Kind.SOURCE);
-        }
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
-            return "";
-        }
-    };
-
-    /**
-     * Only for members (i.e. generated constructor):
-     */
-    public static List<? extends Tree> filterHidden(TreePath basePath, Iterable<? extends Tree> members) {
-        List<Tree> result = new LinkedList<Tree>();
-
-        for (Tree t : members) {
-            if (!isSynthetic(basePath != null ? basePath.getCompilationUnit() : null, t)) {
-                result.add(t);
-            }
-        }
-
-        return result;
-    }
-
-    private static boolean isSynthetic(CompilationUnitTree cut, Tree leaf) throws NullPointerException {
-        JCTree tree = (JCTree) leaf;
-
-        if (tree.pos == (-1))
-            return true;
-
-        if (leaf.getKind() == Kind.METHOD) {
-            //check for synthetic constructor:
-            return (((JCMethodDecl)leaf).mods.flags & Flags.GENERATEDCONSTR) != 0L;
-        }
-
-        //check for synthetic superconstructor call:
-        if (cut != null && leaf.getKind() == Kind.EXPRESSION_STATEMENT) {
-            ExpressionStatementTree est = (ExpressionStatementTree) leaf;
-
-            if (est.getExpression().getKind() == Kind.METHOD_INVOCATION) {
-                MethodInvocationTree mit = (MethodInvocationTree) est.getExpression();
-
-                if (mit.getMethodSelect().getKind() == Kind.IDENTIFIER) {
-                    IdentifierTree it = (IdentifierTree) mit.getMethodSelect();
-
-                    if ("super".equals(it.getName().toString())) {
-                        return ((JCCompilationUnit) cut).endPositions.getEndPos(tree) == (-1);
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean isFakeBlock(Tree t) {
-        return t instanceof FakeBlock;
-    }
-
-    public static boolean isFakeClass(Tree t) {
-        if (!(t instanceof ClassTree)) {
-            return false;
-        }
-
-        ClassTree ct = (ClassTree) t;
-
-        if (ct.getMembers().isEmpty()) {
-            return false;
-        }
-
-        CharSequence wildcardTreeName = Utilities.getWildcardTreeName(ct.getMembers().get(0));
-
-        if (wildcardTreeName == null) {
-            return false;
-        }
-
-        return wildcardTreeName.toString().startsWith("$$");
-    }
-
-    private static final class OffsetSourcePositions implements SourcePositions {
-
-        private final SourcePositions delegate;
-        private final long offset;
-
-        public OffsetSourcePositions(SourcePositions delegate, long offset) {
-            this.delegate = delegate;
-            this.offset = offset;
-        }
-
-        public long getStartPosition(CompilationUnitTree cut, Tree tree) {
-            return delegate.getStartPosition(cut, tree) + offset;
-        }
-
-        public long getEndPosition(CompilationUnitTree cut, Tree tree) {
-            return delegate.getEndPosition(cut, tree) + offset;
-        }
-
-    }
-
-    private static final class OffsetDiagnostic<S> implements Diagnostic<S> {
-        private final Diagnostic<? extends S> delegate;
-        private final SourcePositions sp;
-        private final long offset;
-
-        public OffsetDiagnostic(Diagnostic<? extends S> delegate, SourcePositions sp, long offset) {
-            this.delegate = delegate;
-            this.sp = sp;
-            this.offset = offset;
-        }
-
-        public Diagnostic.Kind getKind() {
-            return delegate.getKind();
-        }
-
-        public S getSource() {
-            return delegate.getSource();
-        }
-
-        public long getPosition() {
-            return delegate.getPosition() + offset;
-        }
-
-        public long getStartPosition() {
-            return delegate.getStartPosition() + offset;
-        }
-
-        public long getEndPosition() {
-            if (delegate instanceof JCDiagnostic) {
-                JCDiagnostic dImpl = (JCDiagnostic) delegate;
-                
-                return dImpl.getDiagnosticPosition().getEndPosition(new EndPosTable() {
-                    @Override public int getEndPos(JCTree tree) {
-                        return (int) sp.getEndPosition(null, tree);
-                    }
-                    @Override public void storeEnd(JCTree tree, int endpos) {
-                        throw new UnsupportedOperationException("Not supported yet.");
-                    }
-                    @Override public int replaceTree(JCTree oldtree, JCTree newtree) {
-                        throw new UnsupportedOperationException("Not supported yet.");
-                    }
-                }) + offset;
-            }
-            return delegate.getEndPosition() + offset;
-        }
-
-        public long getLineNumber() {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-        public long getColumnNumber() {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-
-        public String getCode() {
-            return delegate.getCode();
-        }
-
-        public String getMessage(Locale locale) {
-            return delegate.getMessage(locale);
-        }
-
-    }
-
-    private static class ParserSourcePositions implements SourcePositions {
-
-        private JavacParser parser;
-
-        private ParserSourcePositions(JavacParser parser) {
-            this.parser = parser;
-        }
-
-        public long getStartPosition(CompilationUnitTree file, Tree tree) {
-            return parser.getStartPos((JCTree)tree);
-        }
-
-        public long getEndPosition(CompilationUnitTree file, Tree tree) {
-            return parser.getEndPos((JCTree)tree);
-        }
-    }
-}
diff --git a/.pc/netbeans-svnclientadapter.patch/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java b/.pc/netbeans-svnclientadapter.patch/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
deleted file mode 100644
index 5fdbd4c..0000000
--- a/.pc/netbeans-svnclientadapter.patch/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2008 Sun Microsystems, Inc.
- */
-
-package org.netbeans.libs.svnclientadapter.svnkit;
-
-import java.util.logging.Level;
-import org.netbeans.libs.svnclientadapter.SvnClientAdapterFactory;
-import org.openide.util.lookup.ServiceProvider;
-import org.openide.util.lookup.ServiceProviders;
-import org.tigris.subversion.svnclientadapter.ISVNClientAdapter;
-import org.tmatesoft.svn.core.javahl.SVNClientImpl;
-
-/**
- *
- * @author Tomas Stupka
- */
- at ServiceProviders({@ServiceProvider(service=SvnClientAdapterFactory.class)})
-public class SvnKitClientAdapterFactory extends SvnClientAdapterFactory {
-    
-    private boolean available = false;
-    
-    public SvnKitClientAdapterFactory() {
-        super();
-    }
-
-    @Override
-    public Client provides() {
-        return Client.SVNKIT;
-    }
-
-    @Override
-    protected boolean isAvailable() {
-        if(!available) {
-            try {
-                org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.setup();        
-            } catch (Throwable t) {
-                LOG.log(Level.WARNING, t.getMessage());
-            }
-            if(org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.isAvailable()) {
-                available = true;
-            }
-        }
-        return available;
-    }
-
-    @Override
-    public ISVNClientAdapter createClient() {
-        // is this really needed? this clears the credentials cache
-        SVNClientImpl.setRuntimeCredentialsStorage(null);
-        org.tmatesoft.svn.core.javahl17.SVNClientImpl.setRuntimeCredentialsStorage(null);
-        return org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory
-                .createSVNClient(org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.SVNKIT_CLIENT);
-    }
-    
-}
diff --git a/.pc/netbeans-updatecenters.patch/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/.pc/netbeans-updatecenters.patch/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
deleted file mode 100644
index 6ea6ac0..0000000
--- a/.pc/netbeans-updatecenters.patch/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<filesystem>
-
-  <folder name="Services">
-      
-    <folder name="AutoupdateType">
-      <!-- this ordering left because backward compatibility with deserialized autoupdate types -->
-         <file name="distribution-update-provider.instance">
-         <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/distribution-update-provider.instance"/>
-         <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-         <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Distribution"/>
-         <attr name="category" stringvalue="STANDARD"/>
-         <attr name="enabled" boolvalue="true"/>
-         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
-         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
-         </file>
-
-         <file name="certified-update-provider.instance">
-         <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/certified-update-provider.instance"/>
-         <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-         <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Certified"/>
-         <attr name="category" stringvalue="STANDARD"/>
-         <attr name="enabled" boolvalue="true"/>
-         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
-         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
-         </file>
-
-         <file name="pluginportal-update-provider.instance">
-         <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/pluginportal-update-provider.instance"/>
-         <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-         <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_PluginPortal"/>
-         <attr name="category" stringvalue="COMMUNITY"/>
-         <attr name="enabled" boolvalue="true"/>
-         <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
-         <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
-         </file>
-      
-   </folder>
-    
-  </folder> <!-- Services -->
-
-</filesystem>
diff --git a/.pc/netbeans-wildUpperBound.patch/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/.pc/netbeans-wildUpperBound.patch/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
deleted file mode 100644
index 66ed321..0000000
--- a/.pc/netbeans-wildUpperBound.patch/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ /dev/null
@@ -1,1437 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package org.netbeans.api.java.source;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.*;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.annotation.processing.Completion;
-import javax.annotation.processing.Processor;
-import javax.lang.model.element.*;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.ArrayType;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.WildcardType;
-import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.ElementScanner6;
-
-import com.sun.source.tree.*;
-import com.sun.source.util.SourcePositions;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.api.JavacTaskImpl;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Scope.ImportScope;
-import com.sun.tools.javac.code.Scope.StarImportScope;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.code.Type.TypeVar;
-import com.sun.tools.javac.code.Types;
-import com.sun.tools.javac.comp.Check;
-import com.sun.tools.javac.model.JavacElements;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.util.Context;
-
-import javax.swing.SwingUtilities;
-
-import org.netbeans.api.annotations.common.CheckForNull;
-import org.netbeans.api.annotations.common.NonNull;
-import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.editor.mimelookup.MimePath;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.java.lexer.JavaTokenId;
-import org.netbeans.api.java.queries.JavadocForBinaryQuery;
-import org.netbeans.api.java.queries.SourceForBinaryQuery;
-import org.netbeans.api.java.source.ClasspathInfo.PathKind;
-import org.netbeans.api.java.source.JavaSource.Phase;
-import org.netbeans.api.java.source.matching.Matcher;
-import org.netbeans.api.java.source.matching.Occurrence;
-import org.netbeans.api.java.source.matching.Pattern;
-import org.netbeans.api.lexer.TokenHierarchy;
-import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.modules.java.preprocessorbridge.spi.ImportProcessor;
-import org.netbeans.modules.java.source.ElementHandleAccessor;
-import org.netbeans.modules.java.source.JavadocHelper;
-import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
-import org.netbeans.modules.java.source.parsing.ClasspathInfoProvider;
-import org.netbeans.modules.java.source.parsing.FileObjects;
-import org.netbeans.modules.java.source.parsing.JavacParser;
-import org.netbeans.modules.java.source.save.DiffContext;
-import org.netbeans.modules.java.source.usages.ClassIndexImpl;
-import org.netbeans.modules.java.source.usages.ClassIndexManager;
-import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
-import org.netbeans.modules.java.source.usages.ExecutableFilesIndex;
-import org.netbeans.modules.parsing.api.ParserManager;
-import org.netbeans.modules.parsing.api.ResultIterator;
-import org.netbeans.modules.parsing.api.UserTask;
-import org.netbeans.modules.parsing.api.indexing.IndexingManager;
-import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
-import org.netbeans.spi.java.classpath.support.ClassPathSupport;
-
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.filesystems.URLMapper;
-import org.openide.util.Exceptions;
-import org.openide.util.Lookup;
-import org.openide.util.Pair;
-import org.openide.util.Parameters;
-import org.openide.util.BaseUtilities;
-
-/**
- *
- * @author Dusan Balek
- */
-public class SourceUtils {    
-     
-    private static final Logger LOG = Logger.getLogger(SourceUtils.class.getName());
-
-    private SourceUtils() {}
-    
-    /**
-     * @since 0.21
-     */
-    public static TokenSequence<JavaTokenId> getJavaTokenSequence(final TokenHierarchy hierarchy, final int offset) {
-        if (hierarchy != null) {
-            TokenSequence<?> ts = hierarchy.tokenSequence();
-            while(ts != null && (offset == 0 || ts.moveNext())) {
-                ts.move(offset);
-                if (ts.language() == JavaTokenId.language()) {
-                    return (TokenSequence<JavaTokenId>)ts;
-                }
-                if (!ts.moveNext() && !ts.movePrevious()) {
-                    return null;
-                }
-                ts = ts.embedded();
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Find duplicates for provided expression
-     * @param info CompilationInfo
-     * @param searchingFor expression which is being searched
-     * @param scope scope for search
-     * @param cancel option to cancel find duplicates
-     * @return set of TreePaths representing duplicates
-     * @since 0.85
-     */
-    public static Set<TreePath> computeDuplicates(CompilationInfo info, TreePath searchingFor, TreePath scope, AtomicBoolean cancel) {
-        Set<TreePath> result = new HashSet<>();
-        
-        for (Occurrence od : Matcher.create(info).setCancel(cancel).setSearchRoot(scope).match(Pattern.createSimplePattern(searchingFor))) {
-            result.add(od.getOccurrenceRoot());
-        }
-
-        return result;
-    }    
-    
-    public static boolean checkTypesAssignable(CompilationInfo info, TypeMirror from, TypeMirror to) {
-        Context c = ((JavacTaskImpl) info.impl.getJavacTask()).getContext();
-        if (from.getKind() == TypeKind.TYPEVAR) {
-            Types types = Types.instance(c);
-            TypeVar t = types.substBound((TypeVar)from, com.sun.tools.javac.util.List.of((Type)from), com.sun.tools.javac.util.List.of(types.boxedTypeOrType((Type)to)));
-            return info.getTypes().isAssignable(t.getUpperBound(), to)
-                    || info.getTypes().isAssignable(to, t.getUpperBound());
-        }
-        if (from.getKind() == TypeKind.WILDCARD) {
-            from = Types.instance(c).wildUpperBound((Type)from);
-        }
-        return Check.instance(c).checkType(null, (Type)from, (Type)to).getKind() != TypeKind.ERROR;
-    }
-    
-    public static TypeMirror getBound(WildcardType wildcardType) {
-        Type.TypeVar bound = ((Type.WildcardType)wildcardType).bound;
-        return bound != null ? bound.bound : null;
-    }
-
-    /**
-     * Returns a list of completions for an annotation attribute value suggested by
-     * annotation processors.
-     * 
-     * @param info the CompilationInfo used to resolve annotation processors
-     * @param element the element being annotated
-     * @param annotation the (perhaps partial) annotation being applied to the element
-     * @param member the annotation member to return possible completions for
-     * @param userText source code text to be completed
-     * @return suggested completions to the annotation member
-     * 
-     * @since 0.57
-     */
-    public static List<? extends Completion> getAttributeValueCompletions(CompilationInfo info, Element element, AnnotationMirror annotation, ExecutableElement member, String userText) {
-        List<Completion> completions = new LinkedList<>();
-        if (info.getPhase().compareTo(Phase.ELEMENTS_RESOLVED) >= 0) {
-            String fqn = ((TypeElement) annotation.getAnnotationType().asElement()).getQualifiedName().toString();
-            Iterable<? extends Processor> processors = info.impl.getJavacTask().getProcessors();
-            if (processors != null) {
-                for (Processor processor : processors) {
-                    boolean match = false;
-                    for (String sat : processor.getSupportedAnnotationTypes()) {
-                        if ("*".equals(sat)) { //NOI18N
-                            match = true;
-                            break;
-                        } else if (sat.endsWith(".*")) { //NOI18N
-                            sat = sat.substring(0, sat.length() - 1);
-                            if (fqn.startsWith(sat)) {
-                                match = true;
-                                break;
-                            }
-                        } else if (fqn.equals(sat)) {
-                            match = true;
-                            break;
-                        }
-                    }
-                    if (match) {
-                        try {
-                            for (Completion c : processor.getCompletions(element, annotation, member, userText)) {
-                                completions.add(c);
-                            }
-                        } catch (Exception e) {
-                            Logger.getLogger(processor.getClass().getName()).log(Level.INFO, e.getMessage(), e);
-                        }
-                    }
-                }
-            }
-        }
-        return completions;
-    }
-
-    /**
-     * Returns the type element within which this member or constructor
-     * is declared. Does not accept packages
-     * If this is the declaration of a top-level type (a non-nested class
-     * or interface), returns null.
-     *
-     * @return the type declaration within which this member or constructor
-     * is declared, or null if there is none
-     * @throws IllegalArgumentException if the provided element is a package element
-     * @deprecated use {@link ElementUtilities#enclosingTypeElement(javax.lang.model.element.Element)}
-     */
-    public static @Deprecated TypeElement getEnclosingTypeElement( Element element ) throws IllegalArgumentException {
-        return ElementUtilities.enclosingTypeElementImpl(element);
-    }
-    
-    public static TypeElement getOutermostEnclosingTypeElement( Element element ) {
-	
-	Element ec =  getEnclosingTypeElement( element );
-	if (ec == null) {
-	    ec = element;
-	}
-	
-	while( ec.getEnclosingElement().getKind().isClass() || 
-	       ec.getEnclosingElement().getKind().isInterface() ) {
-	
-	    ec = ec.getEnclosingElement();
-	}
-		
-	return (TypeElement)ec;
-    }
-
-    /**
-     * Returns an array containing the JVM signature of the {@link ElementHandle}.
-     * @param handle to obtain the JVM signature for.
-     * @return an array containing the JVM signature. The signature depends on
-     * the {@link ElementHandle}'s {@link ElementKind}. For class or package
-     * it returns a single element array containing the class (package) binary
-     * name (JLS section 13.1). For field (method) it returns three element array
-     * containing owner class binary name (JLS section 13.1) in the first element,
-     * field (method) name in the second element and JVM type (JVM method formal
-     * parameters (JVMS section 2.10.1)) in the third element.
-     * @since 0.84
-     */
-    @NonNull
-    public static String[] getJVMSignature(@NonNull final ElementHandle<?> handle) {
-        Parameters.notNull("handle", handle);   //NOI18N
-        return ElementHandleAccessor.getInstance().getJVMSignature(handle);
-    }
-
-
-    /**Resolve full qualified name in the given context. Adds import statement as necessary.
-     * Returns name that resolved to a given FQN in given context (either simple name
-     * or full qualified name). Handles import conflicts.
-     * 
-     * <br><b>Note:</b> if the <code>info</code> passed to this method is not an instance of {@link WorkingCopy},
-     * missing import statement is added from a separate modification task executed asynchronously.
-     * <br><b>Note:</b> after calling this method, it is not permitted to rewrite copy.getCompilationUnit().
-     * 
-     * @param info CompilationInfo over which the method should work
-     * @param context in which the fully qualified should be resolved
-     * @param fqn the fully qualified name to resolve
-     * @return either a simple name or a FQN that will resolve to given fqn in given context
-     */
-    public static String resolveImport(final CompilationInfo info, final TreePath context, final String fqn) throws NullPointerException, IOException {
-        if (info == null) {
-            throw new NullPointerException();
-        }
-        if (context == null) {
-            throw new NullPointerException();
-        }
-        if (fqn == null) {
-            throw new NullPointerException();
-        }
-        
-        CodeStyle cs = DiffContext.getCodeStyle(info);
-        if (cs.useFQNs()) {
-            return fqn;
-        }
-        CompilationUnitTree cut = info.getCompilationUnit();
-        final Trees trees = info.getTrees();
-        final Scope scope = trees.getScope(context);
-        String qName = fqn;
-        StringBuilder sqName = new StringBuilder();
-        boolean clashing = false;
-        ElementUtilities eu = info.getElementUtilities();
-        ElementUtilities.ElementAcceptor acceptor = new ElementUtilities.ElementAcceptor() {
-            @Override
-            public boolean accept(Element e, TypeMirror type) {
-                return (e.getKind().isClass() || e.getKind().isInterface()) && trees.isAccessible(scope, (TypeElement)e);
-            }
-        };
-        Element toImport = null;
-        while(qName != null && qName.length() > 0) {
-            int lastDot = qName.lastIndexOf('.');
-            Element element;
-            if ((element = info.getElements().getTypeElement(qName)) != null) {
-                clashing = false;
-                String simple = qName.substring(lastDot < 0 ? 0 : lastDot + 1);
-                if (sqName.length() > 0) {
-                    sqName.insert(0, '.');
-                }
-                sqName.insert(0, simple);
-                if (cs.useSingleClassImport() && (toImport == null || !cs.importInnerClasses())) {
-                    toImport = element;
-                }
-                boolean matchFound = false;
-                for(Element e : eu.getLocalMembersAndVars(scope, acceptor)) {
-                    if (simple.contentEquals(e.getSimpleName())) {
-                        //either a clash or already imported:
-                        if (qName.contentEquals(((TypeElement)e).getQualifiedName())) {
-                            return sqName.toString();
-                        } else {
-                            clashing = true;
-                        }
-                        matchFound = true;
-                        break;
-                    }
-                }
-                if (!matchFound) {
-                    for(TypeElement e : eu.getGlobalTypes(acceptor)) {
-                        if (simple.contentEquals(e.getSimpleName())) {
-                            //either a clash or already imported:
-                            if (qName.contentEquals(e.getQualifiedName())) {
-                                return sqName.toString();
-                            } else {
-                                clashing = true;
-                            }
-                            break;
-                        }
-                    }
-                }
-                if (cs.importInnerClasses()) {
-                    break;
-                }
-            } else if ((element = info.getElements().getPackageElement(qName)) != null) {
-                if (toImport == null || GeneratorUtilities.checkPackagesForStarImport(qName, cs)) {
-                    toImport = element;
-                }
-                break;
-            }
-            qName = lastDot < 0 ? null : qName.substring(0, lastDot);
-        }
-        if (clashing || toImport == null) {
-            return fqn;
-        }
-        
-        //not imported/visible so far by any means:
-        String topLevelLanguageMIMEType = info.getFileObject().getMIMEType();
-        if ("text/x-java".equals(topLevelLanguageMIMEType)){ //NOI18N
-            final Set<Element> elementsToImport = Collections.singleton(toImport);
-            if (info instanceof WorkingCopy) {
-                CompilationUnitTree nue = (CompilationUnitTree) ((WorkingCopy)info).resolveRewriteTarget(cut);
-                ((WorkingCopy)info).rewrite(info.getCompilationUnit(), GeneratorUtilities.get((WorkingCopy)info).addImports(nue, elementsToImport));
-            } else {
-                final ElementHandle handle = ElementHandle.create(toImport);
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            ModificationResult.runModificationTask(Collections.singletonList(info.getSnapshot().getSource()), new UserTask() {
-                                @Override
-                                public void run(ResultIterator resultIterator) throws Exception {
-                                    WorkingCopy copy = WorkingCopy.get(resultIterator.getParserResult());
-                                    copy.toPhase(Phase.ELEMENTS_RESOLVED);
-                                    Element elementToImport = handle.resolve(copy);
-                                    if (elementToImport == null) {
-                                        // the text was possibly changed ?
-                                        return;
-                                    }
-                                    copy.rewrite(copy.getCompilationUnit(), GeneratorUtilities.get(copy).addImports(copy.getCompilationUnit(), Collections.singleton(elementToImport)));
-                                }
-                            }).commit();
-                        } catch (Exception e) {
-                            Exceptions.printStackTrace(e);
-                        }
-                    }
-                });
-            }
-            // only import symbols if import generation succeeded
-            JCCompilationUnit unit = (JCCompilationUnit) info.getCompilationUnit();
-            if (toImport.getKind() == ElementKind.PACKAGE) {
-                StarImportScope importScope = new StarImportScope(unit.starImportScope.owner);
-                importScope.importAll(unit.starImportScope);
-                importScope.importAll(((PackageSymbol)toImport).members());
-                unit.starImportScope = importScope;
-            } else {
-                ImportScope importScope = new ImportScope(unit.namedImportScope.owner);
-                for (Symbol symbol : unit.namedImportScope.getElements()) {
-                    importScope.enter(symbol);
-                }
-                importScope.enterIfAbsent((Symbol) toImport);
-                unit.namedImportScope = importScope;
-            }
-        } else { // embedded java, look up the handler for the top level language
-            Lookup lookup = MimeLookup.getLookup(MimePath.get(topLevelLanguageMIMEType));
-            Collection<? extends ImportProcessor> instances = lookup.lookupAll(ImportProcessor.class);
-
-            for (ImportProcessor importsProcesor : instances) {
-                importsProcesor.addImport(info.getDocument(), fqn);
-            }
-            
-        }
-        return sqName.toString();
-    }
-    
-    /**
-     * Returns a {@link FileObject} in which the Element is defined.
-     * @param element for which the {@link FileObject} should be located
-     * @param cpInfo the classpaths context
-     * @return the defining {@link FileObject} or null if it cannot be
-     * found
-     * 
-     * @deprecated use {@link getFile(ElementHandle, ClasspathInfo)}
-     */
-    public static FileObject getFile (Element element, final ClasspathInfo cpInfo) {
-        Parameters.notNull("element", element); //NOI18N
-        Parameters.notNull("cpInfo", cpInfo);   //NOI18N
-        
-        Element prev = element.getKind() == ElementKind.PACKAGE ? element : null;
-        while (element.getKind() != ElementKind.PACKAGE) {
-            prev = element;
-            element = element.getEnclosingElement();
-        }
-        final ElementKind kind = prev.getKind();
-        if (!(kind.isClass() || kind.isInterface() || kind == ElementKind.PACKAGE)) {
-            return null;
-        }        
-        final ElementHandle<? extends Element> handle = ElementHandle.create(prev);
-        return getFile (handle, cpInfo);
-    }
-    
-    /**
-     * Returns a {@link FileObject} of the source file in which the handle is declared.
-     * @param handle to find the {@link FileObject} for
-     * @param cpInfo classpaths for resolving handle
-     * @return {@link FileObject} or null when the source file cannot be found
-     */
-    public static FileObject getFile (final ElementHandle<? extends Element> handle, final ClasspathInfo cpInfo) {
-        Parameters.notNull("handle", handle);
-        Parameters.notNull("cpInfo", cpInfo);        
-        try {
-            boolean pkg = handle.getKind() == ElementKind.PACKAGE;
-            String[] signature = handle.getSignature();
-            assert signature.length >= 1;
-            final ClassPath[] cps = 
-                new ClassPath[] {
-                    cpInfo.getClassPath(ClasspathInfo.PathKind.SOURCE),
-                    createClassPath(cpInfo,ClasspathInfo.PathKind.OUTPUT),
-                    createClassPath(cpInfo,ClasspathInfo.PathKind.BOOT),                    
-                    createClassPath(cpInfo,ClasspathInfo.PathKind.COMPILE),
-                };
-           String pkgName, className = null;
-            if (pkg) {
-                pkgName = FileObjects.convertPackage2Folder(signature[0]);
-            }
-            else {
-                int index = signature[0].lastIndexOf('.');                          //NOI18N
-                if (index<0) {
-                    pkgName = "";                                             //NOI18N
-                    className = signature[0];
-                }
-                else {
-                    pkgName = FileObjects.convertPackage2Folder(signature[0].substring(0,index));
-                    className = signature[0].substring(index+1);
-                }
-            }
-            final List<Pair<FileObject,ClassPath>> fos = findAllResources(pkgName, cps);
-            for (Pair<FileObject,ClassPath> pair : fos) {                
-                FileObject root = pair.second().findOwnerRoot(pair.first());
-                if (root == null) {
-                    continue;
-                }
-                FileObject[] sourceRoots = SourceForBinaryQuery.findSourceRoots(root.toURL()).getRoots();                        
-                ClassPath sourcePath = ClassPathSupport.createClassPath(sourceRoots);
-                LinkedList<FileObject> folders = new LinkedList<>(sourcePath.findAllResources(pkgName));
-                if (pkg) {
-                    return folders.isEmpty() ? pair.first() : folders.get(0);
-                } else {               
-                    final boolean caseSensitive = isCaseSensitive ();
-                    final Object fnames = getSourceFileNames (className);
-                    folders.addFirst(pair.first());
-                    if (fnames instanceof String) {
-                        FileObject match = findMatchingChild((String)fnames, folders, caseSensitive);
-                        if (match != null) {
-                            return match;
-                        }
-                    } else {
-                        for (String candidate : (List<String>)fnames) {
-                            FileObject match = findMatchingChild(candidate, folders, caseSensitive);
-                            if (match != null) {
-                                return match;
-                            }
-                        }
-                    }
-                    FileObject foundFo;
-                    if (sourceRoots.length == 0) {
-                        foundFo = findSource (signature[0],root);
-                    }
-                    else {
-                        foundFo = findSource (signature[0],sourceRoots);
-                    }
-                    if (foundFo != null) {
-                        return foundFo;
-                    }
-                }
-            }
-        } catch (IOException e) {
-            Exceptions.printStackTrace(e);
-        }
-        return null;        
-    }
-    
-    private static FileObject findMatchingChild(String sourceFileName, Collection<FileObject> folders, boolean caseSensitive) {
-        final Match matchSet = caseSensitive ? new CaseSensitiveMatch(sourceFileName) : new CaseInsensitiveMatch(sourceFileName);
-        for (FileObject folder : folders) {
-            for (FileObject child : folder.getChildren()) {
-                if (matchSet.apply(child)) {
-                    return child;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @NonNull
-    private static List<Pair<FileObject, ClassPath>> findAllResources(
-            @NonNull final String resourceName,
-            @NonNull final ClassPath[] cps) {
-        final List<Pair<FileObject,ClassPath>> result = new ArrayList<>();
-        for (ClassPath cp : cps) {
-            for (FileObject fo : cp.findAllResources(resourceName)) {
-                result.add(Pair.<FileObject,ClassPath>of(fo, cp));
-            }            
-        }
-        return result;
-    }
-    
-    private static FileObject findSource (final String binaryName, final FileObject... fos) throws IOException {
-        final ClassIndexManager cim = ClassIndexManager.getDefault();
-        try {
-            for (FileObject fo : fos) {
-                ClassIndexImpl ci = cim.getUsagesQuery(fo.toURL(), true);
-                if (ci != null) {
-                    String sourceName = ci.getSourceName(binaryName);
-                    if (sourceName != null) {
-                        FileObject result = fo.getFileObject(sourceName);
-                        if (result != null) {
-                            return result;
-                        }
-                    }
-                }
-            }
-        } catch (InterruptedException e) {
-            //canceled, pass - returns null
-        }
-        return null;
-    }
-
-    private static abstract class Match {
-
-        private final String name;
-
-        Match(final String names) {
-            this.name = names;
-        }
-
-        final boolean apply(final FileObject fo) {
-            final String foName = fo.getName();
-            return match(foName,name) && isJava(fo);
-        }
-
-        protected abstract boolean match(String name1, String name2);
-
-        private boolean isJava(final FileObject fo) {
-            return  "java".equalsIgnoreCase(fo.getExt()) && fo.isData(); //NOI18N
-        }
-    }
-
-    private static class CaseSensitiveMatch extends Match {
-
-        CaseSensitiveMatch(final String name) {
-            super(name);
-        }
-
-        @Override
-        protected boolean match(String name1, String name2) {
-            return name1.equals(name2);
-        }
-    }
-
-    private static class CaseInsensitiveMatch extends Match {
-
-        CaseInsensitiveMatch(final String name) {
-            super(name);
-        }
-
-        @Override
-        protected boolean match(String name1, String name2) {
-            return name1.equalsIgnoreCase(name2);
-        }
-    }
-    
-    /**
-     * Finds {@link URL} of a javadoc page for given element when available. This method 
-     * uses {@link JavadocForBinaryQuery} to find the javadoc page for the give element.
-     * For {@link PackageElement} it returns the package-summary.html for given package.
-     * @param element to find the Javadoc for
-     * @param cpInfo classpaths used to resolve (currently unused)
-     * @return the URL of the javadoc page or null when the javadoc is not available.
-     * @deprecated use {@link SourceUtils#getJavadoc(javax.lang.model.element.Element)}
-     * or {@link SourceUtils#getPreferredJavadoc(javax.lang.model.element.Element)}
-     */
-    @Deprecated
-    public static URL getJavadoc (final Element element, final ClasspathInfo cpInfo) {      
-        final Collection<? extends URL> res = getJavadoc(element);
-        return res.isEmpty() ?
-            null :
-            res.iterator().next();
-    }
-
-    /**
-     * Returns preferred Javadoc {@link URL}.
-     * Threading: The method parses the javadoc to find out the used doclet,
-     * so it should not be called from EDT.
-     * @param element to find the Javadoc for
-     * @return the URL of the javadoc page or null when the javadoc is not available.
-     * @since 0.134
-     */
-    @CheckForNull
-    public static URL getPreferredJavadoc(@NonNull final Element element) {
-        Parameters.notNull("element", element); //NOI18N
-        final JavadocHelper.TextStream page = JavadocHelper.getJavadoc(element);
-        if (page == null) {
-            return null;
-        }
-        return page.getLocation();
-    }
-
-    /**
-     * Finds {@link URL}s of a javadoc page for given element when available. This method
-     * uses {@link JavadocForBinaryQuery} to find the javadoc page for the give element.
-     * For {@link PackageElement} it returns the package-summary.html for given package.
-     * Due to the https://bugs.openjdk.java.net/browse/JDK-8025633 there are more possible 
-     * URLs for {@link ExecutableElement}s, this method returns all of them.
-     * @param element to find the Javadoc for
-     * @return the URLs of the javadoc page or an empty collection when the javadoc is not available.
-     * @since 0.133
-     */
-    @NonNull
-    public static Collection<? extends URL> getJavadoc (
-        @NonNull final Element element) {
-        Parameters.notNull("element", element); //NOI18N
-        final JavadocHelper.TextStream page = JavadocHelper.getJavadoc(element);
-        if (page == null) {
-            return Collections.<URL>emptySet();
-        } else {
-            page.close();
-            return page.getLocations();
-        }
-    }
-    
-    /**
-     * Tests whether the initial scan is in progress.
-     */
-    public static boolean isScanInProgress () {
-        return IndexingManager.getDefault().isIndexing();
-    }
-
-    /**
-     * Waits for the end of the initial scan, this helper method 
-     * is designed for tests which require to wait for end of initial scan.
-     * @throws InterruptedException is thrown when the waiting thread is interrupted.
-     * @deprecated use {@link JavaSource#runWhenScanFinished}
-     */
-    public static void waitScanFinished () throws InterruptedException {
-        try {
-            class T extends UserTask implements ClasspathInfoProvider {
-                private final ClassPath EMPTY_PATH = ClassPathSupport.createClassPath(new URL[0]);
-                private final ClasspathInfo cpinfo = ClasspathInfo.create(EMPTY_PATH, EMPTY_PATH, EMPTY_PATH);
-                @Override
-                public void run(ResultIterator resultIterator) throws Exception {
-                    // no-op
-                }
-
-                @Override
-                public ClasspathInfo getClasspathInfo() {
-                    return cpinfo;
-                }
-            }
-            Future<Void> f = ParserManager.parseWhenScanFinished(JavacParser.MIME_TYPE, new T());
-            if (!f.isDone()) {
-                f.get();
-            }
-        } catch (Exception ex) {
-        }
-    }
-    
-    
-    /**
-     * Returns the dependent source path roots for given source root.
-     * It returns all the open project source roots which have either
-     * direct or transitive dependency on the given source root.
-     * @param root to find the dependent roots for
-     * @return {@link Set} of {@link URL}s containing at least the
-     * incoming root, never returns null.
-     * @since 0.10
-     */
-    @NonNull
-    @org.netbeans.api.annotations.common.SuppressWarnings(value = {"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")
-    public static Set<URL> getDependentRoots (@NonNull final URL root) {
-        return getDependentRoots(root, true);
-    }
-    
-    /**
-     * Returns the dependent source path roots for given source root. It returns
-     * all the source roots which have either direct or transitive dependency on
-     * the given source root.
-     *
-     * @param root to find the dependent roots for
-     * @param filterNonOpenedProjects true if the results should only contain roots for
-     * opened projects
-     * @return {@link Set} of {@link URL}s containing at least the incoming
-     * root, never returns null.
-     * @since 0.110
-     */
-    @NonNull
-    @org.netbeans.api.annotations.common.SuppressWarnings(value = {"DMI_COLLECTION_OF_URLS"}, justification="URLs have never host part")
-    public static Set<URL> getDependentRoots(
-        @NonNull final URL root,
-        final boolean filterNonOpenedProjects) {
-        final FileObject rootFO = URLMapper.findFileObject(root);
-        if (rootFO != null) {
-            return mapToURLs(QuerySupport.findDependentRoots(rootFO,filterNonOpenedProjects));
-        } else {
-            return Collections.<URL>singleton(root);
-        }
-    }
-        
-    //Helper methods
-    
-    /**
-     * Returns classes declared in the given source file which have the main method.
-     * @param fo source file
-     * @return the classes containing main method
-     * @throws IllegalArgumentException when file does not exist or is not a java source file.
-     */
-    public static Collection<ElementHandle<TypeElement>> getMainClasses (final @NonNull FileObject fo) {
-        Parameters.notNull("fo", fo);   //NOI18N
-        if (!fo.isValid()) {
-            throw new IllegalArgumentException ("FileObject : " + FileUtil.getFileDisplayName(fo) + " is not valid.");  //NOI18N
-        }
-        if (fo.isVirtual()) {
-            throw new IllegalArgumentException ("FileObject : " + FileUtil.getFileDisplayName(fo) + " is virtual.");  //NOI18N
-        }
-        final JavaSource js = JavaSource.forFileObject(fo);        
-        if (js == null) {
-            throw new IllegalArgumentException ();
-        }
-        try {
-            final LinkedHashSet<ElementHandle<TypeElement>> result = new LinkedHashSet<> ();
-            js.runUserActionTask(new Task<CompilationController>() {            
-                @Override
-                public void run(final CompilationController control) throws Exception {
-                    if (control.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED).compareTo (JavaSource.Phase.ELEMENTS_RESOLVED)>=0) {
-                        final List<TypeElement>  types = new ArrayList<>();
-                        final ElementScanner6<Void,Void> visitor = new ElementScanner6<Void, Void>() {
-                            @Override
-                            public Void visitType(TypeElement e, Void p) {
-                                if (e.getEnclosingElement().getKind() == ElementKind.PACKAGE
-                                   || e.getModifiers().contains(Modifier.STATIC)) {
-                                    types.add(e);
-                                    return super.visitType(e, p);
-                                } else {
-                                    return null;
-                                }
-                            }
-                        };
-                        visitor.scan(control.getTopLevelElements(), null);
-                        for (TypeElement type : types) {
-                            for (ExecutableElement exec :  ElementFilter.methodsIn(control.getElements().getAllMembers(type))) {
-                                if (SourceUtils.isMainMethod(exec)) {
-                                    result.add (ElementHandle.create(type));
-                                }
-                            }
-                        }
-                    }
-                }                
-
-            }, true);
-            return result;
-        } catch (IOException ioe) {
-            Exceptions.printStackTrace(ioe);
-            return Collections.<ElementHandle<TypeElement>>emptySet();
-        }		
-    }
-    
-    /**
-     * Returns true when the class contains main method.
-     * @param qualifiedName the fully qualified name of class
-     * @param cpInfo the classpath used to resolve the class
-     * @return true when the class contains a main method
-     */
-    public static boolean isMainClass (final String qualifiedName, ClasspathInfo cpInfo) {
-        return isMainClass(qualifiedName, cpInfo, false);
-    }
-    
-    /**
-     * Returns true when the class contains main method.
-     * @param qualifiedName the fully qualified name of class
-     * @param cpInfo the classpath used to resolve the class
-     * @param optimistic when true does only index check without parsing the file.
-     * The optimistic check is faster but it works only for source file not for binaries
-     * for which index does not exist. It also does not handle inheritance of the main method.
-     * @return true when the class contains a main method
-     * @since 0.71
-     */
-    public static boolean isMainClass (final String qualifiedName, ClasspathInfo cpInfo, boolean optimistic) {
-        if (qualifiedName == null || cpInfo == null) {
-            throw new IllegalArgumentException ();
-        }
-        //Fast path check by index - main in sources
-        for (ClassPath.Entry entry : cpInfo.getClassPath(PathKind.SOURCE).entries()) {
-            final Iterable<? extends URL> mainClasses = ExecutableFilesIndex.DEFAULT.getMainClasses(entry.getURL());
-            try {
-                final URI root = entry.getURL().toURI();
-                for (URL mainClass : mainClasses) {
-                    try {
-                        URI relative = root.relativize(mainClass.toURI());
-                        final String resourceNameNoExt = FileObjects.stripExtension(relative.getPath());
-                        final String ffqn = FileObjects.convertFolder2Package(resourceNameNoExt,'/');  //NOI18N
-                        if (qualifiedName.equals(ffqn)) {
-                            final ClassPath bootCp = cpInfo.getClassPath(PathKind.BOOT);
-                            if (bootCp.findResource(resourceNameNoExt + '.' + FileObjects.CLASS)!=null) {
-                                //Resource in platform, fall back to slow path
-                                break;
-                            } else {
-                                return true;
-                            }
-                        }
-                    } catch (URISyntaxException e) {
-                        LOG.log(Level.INFO, "Ignoring fast check for file: {0} due to: {1}", new Object[]{mainClass.toString(), e.getMessage()}); //NOI18N
-                    }
-                }
-            } catch (URISyntaxException e) {
-                LOG.log(Level.INFO, "Ignoring fast check for root: {0} due to: {1}", new Object[]{entry.getURL().toString(), e.getMessage()}); //NOI18N
-            }
-        }
-        
-        final boolean[] result = new boolean[]{false};
-        if (!optimistic) {
-            //Slow path fallback - for main in libraries
-            JavaSource js = JavaSource.create(cpInfo);
-            try {
-                js.runUserActionTask(new Task<CompilationController>() {
-
-                    @Override
-                    public void run(CompilationController control) throws Exception {
-                        final JavacElements elms = (JavacElements)control.getElements();
-                        TypeElement type = elms.getTypeElementByBinaryName(qualifiedName);
-                        if (type == null) {
-                            return;
-                        }
-                        List<? extends ExecutableElement> methods = ElementFilter.methodsIn(elms.getAllMembers(type));
-                        for (ExecutableElement method : methods) {
-                            if (SourceUtils.isMainMethod(method)) {
-                                result[0] = true;
-                                break;
-                            }
-                        }
-                    }
-
-                }, true);
-            } catch (IOException ioe) {
-                Exceptions.printStackTrace(ioe);
-            }
-        }
-        return result[0];
-    }
-    
-    /**
-     * Returns true if the method is a main method
-     * @param method to be checked
-     * @return true when the method is a main method
-     */
-    public static boolean isMainMethod (final ExecutableElement method) {
-        if (!"main".contentEquals(method.getSimpleName())) {                //NOI18N
-            return false;
-        }
-        long flags = ((Symbol.MethodSymbol)method).flags();                 //faster
-        if (((flags & Flags.PUBLIC) == 0) || ((flags & Flags.STATIC) == 0)) {
-            return false;
-        }
-        if (method.getReturnType().getKind() != TypeKind.VOID) {
-            return false;
-        }
-        List<? extends VariableElement> params = method.getParameters();
-        if (params.size() != 1) {
-            return false;
-        }
-        TypeMirror param = params.get(0).asType();
-        if (param.getKind() != TypeKind.ARRAY) {
-            return false;
-        }
-        ArrayType array = (ArrayType) param;
-        TypeMirror compound = array.getComponentType();
-        if (compound.getKind() != TypeKind.DECLARED) {
-            return false;
-        }
-        return "java.lang.String".contentEquals(((TypeElement)((DeclaredType)compound).asElement()).getQualifiedName());   //NOI18N
-    }
-    
-    /**
-     * Returns classes declared under the given source roots which have the main method.
-     * @param sourceRoots the source roots
-     * @return the classes containing the main methods
-     * Currently this method is not optimized and may be slow
-     */
-    public static Collection<ElementHandle<TypeElement>> getMainClasses (final FileObject[] sourceRoots) {
-        final List<ElementHandle<TypeElement>> result = new LinkedList<> ();
-        for (final FileObject root : sourceRoots) {
-            try {               
-                final File rootFile = FileUtil.toFile(root);
-                ClassPath bootPath = ClassPath.getClassPath(root, ClassPath.BOOT);
-                ClassPath compilePath = ClassPath.getClassPath(root, ClassPath.COMPILE);
-                ClassPath srcPath = ClassPathSupport.createClassPath(new FileObject[] {root});
-                ClasspathInfo cpInfo = ClasspathInfo.create(bootPath, compilePath, srcPath);
-                JavaSource js = JavaSource.create(cpInfo);
-                js.runUserActionTask(new Task<CompilationController>() {
-                    @Override
-                    public void run(CompilationController control) throws Exception {
-                        final URL rootURL = root.toURL();
-                        Iterable<? extends URL> mainClasses = ExecutableFilesIndex.DEFAULT.getMainClasses(rootURL);                        
-                        List<ElementHandle<TypeElement>> classes = new LinkedList<>();
-                        for (URL mainClass : mainClasses) {
-                            File mainFo = BaseUtilities.toFile(URI.create(mainClass.toExternalForm()));
-                            if (mainFo.exists()) {
-                                classes.addAll(JavaCustomIndexer.getRelatedTypes(mainFo, rootFile));
-                            }
-                        }
-                        for (ElementHandle<TypeElement> cls : classes) {
-                            TypeElement te = cls.resolve(control);
-                            if (te != null) {
-                                Iterable<? extends ExecutableElement> methods = ElementFilter.methodsIn(te.getEnclosedElements());
-                                for (ExecutableElement method : methods) {
-                                    if (isMainMethod(method)) {
-                                        if (isIncluded(cls, control.getClasspathInfo())) {
-                                            result.add (cls);
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }, false);
-            } catch (IOException ioe) {
-                Exceptions.printStackTrace(ioe);
-                return Collections.<ElementHandle<TypeElement>>emptySet();
-            }
-        }
-        return result;
-    }
-
-    private static boolean isIncluded (final ElementHandle<TypeElement> element, final ClasspathInfo cpInfo) {
-        FileObject fobj = getFile (element,cpInfo);
-        if (fobj == null) {
-            //Not source
-            return true;
-        }
-        ClassPath sourcePath = cpInfo.getClassPath(ClasspathInfo.PathKind.SOURCE);
-        for (ClassPath.Entry e : sourcePath.entries()) {
-            FileObject root = e.getRoot ();
-            if (root != null && FileUtil.isParentOf(root,fobj)) {
-                return e.includes(fobj);
-            }
-        }
-        return true;
-    }
-    
-    private static boolean isCaseSensitive () {
-        return ! new File ("a").equals (new File ("A"));    //NOI18N
-    }
-    
-    /**
-     * Returns candidate filenames given a classname. The return value is either 
-     * a String (top-level class, no $) or List<String> as the JLS permits $ in
-     * class names. 
-     */
-    private static Object getSourceFileNames (String classFileName) {
-        int max = classFileName.length() - 1;
-        int index = classFileName.indexOf('$');
-        if (index == -1) {
-            return classFileName;
-        }
-        List<String> ll = new ArrayList<>(3);
-        do {
-            ll.add(classFileName.substring(0, index));
-            if (index >= max) {
-                break;
-            }
-            index = classFileName.indexOf('$', index + 1);
-        } while (index >= 0);
-        ll.add(classFileName);
-        return ll;
-    }
-        
-    /**
-     * Resolves all captured type variables to their respective wildcards in the given type.
-     * @param info CompilationInfo over which the method should work
-     * @param tm type to resolve
-     * @return resolved type
-     * 
-     * @since 0.136
-     */
-    public static TypeMirror resolveCapturedType(CompilationInfo info, TypeMirror tm) {
-        TypeMirror type = resolveCapturedTypeInt(info, tm);
-        
-        if (type.getKind() == TypeKind.WILDCARD) {
-            TypeMirror tmirr = ((WildcardType) type).getExtendsBound();
-            tmirr = tmirr != null ? tmirr : ((WildcardType) type).getSuperBound();
-            if (tmirr != null) {
-                return tmirr;
-            } else { //no extends, just '?
-                TypeElement tel = info.getElements().getTypeElement("java.lang.Object"); // NOI18N
-                return tel == null ? null : tel.asType();
-            }
-                
-        }
-        
-        return type;
-    }
-    
-    private static TypeMirror resolveCapturedTypeInt(CompilationInfo info, TypeMirror tm) {
-        if (tm == null) {
-            return tm;
-        }
-        
-        TypeMirror orig = resolveCapturedType(tm);
-
-        if (orig != null) {
-            tm = orig;
-        }
-        
-        if (tm.getKind() == TypeKind.WILDCARD) {
-            TypeMirror extendsBound = ((WildcardType) tm).getExtendsBound();
-            TypeMirror rct = resolveCapturedTypeInt(info, extendsBound != null ? extendsBound : ((WildcardType) tm).getSuperBound());
-            if (rct != null) {
-                return rct.getKind() == TypeKind.WILDCARD ? rct : info.getTypes().getWildcardType(extendsBound != null ? rct : null, extendsBound == null ? rct : null);
-            }
-        }
-        
-        if (tm.getKind() == TypeKind.DECLARED) {
-            DeclaredType dt = (DeclaredType) tm;
-            List<TypeMirror> typeArguments = new LinkedList<>();
-            
-            for (TypeMirror t : dt.getTypeArguments()) {
-                typeArguments.add(resolveCapturedTypeInt(info, t));
-            }
-            
-            final TypeMirror enclosingType = dt.getEnclosingType();
-            if (enclosingType.getKind() == TypeKind.DECLARED) {
-                return info.getTypes().getDeclaredType((DeclaredType) enclosingType, (TypeElement) dt.asElement(), typeArguments.toArray(new TypeMirror[0]));
-            } else {
-                return info.getTypes().getDeclaredType((TypeElement) dt.asElement(), typeArguments.toArray(new TypeMirror[0]));
-            }
-        }
-
-        if (tm.getKind() == TypeKind.ARRAY) {
-            ArrayType at = (ArrayType) tm;
-            TypeMirror componentType = resolveCapturedTypeInt(info, at.getComponentType());
-            switch (componentType.getKind()) {
-                case VOID:
-                case EXECUTABLE:
-                case WILDCARD:  // heh!
-                case PACKAGE:
-                    break;
-                default:
-                    return info.getTypes().getArrayType(componentType);
-            }
-        }
-        
-        return tm;
-    }
-    /**
-     * @since 0.24
-     */
-    public static WildcardType resolveCapturedType(TypeMirror type) {
-        if (type instanceof Type.CapturedType) {
-            return ((Type.CapturedType) type).wildcard;
-        } else {
-            return null;
-        }
-    }
-    
-    /**
-     * Returns all elements of the given scope that are declared after given position in a source.
-     * @param path to the given search scope
-     * @param pos position in the source
-     * @param sourcePositions
-     * @param trees
-     * @return collection of forward references
-     * 
-     * @since 0.136
-     */
-    public static Collection<? extends Element> getForwardReferences(TreePath path, int pos, SourcePositions sourcePositions, Trees trees) {
-        HashSet<Element> refs = new HashSet<>();
-        Element el;
-        
-        while(path != null) {
-            switch(path.getLeaf().getKind()) {
-                case BLOCK:
-                    if (path.getParentPath().getLeaf().getKind() == Tree.Kind.LAMBDA_EXPRESSION)
-                        break;
-                case ANNOTATION_TYPE:
-                case CLASS:
-                case ENUM:
-                case INTERFACE:
-                    return refs;
-                case VARIABLE:
-                    el = trees.getElement(path);
-                    if (el != null) {
-                        refs.add(el);
-                    }
-                    TreePath parent = path.getParentPath();
-                    if (TreeUtilities.CLASS_TREE_KINDS.contains(parent.getLeaf().getKind())) {
-                        boolean isStatic = ((VariableTree)path.getLeaf()).getModifiers().getFlags().contains(Modifier.STATIC);
-                        for(Tree member : ((ClassTree)parent.getLeaf()).getMembers()) {
-                            if (member.getKind() == Tree.Kind.VARIABLE && sourcePositions.getStartPosition(path.getCompilationUnit(), member) >= pos &&
-                                    (isStatic || !((VariableTree)member).getModifiers().getFlags().contains(Modifier.STATIC))) {
-                                el = trees.getElement(new TreePath(parent, member));
-                                if (el != null) {
-                                    refs.add(el);
-                                }
-                            }
-                        }
-                    }
-                    return refs;
-                case ENHANCED_FOR_LOOP:
-                    EnhancedForLoopTree efl = (EnhancedForLoopTree)path.getLeaf();
-                    if (sourcePositions.getEndPosition(path.getCompilationUnit(), efl.getExpression()) >= pos) {
-                        el = trees.getElement(new TreePath(path, efl.getVariable()));
-                        if (el != null) {
-                            refs.add(el);
-                        }
-                    }                        
-            }
-            path = path.getParentPath();
-        }
-        return refs;
-    }
-
-    // --------------- Helper methods of getFile () -----------------------------
-    private static ClassPath createClassPath (ClasspathInfo cpInfo, PathKind kind) throws MalformedURLException {
-	return ClasspathInfoAccessor.getINSTANCE().getCachedClassPath(cpInfo, kind);	
-    }    
-    
-    // --------------- End of getFile () helper methods ------------------------------
-
-    private static final int MAX_LEN = 6;
-    /**
-     * Utility method for generating method parameter names based on incoming
-     * class name when source is unavailable.
-     * <p/>
-     * This method uses both subjective heuristics to follow common patterns
-     * for common JDK classes, acronym creation for bicapitalized names, and
-     * vowel and repeated character elision if that fails, to generate
-     * readable, programmer-friendly method names.
-     *
-     * @param typeName The fqn of the parameter class
-     * @param used A set of names that have already been used for parameters
-     * and should not be reused, to avoid creating uncompilable code
-     * @return A programmer-friendly parameter name (i.e. not arg0, arg1...)
-     */
-    static @NonNull String generateReadableParameterName (@NonNull String typeName, @NonNull Set<String> used) {
-        boolean arr = typeName.indexOf ("[") > 0 || typeName.endsWith("..."); //NOI18N
-        typeName = trimToSimpleName (typeName);
-        String result = typeName.toLowerCase();
-        //First, do some common, sane substitutions that are common java parlance
-        if ( typeName.endsWith ( "Listener" ) ) { //NOI18N
-            result = Character.toLowerCase(typeName.charAt(0)) + "l"; //NOI18N
-        } else if ( "Object".equals (typeName)) { //NOI18N
-            result = "o"; //NOI18N
-        } else if ("Class".equals(typeName)) { //NOI18N
-            result = "type"; //NOI18N
-        } else if ( "InputStream".equals(typeName)) { //NOI18N
-            result = "in"; //NOI18N
-        } else if ( "OutputStream".equals(typeName)) {
-            result = "out"; //NOI18N
-        } else if ( "Runnable".equals(typeName)) {
-            result = "r"; //NOI18N
-        } else if ( "Lookup".equals(typeName)) {
-            result = "lkp"; //NOI18N
-        } else if ( typeName.endsWith ( "Stream" )) { //NOI18N
-            result = "stream"; //NOI18N
-        } else if ( typeName.endsWith ("Writer")) { //NOI18N
-            result = "writer"; //NOI18N
-        } else if ( typeName.endsWith ("Reader")) { //NOI18N
-            result = "reader"; //NOI18N
-        } else if ( typeName.endsWith ( "Panel" )) { //NOI18N
-            result = "pnl"; //NOI18N
-        } else if ( typeName.endsWith ( "Action" )) { //NOI18N
-            result = "action"; //NOI18N
-        }
-        //Now see if we've made a large and unwieldy variable - people
-        //usually prefer reasonably short but legible arguments
-        if ( result.length () > MAX_LEN ) {
-            //See if we can turn, say, NoClassDefFoundError into "ncdfe"
-            result = tryToMakeAcronym ( typeName );
-            //No luck?  We've probably got one long word like Component or Runnable
-            if (result.length() > MAX_LEN) {
-                //First, strip out vowels - people easily figure out words
-                //missing vowels - common in abbreviations and spam mails
-                result = elideVowelsAndRepetitions(result);
-                if (result.length() > MAX_LEN) {
-                    //Still too long?  Give up and give them a 1 character var name
-                    result = new StringBuilder().append(
-                            result.charAt(0)).toString().toLowerCase();
-                }
-            }
-        }
-        //Make sure we haven't killed everything - if so, use a generic version
-        if ( result.trim ().length () == 0 ) {
-            result = "value"; //NOI18N
-        }
-        //If it's an array, pluralize it (english language style - but better than nothing)
-        if (arr) {
-            result += "s"; //NOI18N
-        }
-        //Now make sure it's legal;  if not, make it a single letter
-        if ( isPrimitiveTypeName ( result ) || !BaseUtilities.isJavaIdentifier ( result ) ) {
-            StringBuilder sb = new StringBuilder();
-            sb.append (result.charAt(0));
-            result = sb.toString();
-        }
-        //Now make sure we're not duplicating a variable name we already used
-        String test = result;
-        int revs = 0;
-        while ( used.contains ( test ) ) {
-            revs++;
-            test = result + revs;
-        }
-        result = test;
-        used.add ( result );
-        return result;
-    }
-
-    /**
-     * Trims to the simple class name and removes and generics
-     *
-     * @param typeName The class name
-     * @return A simplified class name
-     */
-    private static String trimToSimpleName (String typeName) {
-        String result = typeName;
-        int ix = result.indexOf ("<"); //NOI18N
-        if (ix > 0 && ix != typeName.length() - 1) {
-            result = typeName.substring(0, ix);
-        }
-        if (result.endsWith ("...")) { //NOI18N
-            result = result.substring (0, result.length() - 3);
-        }
-        ix = result.lastIndexOf ("$"); //NOI18N
-        if (ix > 0 && ix != result.length() - 1) {
-            result = result.substring(ix + 1);
-        } else {
-            ix = result.lastIndexOf("."); //NOI18N
-            if (ix > 0 && ix != result.length() - 1) {
-                result = result.substring(ix + 1);
-            }
-        }
-        ix = result.indexOf ( "[" ); //NOI18N
-        if ( ix > 0 ) {
-            result = result.substring ( 0, ix );
-        }
-        return result;
-    }
-
-    /**
-     * Removes vowels and repeated letters.  This is used to generate names
-     * where the class name a single long word - e.g. abbreviate
-     * Runnable to rnbl
-     * @param name The name
-     * @return A shortened version of it
-     */
-    private static String elideVowelsAndRepetitions (String name) {
-        char[] chars = name.toCharArray();
-        StringBuilder sb = new StringBuilder();
-        char last = 0;
-        char lastUsed = 0;
-        for (int i = 0; i < chars.length; i++) {
-            char c = chars[i];
-            if (Character.isDigit(c)) {
-                continue;
-            }
-            if (i == 0 || Character.isUpperCase(c)) {
-                if (lastUsed != c) {
-                    sb.append (c);
-                    lastUsed = c;
-                }
-            } else if (c != last && !isVowel(c)) {
-                if (lastUsed != c) {
-                    sb.append (c);
-                    lastUsed = c;
-                }
-            }
-            last = c;
-        }
-        return sb.toString();
-    }
-
-    private static boolean isVowel(char c) {
-        return Arrays.binarySearch(VOWELS, c) >= 0;
-    }
-
-    /**
-     * Vowels in various indo-european-based languages
-     */
-    private static final char[] VOWELS = new char[] {
-    //IMPORTANT:  This array is sorted.  If you add to it,
-    //add in the correct place or Arrays.binarySearch will break on it
-    '\u0061', '\u0065', '\u0069', '\u006f', '\u0075', '\u0079', '\u00e9', '\u00ea',  //NOI18N
-    '\u00e8', '\u00e1', '\u00e2', '\u00e6', '\u00e0', '\u03b1', '\u00e3',  //NOI18N
-    '\u00e5', '\u00e4', '\u00eb', '\u00f3', '\u00f4', '\u0153', '\u00f2',  //NOI18N
-    '\u03bf', '\u00f5', '\u00f6', '\u00ed', '\u00ee', '\u00ec', '\u03b9',  //NOI18N
-    '\u00ef', '\u00fa', '\u00fb', '\u00f9', '\u03d2', '\u03c5', '\u00fc',  //NOI18N
-    '\u0430', '\u043e', '\u044f', '\u0438', '\u0439', '\u0435', '\u044b',  //NOI18N
-    '\u044d', '\u0443', '\u044e', };
-
-    //PENDING:  The below would be much prettier;  whether it survives
-    //cross-platform encoding issues in hg is another question;  the hg diff generated
-    //was incorrect
-/*
-    'a', 'e', 'i', 'o', 'u', 'y', 'à', 'á', //NOI18N
-    'â', 'ã', 'ä', 'å', 'æ', 'è', 'é', //NOI18N
-    'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ò', //NOI18N
-    'ó', 'ô', 'õ', 'ö', 'ù', 'ú', 'û', //NOI18N
-    'ü', 'œ', 'α', 'ι', 'ο', 'υ', 'ϒ', //NOI18N
-    'а', 'е', 'и', 'й', 'о', 'у', 'ы', //NOI18N
-    'э', 'ю', 'я'}; //NOI18N
-*/
-    /**
-     * Determine if a string matches a java primitive type.  Used in generating reasonable variable names.
-     */
-    private static boolean isPrimitiveTypeName (String typeName) {
-        return (
-                //Whoa, ascii art!
-                "void".equals ( typeName ) || //NOI18N
-                "int".equals ( typeName ) || //NOI18N
-                "long".equals ( typeName ) || //NOI18N
-                "float".equals ( typeName ) || //NOI18N
-                "double".equals ( typeName ) || //NOI18N
-                "short".equals ( typeName ) || //NOI18N
-                "char".equals ( typeName ) || //NOI18N
-                "boolean".equals ( typeName ) ); //NOI18N
-    }
-
-    /**
-     * Try to create an acronym-style variable name from a string - i.e.,
-     * "JavaDataObject" becomes "jdo".
-     */
-    private static String tryToMakeAcronym (String s) {
-        char[] c = s.toCharArray ();
-        StringBuilder sb = new StringBuilder ();
-        for ( int i = 0; i < c.length; i++ ) {
-            if ( Character.isUpperCase (c[i])) {
-                sb.append ( c[ i ] );
-            }
-        }
-        if ( sb.length () > 1 ) {
-            return sb.toString ().toLowerCase ();
-        } else {
-            return s.toLowerCase();
-        }
-    }
-
-    @NonNull
-    private static Set<URL> mapToURLs(
-        @NonNull final Collection<? extends FileObject> fos) {
-        final Set<URL> res = new HashSet<>(fos.size());
-        for (FileObject fo : fos) {
-            res.add(fo.toURL());
-        }
-        return res;
-    }
-}
diff --git a/.pc/netbeans-xml.jaxb.api.patch/xml.jaxb.api/nbproject/project.properties b/.pc/netbeans-xml.jaxb.api.patch/xml.jaxb.api/nbproject/project.properties
deleted file mode 100644
index 4356623..0000000
--- a/.pc/netbeans-xml.jaxb.api.patch/xml.jaxb.api/nbproject/project.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# Contributor(s):
-#
-# The Original Software is NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
-is.autoload=true
-
-jnlp.indirect.jars=\
-    modules/ext/jaxb/activation.jar,\
-    modules/ext/jaxb/api/jaxb-api.jar,\
-    modules/ext/jaxb/api/jsr173_1.0_api.jar
-
-release.external/activation.jar=modules/ext/jaxb/activation.jar
-release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
-release.external/jsr173_1.0_api.jar=modules/ext/jaxb/api/jsr173_1.0_api.jar
-
-sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-xsl-httpserver.patch/xsl/manifest.mf b/.pc/netbeans-xsl-httpserver.patch/xsl/manifest.mf
deleted file mode 100644
index 640b690..0000000
--- a/.pc/netbeans-xsl-httpserver.patch/xsl/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.netbeans.modules.xsl/1
-OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xsl/resources/Bundle.properties
-OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
-OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.42.1
diff --git a/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
deleted file mode 100644
index d97a2cd..0000000
--- a/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2011 Oracle
- */
-package org.netbeans.modules.netbinox;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.baseadaptor.bundlefile.DirBundleFile;
-import org.eclipse.osgi.baseadaptor.bundlefile.DirZipBundleEntry;
-import org.eclipse.osgi.baseadaptor.bundlefile.MRUBundleFileList;
-import org.eclipse.osgi.baseadaptor.bundlefile.ZipBundleFile;
-import org.netbeans.core.netigso.spi.BundleContent;
-import org.netbeans.core.netigso.spi.NetigsoArchive;
-import org.openide.modules.ModuleInfo;
-import org.openide.util.Lookup;
-
-/** This is fake bundle. It is created by the Netbinox infrastructure to 
- * use the {@link NetigsoArchive} to get cached data and speed up the start.
- *
- * @author Jaroslav Tulach <jtulach at netbeans.org>
- */
-final class JarBundleFile extends BundleFile implements BundleContent {
-    private BundleFile delegate;
-
-    private static Map<Long,File> usedIds;
-
-    private final MRUBundleFileList mru;
-    private final BaseData data;
-    private final NetigsoArchive archive;
-    
-    JarBundleFile(
-        File base, BaseData data, NetigsoArchive archive,
-        MRUBundleFileList mru, boolean isBase
-    ) {
-        super(base);
-
-        long id;
-        if (isBase) {
-            id = data.getBundleID();
-        } else {
-            id = 100000 + base.getPath().hashCode();
-        }
-
-        boolean assertOn = false;
-        assert assertOn = true;
-        if (assertOn) {
-            if (usedIds == null) {
-                usedIds =  new HashMap<Long, File>();
-            }
-            File prev = usedIds.put(id, base);
-            if (prev != null && !prev.equals(base)) {
-                NetbinoxFactory.LOG.log(
-                    Level.WARNING,
-                    "same id: {0} for {1} and {2}", // NOI18N
-                    new Object[]{id, base, prev}
-                );
-            }
-        }
-
-        this.archive = archive.forBundle(id, this);
-        this.data = data;
-        this.mru = mru;
-    }
-
-
-    private synchronized BundleFile delegate(String who, String what) {
-        if (delegate == null) {
-            NetbinoxFactory.LOG.log(Level.FINE, "opening {0} because of {1} needing {2}", new Object[]{data.getLocation(), who, what});
-            try {
-                delegate = new ZipBundleFile(getBaseFile(), data, mru) {
-                    @Override
-                    protected boolean checkedOpen() {
-                        try {
-                            return getZipFile() != null;
-                        } catch (IOException ex) {
-                            final File bf = new File(getBaseFile().getPath());
-                            if (bf.isDirectory()) {
-                                try {
-                                    delegate = new DirBundleFile(bf, false);
-                                    return false;
-                                } catch (IOException dirEx) {
-                                    NetbinoxFactory.LOG.log(Level.WARNING, 
-                                        "Cannot create DirBundleFile for " + bf,
-                                        dirEx
-                                    );
-                                }
-                            }
-                            NetbinoxFactory.LOG.log(Level.WARNING, "Cannot open bundle delegate {0}", bf);
-                            if (!bf.isFile() || !bf.canRead()) {
-                                delegate = EmptyBundleFile.EMPTY;
-                                return false;
-                            }
-                        }
-                        // no optimizations
-                        return super.checkedOpen();
-                    }
-                };
-            } catch (IOException ex) {
-                NetbinoxFactory.LOG.log(Level.WARNING, "Error creating delegate for {0} because of {1}", new Object[] { getBaseFile(), data.getLocation() });
-                delegate = EmptyBundleFile.EMPTY;
-            }
-        }
-        return delegate;
-    }
-
-    @Override
-    public File getBaseFile() {
-        final File file = super.getBaseFile();
-        class VFile extends File {
-
-            public VFile() {
-                super(file.getPath());
-            }
-
-            @Override
-            public boolean isDirectory() {
-                return false;
-            }
-
-            @Override
-            public boolean isFile() {
-                return true;
-            }
-
-            @Override
-            public boolean exists() {
-                return true;
-            }
-
-            @Override
-            public File getAbsoluteFile() {
-                return this;
-            }
-
-            @Override
-            public long lastModified() {
-                return data.getLastModified();
-            }
-        }
-        return new VFile();
-    }
-
-    @Override
-    public File getFile(String file, boolean bln) {
-        byte[] exists = getCachedEntry(file);
-        if (exists == null) {
-            return null;
-        }
-        BundleFile d = delegate("getFile", file);
-        return d == null ? null : d.getFile(file, bln);
-    }
-
-    @Override
-    public byte[] resource(String name) throws IOException {
-        BundleEntry u = findEntry("resource", name);
-        if (u == null) {
-            return null;
-        }
-        InputStream is = u.getInputStream();
-        if (is == null) {
-            return new byte[0];
-        }
-        byte[] arr = null;
-        try {
-            arr = new byte[is.available()];
-            int pos = 0;
-            for (;;) {
-                int toRead = arr.length - pos;
-                if (toRead == 0) {
-                    break;
-                }
-                int len = is.read(arr, pos, toRead);
-                if (len == -1) {
-                    break;
-                }
-                pos += len;
-            }
-            if (pos != arr.length) {
-                throw new IOException("Not read enough: " + pos + " should have been: " + arr.length); // NOI18N
-            }
-        } finally {
-            is.close();
-        }
-        NetbinoxFactory.LOG.log(Level.FINE, "Loaded {1} bytes for {0}", new Object[] { name, arr.length }); // NOI18N
-        return arr;
-    }
-
-    private BundleEntry findEntry(String why, final String name) {
-        if (!name.equals("META-INF/MANIFEST.MF") && // NOI18N
-            data != null && 
-            data.getLocation() != null && 
-            data.getLocation().startsWith("netigso://") // NOI18N
-        ) { 
-            String cnb = data.getLocation().substring(10);
-            for (ModuleInfo mi : Lookup.getDefault().lookupAll(ModuleInfo.class)) {
-                if (mi.getCodeNameBase().equals(cnb)) {
-                    if (!mi.isEnabled()) {
-                        break;
-                    }
-                    final URL url = mi.getClassLoader().getResource(name);
-                    if (url != null) {
-                        return new ModuleEntry(url, name);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-        
-        if ("/".equals(name)) { // NOI18N
-            return new RootEntry(this); // NOI18N
-        }
-        
-        BundleEntry u;
-        for (;;) {
-            BundleFile d = delegate(why, name);
-            u = d.getEntry(name);
-            if (u != null || d == delegate) {
-                break;
-            }
-        }
-        return u;
-    }
-
-
-    private byte[] getCachedEntry(String name) {
-        try {
-            return archive.fromArchive(name);
-        } catch (IOException ex) {
-            return null;
-        }
-    }
-
-    @Override
-    public BundleEntry getEntry(final String name) {
-        if (!archive.isActive()) {
-            return delegate("inactive", name).getEntry(name); // NOI18N
-        }
-        
-        final byte[] arr = getCachedEntry(name);
-        if (arr == null && !name.equals("/")) {
-            return null;
-        }
-        return new CachingEntry(arr, name);
-    }
-
-    @Override
-    public Enumeration<String> getEntryPaths(String prefix) {
-        BundleFile d = delegate("getEntryPaths", prefix);
-        if (d == null) {
-            return Collections.enumeration(Collections.<String>emptyList());
-        }
-        return d.getEntryPaths(prefix);
-    }
-
-    @Override
-    public synchronized void close() throws IOException {
-        if (delegate != null) {
-            delegate.close();
-        }
-    }
-
-    @Override
-    public void open() throws IOException {
-        if (delegate != null) {
-            delegate.open();
-        }
-    }
-
-    @Override
-    public boolean containsDir(String path) {
-        return path.endsWith("/") && getEntry(path) != null;
-    }
-
-    private class CachingEntry extends BundleEntry {
-        private final String name;
-        private final int size;
-        private final Reference<byte[]> arr;
-
-        public CachingEntry(byte[] arr, String name) {
-            this.size = arr.length;
-            this.name = name;
-            this.arr = new SoftReference<byte[]>(arr);
-        }
-
-        @Override
-        public InputStream getInputStream() throws IOException {
-            byte[] data = arr.get();
-            // once used, let the array go...
-            arr.clear();
-            if (data == null) {
-                data = getCachedEntry(name);
-            }
-            if (data == null) {
-                throw new FileNotFoundException();
-            }
-            return new ByteArrayInputStream(data);
-        }
-
-        @Override
-        public long getSize() {
-            return size;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public long getTime() {
-            return getBaseFile().lastModified();
-        }
-
-        @Override
-        public URL getLocalURL() {
-            return findEntry("getLocalURL", name).getLocalURL(); // NOI18N
-        }
-
-        @Override
-        public URL getFileURL() {
-            return findEntry("getFileURL", name).getFileURL(); // NOI18N
-        }
-    }
-}
diff --git a/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
deleted file mode 100644
index 89c1357..0000000
--- a/.pc/osgi-update.patch/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2011 Oracle
- */
-package org.netbeans.modules.netbinox;
-
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Map;
-import java.util.Properties;
-import java.util.logging.Level;
-import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
-import org.eclipse.osgi.launch.Equinox;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.Filter;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- *
- * @author Jaroslav Tulach <jtulach at netbeans.org>
- */
-class Netbinox extends Equinox {
-    private final String installArea;
-    
-    public Netbinox(Map configuration) {
-        super(configuration);
-        Object ia = configuration.get("osgi.install.area"); // NOI18N
-        if (ia instanceof String) {
-            installArea = (String)ia;
-        } else {
-            installArea = null;
-        }
-    }
-    
-    @Override
-    public void init() throws BundleException {
-        super.init();
-        if (Boolean.getBoolean("osgi.framework.useSystemProperties")) {
-            Properties prev = FrameworkProperties.getProperties();
-            try {
-                Field f = FrameworkProperties.class.getDeclaredField("properties"); // NOI18N
-                f.setAccessible(true);
-                f.set(null, null);
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
-            Properties newP = FrameworkProperties.getProperties();
-            for (Map.Entry en : prev.entrySet()) {
-                if (en.getKey() instanceof String && en.getValue() instanceof String) {
-                    newP.setProperty((String)en.getKey(), (String)en.getValue());
-                }
-            }
-            assert System.getProperties() == FrameworkProperties.getProperties();
-        }
-    }
-    
-    @Override
-    public BundleContext getBundleContext() {
-        return new Context(super.getBundleContext(), installArea);
-    }
-    
-    private static final class Context implements BundleContext {
-        private final BundleContext delegate;
-        private final String installArea;
-
-        public Context(BundleContext delegate, String installArea) {
-            this.delegate = delegate;
-            this.installArea = installArea;
-        }
-        
-        public boolean ungetService(ServiceReference sr) {
-            return delegate.ungetService(sr);
-        }
-
-        public void removeServiceListener(ServiceListener sl) {
-            delegate.removeServiceListener(sl);
-        }
-
-        public void removeFrameworkListener(FrameworkListener fl) {
-            delegate.removeFrameworkListener(fl);
-        }
-
-        public void removeBundleListener(BundleListener bl) {
-            delegate.removeBundleListener(bl);
-        }
-
-        public ServiceRegistration registerService(String string, Object o, Dictionary dctnr) {
-            return delegate.registerService(string, o, dctnr);
-        }
-
-        public ServiceRegistration registerService(String[] strings, Object o, Dictionary dctnr) {
-            return delegate.registerService(strings, o, dctnr);
-        }
-
-        public Bundle installBundle(String string) throws BundleException {
-            return installBundle(string, null);
-        }
-
-        @Override
-        public Bundle installBundle(String url, InputStream in) throws BundleException {
-            final String pref = "reference:";
-            if (url.startsWith(pref)) {
-                // workaround for problems with space in path
-                url = url.replaceAll("%20", " ");
-                String filePart = url.substring(pref.length());
-                if (installArea != null && filePart.startsWith(installArea)) {
-                    String relPath = filePart.substring(installArea.length());
-                    if (relPath.startsWith("/")) { // NOI18N
-                        relPath = relPath.substring(1);
-                    }
-                    url = pref + "file:" + relPath;
-                    NetbinoxFactory.LOG.log(Level.FINE, "Converted to relative {0}", url);
-                } else {
-                    NetbinoxFactory.LOG.log(Level.FINE, "Kept absolute {0}", url);
-                }
-            }
-            return delegate.installBundle(url, in);
-        }
-        
-        @Override
-        public Collection getServiceReferences(Class type, String string) throws InvalidSyntaxException {
-            return delegate.getServiceReferences(type, string);
-        }
-        
-        @Override
-        public ServiceReference getServiceReference(Class type) {
-            return delegate.getServiceReference(type);
-        }
-
-        @Override
-        public ServiceRegistration registerService(Class type, Object s, Dictionary dctnr) {
-            return delegate.registerService(type, s, dctnr);
-        }
-
-        @Override
-        public ServiceReference[] getServiceReferences(String string, String string1) throws InvalidSyntaxException {
-            return delegate.getServiceReferences(string, string1);
-        }
-
-        public ServiceReference getServiceReference(String string) {
-            return delegate.getServiceReference(string);
-        }
-
-        public Object getService(ServiceReference sr) {
-            return delegate.getService(sr);
-        }
-
-        public String getProperty(String string) {
-            return delegate.getProperty(string);
-        }
-
-        public File getDataFile(String string) {
-            return delegate.getDataFile(string);
-        }
-
-        public Bundle[] getBundles() {
-            return delegate.getBundles();
-        }
-
-        public Bundle getBundle(long l) {
-            return delegate.getBundle(l);
-        }
-
-        public Bundle getBundle() {
-            return delegate.getBundle();
-        }
-        
-        public Bundle getBundle(String s) {
-            return delegate.getBundle(s);
-        }
-
-        public ServiceReference[] getAllServiceReferences(String string, String string1) throws InvalidSyntaxException {
-            return delegate.getAllServiceReferences(string, string1);
-        }
-
-        public Filter createFilter(String string) throws InvalidSyntaxException {
-            return delegate.createFilter(string);
-        }
-
-        public void addServiceListener(ServiceListener sl) {
-            delegate.addServiceListener(sl);
-        }
-
-        public void addServiceListener(ServiceListener sl, String string) throws InvalidSyntaxException {
-            delegate.addServiceListener(sl, string);
-        }
-
-        public void addFrameworkListener(FrameworkListener fl) {
-            delegate.addFrameworkListener(fl);
-        }
-
-        public void addBundleListener(BundleListener bl) {
-            delegate.addBundleListener(bl);
-        }
-    } // end of Context
-}
diff --git a/.pc/reproducible-build.patch/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java b/.pc/reproducible-build.patch/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
deleted file mode 100644
index 30b0f0a..0000000
--- a/.pc/reproducible-build.patch/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package org.netbeans.nbbuild;
-
-import java.io.*;
-import java.util.*;
-import java.io.FileOutputStream;
-import java.util.zip.CRC32;
-
-import org.w3c.dom.*;
-import org.xml.sax.InputSource;
-
-import org.apache.tools.ant.BuildException;
-
-/** This class represents module updates tracking
- *
- * @author  akemr
- */
-class UpdateTracking {
-    private static final String ELEMENT_MODULE = "module"; // NOI18N
-    private static final String ATTR_CODENAME = "codename"; // NOI18N
-    private static final String ELEMENT_VERSION = "module_version"; // NOI18N
-    private static final String ATTR_VERSION = "specification_version"; // NOI18N
-    private static final String ATTR_ORIGIN = "origin"; // NOI18N
-    private static final String ATTR_LAST = "last"; // NOI18N
-    private static final String ATTR_INSTALL = "install_time"; // NOI18N
-    private static final String ELEMENT_FILE = "file"; // NOI18N
-    private static final String ATTR_FILE_NAME = "name"; // NOI18N
-    private static final String ATTR_CRC = "crc"; // NOI18N
-    
-    private static final String NBM_ORIGIN = "nbm"; // NOI18N
-    private static final String INST_ORIGIN = "installer"; // NOI18N
-
-    /** Platform dependent file name separator */
-    private static final String FILE_SEPARATOR = System.getProperty ("file.separator");  // NOI18N           
-
-    /** The name of the install_later file */
-    public static final String TRACKING_DIRECTORY = "update_tracking"; // NOI18N
-    
-    private File trackingFile = null;
-    
-    private String origin = NBM_ORIGIN;
-    private String nbPath = null;
-    private Module module = null;
-    protected InputStream is = null;
-    protected OutputStream os = null;
-   
-    // for generating xml in build process
-    public UpdateTracking( String nbPath ) {
-        this.nbPath = nbPath;
-        origin = INST_ORIGIN;
-    }
-
-    /**
-     * Use this constructor, only when you want to use I/O Streams
-     */
-    public UpdateTracking () {
-        this.nbPath = null;
-        origin = INST_ORIGIN;
-    }
-    
-    public Version addNewModuleVersion( String codename, String spec_version ) {
-        module = new Module();
-        module.setCodename( codename );
-        Version version = new Version();        
-        version.setVersion( spec_version );
-        version.setOrigin( origin );
-        version.setLast( true );
-        version.setInstall_time( System.currentTimeMillis() );
-        module.setVersion( version );
-        return version;
-    }
-    
-    public String getVersionFromFile (File utf) throws BuildException {
-        this.setTrackingFile(utf.getParentFile(), utf.getName());
-        read();
-        if ( module.getVersions().size() != 1 ) 
-            throw new BuildException ("Module described in update tracking file " + utf.getAbsolutePath() + " has got " + module.getVersions().size() + " specification versions. Correct number is 1.");
-        return module.getVersions().get(0).getVersion();
-    }
-    
-    public String getCodenameFromFile (File utf) throws BuildException {
-        this.setTrackingFile(utf.getParentFile(), utf.getName());
-        read();
-        if ( module.getVersions().size() != 1 ) 
-            throw new BuildException ("Module described in update tracking file " + utf.getAbsolutePath() + " has got " + module.getVersions().size() + " specification versions. Correct number is 1.");
-        return module.getCodename();
-    }
-    
-    public String getVersionForCodeName( String codeName ) throws BuildException {
-        module = new Module();
-        module.setCodename( codeName );
-//        if (this.is == null) {
-            File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
-            setTrackingFile(directory, getTrackingFileName());
-            if (!trackingFile.exists() || !trackingFile.isFile())
-                throw new BuildException ("Tracking file " + trackingFile.getAbsolutePath() + " cannot be found for module " + module.getCodenamebase());
-//        }
-        read();
-        if ( module.getVersions().size() != 1 ) 
-            throw new BuildException ("Module with codenamebase " + codeName + " has got " + module.getVersions().size() + " specification versions. Correct number is 1.");
-        return module.getVersions().get(0).getVersion();
-    }
-    
-    public String[] getListOfNBM( String codeName ) throws BuildException {
-        module = new Module();
-        module.setCodename( codeName );
-        if (this.is == null) {
-            File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
-            setTrackingFile(directory, getTrackingFileName());
-            if (!trackingFile.exists() || !trackingFile.isFile())
-                throw new BuildException ("Tracking file " + trackingFile.getAbsolutePath() + " cannot be found for module " + module.getCodenamebase());
-        }
-        
-        read();
-        
-        if ( module.getVersions().size() != 1 ) 
-            throw new BuildException ("Module with codenamebase " + codeName + " has got " + module.getVersions().size() + " specification versions. Correct number is 1.");
-        
-        List<ModuleFile> files = module.getVersions().get(0).getFiles();
-        String [] listFiles = new String[ files.size() ];
-        for (int i=0; i < files.size(); i++) {
-            listFiles[i] = files.get(i).getName().replace(File.separatorChar,'/');
-        }
-        
-        return listFiles;
-    }
-
-    public void removeLocalized( String locale ) {
-        File updateDirectory = new File( nbPath, TRACKING_DIRECTORY );
-        File[] trackingFiles = updateDirectory.listFiles( new FileFilter() { // Get only *.xml files
-            public boolean accept( File file ) {
-                return file.isFile() &&file.getName().endsWith(".xml"); //NOI18N
-            }
-        } );
-        if (trackingFiles != null)
-            for (int i = trackingFiles.length-1; i >= 0; i--) {
-                trackingFile = trackingFiles[i];
-                read();
-                module.removeLocalized( locale );
-                write();
-            }
-    }
-    
-    void write( ) throws BuildException{
-        Document document = XMLUtil.createDocument(ELEMENT_MODULE);  
-        Element e_module = document.getDocumentElement();
-        e_module.setAttribute(ATTR_CODENAME, module.getCodename());
-        for (Version ver : module.getVersions()) {
-            Element e_version = document.createElement(ELEMENT_VERSION);
-            e_version.setAttribute(ATTR_VERSION, ver.getVersion());
-            e_version.setAttribute(ATTR_ORIGIN, ver.getOrigin());
-            e_version.setAttribute(ATTR_LAST, "true");                          //NOI18N
-            e_version.setAttribute(ATTR_INSTALL, Long.toString(ver.getInstall_time()));
-            e_module.appendChild( e_version );
-            for (ModuleFile file : ver.getFiles()) {
-                Element e_file = document.createElement(ELEMENT_FILE);
-                e_file.setAttribute(ATTR_FILE_NAME, file.getName().replace(File.separatorChar,'/'));
-                e_file.setAttribute(ATTR_CRC, file.getCrc());
-                e_version.appendChild( e_file );
-            }
-        }
-        
-        //document.getDocumentElement().normalize();
-        if (this.os == null) {
-            File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
-            if (!directory.exists()) {
-                directory.mkdirs();
-            }
-            setTrackingFile(directory, this.getTrackingFileName());
-            FileOutputStream fos = null;
-            try {
-                fos = new FileOutputStream(new File(directory,this.getTrackingFileName()));
-            } catch (Exception e) {
-                throw new BuildException("Could not get outputstream to write update tracking", e);
-            }
-            this.setTrackingOutputStream(fos);
-        }
-        try {
-            try {
-                XMLUtil.write(document, this.os);
-            } finally {
-                this.os.close();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            if ((trackingFile != null) && (trackingFile.exists()))
-                trackingFile.delete();
-            throw new BuildException("Could not write update tracking", e);
-        }        
-    }
-
-    protected void setTrackingFile (File dir, String tFname) throws BuildException {
-        this.trackingFile = new File(dir,tFname);
-//        this.trackingFile.mkdirs();
-        try {
-            //setTrackingOutputStream(new FileOutputStream(this.trackingFile));
-            if (this.trackingFile.exists())
-                setTrackingInputStream(new FileInputStream(this.trackingFile));
-        } catch (java.io.FileNotFoundException fnf) {
-            throw new BuildException("Unable to find tracking file "+this.trackingFile.getAbsolutePath(), fnf);
-        }
-    }
-    
-    public void setTrackingOutputStream(OutputStream tos) {
-        this.os = tos;
-    }
-    
-    public OutputStream getTrackingOutputStream() {
-        return this.os;
-    }
-    
-    public void setTrackingInputStream(InputStream tis) {
-        this.is = tis;
-    }
-    
-    public String getTrackingFileName() throws BuildException {
-        String trackingFileName = module.getCodenamebase();
-        if ( ( trackingFileName == null ) || ( trackingFileName.length() == 0 ) )
-            throw new BuildException ("Empty codenamebase, unable to locate tracking file");
-        trackingFileName = trackingFileName.replace('.', '-') + ".xml"; //NOI18N
-        return trackingFileName;
-    }
-
-    /** Scan through Document document. */
-    private void read() throws BuildException {
-        /** Document document */
-        Document document;
-        if (this.is == null) {
-            File directory = new File( nbPath + FILE_SEPARATOR + TRACKING_DIRECTORY );
-            if (!directory.exists()) {
-                directory.mkdirs();
-            }
-            setTrackingFile(directory,getTrackingFileName());
-        }
-        try {
-            InputSource xmlInputSource = new InputSource( this.is );
-            document = XMLUtil.parse( xmlInputSource, false, false, XMLUtil.rethrowHandler(), XMLUtil.nullResolver());
-            if (is != null)
-                is.close();
-        } catch ( org.xml.sax.SAXException e ) {
-            e.printStackTrace();
-            if (trackingFile == null) {
-                throw new BuildException ("Update tracking data in external InputStream is not well formatted XML document.", e);
-            } else {
-                throw new BuildException ("Update tracking file " + trackingFile.getAbsolutePath() + " is not well formatted XML document.", e);
-            }
-        } catch ( java.io.IOException e ) {
-            e.printStackTrace();
-            if (trackingFile == null) {
-                throw new BuildException ("I/O error while accessing tracking data in InputStream", e);
-            } else {
-                throw new BuildException ("I/O error while accessing tracking file " + trackingFile.getAbsolutePath(), e);
-            }
-        }
-            
-        Element element = document.getDocumentElement();
-        if ((element != null) && element.getTagName().equals(ELEMENT_MODULE)) {
-            scanElement_module(element);
-        }
-    }    
-    
-    /** Scan through Element named module. */
-    void scanElement_module(Element element) { // <module>
-        module = new Module();        
-        NamedNodeMap attrs = element.getAttributes();
-        for (int i = 0; i < attrs.getLength(); i++) {
-            Attr attr = (Attr) attrs.item(i);
-            if (attr.getName().equals(ATTR_CODENAME)) { // <module codename="???">
-                module.setCodename( attr.getValue() );
-            }
-        }
-        NodeList nodes = element.getChildNodes();
-        for (int i = 0; i < nodes.getLength(); i++) {
-            Node node = nodes.item(i);
-            if ( node.getNodeType() == Node.ELEMENT_NODE ) {
-                Element nodeElement = (Element) node;
-                if (nodeElement.getTagName().equals(ELEMENT_VERSION)) {
-                    scanElement_module_version(nodeElement, module);
-                }
-            }
-        }
-    }
-    
-    /** Scan through Element named module_version. */
-    void scanElement_module_version(Element element, Module module) { // <module_version>
-        Version version = new Version();        
-        NamedNodeMap attrs = element.getAttributes();
-        for (int i = 0; i < attrs.getLength(); i++) {
-            Attr attr = (Attr) attrs.item(i);
-            if (attr.getName().equals(ATTR_VERSION)) { // <module_version specification_version="???">
-                version.setVersion( attr.getValue() );
-            }
-            if (attr.getName().equals(ATTR_ORIGIN)) { // <module_version origin="???">
-                version.setOrigin( attr.getValue() );
-            }
-            if (attr.getName().equals(ATTR_LAST)) { // <module_version last="???">                
-                version.setLast( Boolean.getBoolean(attr.getValue() ));
-            }
-            if (attr.getName().equals(ATTR_INSTALL)) { // <module_version install_time="???">
-                long li = 0;
-                try {
-                    li = Long.parseLong( attr.getValue() );
-                } catch ( NumberFormatException nfe ) {
-                }
-                version.setInstall_time( li );
-            }
-        }
-        NodeList nodes = element.getChildNodes();
-        for (int i = 0; i < nodes.getLength(); i++) {
-            Node node = nodes.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
-                Element nodeElement = (Element) node;
-                if (nodeElement.getTagName().equals(ELEMENT_FILE)) {
-                    scanElement_file(nodeElement, version);
-                }
-            }
-        }
-        module.addVersion( version );
-    }
-    
-    /** Scan through Element named file. */
-    void scanElement_file(Element element, Version version) { // <file>
-        ModuleFile file = new ModuleFile();        
-        NamedNodeMap attrs = element.getAttributes();
-        for (int i = 0; i < attrs.getLength(); i++) {
-            Attr attr = (Attr)attrs.item(i);
-            if (attr.getName().equals(ATTR_FILE_NAME)) { // <file name="???">
-                file.setName( attr.getValue().replace(File.separatorChar,'/') );
-            }
-            if (attr.getName().equals(ATTR_CRC)) { // <file crc="???">
-                file.setCrc( attr.getValue() );
-            }
-        }
-        version.addFile (file );
-    }
-
-    static CRC32 crcForFile(File inFile) throws FileNotFoundException, IOException {
-        FileInputStream inFileStream = new FileInputStream(inFile);
-        byte[] array = new byte[(int) inFile.length()];
-        CRC32 crc = new CRC32();
-        int len = inFileStream.read(array);
-        if (len != array.length) {
-            throw new BuildException("Cannot fully read " + inFile);
-        }
-        inFileStream.close();
-        crc.update(array);
-        return crc;
-    }
-    
-    class Module extends Object {        
-        
-        /** Holds value of property codename. */
-        private String codename;
-        
-        /** Holds value of property versions. */
-        private List<Version> versions = new ArrayList<Version>();
-        
-        /** Getter for property codenamebase.
-         * @return Value of property codenamebase.
-         */
-        String getCodenamebase() {
-	    String codenamebase = new String(codename);
-            int idx = codenamebase.lastIndexOf ('/'); //NOI18N
-            if (idx != -1) codenamebase = codenamebase.substring (0, idx);
-
-            return codenamebase;
-        }
-
-         /** Getter for property codename.
-         * @return Value of property codename.
-         */
-        String getCodename() {
-            return codename;
-        }
-       
-        /** Setter for property codename.
-         * @param codename New value of property codename.
-         */
-        void setCodename(String codename) {
-            this.codename = codename;
-        }
-        
-        /** Getter for property versions.
-         * @return Value of property versions.
-         */
-        List<Version> getVersions() {
-            return versions;
-        }
-        
-        /** Setter for property versions.
-         * @param versions New value of property versions.
-         */
-        void setVersions(List<Version> versions) {
-            this.versions = versions;
-        }
-        
-        void addVersion( Version version ) {
-            versions = new ArrayList<Version>();
-            versions.add( version );
-        }
-
-        void setVersion( Version version ) {
-            versions = new ArrayList<Version>();
-            versions.add( version );
-        }
-        
-        void removeLocalized( String locale ) {
-            Iterator it = versions.iterator();
-            while (it.hasNext()) {
-                Version ver = (Version) it.next();
-                ver.removeLocalized( locale );
-            }
-        }
-    }
-    
-    public class Version extends Object {        
-        
-        /** Holds value of property version. */
-        private String version;
-        
-        /** Holds value of property origin. */
-        private String origin;
-        
-        /** Holds value of property last. */
-        private boolean last;
-        
-        /** Holds value of property install_time. */
-        private long install_time = 0;
-        
-        /** Holds value of property files. */
-        private List<ModuleFile> files = new ArrayList<ModuleFile>();
-        
-        /** Getter for property version.
-         * @return Value of property version.
-         */
-        String getVersion() {
-            return version;
-        }
-        
-        /** Setter for property version.
-         * @param version New value of property version.
-         */
-        void setVersion(String version) {
-            this.version = version;
-        }
-        
-        /** Getter for property origin.
-         * @return Value of property origin.
-         */
-        String getOrigin() {
-            return origin;
-        }
-        
-        /** Setter for property origin.
-         * @param origin New value of property origin.
-         */
-        void setOrigin(String origin) {
-            this.origin = origin;
-        }
-        
-        /** Getter for property last.
-         * @return Value of property last.
-         */
-        boolean isLast() {
-            return last;
-        }
-        
-        /** Setter for property last.
-         * @param last New value of property last.
-         */
-        void setLast(boolean last) {
-            this.last = last;
-        }
-        
-        /** Getter for property install_time.
-         * @return Value of property install_time.
-         */
-        long getInstall_time() {
-            return install_time;
-        }
-        
-        /** Setter for property install_time.
-         * @param install_time New value of property install_time.
-         */
-        void setInstall_time(long install_time) {
-            this.install_time = install_time;
-        }
-        
-        /** Getter for property files.
-         * @return Value of property files.
-         */
-        List<ModuleFile> getFiles() {
-            return files;
-        }
-        
-        /** Setter for property files.
-         * @param files New value of property files.
-         */
-        void setFiles(List<ModuleFile> files) {
-            this.files = files;
-        }
-        
-        void addFile( ModuleFile file ) {
-            files.add( file );
-        }
-        
-        public void addFileWithCrc( String filename, String crc ) {
-            ModuleFile file = new ModuleFile();
-            file.setName( filename );
-            file.setCrc( crc);
-            files.add( file );
-        }
-        
-        public void removeLocalized( String locale ) {
-            List<ModuleFile> newFiles = new ArrayList<ModuleFile>();
-            for (ModuleFile file : files) {
-                if (file.getName().indexOf("_" + locale + ".") == -1 // NOI18N
-                        && file.getName().indexOf("_" + locale + "/") == -1 // NOI18N
-                        && !file.getName().endsWith("_" + locale) ) // NOI18N
-                    newFiles.add ( file );
-            }
-            files = newFiles;
-            
-        }
-
-        void addFileForRoot(File file) throws IOException {
-            CRC32 crc = crcForFile(file);
-            if (!file.getPath().startsWith(nbPath)) {
-                throw new BuildException("File " + file + " needs to be under " + nbPath);
-            }
-            String rel = file.getPath().substring(nbPath.length()).replace(File.separatorChar, '/');
-            if (rel.startsWith("/")) {
-                rel = rel.substring(1);
-            }
-            addFileWithCrc(rel, "" + crc.getValue());
-        }
-    }
-    
-    class ModuleFile extends Object {        
-        
-        /** Holds value of property name. */
-        private String name;
-        
-        /** Holds value of property crc. */
-        private String crc;
-        
-        /** Getter for property name.
-         * @return Value of property name.
-         */
-        String getName() {
-            return name;
-        }
-        
-        /** Setter for property name.
-         * @param name New value of property name.
-         */
-        void setName(String name) {
-            this.name = name.replace(File.separatorChar,'/');
-        }
-        
-        /** Getter for property crc.
-         * @return Value of property crc.
-         */
-        String getCrc() {
-            return crc;
-        }
-        
-        /** Setter for property crc.
-         * @param crc New value of property crc.
-         */
-        void setCrc(String crc) {
-            this.crc = crc;
-        }
-        
-    }
-
-}
diff --git a/.pc/netbeans-empty-binaries-list.patch/apisupport.feedreader/external/binaries-list b/apisupport.feedreader/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/apisupport.feedreader/external/binaries-list
rename to apisupport.feedreader/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/apisupport.harness/external/binaries-list
rename to apisupport.harness/external/binaries-list
diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
index f5499dc..c7d6f5e 100644
--- a/apisupport.harness/windows-launcher-src/Makefile
+++ b/apisupport.harness/windows-launcher-src/Makefile
@@ -17,7 +17,7 @@
 MKDIR=mkdir
 CP=cp
 CCADMIN=CCadmin
-RANLIB=i686-w64-mingw32-ranlib
+RANLIB=ranlib
 
 
 
@@ -28,10 +28,10 @@ build: .build-post
 # Add your pre 'build' code here...
 
 .build-pre-app.exe: app.rc
-	i686-w64-mingw32-windres -oapp.res -Ocoff app.rc
+	windres -oapp.res -Ocoff app.rc
 
 .build-pre-app64.exe: app.rc
-	x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
+	x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
 
 .build-post: .build-impl
 # Add your post 'build' code here...	
@@ -40,7 +40,6 @@ build: .build-post
 
 # clean
 clean: .clean-post
-	-rm -f app.res app64.res
 
 .clean-pre:
 # Add your pre 'clean' code here...
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
index 3859387..c96635b 100644
--- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
@@ -13,12 +13,12 @@ CP=cp
 GREP=grep
 NM=nm
 CCADMIN=CCadmin
-RANLIB=i686-w64-mingw32-ranlib
-CC=
-CCC=i686-w64-mingw32-g++
-CXX=i686-w64-mingw32-g++
-FC=
-AS=i686-w64-mingw32-as
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=gfortran
+AS=as.exe
 
 # Macros
 CND_PLATFORM=Cygwin-Windows
@@ -45,8 +45,8 @@ OBJECTFILES= \
 CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=-m32
-CXXFLAGS=-m32
+CCFLAGS=-m32 -mno-cygwin
+CXXFLAGS=-m32 -mno-cygwin
 
 # Fortran Compiler Flags
 FFLAGS=
@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app.res
 ${OBJECTDIR}/applauncher.o: applauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
+	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
 
 ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp 
 	${MKDIR} -p ${OBJECTDIR}/_ext/493252820
 	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
 
 ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}/_ext/216238457
 	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
+	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
 
 ${OBJECTDIR}/app.o: app.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} $@.d
-	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
+	$(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
 
 # Subprojects
 .build-subprojects:
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
index 2922e6a..e35d1ac 100644
--- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
@@ -13,12 +13,12 @@ CP=cp
 GREP=grep
 NM=nm
 CCADMIN=CCadmin
-RANLIB=x86_64-w64-mingw32-ranlib
-CC=x86_64-w64-mingw32-gcc
-CCC=x86_64-w64-mingw32-g++
-CXX=x86_64-w64-mingw32-g++
-FC=
-AS=x86_64-w64-mingw32-as
+RANLIB=ranlib
+CC=x86_64-w64-mingw32-gcc.exe
+CCC=x86_64-w64-mingw32-g++.exe
+CXX=x86_64-w64-mingw32-g++.exe
+FC=gfortran
+AS=as.exe
 
 # Macros
 CND_PLATFORM=Cygwin64-Windows
@@ -45,8 +45,8 @@ OBJECTFILES= \
 CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=-m64 -static-libgcc -static-libstdc++
-CXXFLAGS=-m64 -static-libgcc -static-libstdc++
+CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
 
 # Fortran Compiler Flags
 FFLAGS=
diff --git a/apisupport.kit/nbproject/project.xml b/apisupport.kit/nbproject/project.xml
index 8c29310..a2f9bc8 100644
--- a/apisupport.kit/nbproject/project.xml
+++ b/apisupport.kit/nbproject/project.xml
@@ -17,7 +17,7 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
@@ -35,7 +35,7 @@
                     <run-dependency>
                         <specification-version>1.0</specification-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
                     <run-dependency>
diff --git a/.pc/netbeans-empty-binaries-list.patch/c.googlecode.javaewah.JavaEWAH/external/binaries-list b/c.googlecode.javaewah.JavaEWAH/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/c.googlecode.javaewah.JavaEWAH/external/binaries-list
rename to c.googlecode.javaewah.JavaEWAH/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/c.jcraft.jsch/external/binaries-list b/c.jcraft.jsch/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/c.jcraft.jsch/external/binaries-list
rename to c.jcraft.jsch/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/c.jcraft.jzlib/external/binaries-list b/c.jcraft.jzlib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/c.jcraft.jzlib/external/binaries-list
rename to c.jcraft.jzlib/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/cnd.discovery/external/binaries-list b/cnd.discovery/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/cnd.discovery/external/binaries-list
rename to cnd.discovery/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/cnd.modelimpl/external/binaries-list b/cnd.modelimpl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/cnd.modelimpl/external/binaries-list
rename to cnd.modelimpl/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/cnd.remote/external/binaries-list b/cnd.remote/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/cnd.remote/external/binaries-list
rename to cnd.remote/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/cordova.platforms.ios/external/binaries-list b/cordova.platforms.ios/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/cordova.platforms.ios/external/binaries-list
rename to cordova.platforms.ios/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/css.editor/external/binaries-list b/css.editor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/css.editor/external/binaries-list
rename to css.editor/external/binaries-list
diff --git a/css.editor/nbproject/project.properties b/css.editor/nbproject/project.properties
index ad38710..35a1046 100644
--- a/css.editor/nbproject/project.properties
+++ b/css.editor/nbproject/project.properties
@@ -40,8 +40,8 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-#release.external/css21-spec.zip=docs/css21-spec.zip
-#release.external/css3-spec.zip=docs/css3-spec.zip
+release.external/css21-spec.zip=docs/css21-spec.zip
+release.external/css3-spec.zip=docs/css3-spec.zip
 
 jnlp.indirect.files=\
     docs/css21-spec.zip,\
diff --git a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
index 965481e..bbb50fa 100644
--- a/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
+++ b/css.lib/src/org/netbeans/modules/css/lib/NbParseTreeBuilder.java
@@ -226,7 +226,7 @@ public class NbParseTreeBuilder extends BlankDebugEventListener {
 
         RuleNode ruleNode = callStack.peek();
         TokenNode elementNode = new TokenNode(source, (CommonToken) token);
-        elementNode.hiddenTokens = (List) this.hiddenTokens;
+        elementNode.hiddenTokens = this.hiddenTokens;
         hiddenTokens.clear();
         ruleNode.addChild(elementNode);
 
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
index 09fd256..e0d8a70 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java
@@ -134,6 +134,7 @@ final class DataViewTableUI extends ResultSetJXTable {
         }
         super.setModel(dataModel);
         dataModel.addTableModelListener(dataChangedListener); // Add new change listener
+        setRowFilter((RowFilter) oldFilter);
         if (dataviewUI != null) {
             dataviewUI.handleColumnUpdated();
         }
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
index 5ce28c2..b0eb987 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
@@ -504,6 +504,7 @@ class DataViewUI extends JXPanel {
         {
             MultiColPatternFilter filterP = new MultiColPatternFilter(rows);
             filterP.setFilterStr(matchBoxField.getText(), LITERAL_FIND);
+            table.setRowFilter(filterP);
         }
     }
 
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
index e1dd566..88a9b3a 100644
--- a/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
@@ -161,6 +161,16 @@ public class ResultSetJXTable extends JXTableDecorator {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
+    public <R extends TableModel> void setRowFilter(RowFilter<? super R, ? super Integer> filter) {
+        if(getRowSorter() instanceof DefaultRowSorter) {
+            ((DefaultRowSorter) getRowSorter()).setRowFilter(filter);
+        } else {
+            super.setRowFilter(filter);
+        }
+    }
+
+    @Override
     public void setModel(TableModel dataModel) {
         if(! (dataModel instanceof ResultSetTableModel)) {
             throw new IllegalArgumentException(
diff --git a/.pc/netbeans-empty-binaries-list.patch/db.drivers/external/binaries-list b/db.drivers/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/db.drivers/external/binaries-list
rename to db.drivers/external/binaries-list
diff --git a/db.drivers/nbproject/project.properties b/db.drivers/nbproject/project.properties
index d2f7131..929aa22 100644
--- a/db.drivers/nbproject/project.properties
+++ b/db.drivers/nbproject/project.properties
@@ -42,8 +42,8 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
-#release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
-#release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
+release.external/mysql-connector-java-5.1.23-bin.jar=modules/ext/mysql-connector-java-5.1.23-bin.jar
+release.external/postgresql-9.2-1002.jdbc4.jar=modules/ext/postgresql-9.2-1002.jdbc4.jar
 jnlp.indirect.jars=\
     modules/ext/mysql-connector-java-5.1.23-bin.jar,\
     modules/ext/postgresql-9.2-1002.jdbc4.jar
diff --git a/db.sql.visualeditor/build.xml b/db.sql.visualeditor/build.xml
index aab434c..456f782 100644
--- a/db.sql.visualeditor/build.xml
+++ b/db.sql.visualeditor/build.xml
@@ -16,9 +16,9 @@
 
     <target name="sql">
       <mkdir dir="build"/>
-      <!--<copy file="external/javacc-3.2.jar" tofile="build/javacc.jar"/>-->
+      <copy file="external/javacc-3.2.jar" tofile="build/javacc.jar"/>
       <javacc target="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj"
-          javacchome="/usr/share/java/">
+	   javacchome="build">
       </javacc>
     </target>
 
diff --git a/.pc/netbeans-empty-binaries-list.patch/db.sql.visualeditor/external/binaries-list b/db.sql.visualeditor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/db.sql.visualeditor/external/binaries-list
rename to db.sql.visualeditor/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/db/external/binaries-list b/db/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/db/external/binaries-list
rename to db/external/binaries-list
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..2484bef
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+Netbeans
+========
+
+Under certain circumstances Netbeans will crash during editing. This is a known
+issue in the java-atk-wrapper package (Debian bug #858700). You can work around
+it by disabling assistive_technologies in /etc/java-8-openjdk/accessibility.properties.
diff --git a/debian/changelog b/debian/changelog
index a719e4b..5ad3001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-netbeans (8.1+dfsg3-2) UNRELEASED; urgency=medium
+netbeans (8.1+dfsg3-2) unstable; urgency=medium
 
-  * Team upload.
+  [ Markus Koschany ]
+  * Add missing dependencies to libnb-ide14-java.
+    Thanks to Andreas Beckmann for the report. (Closes: #857955)
+  * Fix ClassNotFoundException: org.jcodings.Encoding.
+    See https://netbeans.org/bugzilla/show_bug.cgi?id=256166
+  * Update orig-tar script and use $BASE variable.
+  * Use jdk8.builds option consistently.
+  * Add README.Debian file.
 
   [ Emmanuel Bourg ]
-  * Switch back to libcglib-java
+  * Switch back to libcglib-java.
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sun, 02 Oct 2016 22:35:50 +0200
+ -- Markus Koschany <apo at debian.org>  Thu, 20 Apr 2017 12:35:05 +0200
 
 netbeans (8.1+dfsg3-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 66d66bb..ae6e189 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
  javahelper,
  junit,
  junit4,
- libasm-java (>= 5),
  libbeansbinding-java,
  libbindex-java,
  libbytelist-java,
@@ -108,6 +107,7 @@ Package: libnb-ide14-java
 Architecture: all
 Depends:
  antlr3 (>= 3.5.2),
+ libasm-java (>= 5),
  libbytelist-java,
  libcommons-codec-java,
  libcommons-io-java,
@@ -119,9 +119,11 @@ Depends:
  libhttpclient-java,
  libicu4j-4.4-java,
  libini4j-java,
+ libjaxb-java,
  libjgit-java,
  libjsch-agent-proxy-java (>= 0.0.8),
  libjsch-java,
+ libjson-simple-java,
  libjvyamlb-java,
  libjzlib-java,
  liblucene3-java,
@@ -157,7 +159,6 @@ Depends:
  libbeansbinding-java,
  libcglib-java (>= 3.0),
  libeclipselink-java,
- libjson-simple-java,
  libnb-absolutelayout-java,
  libnb-ide14-java (= ${binary:Version}),
  libnb-javaparser-java,
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 4b72714..ec71187 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -140,10 +140,10 @@ find $BASE/ -name "*.ear" -type f -delete
 rm -rf $BASE/versioning.util/test/unit/data/
 
 # Remove W3C spec files #823813
-rm -r websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/catalog/resources/
+rm -r $BASE/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/catalog/resources/
 
 # Remove PHP testfiles like performance.php from SMF 1.1 #823812
-rm -r php.editor/test/unit/data/testfiles/parser/performance/performance.php
+rm -r $BASE/php.editor/test/unit/data/testfiles/parser/performance/performance.php
 
 
 # Make our ".orig.tar.xz"
diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch
index ef6997c..f5df01f 100644
--- a/debian/patches/netbeans-ide-launcher.patch
+++ b/debian/patches/netbeans-ide-launcher.patch
@@ -22,7 +22,7 @@ index 3cdd3dc..96a12fc 100644
  #
 -netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true"
 -
-+netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.java2d.pmoffscreen=false"
++netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.java2d.pmoffscreen=false --cp:p /usr/share/java/jcodings.jar"
  # Default location of JDK:
  # (set by installer or commented out if launcher should decide)
  #
diff --git a/debian/rules b/debian/rules
index 4020e32..2a83be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,7 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	$(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
 	$(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
-	ant -Dpermit.jdk7.builds=true -f nbbuild/build.xml clean
+	ant -Dpermit.jdk8.builds=true -f nbbuild/build.xml clean
 	mh_clean
 	# remove all the symlinks to jar files we created
 	find . -name "*.jar" -type l -delete
diff --git a/.pc/netbeans-empty-binaries-list.patch/derby/external/binaries-list b/derby/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/derby/external/binaries-list
rename to derby/external/binaries-list
diff --git a/derby/nbproject/project.properties b/derby/nbproject/project.properties
index 77f3494..4039fad 100644
--- a/derby/nbproject/project.properties
+++ b/derby/nbproject/project.properties
@@ -43,9 +43,9 @@
 javac.source=1.7
 javac.compilerargs=-Xlint:unchecked
 
-#release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
-#jnlp.indirect.jars=\
-#    modules/ext/derbysampledb.zip
+release.external/derbysampledb.zip=modules/ext/derbysampledb.zip
+jnlp.indirect.jars=\
+    modules/ext/derbysampledb.zip
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\
diff --git a/.pc/netbeans-empty-binaries-list.patch/dlight.nativeexecution/external/binaries-list b/dlight.nativeexecution/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/dlight.nativeexecution/external/binaries-list
rename to dlight.nativeexecution/external/binaries-list
diff --git a/dlight.nativeexecution/nbproject/project.properties b/dlight.nativeexecution/nbproject/project.properties
index 12ea4cf..33908a3 100644
--- a/dlight.nativeexecution/nbproject/project.properties
+++ b/dlight.nativeexecution/nbproject/project.properties
@@ -24,3 +24,80 @@ test.config.stableBTD.excludes=\
     **/TerminalConfigurationProviderTest.class,\
     **/WindowsSupportTest.class
 
+release.external/exechlp-1.0.zip!/Linux-x86/process_start       = bin/nativeexecution/Linux-x86/process_start
+release.external/exechlp-1.0.zip!/Linux-x86/pty                 = bin/nativeexecution/Linux-x86/pty
+release.external/exechlp-1.0.zip!/Linux-x86/pty_open            = bin/nativeexecution/Linux-x86/pty_open
+release.external/exechlp-1.0.zip!/Linux-x86/sigqueue            = bin/nativeexecution/Linux-x86/sigqueue
+release.external/exechlp-1.0.zip!/Linux-x86/stat                = bin/nativeexecution/Linux-x86/stat
+release.external/exechlp-1.0.zip!/Linux-x86/unbuffer.so         = bin/nativeexecution/Linux-x86/unbuffer.so
+release.external/exechlp-1.0.zip!/Linux-x86/killall             = bin/nativeexecution/Linux-x86/killall
+release.external/exechlp-1.0.zip!/Linux-x86_64/process_start    = bin/nativeexecution/Linux-x86_64/process_start
+release.external/exechlp-1.0.zip!/Linux-x86_64/pty              = bin/nativeexecution/Linux-x86_64/pty
+release.external/exechlp-1.0.zip!/Linux-x86_64/pty_open         = bin/nativeexecution/Linux-x86_64/pty_open
+release.external/exechlp-1.0.zip!/Linux-x86_64/sigqueue         = bin/nativeexecution/Linux-x86_64/sigqueue
+release.external/exechlp-1.0.zip!/Linux-x86_64/stat             = bin/nativeexecution/Linux-x86_64/stat
+release.external/exechlp-1.0.zip!/Linux-x86_64/unbuffer.so      = bin/nativeexecution/Linux-x86_64/unbuffer.so
+release.external/exechlp-1.0.zip!/Linux-x86_64/killall          = bin/nativeexecution/Linux-x86_64/killall
+release.external/exechlp-1.0.zip!/Linux-sparc_64/process_start  = bin/nativeexecution/Linux-sparc_64/process_start
+release.external/exechlp-1.0.zip!/Linux-sparc_64/pty            = bin/nativeexecution/Linux-sparc_64/pty
+release.external/exechlp-1.0.zip!/Linux-sparc_64/pty_open       = bin/nativeexecution/Linux-sparc_64/pty_open
+release.external/exechlp-1.0.zip!/Linux-sparc_64/sigqueue       = bin/nativeexecution/Linux-sparc_64/sigqueue
+release.external/exechlp-1.0.zip!/Linux-sparc_64/stat           = bin/nativeexecution/Linux-sparc_64/stat
+release.external/exechlp-1.0.zip!/Linux-sparc_64/unbuffer.so    = bin/nativeexecution/Linux-sparc_64/unbuffer.so
+release.external/exechlp-1.0.zip!/Linux-sparc_64/killall        = bin/nativeexecution/Linux-sparc_64/killall
+release.external/exechlp-1.0.zip!/Windows-x86/process_start     = bin/nativeexecution/Windows-x86/process_start
+release.external/exechlp-1.0.zip!/Windows-x86/pty               = bin/nativeexecution/Windows-x86/pty
+release.external/exechlp-1.0.zip!/Windows-x86/pty_open          = bin/nativeexecution/Windows-x86/pty_open
+release.external/exechlp-1.0.zip!/Windows-x86/sigqueue          = bin/nativeexecution/Windows-x86/sigqueue
+release.external/exechlp-1.0.zip!/Windows-x86/unbuffer.dll      = bin/nativeexecution/Windows-x86/unbuffer.dll
+release.external/exechlp-1.0.zip!/Windows-x86/killall           = bin/nativeexecution/Windows-x86/killall
+release.external/exechlp-1.0.zip!/Windows-x86_64/process_start  = bin/nativeexecution/Windows-x86_64/process_start
+release.external/exechlp-1.0.zip!/Windows-x86_64/pty            = bin/nativeexecution/Windows-x86_64/pty
+release.external/exechlp-1.0.zip!/Windows-x86_64/pty_open       = bin/nativeexecution/Windows-x86_64/pty_open
+release.external/exechlp-1.0.zip!/Windows-x86_64/sigqueue       = bin/nativeexecution/Windows-x86_64/sigqueue
+release.external/exechlp-1.0.zip!/Windows-x86_64/killall        = bin/nativeexecution/Windows-x86_64/killall
+release.external/exechlp-1.0.zip!/Windows-x86_64/unbuffer.dll   = bin/nativeexecution/Windows-x86_64/unbuffer.dll
+release.external/exechlp-1.0.zip!/MacOSX-x86/process_start      = bin/nativeexecution/MacOSX-x86/process_start
+release.external/exechlp-1.0.zip!/MacOSX-x86/pty                = bin/nativeexecution/MacOSX-x86/pty
+release.external/exechlp-1.0.zip!/MacOSX-x86/pty_open           = bin/nativeexecution/MacOSX-x86/pty_open
+release.external/exechlp-1.0.zip!/MacOSX-x86/stat               = bin/nativeexecution/MacOSX-x86/stat
+release.external/exechlp-1.0.zip!/MacOSX-x86/unbuffer.dylib     = bin/nativeexecution/MacOSX-x86/unbuffer.dylib
+release.external/exechlp-1.0.zip!/MacOSX-x86/killall            = bin/nativeexecution/MacOSX-x86/killall
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/process_start   = bin/nativeexecution/MacOSX-x86_64/process_start
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty             = bin/nativeexecution/MacOSX-x86_64/pty
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty_open        = bin/nativeexecution/MacOSX-x86_64/pty_open
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/stat            = bin/nativeexecution/MacOSX-x86_64/stat
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/unbuffer.dylib  = bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib
+release.external/exechlp-1.0.zip!/MacOSX-x86_64/killall         = bin/nativeexecution/MacOSX-x86_64/killall
+release.external/exechlp-1.0.zip!/SunOS-sparc/privp             = bin/nativeexecution/SunOS-sparc/privp
+release.external/exechlp-1.0.zip!/SunOS-sparc/process_start     = bin/nativeexecution/SunOS-sparc/process_start
+release.external/exechlp-1.0.zip!/SunOS-sparc/pty               = bin/nativeexecution/SunOS-sparc/pty
+release.external/exechlp-1.0.zip!/SunOS-sparc/pty_open          = bin/nativeexecution/SunOS-sparc/pty_open
+release.external/exechlp-1.0.zip!/SunOS-sparc/sigqueue          = bin/nativeexecution/SunOS-sparc/sigqueue
+release.external/exechlp-1.0.zip!/SunOS-sparc/stat              = bin/nativeexecution/SunOS-sparc/stat
+release.external/exechlp-1.0.zip!/SunOS-sparc/unbuffer.so       = bin/nativeexecution/SunOS-sparc/unbuffer.so
+release.external/exechlp-1.0.zip!/SunOS-sparc/killall           = bin/nativeexecution/SunOS-sparc/killall
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/privp          = bin/nativeexecution/SunOS-sparc_64/privp
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/process_start  = bin/nativeexecution/SunOS-sparc_64/process_start
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty            = bin/nativeexecution/SunOS-sparc_64/pty
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty_open       = bin/nativeexecution/SunOS-sparc_64/pty_open
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/sigqueue       = bin/nativeexecution/SunOS-sparc_64/sigqueue
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/stat           = bin/nativeexecution/SunOS-sparc_64/stat
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/unbuffer.so    = bin/nativeexecution/SunOS-sparc_64/unbuffer.so
+release.external/exechlp-1.0.zip!/SunOS-sparc_64/killall        = bin/nativeexecution/SunOS-sparc_64/killall
+release.external/exechlp-1.0.zip!/SunOS-x86/privp               = bin/nativeexecution/SunOS-x86/privp
+release.external/exechlp-1.0.zip!/SunOS-x86/process_start       = bin/nativeexecution/SunOS-x86/process_start
+release.external/exechlp-1.0.zip!/SunOS-x86/pty                 = bin/nativeexecution/SunOS-x86/pty
+release.external/exechlp-1.0.zip!/SunOS-x86/pty_open            = bin/nativeexecution/SunOS-x86/pty_open
+release.external/exechlp-1.0.zip!/SunOS-x86/sigqueue            = bin/nativeexecution/SunOS-x86/sigqueue
+release.external/exechlp-1.0.zip!/SunOS-x86/stat                = bin/nativeexecution/SunOS-x86/stat
+release.external/exechlp-1.0.zip!/SunOS-x86/unbuffer.so         = bin/nativeexecution/SunOS-x86/unbuffer.so
+release.external/exechlp-1.0.zip!/SunOS-x86/killall             = bin/nativeexecution/SunOS-x86/killall
+release.external/exechlp-1.0.zip!/SunOS-x86_64/process_start    = bin/nativeexecution/SunOS-x86_64/process_start
+release.external/exechlp-1.0.zip!/SunOS-x86_64/pty              = bin/nativeexecution/SunOS-x86_64/pty
+release.external/exechlp-1.0.zip!/SunOS-x86_64/pty_open         = bin/nativeexecution/SunOS-x86_64/pty_open
+release.external/exechlp-1.0.zip!/SunOS-x86_64/sigqueue         = bin/nativeexecution/SunOS-x86_64/sigqueue
+release.external/exechlp-1.0.zip!/SunOS-x86_64/stat             = bin/nativeexecution/SunOS-x86_64/stat
+release.external/exechlp-1.0.zip!/SunOS-x86_64/unbuffer.so      = bin/nativeexecution/SunOS-x86_64/unbuffer.so
+release.external/exechlp-1.0.zip!/SunOS-x86_64/killall          = bin/nativeexecution/SunOS-x86_64/killall
+
diff --git a/.pc/netbeans-empty-binaries-list.patch/dlight.remote.impl/external/binaries-list b/dlight.remote.impl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/dlight.remote.impl/external/binaries-list
rename to dlight.remote.impl/external/binaries-list
diff --git a/editor.kit/nbproject/project.xml b/editor.kit/nbproject/project.xml
index 2d42be1..ca4a1bd 100644
--- a/editor.kit/nbproject/project.xml
+++ b/editor.kit/nbproject/project.xml
@@ -46,13 +46,13 @@
                         <specification-version>1.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.html.validation</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
                         <specification-version>1.1</specification-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.image</code-name-base>
                     <run-dependency>
@@ -60,13 +60,13 @@
                         <specification-version>1.19</specification-version>
                     </run-dependency>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.javascript2.kit</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
                         <specification-version>0.1</specification-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.languages.diff</code-name-base>
                     <run-dependency>
diff --git a/.pc/netbeans-empty-binaries-list.patch/extexecution.process/external/binaries-list b/extexecution.process/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/extexecution.process/external/binaries-list
rename to extexecution.process/external/binaries-list
diff --git a/extexecution.process/nbproject/project.properties b/extexecution.process/nbproject/project.properties
index d5be2ba..4d9b43c 100644
--- a/extexecution.process/nbproject/project.properties
+++ b/extexecution.process/nbproject/project.properties
@@ -1,6 +1,6 @@
 is.eager=true
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
-#release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
-#release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
-#release.external/processtreekiller-1.0.5.jar=modules/ext/processtreekiller-1.0.5.jar
+release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
+release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
+release.external/processtreekiller-1.0.5.jar=modules/ext/processtreekiller-1.0.5.jar
diff --git a/extexecution.process/nbproject/project.xml b/extexecution.process/nbproject/project.xml
index 13e0001..36199b1 100644
--- a/extexecution.process/nbproject/project.xml
+++ b/extexecution.process/nbproject/project.xml
@@ -47,7 +47,7 @@
                 </dependency>
             </module-dependencies>
             <public-packages/>
-            <!--<class-path-extension>
+            <class-path-extension>
                 <runtime-relative-path>ext/winp-1.14-patched.jar</runtime-relative-path>
                 <binary-origin>external/winp-1.14-patched.jar</binary-origin>
             </class-path-extension>
@@ -58,7 +58,7 @@
             <class-path-extension>
                 <runtime-relative-path>ext/processtreekiller-1.0.5.jar</runtime-relative-path>
                 <binary-origin>external/processtreekiller-1.0.5.jar</binary-origin>
-            </class-path-extension>-->
+            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java b/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
index 66d4301..8f75676 100644
--- a/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
+++ b/extexecution.process/src/org/netbeans/modules/extexecution/process/ProcessesImpl.java
@@ -43,6 +43,7 @@
 package org.netbeans.modules.extexecution.process;
 
 import java.util.Map;
+import org.netbeans.processtreekiller.ProcessTreeKiller;
 import org.netbeans.spi.extexecution.base.ProcessesImplementation;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -55,7 +56,7 @@ public class ProcessesImpl implements ProcessesImplementation {
 
     @Override
     public void killTree(Process process, Map<String, String> environment) {
-        //ProcessTreeKiller.get().kill(process, environment);
+        ProcessTreeKiller.get().kill(process, environment);
     }
 
 }
diff --git a/.pc/netbeans-empty-binaries-list.patch/hibernate4lib/external/binaries-list b/hibernate4lib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/hibernate4lib/external/binaries-list
rename to hibernate4lib/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/html.editor/external/binaries-list b/html.editor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/html.editor/external/binaries-list
rename to html.editor/external/binaries-list
diff --git a/html.editor/nbproject/project.properties b/html.editor/nbproject/project.properties
index bfe5d8c..bd9151b 100644
--- a/html.editor/nbproject/project.properties
+++ b/html.editor/nbproject/project.properties
@@ -40,7 +40,7 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-#release.external/html-4.01.zip=docs/html-4.01.zip
+release.external/html-4.01.zip=docs/html-4.01.zip
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.7
diff --git a/.pc/netbeans-empty-binaries-list.patch/html.parser/external/binaries-list b/html.parser/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/html.parser/external/binaries-list
rename to html.parser/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/html.validation/external/binaries-list b/html.validation/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/html.validation/external/binaries-list
rename to html.validation/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/httpserver/external/binaries-list b/httpserver/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/httpserver/external/binaries-list
rename to httpserver/external/binaries-list
diff --git a/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java b/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
index b3f8d8b..b02755d 100644
--- a/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
+++ b/hudson.ui/src/org/netbeans/modules/hudson/ui/APITokenConnectionAuthenticator.java
@@ -47,6 +47,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JPanel;
+import org.apache.commons.net.util.Base64;
 import org.netbeans.api.keyring.Keyring;
 import org.netbeans.modules.hudson.api.HudsonManager;
 import org.netbeans.modules.hudson.api.HudsonVersion;
@@ -126,7 +127,7 @@ public class APITokenConnectionAuthenticator extends JPanel {
             String token = new String(panel.tokField.getPassword());
             panel.tokField.setText("");
             Keyring.save(key, token.toCharArray(), Bundle.APITokenConnectionAuthenticator_password_description(home, username));
-            //BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
+            BASIC_AUTH.put(home.toString(), new Base64(0).encodeToString((username + ':' + token).getBytes()).trim());
             try {
                 return conn.getURL().openConnection();
             } catch (IOException x) {
diff --git a/ide.kit/nbproject/project.xml b/ide.kit/nbproject/project.xml
index e48c62b..16d140e 100644
--- a/ide.kit/nbproject/project.xml
+++ b/ide.kit/nbproject/project.xml
@@ -160,13 +160,13 @@
                         <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.httpserver</code-name-base>
                     <run-dependency>
                         <release-version>2</release-version>
                         <specification-version>2.7</specification-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.jumpto</code-name-base>
                     <run-dependency>
diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
index 8a2d6b9..3cdd3dc 100644
--- a/ide/launcher/netbeans.conf
+++ b/ide/launcher/netbeans.conf
@@ -43,7 +43,8 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
 # Concurrent Mark & Sweep garbage collector.
 # (see http://wiki.netbeans.org/FaqGCPauses)
 #
-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.java2d.pmoffscreen=false"
+netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true"
+
 # Default location of JDK:
 # (set by installer or commented out if launcher should decide)
 #
diff --git a/ide/launcher/unix/netbeans b/ide/launcher/unix/netbeans
index acaa554..8218c36 100644
--- a/ide/launcher/unix/netbeans
+++ b/ide/launcher/unix/netbeans
@@ -57,7 +57,7 @@ while [ -h "$PRG" ]; do
     fi
 done
 
-progdir=/usr/share/netbeans/8.1/bin
+progdir=`dirname "$PRG"`
 old=`pwd`
 cd "$progdir"/..
 basedir=`pwd`
@@ -84,9 +84,9 @@ if [ -f "$basedir"/etc/netbeans.conf ] ; then
 fi
 
 # following should be done just in RPM or Solaris Launcher
-if [ -f /etc/netbeans.conf ] ; then
-    . /etc/netbeans.conf
-fi
+# if [ -f /etc/netbeans.conf ] ; then
+#     . /etc/netbeans.conf
+# fi
 
 export DEFAULT_USERDIR_ROOT
 
@@ -236,6 +236,7 @@ case "`uname`" in
             --branding nb \
             --clusters '"$netbeans_clusters"' \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
             ${netbeans_default_options} \
             '"$@"'
         ;;
@@ -245,6 +246,7 @@ case "`uname`" in
             --branding nb \
             --clusters '"$netbeans_clusters"' \
             -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
+            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
             ${netbeans_default_options} \
             '"$@"'
         ;;
diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
index a1a5967..97c15ba 100644
--- a/ide/launcher/windows/nblauncher.cpp
+++ b/ide/launcher/windows/nblauncher.cpp
@@ -53,7 +53,6 @@
 #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
 #include "../../../o.n.bootstrap/launcher/windows/argnames.h"
 #include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h"
-#include <stdio.h>
 
 using namespace std;
 
diff --git a/.pc/netbeans-empty-binaries-list.patch/j2ee.dd/external/binaries-list b/j2ee.dd/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/j2ee.dd/external/binaries-list
rename to j2ee.dd/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/j2ee.eclipselink/external/binaries-list b/j2ee.eclipselink/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/j2ee.eclipselink/external/binaries-list
rename to j2ee.eclipselink/external/binaries-list
diff --git a/j2ee.eclipselink/nbproject/project.properties b/j2ee.eclipselink/nbproject/project.properties
index 8ad821b..53059dc 100644
--- a/j2ee.eclipselink/nbproject/project.properties
+++ b/j2ee.eclipselink/nbproject/project.properties
@@ -46,9 +46,10 @@ javac.source=1.6
 jnlp.indirect.jars=\
     modules/ext/eclipselink/eclipselink.jar,\
     modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar,\
-    modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+    modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar,\
+    modules/ext/docs/javax.persistence-2.1.0-doc.zip
 
 release.external/eclipselink.jar=modules/ext/eclipselink/eclipselink.jar
 release.external/javax.persistence_2.1.0.v201304241213.jar=modules/ext/eclipselink/javax.persistence_2.1.0.v201304241213.jar
 release.external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar=modules/ext/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-#release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
+release.external/JPAjavadocs04032013.zip=modules/ext/docs/javax.persistence-2.1.0-doc.zip
\ No newline at end of file
diff --git a/.pc/netbeans-empty-binaries-list.patch/j2ee.eclipselinkmodelgen/external/binaries-list b/j2ee.eclipselinkmodelgen/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/j2ee.eclipselinkmodelgen/external/binaries-list
rename to j2ee.eclipselinkmodelgen/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/j2ee.platform/external/binaries-list b/j2ee.platform/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/j2ee.platform/external/binaries-list
rename to j2ee.platform/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/j2eeapis/external/binaries-list b/j2eeapis/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/j2eeapis/external/binaries-list
rename to j2eeapis/external/binaries-list
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
index 5fa2145..c3b9a82 100644
--- a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java
@@ -203,7 +203,7 @@ public class CommandLineParser extends Parser {
                 if (root instanceof JavaVMOption<?>) {
                     result.add((JavaVMOption<?>) root);
                 } else if (root != null) {
-                    //result.addAll(root.getChildren());
+                    result.addAll(root.getChildren());
                 }                                       
             } catch (RecognitionException e) {
                 e.printStackTrace();
@@ -1282,4 +1282,4 @@ public class CommandLineParser extends Parser {
     public static final BitSet FOLLOW_TEXT_in_eText347 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_TEXT_in_nonSwitchOption359 = new BitSet(new long[]{0x0000000000000002L});
 
-}
+}
\ No newline at end of file
diff --git a/java.kit/nbproject/project.xml b/java.kit/nbproject/project.xml
index 69e9be8..e2acd54 100644
--- a/java.kit/nbproject/project.xml
+++ b/java.kit/nbproject/project.xml
@@ -275,7 +275,7 @@ made subject to such option by the copyright holder.
                         <specification-version>1.8</specification-version>
                     </run-dependency>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.websvc.jaxws21</code-name-base>
                     <run-dependency>
                         <release-version>1</release-version>
@@ -287,7 +287,7 @@ made subject to such option by the copyright holder.
                     <run-dependency>
                         <release-version>1</release-version>
                     </run-dependency>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.xml.jaxb</code-name-base>
                     <run-dependency>
diff --git a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index e666f42..66ed321 100644
--- a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -188,9 +188,9 @@ public class SourceUtils {
             return info.getTypes().isAssignable(t.getUpperBound(), to)
                     || info.getTypes().isAssignable(to, t.getUpperBound());
         }
-        //if (from.getKind() == TypeKind.WILDCARD) {
-        //    from = Types.instance(c).wildUpperBound((Type)from);
-        //}
+        if (from.getKind() == TypeKind.WILDCARD) {
+            from = Types.instance(c).wildUpperBound((Type)from);
+        }
         return Check.instance(c).checkType(null, (Type)from, (Type)to).getKind() != TypeKind.ERROR;
     }
     
diff --git a/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
index d4df87c..a4b8abc 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
@@ -106,8 +106,7 @@ public final class CachingArchiveClassLoader extends ClassLoader {
                             }
                             return defineClass(
                                     name,
-                                    //com.sun.tools.hc.LambdaMetafactory.translateClassFile(buffer,0,len),
-                                    buffer,
+                                    com.sun.tools.hc.LambdaMetafactory.translateClassFile(buffer,0,len),
                                     0,
                                     len);
                         } catch (FileNotFoundException fnf) {
diff --git a/.pc/netbeans-empty-binaries-list.patch/javacard.apdu.io/external/binaries-list b/javacard.apdu.io/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javacard.apdu.io/external/binaries-list
rename to javacard.apdu.io/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javacard.ri.bundle/external/binaries-list b/javacard.ri.bundle/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javacard.ri.bundle/external/binaries-list
rename to javacard.ri.bundle/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javacard.ri.platform/external/binaries-list b/javacard.ri.platform/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javacard.ri.platform/external/binaries-list
rename to javacard.ri.platform/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javaee.api/external/binaries-list b/javaee.api/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javaee.api/external/binaries-list
rename to javaee.api/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javaee7.api/external/binaries-list b/javaee7.api/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javaee7.api/external/binaries-list
rename to javaee7.api/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javahelp/external/binaries-list b/javahelp/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javahelp/external/binaries-list
rename to javahelp/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/javascript2.editor/external/binaries-list b/javascript2.editor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/javascript2.editor/external/binaries-list
rename to javascript2.editor/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/jemmy/external/binaries-list b/jemmy/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/jemmy/external/binaries-list
rename to jemmy/external/binaries-list
diff --git a/jemmy/nbproject/project.properties b/jemmy/nbproject/project.properties
index f15365d..ab73fe9 100644
--- a/jemmy/nbproject/project.properties
+++ b/jemmy/nbproject/project.properties
@@ -43,7 +43,7 @@ is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
 release.external/jemmy-2.3.1.1.jar=modules/ext/jemmy-2.3.1.1.jar
-#release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
-#release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
+release.external/jemmy-2.3.1.1-doc.zip=docs/jemmy-2.3.1.1-doc.zip
+release.external/jemmy-2.3.1.1-src.zip=docs/jemmy-2.3.1.1-src.zip
 sigtest.gen.fail.on.error=false
 
diff --git a/.pc/netbeans-empty-binaries-list.patch/junitlib/external/binaries-list b/junitlib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/junitlib/external/binaries-list
rename to junitlib/external/binaries-list
diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties
index d7ba938..e6f478f 100644
--- a/junitlib/nbproject/project.properties
+++ b/junitlib/nbproject/project.properties
@@ -1,8 +1,8 @@
 is.autoload=true
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
-#release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar
-#release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar
+release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar
+release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar
 nbm.target.cluster=java
 nbm.is.global=false
 jnlp.indirect.jars=\
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.amazon/external/binaries-list b/libs.amazon/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.amazon/external/binaries-list
rename to libs.amazon/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.antlr3.devel/external/binaries-list b/libs.antlr3.devel/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.antlr3.devel/external/binaries-list
rename to libs.antlr3.devel/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.antlr3.runtime/external/binaries-list b/libs.antlr3.runtime/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.antlr3.runtime/external/binaries-list
rename to libs.antlr3.runtime/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.asm/external/binaries-list b/libs.asm/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.asm/external/binaries-list
rename to libs.asm/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.bytelist/external/binaries-list b/libs.bytelist/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.bytelist/external/binaries-list
rename to libs.bytelist/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.cglib/external/binaries-list b/libs.cglib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.cglib/external/binaries-list
rename to libs.cglib/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.clank/external/binaries-list b/libs.clank/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.clank/external/binaries-list
rename to libs.clank/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.commons_compress/external/binaries-list b/libs.commons_compress/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.commons_compress/external/binaries-list
rename to libs.commons_compress/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.commons_fileupload/external/binaries-list b/libs.commons_fileupload/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.commons_fileupload/external/binaries-list
rename to libs.commons_fileupload/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.commons_net/external/binaries-list b/libs.commons_net/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.commons_net/external/binaries-list
rename to libs.commons_net/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.elimpl/external/binaries-list b/libs.elimpl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.elimpl/external/binaries-list
rename to libs.elimpl/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.felix/external/binaries-list b/libs.felix/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.felix/external/binaries-list
rename to libs.felix/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.freemarker/external/binaries-list b/libs.freemarker/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.freemarker/external/binaries-list
rename to libs.freemarker/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.glassfish_logging/external/binaries-list b/libs.glassfish_logging/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.glassfish_logging/external/binaries-list
rename to libs.glassfish_logging/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.groovy/external/binaries-list b/libs.groovy/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.groovy/external/binaries-list
rename to libs.groovy/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.ini4j/external/binaries-list b/libs.ini4j/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.ini4j/external/binaries-list
rename to libs.ini4j/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.javacapi/external/binaries-list b/libs.javacapi/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.javacapi/external/binaries-list
rename to libs.javacapi/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.javacimpl/external/binaries-list b/libs.javacimpl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.javacimpl/external/binaries-list
rename to libs.javacimpl/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.javacup/external/binaries-list b/libs.javacup/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.javacup/external/binaries-list
rename to libs.javacup/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.javafx/external/binaries-list b/libs.javafx/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.javafx/external/binaries-list
rename to libs.javafx/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jaxb/external/binaries-list b/libs.jaxb/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jaxb/external/binaries-list
rename to libs.jaxb/external/binaries-list
diff --git a/libs.jaxb/nbproject/project.properties b/libs.jaxb/nbproject/project.properties
index e1de8b1..299cbe2 100644
--- a/libs.jaxb/nbproject/project.properties
+++ b/libs.jaxb/nbproject/project.properties
@@ -52,10 +52,10 @@ jnlp.indirect.jars=\
 pack200.excludes=modules/ext/jaxb/jaxb-xjc.jar
 
 release.external/jaxb-impl.jar=modules/ext/jaxb/jaxb-impl.jar
-#release.external/jaxb1-impl.jar=modules/ext/jaxb/jaxb1-impl.jar
+release.external/jaxb1-impl.jar=modules/ext/jaxb/jaxb1-impl.jar
 release.external/jaxb-xjc.jar=modules/ext/jaxb/jaxb-xjc.jar
 
 # JAXB Javadoc
-#release.external/jaxb-api-doc.zip=docs/jaxb-api-doc.zip
+release.external/jaxb-api-doc.zip=docs/jaxb-api-doc.zip
 
 sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jna.platform/external/binaries-list b/libs.jna.platform/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jna.platform/external/binaries-list
rename to libs.jna.platform/external/binaries-list
diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
index 608ea2b..b8afdb4 100644
--- a/libs.jna.platform/nbproject/project.properties
+++ b/libs.jna.platform/nbproject/project.properties
@@ -42,5 +42,5 @@
 
 is.autoload=true
 javac.source=1.6
-#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
+release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
 sigtest.gen.fail.on.error=false
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jna/external/binaries-list b/libs.jna/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jna/external/binaries-list
rename to libs.jna/external/binaries-list
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
index 0a8e520..c6de368 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
@@ -41,17 +41,17 @@
 # made subject to such option by the copyright holder.
 
 javac.source=1.6
-#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
+release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
 # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
-#release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
-#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
-#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
-#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
-#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-#jnlp.verify.excludes=\
-#    modules/lib/amd64/jnidispatch-410.dll,\
-#    modules/lib/amd64/linux/libjnidispatch-410.so,\
-#    modules/lib/i386/linux/libjnidispatch-410.so,\
-#    modules/lib/x86/jnidispatch-410.dll,\
-#    modules/lib/libjnidispatch-410.jnilib
+release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
+release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
+release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
+release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
+release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
+jnlp.verify.excludes=\
+    modules/lib/amd64/jnidispatch-410.dll,\
+    modules/lib/amd64/linux/libjnidispatch-410.so,\
+    modules/lib/i386/linux/libjnidispatch-410.so,\
+    modules/lib/x86/jnidispatch-410.dll,\
+    modules/lib/libjnidispatch-410.jnilib
 sigtest.gen.fail.on.error=false
diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
index fa3201f..cf306a7 100644
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
     public void validate() {
         super.validate();
         //#211655
-        System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
+        System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
     }
 }
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jsch.agentproxy/external/binaries-list b/libs.jsch.agentproxy/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jsch.agentproxy/external/binaries-list
rename to libs.jsch.agentproxy/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.json_simple/external/binaries-list b/libs.json_simple/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.json_simple/external/binaries-list
rename to libs.json_simple/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jstestdriver/external/binaries-list b/libs.jstestdriver/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jstestdriver/external/binaries-list
rename to libs.jstestdriver/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jstl/external/binaries-list b/libs.jstl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jstl/external/binaries-list
rename to libs.jstl/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.junit4/external/binaries-list b/libs.junit4/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.junit4/external/binaries-list
rename to libs.junit4/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.jvyamlb/external/binaries-list b/libs.jvyamlb/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.jvyamlb/external/binaries-list
rename to libs.jvyamlb/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.lucene/external/binaries-list b/libs.lucene/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.lucene/external/binaries-list
rename to libs.lucene/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.nashorn/external/binaries-list b/libs.nashorn/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.nashorn/external/binaries-list
rename to libs.nashorn/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.osgi/external/binaries-list b/libs.osgi/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.osgi/external/binaries-list
rename to libs.osgi/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.plist/external/binaries-list b/libs.plist/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.plist/external/binaries-list
rename to libs.plist/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.smack/external/binaries-list b/libs.smack/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.smack/external/binaries-list
rename to libs.smack/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.springframework/external/binaries-list b/libs.springframework/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.springframework/external/binaries-list
rename to libs.springframework/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter.javahl/external/binaries-list b/libs.svnClientAdapter.javahl/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter.javahl/external/binaries-list
rename to libs.svnClientAdapter.javahl/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter.svnkit/external/binaries-list b/libs.svnClientAdapter.svnkit/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter.svnkit/external/binaries-list
rename to libs.svnClientAdapter.svnkit/external/binaries-list
diff --git a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java b/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
index ade5a32..5fdbd4c 100644
--- a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
+++ b/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
@@ -85,8 +85,8 @@ public class SvnKitClientAdapterFactory extends SvnClientAdapterFactory {
     @Override
     public ISVNClientAdapter createClient() {
         // is this really needed? this clears the credentials cache
-        //SVNClientImpl.setRuntimeCredentialsStorage(null);
-        //org.tmatesoft.svn.core.javahl17.SVNClientImpl.setRuntimeCredentialsStorage(null);
+        SVNClientImpl.setRuntimeCredentialsStorage(null);
+        org.tmatesoft.svn.core.javahl17.SVNClientImpl.setRuntimeCredentialsStorage(null);
         return org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory
                 .createSVNClient(org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory.SVNKIT_CLIENT);
     }
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter/external/binaries-list b/libs.svnClientAdapter/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.svnClientAdapter/external/binaries-list
rename to libs.svnClientAdapter/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.swingx/external/binaries-list b/libs.swingx/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.swingx/external/binaries-list
rename to libs.swingx/external/binaries-list
diff --git a/libs.swingx/nbproject/project.properties b/libs.swingx/nbproject/project.properties
index b021baf..077a5ea 100644
--- a/libs.swingx/nbproject/project.properties
+++ b/libs.swingx/nbproject/project.properties
@@ -40,6 +40,6 @@
 # Version 2 license, then the option applies only if the new code is
 # made subject to such option by the copyright holder.
 
-#release.external/swingx-all-1.6.4.jar=modules/ext/swingx-all-1.6.4.jar
+release.external/swingx-all-1.6.4.jar=modules/ext/swingx-all-1.6.4.jar
 sigtest.gen.fail.on.error=false
 
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.testng/external/binaries-list b/libs.testng/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.testng/external/binaries-list
rename to libs.testng/external/binaries-list
diff --git a/libs.testng/nbproject/project.properties b/libs.testng/nbproject/project.properties
index 9d9f860..4d3caca 100644
--- a/libs.testng/nbproject/project.properties
+++ b/libs.testng/nbproject/project.properties
@@ -42,7 +42,7 @@
 
 is.autoload=true
 release.external/testng-6.8.1-dist.jar=modules/ext/testng-6.8.1-dist.jar
-#release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
+release.external/testng-6.8.1-javadoc.zip=docs/testng-6.8.1-javadoc.zip
 sigtest.skip.check=true
 sigtest.fail.on.error=false
 jnlp.indirect.jars=\
diff --git a/.pc/netbeans-empty-binaries-list.patch/libs.xerces/external/binaries-list b/libs.xerces/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/libs.xerces/external/binaries-list
rename to libs.xerces/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/maven.embedder/external/binaries-list b/maven.embedder/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/maven.embedder/external/binaries-list
rename to maven.embedder/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/maven.indexer/external/binaries-list b/maven.indexer/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/maven.indexer/external/binaries-list
rename to maven.indexer/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/maven/external/binaries-list b/maven/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/maven/external/binaries-list
rename to maven/external/binaries-list
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java b/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
index fdb836d..30b0f0a 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/UpdateTracking.java
@@ -526,7 +526,7 @@ class UpdateTracking {
          * @param install_time New value of property install_time.
          */
         void setInstall_time(long install_time) {
-            this.install_time = 1434794324829L;
+            this.install_time = install_time;
         }
         
         /** Getter for property files.
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 3c780eb..8e3826a 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -99,6 +99,7 @@ javadoc.packages=\
 # List of modules that provide stable javadoc
 config.javadoc.stable=\
     api.annotations.common,\
+    api.htmlui,\
     api.intent,\
     api.io,\
     api.knockout,\
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index e008f57..90c7a1a 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -145,7 +145,7 @@ made subject to such option by the copyright holder.
 
   <target name="init-module-list" depends="bootstrap,init-tasks">
     <!-- Define modules. -->
-    <!--<checkmoduleconfigs nbroot=".."/>-->
+    <checkmoduleconfigs nbroot=".."/>
     <resolvelist name="allmodules" list="${nb.clusters.list}"/>
     <pathconvert property="modules.fullpath" >
         <path>
@@ -314,8 +314,8 @@ made subject to such option by the copyright holder.
     <mkdir dir="${netbeans.dest.dir}/bin" />
     <copy file="../ide/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
     <chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
-    <!--<copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
-    <copy file="../ide/launcher/windows/netbeans64.exe" todir="${netbeans.dest.dir}/bin" />-->
+    <copy file="../ide/launcher/windows/netbeans.exe" todir="${netbeans.dest.dir}/bin" />
+    <copy file="../ide/launcher/windows/netbeans64.exe" todir="${netbeans.dest.dir}/bin" />
     <!-- if anybody knows better place for icons, let me know: jtulach at netbeans.org -->
 
     <mkdir dir="${netbeans.dest.dir}/etc" />
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index a552b65..9b1177a 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -107,8 +107,10 @@ clusters.config.java.list=\
         ${clusters.config.platform.list},\
         nb.cluster.ide,\
         nb.cluster.extide,\
+        nb.cluster.websvccommon,\
         nb.cluster.java,\
         nb.cluster.javafx,\
+        nb.cluster.profiler,\
         nb.cluster.nb
 
 clusters.config.enterprise.list=\
@@ -199,6 +201,7 @@ nb.cluster.platform.dir=platform
 nb.cluster.platform.depends=nb.cluster.bootstrap
 nb.cluster.platform=\
         api.annotations.common,\
+        api.htmlui,\
         api.intent,\
         api.io,\
         api.progress,\
@@ -246,9 +249,17 @@ nb.cluster.platform=\
         masterfs.nio2,\
         masterfs.ui,\
         masterfs.windows,\
+        net.java.html,\
+        net.java.html.boot,\
+        net.java.html.boot.fx,\
+        net.java.html.boot.script,\
+        net.java.html.geo,\
+        net.java.html.json,\
+        net.java.html.sound,\
         netbinox,\
         o.jdesktop.layout,\
         o.n.core,\
+        o.n.html.ko4j,\
         o.n.swing.outline,\
         o.n.swing.plaf,\
         o.n.swing.tabcontrol,\
@@ -279,6 +290,7 @@ nb.cluster.platform=\
         spi.actions,\
         spi.quicksearch,\
         templates,\
+        templatesui,\
         uihandler
 validation.nb.cluster.platform=\
         o.n.core,\
@@ -295,11 +307,16 @@ nb.cluster.ide=\
         api.knockout,\
         api.xml,\
         api.xml.ui,\
+        bugtracking,\
+        bugtracking.bridge,\
+        bugtracking.commons,\
+        bugzilla,\
         c.googlecode.javaewah.JavaEWAH,\
         c.jcraft.jsch,\
         c.jcraft.jzlib,\
         code.analysis,\
         core.browser,\
+        core.browser.webview,\
         core.ide,\
         core.multitabs.project,\
         csl.api,\
@@ -357,6 +374,7 @@ nb.cluster.ide=\
         extbrowser,\
         extexecution,\
         extexecution.base,\
+        extexecution.impl,\
         extexecution.process,\
         git,\
         gototest,\
@@ -364,11 +382,15 @@ nb.cluster.ide=\
         gsf.testrunner,\
         gsf.testrunner.ui,\
         html,\
+        html.angular,\
         html.custom,\
         html.editor,\
         html.editor.lib,\
+        html.knockout,\
         html.lexer,\
         html.parser,\
+        html.validation,\
+        httpserver,\
         hudson,\
         hudson.git,\
         hudson.mercurial,\
@@ -378,6 +400,15 @@ nb.cluster.ide=\
         ide.kit,\
         image,\
         javascript2.debug,\
+        javascript2.editor,\
+        javascript2.extjs,\
+	javascript2.jade,\
+        javascript2.jquery,\
+        javascript2.kit,\
+        javascript2.knockout,\
+	javascript2.nodejs,\
+        javascript2.prototypejs,\
+	javascript2.requirejs,\
         jellytools.ide,\
         jumpto,\
         languages,\
@@ -398,13 +429,17 @@ nb.cluster.ide=\
         libs.json_simple,\
         libs.jvyamlb,\
         libs.lucene,\
+        libs.nashorn,\
+        libs.smack,\
         libs.svnClientAdapter,\
         libs.svnClientAdapter.javahl,\
         libs.svnClientAdapter.svnkit,\
         libs.swingx,\
         libs.xerces,\
         localhistory,\
+        localtasks,\
         mercurial,\
+        mylyn.util,\
         notifications,\
         o.apache.commons.codec,\
         o.apache.commons.httpclient,\
@@ -413,8 +448,28 @@ nb.cluster.ide=\
         o.apache.commons.logging,\
         o.apache.ws.commons.util,\
         o.apache.xml.resolver,\
+        o.apache.xmlrpc,\
+        o.eclipse.core.contenttype,\
+        o.eclipse.core.jobs,\
+        o.eclipse.core.net,\
+        o.eclipse.core.runtime,\
+        o.eclipse.core.runtime.compatibility.auth,\
+        o.eclipse.equinox.app,\
+        o.eclipse.equinox.common,\
+        o.eclipse.equinox.preferences,\
+        o.eclipse.equinox.registry,\
+        o.eclipse.equinox.security,\
         o.eclipse.jgit,\
         o.eclipse.jgit.java7,\
+        o.eclipse.mylyn.bugzilla.core,\
+        o.eclipse.mylyn.commons.core,\
+        o.eclipse.mylyn.commons.net,\
+        o.eclipse.mylyn.commons.repositories.core,\
+        o.eclipse.mylyn.commons.xmlrpc,\
+        o.eclipse.mylyn.tasks.core,\
+        o.eclipse.mylyn.wikitext.confluence.core,\
+        o.eclipse.mylyn.wikitext.core,\
+        o.eclipse.mylyn.wikitext.textile.core,\
         o.n.swing.dirchooser,\
         o.openidex.util,\
         options.editor,\
@@ -446,11 +501,11 @@ nb.cluster.ide=\
         selenium2.server,\
         server,\
         servletapi,\
-        slf4j.dummy,\
         spellchecker,\
         spellchecker.apimodule,\
         spellchecker.bindings.htmlxml,\
         spellchecker.bindings.properties,\
+        spellchecker.dictionary_en,\
         spellchecker.kit,\
         spi.debugger.ui,\
         spi.editor.hints,\
@@ -509,6 +564,7 @@ nb.cluster.java.depends=\
         nb.cluster.ide,\
         nb.cluster.extide,\
         nb.cluster.platform,\
+        nb.cluster.websvccommon,\
         nb.cluster.harness
 nb.cluster.java=\
         ant.browsetask,\
@@ -518,6 +574,7 @@ nb.cluster.java=\
         ant.kit,\
         api.debugger.jpda,\
         api.java,\
+        api.maven,\
         beans,\
         classfile,\
         dbschema,\
@@ -536,15 +593,21 @@ nb.cluster.java=\
         form.kit,\
         form.nb,\
         form.refactoring,\
+        hibernate,\
+        hibernate4lib,\
         hudson.ant,\
+        hudson.maven,\
         i18n,\
         i18n.form,\
         j2ee.core.utilities,\
         j2ee.eclipselink,\
         j2ee.eclipselinkmodelgen,\
+        j2ee.jpa.refactoring,\
+        j2ee.jpa.verification,\
         j2ee.metadata,\
         j2ee.metadata.model.support,\
         j2ee.persistence,\
+        j2ee.persistence.kit,\
         j2ee.persistenceapi,\
         java.api.common,\
         java.completion,\
@@ -597,6 +660,26 @@ nb.cluster.java=\
         libs.cglib,\
         libs.javacapi,\
         libs.javacimpl,\
+        libs.springframework,\
+        maven,\
+        maven.checkstyle,\
+        maven.coverage,\
+        maven.embedder,\
+        maven.grammar,\
+        maven.graph,\
+        maven.hints,\
+        maven.indexer,\
+        maven.indexer.ui,\
+        maven.junit,\
+        maven.junit.ui,\
+        maven.kit,\
+        maven.model,\
+        maven.osgi,\
+        maven.persistence,\
+        maven.refactoring,\
+        maven.repository,\
+        maven.search,\
+        maven.spring,\
         nashorn.execution,\
         o.jdesktop.beansbinding,\
         performance,\
@@ -605,12 +688,18 @@ nb.cluster.java=\
         projectimport.eclipse.j2se,\
         refactoring.java,\
         selenium2.java,\
+        selenium2.maven,\
         spellchecker.bindings.java,\
         spi.debugger.jpda.ui,\
         spi.java.hints,\
+        spring.beans,\
         testng,\
         testng.ant,\
+        testng.maven,\
         testng.ui,\
+        websvc.jaxws21,\
+        websvc.jaxws21api,\
+        websvc.saas.codegen.java,\
         whitelist,\
         xml.jaxb,\
         xml.tools.java
@@ -628,12 +717,16 @@ nb.cluster.apisupport.depends=\
 nb.cluster.apisupport=\
         apisupport.ant,\
         apisupport.crudsample,\
+        apisupport.feedreader,\
+        apisupport.installer,\
+        apisupport.installer.maven,\
         apisupport.kit,\
         apisupport.osgidemo,\
         apisupport.paintapp,\
         apisupport.project,\
         apisupport.refactoring,\
-        apisupport.wizards
+        apisupport.wizards,\
+        maven.apisupport
 
 nb.cluster.enterprise.dir=enterprise
 nb.cluster.enterprise.depends=\
@@ -647,6 +740,7 @@ nb.cluster.enterprise.depends=\
         nb.cluster.harness
 nb.cluster.enterprise=\
         api.web.webmodule,\
+        apisupport.restsample,\
         cloud.amazon,\
         cloud.common,\
         el.lexer,\
@@ -694,6 +788,9 @@ nb.cluster.enterprise=\
         libs.elimpl,\
         libs.glassfish_logging,\
         libs.jstl,\
+        maven.j2ee,\
+        maven.jaxws,\
+        maven.samples,\
         performance.javaee,\
         performance.scripting,\
         performance.web,\
@@ -771,6 +868,7 @@ nb.cluster.nb.depends=\
         nb.cluster.harness
 nb.cluster.nb=\
         autoupdate.pluginimporter,\
+        bugzilla.exceptionreporter,\
         deadlock.detector,\
         ide.branding,\
         ide.branding.kit,\
@@ -785,6 +883,8 @@ nb.cluster.harness=\
         apisupport.harness,\
         jellytools.platform,\
         jemmy,\
+        libs.nbi.ant,\
+        libs.nbi.engine,\
         nbjunit,\
         o.n.insane
 
@@ -800,6 +900,7 @@ nb.cluster.profiler=\
         lib.profiler.charts,\
         lib.profiler.common,\
         lib.profiler.ui,\
+        maven.profiler,\
         profiler,\
         profiler.api,\
         profiler.attach,\
@@ -883,7 +984,9 @@ nb.cluster.groovy=\
         groovy.kit,\
         groovy.refactoring,\
         groovy.samples,\
-        groovy.support
+        groovy.support,\
+        libs.groovy,\
+        maven.groovy
 
 nb.cluster.mobility.dir=mobility
 nb.cluster.mobility.depends=\
@@ -977,6 +1080,7 @@ nb.cluster.cnd=\
         cnd.toolchain,\
         cnd.utils,\
         jellytools.cnd,\
+        libs.clank
 validation.nb.cluster.cnd=\
         cnd.kit
 
@@ -1029,6 +1133,8 @@ nb.cluster.jira=\
         o.apache.axis,\
         o.apache.commons.discovery,\
         o.codehaus.jettison,\
+        o.eclipse.mylyn.commons.soap,\
+        o.eclipse.mylyn.monitor.ui.dummy,\
         o.joda.time
 
 nb.cluster.team.dir=extra
@@ -1037,6 +1143,7 @@ nb.cluster.team.depends=\
         nb.cluster.platform,\
         nb.cluster.ide
 nb.cluster.team=\
+        bugtracking.kenai,\
         c.tasktop.c2c.server.cloud.api,\
         c.tasktop.c2c.server.common.api,\
         c.tasktop.c2c.server.profile.api,\
@@ -1045,6 +1152,7 @@ nb.cluster.team=\
         c.tasktop.c2c.server.wiki.api,\
         kenai,\
         kenai.kit,\
+        kenai.maven,\
         kenai.ui,\
         lib.cvsclient,\
         o.codehaus.jackson.core,\
@@ -1098,6 +1206,7 @@ nb.cluster.stableuc=\
         libs.oracle.cloud,\
         libs.ppawtlayout,\
         loadgenerator,\
+	maven.util,\
         mobility.antext,\
         mobility.cldcplatform.catalog,\
         mobility.deployment.ftpscp,\
@@ -1170,6 +1279,7 @@ nb.cluster.betauc=\
         contrib/modulemanager,\
         contrib/quickfilechooser,\
         contrib/selenium,\
+        contrib/selenium.maven,\
         contrib/selenium.php,\
         contrib/selenium.server,\
         o.apache.jmeter.module,\
diff --git a/.pc/netbeans-empty-binaries-list.patch/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/nbbuild/external/binaries-list
rename to nbbuild/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.boot.fx/external/binaries-list b/net.java.html.boot.fx/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.boot.fx/external/binaries-list
rename to net.java.html.boot.fx/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.boot.script/external/binaries-list b/net.java.html.boot.script/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.boot.script/external/binaries-list
rename to net.java.html.boot.script/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.boot/external/binaries-list b/net.java.html.boot/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.boot/external/binaries-list
rename to net.java.html.boot/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.geo/external/binaries-list b/net.java.html.geo/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.geo/external/binaries-list
rename to net.java.html.geo/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.json/external/binaries-list b/net.java.html.json/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.json/external/binaries-list
rename to net.java.html.json/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html.sound/external/binaries-list b/net.java.html.sound/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html.sound/external/binaries-list
rename to net.java.html.sound/external/binaries-list
diff --git a/net.java.html/build.xml b/net.java.html/build.xml
index 28f236f..9d4bc83 100644
--- a/net.java.html/build.xml
+++ b/net.java.html/build.xml
@@ -3,4 +3,3 @@
     <import file="../nbbuild/templates/projectized.xml"/>
     <target name="jar"/>
 </project>
-
diff --git a/.pc/netbeans-empty-binaries-list.patch/net.java.html/external/binaries-list b/net.java.html/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/net.java.html/external/binaries-list
rename to net.java.html/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/netbinox/external/binaries-list b/netbinox/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/netbinox/external/binaries-list
rename to netbinox/external/binaries-list
diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
index 37846b0..d97a2cd 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent {
                             final File bf = new File(getBaseFile().getPath());
                             if (bf.isDirectory()) {
                                 try {
-                                    delegate = new DirBundleFile(bf);
+                                    delegate = new DirBundleFile(bf, false);
                                     return false;
                                 } catch (IOException dirEx) {
                                     NetbinoxFactory.LOG.log(Level.WARNING, 
diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
index 77a70d3..89c1357 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
@@ -61,8 +61,6 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.framework.ServiceObjects;
-import org.osgi.framework.ServiceFactory;
 
 /**
  *
@@ -241,11 +239,5 @@ class Netbinox extends Equinox {
         public void addBundleListener(BundleListener bl) {
             delegate.addBundleListener(bl);
         }
-        public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> refer) {
-            return null;
-        }
-        public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) {
-            return null;
-        }
     } // end of Context
 }
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.commons.codec/external/binaries-list b/o.apache.commons.codec/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.commons.codec/external/binaries-list
rename to o.apache.commons.codec/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.commons.httpclient/external/binaries-list b/o.apache.commons.httpclient/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.commons.httpclient/external/binaries-list
rename to o.apache.commons.httpclient/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.commons.io/external/binaries-list b/o.apache.commons.io/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.commons.io/external/binaries-list
rename to o.apache.commons.io/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.commons.lang/external/binaries-list b/o.apache.commons.lang/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.commons.lang/external/binaries-list
rename to o.apache.commons.lang/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.commons.logging/external/binaries-list b/o.apache.commons.logging/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.commons.logging/external/binaries-list
rename to o.apache.commons.logging/external/binaries-list
diff --git a/o.apache.tools.ant.module/build.xml b/o.apache.tools.ant.module/build.xml
index e54585b..9d8a0d7 100644
--- a/o.apache.tools.ant.module/build.xml
+++ b/o.apache.tools.ant.module/build.xml
@@ -79,14 +79,14 @@ made subject to such option by the copyright holder.
 
     <target name="netbeans-extra" depends="jar-bridge">
         <mkdir dir="${cluster}/ant/lib"/>
-        <!--<copy todir="${cluster}/ant/lib">
+        <copy todir="${cluster}/ant/lib">
             <fileset dir="external/lib"/>
         </copy>
         <unzip dest="${cluster}/ant">
             <fileset dir="external">
                 <include name="ant-misc-*.zip"/>
             </fileset>
-        </unzip>-->
+        </unzip>
     </target>
 
     <target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.tools.ant.module/external/binaries-list b/o.apache.tools.ant.module/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.tools.ant.module/external/binaries-list
rename to o.apache.tools.ant.module/external/binaries-list
diff --git a/o.apache.tools.ant.module/external/build.xml b/o.apache.tools.ant.module/external/build.xml
index 516568d..3629c6b 100644
--- a/o.apache.tools.ant.module/external/build.xml
+++ b/o.apache.tools.ant.module/external/build.xml
@@ -45,7 +45,7 @@ made subject to such option by the copyright holder.
 -->
 <project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
     <target name="unzip">
-        <!-- <unzip src="ant-libs-1.9.4.zip" dest="lib"/>-->
+        <unzip src="ant-libs-1.9.4.zip" dest="lib"/>
     </target>
     <target name="clean">
         <delete dir="lib"/>
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.ws.commons.util/external/binaries-list b/o.apache.ws.commons.util/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.ws.commons.util/external/binaries-list
rename to o.apache.ws.commons.util/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.xml.resolver/external/binaries-list b/o.apache.xml.resolver/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.xml.resolver/external/binaries-list
rename to o.apache.xml.resolver/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.apache.xmlrpc/external/binaries-list b/o.apache.xmlrpc/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.apache.xmlrpc/external/binaries-list
rename to o.apache.xmlrpc/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.core.contenttype/external/binaries-list b/o.eclipse.core.contenttype/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.core.contenttype/external/binaries-list
rename to o.eclipse.core.contenttype/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.core.jobs/external/binaries-list b/o.eclipse.core.jobs/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.core.jobs/external/binaries-list
rename to o.eclipse.core.jobs/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.core.net/external/binaries-list b/o.eclipse.core.net/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.core.net/external/binaries-list
rename to o.eclipse.core.net/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.core.runtime.compatibility.auth/external/binaries-list b/o.eclipse.core.runtime.compatibility.auth/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.core.runtime.compatibility.auth/external/binaries-list
rename to o.eclipse.core.runtime.compatibility.auth/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.core.runtime/external/binaries-list b/o.eclipse.core.runtime/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.core.runtime/external/binaries-list
rename to o.eclipse.core.runtime/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.app/external/binaries-list b/o.eclipse.equinox.app/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.app/external/binaries-list
rename to o.eclipse.equinox.app/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.common/external/binaries-list b/o.eclipse.equinox.common/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.common/external/binaries-list
rename to o.eclipse.equinox.common/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.preferences/external/binaries-list b/o.eclipse.equinox.preferences/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.preferences/external/binaries-list
rename to o.eclipse.equinox.preferences/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.registry/external/binaries-list b/o.eclipse.equinox.registry/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.registry/external/binaries-list
rename to o.eclipse.equinox.registry/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.security/external/binaries-list b/o.eclipse.equinox.security/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.equinox.security/external/binaries-list
rename to o.eclipse.equinox.security/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.jgit.java7/external/binaries-list b/o.eclipse.jgit.java7/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.jgit.java7/external/binaries-list
rename to o.eclipse.jgit.java7/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.jgit/external/binaries-list b/o.eclipse.jgit/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.jgit/external/binaries-list
rename to o.eclipse.jgit/external/binaries-list
diff --git a/o.eclipse.jgit/nbproject/project.xml b/o.eclipse.jgit/nbproject/project.xml
index 0925156..897d09c 100644
--- a/o.eclipse.jgit/nbproject/project.xml
+++ b/o.eclipse.jgit/nbproject/project.xml
@@ -14,14 +14,9 @@
                     <code-name-base>com.googlecode.javaewah.JavaEWAH</code-name-base>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.6.12</specification-version>
+                        <specification-version>0.7.9</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>slf4j.dummy</code-name-base>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
             </module-dependencies>
             <public-packages/>
             <class-path-extension>
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.bugzilla.core/external/binaries-list b/o.eclipse.mylyn.bugzilla.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.bugzilla.core/external/binaries-list
rename to o.eclipse.mylyn.bugzilla.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.core/external/binaries-list b/o.eclipse.mylyn.commons.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.core/external/binaries-list
rename to o.eclipse.mylyn.commons.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.net/external/binaries-list b/o.eclipse.mylyn.commons.net/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.net/external/binaries-list
rename to o.eclipse.mylyn.commons.net/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.repositories.core/external/binaries-list b/o.eclipse.mylyn.commons.repositories.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.repositories.core/external/binaries-list
rename to o.eclipse.mylyn.commons.repositories.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list b/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
rename to o.eclipse.mylyn.commons.xmlrpc/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.tasks.core/external/binaries-list b/o.eclipse.mylyn.tasks.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.tasks.core/external/binaries-list
rename to o.eclipse.mylyn.tasks.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list b/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
rename to o.eclipse.mylyn.wikitext.confluence.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.core/external/binaries-list b/o.eclipse.mylyn.wikitext.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.core/external/binaries-list
rename to o.eclipse.mylyn.wikitext.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list b/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
rename to o.eclipse.mylyn.wikitext.textile.core/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.jdesktop.beansbinding/external/binaries-list b/o.jdesktop.beansbinding/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.jdesktop.beansbinding/external/binaries-list
rename to o.jdesktop.beansbinding/external/binaries-list
diff --git a/o.jdesktop.beansbinding/nbproject/project.properties b/o.jdesktop.beansbinding/nbproject/project.properties
index 9a40c4c..d2951bb 100644
--- a/o.jdesktop.beansbinding/nbproject/project.properties
+++ b/o.jdesktop.beansbinding/nbproject/project.properties
@@ -42,6 +42,6 @@
 
 is.autoload=true
 release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar
-#release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
-#jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
+release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip
+jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip
 spec.version.base=1.26.1
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.jdesktop.layout/external/binaries-list b/o.jdesktop.layout/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.jdesktop.layout/external/binaries-list
rename to o.jdesktop.layout/external/binaries-list
diff --git a/o.jdesktop.layout/nbproject/project.properties b/o.jdesktop.layout/nbproject/project.properties
index 015c254..bf2a43b 100644
--- a/o.jdesktop.layout/nbproject/project.properties
+++ b/o.jdesktop.layout/nbproject/project.properties
@@ -42,6 +42,6 @@
 
 is.autoload=true
 release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar
-#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
-#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
+release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip
+release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip
 jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip
diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
index 2f78df1..990aafa 100644
--- a/o.n.bootstrap/launcher/windows/Makefile
+++ b/o.n.bootstrap/launcher/windows/Makefile
@@ -15,7 +15,7 @@
 MKDIR=mkdir
 CP=cp
 CCADMIN=CCadmin
-RANLIB=i686-w64-mingw32-ranlib
+RANLIB=ranlib
 
 
 
@@ -26,12 +26,16 @@ build: .build-post-$(CONF)
 # Add your pre 'build' code here...
 
 .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-	i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-	i686-w64-mingw32-g++ -s -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-
+	windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
+	g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
+	cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
+	cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
+	
 .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
-	x86_64-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe64.res
-	x86_64-w64-mingw32-g++ -m64 -s -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
+	x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res 
+	x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe 
+	cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
+	cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
 
 
 
@@ -42,7 +46,7 @@ clean: .clean-post-$(CONF)
 # Add your pre 'clean' code here...
 
 .clean-post-nbexec: .clean-impl
-	rm -f nbexec_exe32.res nbexec.exe
+	rm -f nbexec_exe32.res nbexec32.exe
 	
 .clean-post-nbexec64: .clean-impl
 	rm -f nbexec_exe64.res nbexec64.exe
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
index 961e7dc..7b5163b 100644
--- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
@@ -13,12 +13,12 @@ CP=cp
 GREP=grep
 NM=nm
 CCADMIN=CCadmin
-RANLIB=i686-w64-mingw32-ranlib
-CC=
-CCC=i686-w64-mingw32-g++
-CXX=i686-w64-mingw32-g++
-FC=
-AS=i686-w64-mingw32-as
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=gfortran
+AS=as
 
 # Macros
 CND_PLATFORM=Cygwin-Windows
@@ -46,8 +46,8 @@ OBJECTFILES= \
 CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=-m32
-CXXFLAGS=-m32
+CCFLAGS=-m32 -mno-cygwin
+CXXFLAGS=-m32 -mno-cygwin
 
 # Fortran Compiler Flags
 FFLAGS=
@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
 nbexec.dll: ${OBJECTDIR}/nbexec.res
 
 nbexec.dll: ${OBJECTFILES}
-	${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -shared
+	${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
 
 ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
 
 ${OBJECTDIR}/nbexec.o: nbexec.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
 
 ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
 	${MKDIR} -p ${OBJECTDIR}
 	@echo Compiling Resource files...
-	i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
+	windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
 
 : nbexec_exe.rc 
 	@echo 
@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
 ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
 
 ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
 
 ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
 
 # Subprojects
 .build-subprojects:
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
index 485127e..7fb819e 100644
--- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
@@ -13,12 +13,12 @@ CP=cp
 GREP=grep
 NM=nm
 CCADMIN=CCadmin
-RANLIB=x86_64-w64-mingw32-ranlib
-CC=
+RANLIB=ranlib
+CC=x86_64-w64-mingw32-gcc
 CCC=x86_64-w64-mingw32-g++
 CXX=x86_64-w64-mingw32-g++
-FC=
-AS=x86_64-w64-mingw32-as
+FC=gfortran
+AS=as
 
 # Macros
 CND_PLATFORM=Cygwin64-Windows
@@ -46,8 +46,8 @@ OBJECTFILES= \
 CFLAGS=
 
 # CC Compiler Flags
-CCFLAGS=-m64 -static-libgcc -static-libstdc++
-CXXFLAGS=-m64 -static-libgcc -static-libstdc++
+CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
 
 # Fortran Compiler Flags
 FFLAGS=
@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
 nbexec64.dll: ${OBJECTDIR}/nbexec64.res
 
 nbexec64.dll: ${OBJECTFILES}
-	${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -shared
+	${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
 
 ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
 
 ${OBJECTDIR}/nbexec.o: nbexec.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
 
 ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
 	${MKDIR} -p ${OBJECTDIR}
 	@echo Compiling Resource files...
-	x86_64-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
+	x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
 
 : nbexec_exe.rc 
 	@echo 
@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
 ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
 
 ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
 
 ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp 
 	${MKDIR} -p ${OBJECTDIR}
 	${RM} "$@.d"
-	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+	$(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
 
 # Subprojects
 .build-subprojects:
diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
index 0193220..21f947f 100644
--- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
@@ -52,7 +52,6 @@
 #include "argnames.h"
 #include <tlhelp32.h>
 #include <windows.h>
-#include <stdio.h>
 
 using namespace std;
 
diff --git a/o.n.bootstrap/nbproject/project.properties b/o.n.bootstrap/nbproject/project.properties
index 396d029..bc67095 100644
--- a/o.n.bootstrap/nbproject/project.properties
+++ b/o.n.bootstrap/nbproject/project.properties
@@ -44,11 +44,11 @@ javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.7
 module.jar.dir=lib
 module.jar.basename=boot.jar
-#release.launcher/unix/nbexec=lib/nbexec
-#release.launcher/windows/nbexec.exe=lib/nbexec.exe
-#release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
-#release.launcher/windows/nbexec.dll=lib/nbexec.dll
-#release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
+release.launcher/unix/nbexec=lib/nbexec
+release.launcher/windows/nbexec.exe=lib/nbexec.exe
+release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
+release.launcher/windows/nbexec.dll=lib/nbexec.dll
+release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
 nbm.executable.files=lib/nbexec
 
 javadoc.arch=${basedir}/arch.xml
diff --git a/.pc/netbeans-empty-binaries-list.patch/o.n.html.ko4j/external/binaries-list b/o.n.html.ko4j/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/o.n.html.ko4j/external/binaries-list
rename to o.n.html.ko4j/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/php.editor/external/binaries-list b/php.editor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/php.editor/external/binaries-list
rename to php.editor/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/php.phpdoc.documentation/external/binaries-list b/php.phpdoc.documentation/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/php.phpdoc.documentation/external/binaries-list
rename to php.phpdoc.documentation/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/php.project/external/binaries-list b/php.project/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/php.project/external/binaries-list
rename to php.project/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/servletapi/external/binaries-list b/servletapi/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/servletapi/external/binaries-list
rename to servletapi/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/servletjspapi/external/binaries-list b/servletjspapi/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/servletjspapi/external/binaries-list
rename to servletjspapi/external/binaries-list
diff --git a/slf4j.dummy/build.xml b/slf4j.dummy/build.xml
deleted file mode 100644
index b7663bc..0000000
--- a/slf4j.dummy/build.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="slf4j.dummy" default="netbeans" basedir=".">
-    <import file="../nbbuild/templates/projectized.xml"/>
-    <target name="jar">
-        <jar jarfile="${cluster}/${module.jar}">
-          <manifest>
-             <attribute name="Bundle-SymbolicName" value="slf4j.dummy;singleton:=true"/>
-             <attribute name="Export-Package" value="org.slf4j;version=1.7.14"/>
-          </manifest>
-        </jar>
-    </target>
-</project>
diff --git a/slf4j.dummy/manifest.mf b/slf4j.dummy/manifest.mf
deleted file mode 100644
index 74571ad..0000000
--- a/slf4j.dummy/manifest.mf
+++ /dev/null
@@ -1 +0,0 @@
-OpenIDE-Module: slf4j.dummy
diff --git a/slf4j.dummy/nbproject/project.xml b/slf4j.dummy/nbproject/project.xml
deleted file mode 100644
index 53962c8..0000000
--- a/slf4j.dummy/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-        <type>org.netbeans.modules.apisupport.project</type>
-        <configuration>
-            <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
-                <code-name-base>slf4j.dummy</code-name-base>
-                <module-dependencies/>
-                <public-packages/>
-                <class-path-extension>
-                    <runtime-relative-path>slf4j-dummy.jar</runtime-relative-path>
-                    <binary-origin>external/slf4j-dummy.jar</binary-origin>
-                </class-path-extension>
-            </data>
-        </configuration>
-</project>
diff --git a/.pc/netbeans-empty-binaries-list.patch/spellchecker.dictionary_en/external/binaries-list b/spellchecker.dictionary_en/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/spellchecker.dictionary_en/external/binaries-list
rename to spellchecker.dictionary_en/external/binaries-list
diff --git a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
index 3248033..8b98f4f 100644
--- a/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
+++ b/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
@@ -1575,9 +1575,9 @@ public class Utilities {
                     @Override public int getEndPos(JCTree tree) {
                         return (int) sp.getEndPosition(null, tree);
                     }
-                    //@Override public void storeEnd(JCTree tree, int endpos) {
-                    //    throw new UnsupportedOperationException("Not supported yet.");
-                    //}
+                    @Override public void storeEnd(JCTree tree, int endpos) {
+                        throw new UnsupportedOperationException("Not supported yet.");
+                    }
                     @Override public int replaceTree(JCTree oldtree, JCTree newtree) {
                         throw new UnsupportedOperationException("Not supported yet.");
                     }
diff --git a/.pc/netbeans-empty-binaries-list.patch/swing.validation/external/binaries-list b/swing.validation/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/swing.validation/external/binaries-list
rename to swing.validation/external/binaries-list
diff --git a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
index 63b4a60..6ea6ac0 100644
--- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -55,7 +55,7 @@ made subject to such option by the copyright holder.
          <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
          <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Distribution"/>
          <attr name="category" stringvalue="STANDARD"/>
-         <attr name="enabled" boolvalue="false"/>
+         <attr name="enabled" boolvalue="true"/>
          <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
          <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
          </file>
@@ -65,7 +65,7 @@ made subject to such option by the copyright holder.
          <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
          <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Certified"/>
          <attr name="category" stringvalue="STANDARD"/>
-         <attr name="enabled" boolvalue="false"/>
+         <attr name="enabled" boolvalue="true"/>
          <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
          <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
          </file>
@@ -75,7 +75,7 @@ made subject to such option by the copyright holder.
          <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
          <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_PluginPortal"/>
          <attr name="category" stringvalue="COMMUNITY"/>
-         <attr name="enabled" boolvalue="false"/>
+         <attr name="enabled" boolvalue="true"/>
          <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
          <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
          </file>
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.core.syntax/external/binaries-list b/web.core.syntax/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.core.syntax/external/binaries-list
rename to web.core.syntax/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.jsf.editor/external/binaries-list b/web.jsf.editor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.jsf.editor/external/binaries-list
rename to web.jsf.editor/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.jsf12/external/binaries-list b/web.jsf12/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.jsf12/external/binaries-list
rename to web.jsf12/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.jsf20/external/binaries-list b/web.jsf20/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.jsf20/external/binaries-list
rename to web.jsf20/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.jspparser/external/binaries-list b/web.jspparser/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.jspparser/external/binaries-list
rename to web.jspparser/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.monitor/external/binaries-list b/web.monitor/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.monitor/external/binaries-list
rename to web.monitor/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.primefaces/external/binaries-list b/web.primefaces/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.primefaces/external/binaries-list
rename to web.primefaces/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/web.struts/external/binaries-list b/web.struts/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/web.struts/external/binaries-list
rename to web.struts/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/websvc.jaxws21/external/binaries-list b/websvc.jaxws21/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/websvc.jaxws21/external/binaries-list
rename to websvc.jaxws21/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/websvc.jaxws21api/external/binaries-list b/websvc.jaxws21api/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/websvc.jaxws21api/external/binaries-list
rename to websvc.jaxws21api/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/websvc.metro.lib/external/binaries-list b/websvc.metro.lib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/websvc.metro.lib/external/binaries-list
rename to websvc.metro.lib/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/websvc.restlib/external/binaries-list b/websvc.restlib/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/websvc.restlib/external/binaries-list
rename to websvc.restlib/external/binaries-list
diff --git a/.pc/netbeans-empty-binaries-list.patch/xml.jaxb.api/external/binaries-list b/xml.jaxb.api/external/binaries-list
similarity index 100%
rename from .pc/netbeans-empty-binaries-list.patch/xml.jaxb.api/external/binaries-list
rename to xml.jaxb.api/external/binaries-list
diff --git a/xml.jaxb.api/nbproject/project.properties b/xml.jaxb.api/nbproject/project.properties
index 74e65d3..4356623 100644
--- a/xml.jaxb.api/nbproject/project.properties
+++ b/xml.jaxb.api/nbproject/project.properties
@@ -47,8 +47,8 @@ jnlp.indirect.jars=\
     modules/ext/jaxb/api/jaxb-api.jar,\
     modules/ext/jaxb/api/jsr173_1.0_api.jar
 
-#release.external/activation.jar=modules/ext/jaxb/activation.jar
+release.external/activation.jar=modules/ext/jaxb/activation.jar
 release.external/jaxb-api.jar=modules/ext/jaxb/api/jaxb-api.jar
-#release.external/jsr173_1.0_api.jar=modules/ext/jaxb/api/jsr173_1.0_api.jar
+release.external/jsr173_1.0_api.jar=modules/ext/jaxb/api/jsr173_1.0_api.jar
 
 sigtest.gen.fail.on.error=false
diff --git a/xsl/manifest.mf b/xsl/manifest.mf
index 30b312f..640b690 100644
--- a/xsl/manifest.mf
+++ b/xsl/manifest.mf
@@ -2,5 +2,6 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.xsl/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xsl/resources/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
+OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module-Specification-Version: 1.42.1
diff --git a/xsl/nbproject/project.xml b/xsl/nbproject/project.xml
index cba4bd1..16e1d5f 100644
--- a/xsl/nbproject/project.xml
+++ b/xsl/nbproject/project.xml
@@ -249,11 +249,11 @@ made subject to such option by the copyright holder.
                         <code-name-base>org.netbeans.libs.junit4</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
-                    <!--<test-dependency>
+                    <test-dependency>
                         <code-name-base>org.netbeans.modules.httpserver</code-name-base>
                         <recursive/>
                         <compile-dependency/>
-                    </test-dependency>-->
+                    </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
                         <recursive/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git



More information about the pkg-java-commits mailing list