You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/11/22 11:43:05 UTC
[GitHub] sdedic closed pull request #917: Fragments for libs.javafx with
JavaFX 11 implementation
sdedic closed pull request #917: Fragments for libs.javafx with JavaFX 11 implementation
URL: https://github.com/apache/incubator-netbeans/pull/917
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ergonomics/ide.ergonomics/java.properties b/ergonomics/ide.ergonomics/java.properties
index 31e21a7f53..6c6d171286 100644
--- a/ergonomics/ide.ergonomics/java.properties
+++ b/ergonomics/ide.ergonomics/java.properties
@@ -22,6 +22,7 @@ projectImporter=Eclipse
mainModule=org.netbeans.modules.java.kit
extra.modules=org.netbeans.modules.nbjavac
extra.modules.recommended.min.jdk=9
+extra.modules.1=org\\.netbeans\\.libs\\.javafx\\.(linux|win|macosx)
LBL_Ergonomics_Extra_Required=Additional modules are needed to run Java SE support on JDK 8.
LBL_Ergonomics_Extra_Recommended=Additional modules are recommended to run Java SE support.
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java
index 6e95a6400a..06270ec772 100644
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java
@@ -70,7 +70,7 @@
public ConfigurationPanel(String displayName, final Callable<JComponent> callable, FeatureInfo info) {
this(callable);
- setInfo(info, displayName, Collections.<UpdateElement>emptyList(), Collections.<String>emptyList());
+ setInfo(info, displayName, Collections.<UpdateElement>emptyList(), Collections.emptyList());
}
public ConfigurationPanel(final Callable<JComponent> callable) {
@@ -83,7 +83,7 @@ public ConfigurationPanel(final Callable<JComponent> callable) {
}
public void setInfo(FeatureInfo info, String displayName, Collection<UpdateElement> toInstall,
- Collection<String> missingModules) {
+ Collection<FeatureInfo.ExtraModuleInfo> missingModules) {
this.featureInfo = info;
this.featureInstall = toInstall;
boolean activateNow = toInstall.isEmpty() && missingModules.isEmpty();
@@ -101,12 +101,13 @@ public void setInfo(FeatureInfo info, String displayName, Collection<UpdateEleme
downloadButton.setVisible(true);
SpecificationVersion jdk = new SpecificationVersion(System.getProperty("java.specification.version"));
String lblDownloadMsg;
-
+
boolean required = false;
-
- if (info.getExtraModulesRecommendedMinJDK() != null &&
- jdk.compareTo(new SpecificationVersion(info.getExtraModulesRecommendedMinJDK())) < 0) {
- required = true;
+
+ for (FeatureInfo.ExtraModuleInfo mi : info.getExtraModules()) {
+ if (mi.recMinJDK != null && jdk.compareTo(mi.recMinJDK) < 0) {
+ required = true;
+ }
}
if (info.getExtraModulesRequiredText() != null && info.getExtraModulesRecommendedText() == null) {
required = true;
@@ -122,7 +123,7 @@ public void setInfo(FeatureInfo info, String displayName, Collection<UpdateEleme
String list = "";
if (!missingModules.isEmpty()) {
StringBuilder sb = new StringBuilder();
- for (String s : missingModules) {
+ for (FeatureInfo.ExtraModuleInfo s : missingModules) {
if (sb.length() > 0) {
sb.append(", "); // NOI18N
}
@@ -139,7 +140,7 @@ public void setInfo(FeatureInfo info, String displayName, Collection<UpdateEleme
} else {
downloadButton.setEnabled(true);
}
-
+
String lblActivateMsg = NbBundle.getMessage(ConfigurationPanel.class, "LBL_EnableInfo", displayName);
String btnActivateMsg = NbBundle.getMessage(ConfigurationPanel.class, "LBL_Enable");
String btnDownloadMsg = NbBundle.getMessage(ConfigurationPanel.class, "LBL_Download");
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfo.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfo.java
index c2f1c179c2..1c8e7f1dcf 100755
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfo.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfo.java
@@ -26,17 +26,20 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
+import java.util.regex.Pattern;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathExpression;
import org.w3c.dom.Document;
import org.openide.modules.ModuleInfo;
+import org.openide.modules.SpecificationVersion;
import org.openide.util.Lookup;
/** Description of <em>Feature On Demand</em> capabilities and a
@@ -213,17 +216,37 @@ int isProject(FeatureProjectFactory.Data data) {
return Collections.unmodifiableSet(cnbs);
}
- public final Set<String> getExtraModules() {
- String cnbs = properties.getProperty("extra.modules"); // NOI18N
- TreeSet<String> s = new TreeSet<String>();
- if (cnbs != null) {
- s.addAll(Arrays.asList(cnbs.split(",")));
+ public final Set<ExtraModuleInfo> getExtraModules() {
+ Set<ExtraModuleInfo> s = new LinkedHashSet<>();
+ for (int i = 0; ; i++) {
+ String propName = i == 0 ? "extra.modules" : "extra.modules." + i; // NOI18N
+ String cnbPattern = properties.getProperty(propName);
+ if (cnbPattern == null) {
+ break;
+ }
+ String rec = properties.getProperty(propName + ".recommended.min.jdk"); // NOI18N
+ s.add(new ExtraModuleInfo(cnbPattern, rec));
}
return s;
}
- public final String getExtraModulesRecommendedMinJDK() {
- return properties.getProperty("extra.modules.recommended.min.jdk"); // NOI18N
+ static final class ExtraModuleInfo {
+ private final Pattern cnb;
+ final SpecificationVersion recMinJDK;
+
+ ExtraModuleInfo(String cnbPattern, String recommended) {
+ this.cnb = Pattern.compile(cnbPattern);
+ this.recMinJDK = recommended != null ? new SpecificationVersion(recommended) : null;
+ }
+
+ boolean matches(String cnb) {
+ return this.cnb.matcher(cnb).matches();
+ }
+
+ @Override
+ public String toString() {
+ return "ExtraModuleInfo{" + "cnb=" + cnb + ", recommended=" + recMinJDK + '}';
+ }
}
public final String getExtraModulesRequiredText() {
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java
index eea30cd302..a4aeb55eea 100644
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java
@@ -65,7 +65,7 @@
/**
* Features, whose 'extra' modules were not found.
*/
- private Map<FeatureInfo, List<String>> incompleteFeatures = new HashMap<>();
+ private Map<FeatureInfo, List<FeatureInfo.ExtraModuleInfo>> incompleteFeatures = new HashMap<>();
/**
* Errors encountered during updating component descriptions
@@ -103,13 +103,13 @@ public FindComponentModules(FeatureInfo info, FeatureInfo... additional) {
return incompleteFeatures.keySet();
}
- void markIncompleteFeature(FeatureInfo fi, String cnb) {
+ void markIncompleteFeature(FeatureInfo fi, FeatureInfo.ExtraModuleInfo moduleInfo) {
incompleteFeatures.computeIfAbsent(fi, (f) -> new ArrayList<>())
- .add(cnb);
+ .add(moduleInfo);
}
- public Collection<String> getMissingModules(FeatureInfo info) {
- return incompleteFeatures.getOrDefault(info, Collections.<String>emptyList());
+ public Collection<FeatureInfo.ExtraModuleInfo> getMissingModules(FeatureInfo info) {
+ return incompleteFeatures.getOrDefault(info, Collections.emptyList());
}
public Collection<IOException> getUpdateErrors() {
@@ -247,18 +247,22 @@ private void findComponentModules () {
}
boolean decr = true;
for (FeatureInfo fi : this.infos) {
- Set<String> extraModules = fi.getExtraModules();
- FOUND: for (String cnb : extraModules) {
+ Set<FeatureInfo.ExtraModuleInfo> extraModules = fi.getExtraModules();
+ FOUND: for (FeatureInfo.ExtraModuleInfo moduleInfo : extraModules) {
+ boolean found = false;
for (UpdateUnit unit : allUnits) {
- if (cnb.equals(unit.getCodeName())) {
+ if (moduleInfo.matches(unit.getCodeName())) {
if (unit.getInstalled() != null) {
continue FOUND;
} else {
res.add(unit.getAvailableUpdates().get(0));
- continue FOUND;
+ found = true;
}
}
}
+ if (found) {
+ continue FOUND;
+ }
// not found
if (decr) {
@@ -270,7 +274,7 @@ private void findComponentModules () {
decr = false;
}
// extra module(s) for the feature weren't found
- markIncompleteFeature(fi, cnb);
+ markIncompleteFeature(fi, moduleInfo);
}
}
refresh[0] = 0;
diff --git a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CachingPreventsLoadingOfModuleManifestsTest.java b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CachingPreventsLoadingOfModuleManifestsTest.java
index aaccb464cc..a3661c1ad0 100644
--- a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CachingPreventsLoadingOfModuleManifestsTest.java
+++ b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CachingPreventsLoadingOfModuleManifestsTest.java
@@ -64,7 +64,7 @@ public static Test suite() throws IOException {
).
gui(false).
clusters("ergonomics.*").
- clusters(".*").
+ clusters("(?!extra).*").
enableModules("ide[0-9]*", ".*").
enableClasspathModules(false).
honorAutoloadEager(true);
diff --git a/extra/libs.javafx.linux/build.xml b/extra/libs.javafx.linux/build.xml
new file mode 100644
index 0000000000..9469085669
--- /dev/null
+++ b/extra/libs.javafx.linux/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="extra/libs.javafx.linux">
+ <description>Builds, tests, and runs the project org.netbeans.libs.javafx.linux</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/extra/libs.javafx.linux/external/binaries-list b/extra/libs.javafx.linux/external/binaries-list
new file mode 100644
index 0000000000..4931c8ba31
--- /dev/null
+++ b/extra/libs.javafx.linux/external/binaries-list
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+F8D1CED6047B010F1E3BB92DC060862179CE5897 org.openjfx:javafx-base:11:linux
+794488E3B1F4635D9A1B842BDC872A5EB8FD54CA org.openjfx:javafx-controls:11:linux
+4AB9EDD8D481A420044C473FDB5718CCDD35C836 org.openjfx:javafx-graphics:11:linux
+F65E90798210A9FF1CAD3E7686AF8C1DB138477F org.openjfx:javafx-media:11:linux
+5F50385BC156B2E3BD478F9FDED919F9D8AE8801 org.openjfx:javafx-web:11:linux
+86E2C4FEB81F5147BBB5E662B0892A61535A7472 org.openjfx:javafx-swing:11:linux
+
+
diff --git a/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external
new file mode 100644
index 0000000000..09566c0290
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-base-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1981012727
+URL: m2:/org.openjfx:javafx-base:11:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external
new file mode 100644
index 0000000000..a1aed93610
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-controls-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1480075818
+URL: m2:/org.openjfx:javafx-controls:11:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external
new file mode 100644
index 0000000000..aae93c7cf7
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-graphics-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1795026346
+URL: m2:/org.openjfx:javafx-graphics:11:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-linux-11-license.txt b/extra/libs.javafx.linux/external/javafx-linux-11-license.txt
new file mode 100644
index 0000000000..a059d6ba6d
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-linux-11-license.txt
@@ -0,0 +1,435 @@
+Name: JavaFX
+Description: JavaFX API and Implementation
+Version: 11
+License: GPL-2-CP
+Origin: https://github.com/javafxports/openjdk-jfx/
+Source: https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
+Files: javafx-base-11-linux.jar, javafx-controls-11-linux.jar, javafx-graphics-11-linux.jar, javafx-media-11-linux.jar, javafx-swing-11-linux.jar, javafx-web-11-linux.jar
+Type: compile-time,optional
+Comment: Used at compile. Possibly downloaded later.
+
+The GNU General Public License (GPL)
+Version 2, June 1991
+
+ Copyright 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim
+ copies of this license document, but changing it is not
+ allowed.
+
+ Preamble
+
+The licenses for most software are designed to take away
+your freedom to share and change it. By contrast, the GNU
+General Public License is intended to guarantee your freedom
+to share and change free software--to make sure the software
+is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software
+and to any other program whose authors commit to using it.
+(Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can
+apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom,
+not price. Our General Public Licenses are designed to make
+sure that you have the freedom to distribute copies of free
+software (and charge for this service if you wish), that you
+receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that
+forbid anyone to deny you these rights or to ask you to
+surrender the rights. These restrictions translate to
+certain responsibilities for you if you distribute copies of
+the software, or if you modify it.
+
+For example, if you distribute copies of such a program,
+whether gratis or for a fee, you must give the recipients
+all the rights that you have. You must make sure that they,
+too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the
+software, and (2) offer you this license which gives you
+legal permission to copy, distribute and/or modify the
+software.
+
+Also, for each author's protection and ours, we want to make
+certain that everyone understands that there is no warranty
+for this free software. If the software is modified by
+someone else and passed on, we want its recipients to know
+that what they have is not the original, so that any
+problems introduced by others will not reflect on the
+original authors' reputations.
+
+Finally, any free program is threatened constantly by
+software patents. We wish to avoid the danger that
+redistributors of a free program will individually obtain
+patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution
+and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+MODIFICATION
+
+0. This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it
+may be distributed under the terms of this General Public
+License. The "Program", below, refers to any such program or
+work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into
+another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each
+licensee is addressed as "you".
+
+Activities other than copying, distribution and modification
+are not covered by this License; they are outside its scope.
+The act of running the Program is not restricted, and the
+output from the Program is covered only if its contents
+constitute a work based on the Program (independent of
+having been made by running the Program). Whether that is
+true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the
+Program's source code as you receive it, in any medium,
+provided that you conspicuously and appropriately publish on
+each copy an appropriate copyright notice and disclaimer of
+warranty; keep intact all the notices that refer to this
+License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this License along
+with the Program.
+
+You may charge a fee for the physical act of transferring a
+copy, and you may at your option offer warranty protection
+in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any
+portion of it, thus forming a work based on the Program, and
+copy and distribute such modifications or work under the
+terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+ a) You must cause the modified files to carry prominent
+ notices stating that you changed the files and the date
+ of any change.
+
+ b) You must cause any work that you distribute or
+ publish, that in whole or in part contains or is derived
+ from the Program or any part thereof, to be licensed as
+ a whole at no charge to all third parties under the
+ terms of this License.
+
+ c) If the modified program normally reads commands
+ interactively when run, you must cause it, when started
+ running for such interactive use in the most ordinary
+ way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is
+ no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program
+ under these conditions, and telling the user how to view
+ a copy of this License. (Exception: if the Program
+ itself is interactive but does not normally print such
+ an announcement, your work based on the Program is not
+ required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the
+Program, and can be reasonably considered independent and
+separate works in themselves, then this License, and its
+terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same
+sections as part of a whole which is a work based on the
+Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees
+extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights
+or contest your rights to work written entirely by you;
+rather, the intent is to exercise the right to control the
+distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on
+the Program with the Program (or with a work based on the
+Program) on a volume of a storage or distribution medium
+does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based
+on it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you
+also do one of the following:
+
+ a) Accompany it with the complete corresponding
+ machine-readable source code, which must be distributed
+ under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least
+ three years, to give any third party, for a charge no
+ more than your cost of physically performing source
+ distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the
+ terms of Sections 1 and 2 above on a medium customarily
+ used for software interchange; or,
+
+ c) Accompany it with the information you received as to
+ the offer to distribute corresponding source code. (This
+ alternative is allowed only for noncommercial
+ distribution and only if you received the program in
+ object code or executable form with such an offer, in
+ accord with Subsection b above.)
+
+The source code for a work means the preferred form of the
+work for making modifications to it. For an executable work,
+complete source code means all the source code for all
+modules it contains, plus any associated interface
+definition files, plus the scripts used to control
+compilation and installation of the executable. However, as
+a special exception, the source code distributed need not
+include anything that is normally distributed (in either
+source or binary form) with the major components (compiler,
+kernel, and so on) of the operating system on which the
+executable runs, unless that component itself accompanies
+the executable.
+
+If distribution of executable or object code is made by
+offering access to copy from a designated place, then
+offering equivalent access to copy the source code from the
+same place counts as distribution of the source code, even
+though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the
+Program except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense or distribute
+the Program is void, and will automatically terminate your
+rights under this License. However, parties who have
+received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties
+remain in full compliance.
+
+5. You are not required to accept this License, since you
+have not signed it. However, nothing else grants you
+permission to modify or distribute the Program or its
+derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or
+distributing the Program (or any work based on the Program),
+you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or
+modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based
+on the Program), the recipient automatically receives a
+license from the original licensor to copy, distribute or
+modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein. You are
+not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to
+patent issues), conditions are imposed on you (whether by
+court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as
+to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a
+consequence you may not distribute the Program at all. For
+example, if a patent license would not permit royalty-free
+redistribution of the Program by all those who receive
+copies directly or indirectly through you, then the only way
+you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or
+unenforceable under any particular circumstance, the balance
+of the section is intended to apply and the section as a
+whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to
+infringe any patents or other property right claims or to
+contest validity of any such claims; this section has the
+sole purpose of protecting the integrity of the free
+software distribution system, which is implemented by public
+license practices. Many people have made generous
+contributions to the wide range of software distributed
+through that system in reliance on consistent application of
+that system; it is up to the author/donor to decide if he or
+she is willing to distribute software through any other
+system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is
+believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is
+restricted in certain countries either by patents or by
+copyrighted interfaces, the original copyright holder who
+places the Program under this License may add an explicit
+geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or
+among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the
+body of this License.
+
+9. The Free Software Foundation may publish revised and/or
+new versions of the General Public License from time to
+time. Such new versions will be similar in spirit to the
+present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If
+the Program specifies a version number of this License which
+applies to it and "any later version", you have the option
+of following the terms and conditions either of that version
+or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number
+of this License, you may choose any version ever published
+by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into
+other free programs whose distribution conditions are
+different, write to the author to ask for permission. For
+software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be
+guided by the two goals of preserving the free status of all
+derivatives of our free software and of promoting the
+sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
+TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
+WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED
+ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
+LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the
+greatest possible use to the public, the best way to achieve
+this is to make it free software which everyone can
+redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is
+safest to attach them to the start of each source file to
+most effectively convey the exclusion of warranty; and each
+file should have at least the "copyright" line and a pointer
+to where the full notice is found.
+
+ One line to give the program's name and a brief idea of
+ what it does. Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General
+ Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General
+ Public License along with this program; if not, write to
+ the Free Software Foundation, Inc., 59 Temple Place,
+ Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and
+paper mail.
+
+If the program is interactive, make it output a short notice
+like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of
+ author Gnomovision comes with ABSOLUTELY NO WARRANTY;
+ for details type `show w'. This is free software, and
+ you are welcome to redistribute it under certain
+ conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show
+the appropriate parts of the General Public License. Of
+course, the commands you use may be called something other
+than `show w' and `show c'; they could even be mouse-clicks
+or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a
+programmer) or your school, if any, to sign a "copyright
+disclaimer" for the program, if necessary. Here is a sample;
+alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in
+ the program `Gnomovision' (which makes passes at
+ compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating
+your program into proprietary programs. If your program is a
+subroutine library, you may consider it more useful to
+permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+
+Certain source files distributed by Sun Microsystems, Inc.
+are subject to the following clarification and special
+exception to the GPL, but only where Sun has expressly
+included in the particular source file's header the words
+"Sun designates this particular file as subject to the
+"Classpath" exception as provided by Sun in the LICENSE file
+that accompanied this code."
+
+Linking this library statically or dynamically with other
+modules is making a combined work based on this library.
+Thus, the terms and conditions of the GNU General Public
+License cover the whole combination.
+
+As a special exception, the copyright holders of this
+library give you permission to link this library with
+independent modules to produce an executable, regardless of
+the license terms of these independent modules, and to copy
+and distribute the resulting executable under terms of your
+choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license
+of that module. An independent module is a module which is
+not derived from or based on this library. If you modify
+this library, you may extend this exception to your version
+of the library, but you are not obligated to do so. If you
+do not wish to do so, delete this exception statement from
+your version.
diff --git a/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external
new file mode 100644
index 0000000000..bc3ef403af
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-media-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 4234379255
+URL: m2:/org.openjfx:javafx-media:11:jar:linux
\ No newline at end of file
diff --git a/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external
new file mode 100644
index 0000000000..7f328e3626
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-swing-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 1450029661
+URL: m2:/org.openjfx:javafx-swing:11:jar:linux
diff --git a/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external b/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external
new file mode 100644
index 0000000000..4c8cc82f13
--- /dev/null
+++ b/extra/libs.javafx.linux/external/javafx-web-11-linux.jar.external
@@ -0,0 +1,2 @@
+CRC: 227437070
+URL: m2:/org.openjfx:javafx-web:11:jar:linux
\ No newline at end of file
diff --git a/extra/libs.javafx.linux/manifest.mf b/extra/libs.javafx.linux/manifest.mf
new file mode 100644
index 0000000000..0f94fb7889
--- /dev/null
+++ b/extra/libs.javafx.linux/manifest.mf
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.libs.javafx.linux
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/linux/Bundle.properties
+OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
+OpenIDE-Module-Specification-Version: 11.0
+OpenIDE-Module-Java-Dependencies: Java > 11
+OpenIDE-Module-Needs: org.openide.modules.os.Linux
+OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.linux/nbproject/project.properties b/extra/libs.javafx.linux/nbproject/project.properties
new file mode 100644
index 0000000000..2e207a1b18
--- /dev/null
+++ b/extra/libs.javafx.linux/nbproject/project.properties
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+javac.source=1.7
+javac.target=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+is.autoload=true
+
+release.external/javafx-base-11-linux.jar=modules/ext/javafx-base-11-linux.jar
+release.external/javafx-base-11-linux.jar.external=modules/ext/javafx-base-11-linux.jar.external
+release.external/javafx-controls-11-linux.jar=modules/ext/javafx-controls-11-linux.jar
+release.external/javafx-controls-11-linux.jar.external=modules/ext/javafx-controls-11-linux.jar.external
+release.external/javafx-graphics-11-linux.jar=modules/ext/javafx-graphics-11-linux.jar
+release.external/javafx-graphics-11-linux.jar.external=modules/ext/javafx-graphics-11-linux.jar.external
+release.external/javafx-media-11-linux.jar=modules/ext/javafx-media-11-linux.jar
+release.external/javafx-media-11-linux.jar.external=modules/ext/javafx-media-11-linux.jar.external
+release.external/javafx-swing-11-linux.jar=modules/ext/javafx-swing-11-linux.jar
+release.external/javafx-swing-11-linux.jar.external=modules/ext/javafx-swing-11-linux.jar.external
+release.external/javafx-web-11-linux.jar=modules/ext/javafx-web-11-linux.jar
+release.external/javafx-web-11-linux.jar.external=modules/ext/javafx-web-11-linux.jar.external
+
+license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.linux/nbproject/project.xml b/extra/libs.javafx.linux/nbproject/project.xml
new file mode 100644
index 0000000000..47ae566bec
--- /dev/null
+++ b/extra/libs.javafx.linux/nbproject/project.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<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.libs.javafx.linux</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.openide.modules</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>7.40</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.libs.javafx</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>2.10</specification-version>
+ </run-dependency>
+ </dependency>
+ </module-dependencies>
+ <public-packages/>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-base-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-base-11-linux.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-controls-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-controls-11-linux.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-graphics-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-graphics-11-linux.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-media-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-media-11-linux.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-swing-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-swing-11-linux.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-web-11-linux.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-11-linux.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
diff --git a/extra/libs.javafx.linux/src/org/netbeans/libs/javafx/linux/Bundle.properties b/extra/libs.javafx.linux/src/org/netbeans/libs/javafx/linux/Bundle.properties
new file mode 100644
index 0000000000..aaf3b5d720
--- /dev/null
+++ b/extra/libs.javafx.linux/src/org/netbeans/libs/javafx/linux/Bundle.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+OpenIDE-Module-Name=JavaFX Implementation for Linux
diff --git a/extra/libs.javafx.macosx/build.xml b/extra/libs.javafx.macosx/build.xml
new file mode 100644
index 0000000000..daee6cd6b7
--- /dev/null
+++ b/extra/libs.javafx.macosx/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="extra/libs.javafx.macosx">
+ <description>Builds, tests, and runs the project org.netbeans.libs.javafx.macosx</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/extra/libs.javafx.macosx/external/binaries-list b/extra/libs.javafx.macosx/external/binaries-list
new file mode 100644
index 0000000000..cbf9aaeee6
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/binaries-list
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+4B060DAD0AFFD866DF9D959E064FAA8A1A2F4AF0 org.openjfx:javafx-base:11:mac
+E3A24A14E8732ABC6DC173F15872DC63E2A32E16 org.openjfx:javafx-controls:11:mac
+0AF47A6D3668D3CE1C61E1FE13C44471B6F8D469 org.openjfx:javafx-graphics:11:mac
+96340B87188E18FAD90BA9673C45FBB942E8A11A org.openjfx:javafx-media:11:mac
+85122D46916C3ECBCB1202C7509C4AEC972EA10B org.openjfx:javafx-web:11:mac
+6FD6F4E3C5F59FA30CA61204877101ED978005AA org.openjfx:javafx-swing:11:mac
+
+
diff --git a/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external
new file mode 100644
index 0000000000..8bdd7a96b1
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-base-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1709767977
+URL: m2:/org.openjfx:javafx-base:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external
new file mode 100644
index 0000000000..f6a363dcaf
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-controls-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 2491711113
+URL: m2:/org.openjfx:javafx-controls:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external
new file mode 100644
index 0000000000..c40cdce249
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-graphics-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 3503809833
+URL: m2:/org.openjfx:javafx-graphics:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-mac-11-license.txt b/extra/libs.javafx.macosx/external/javafx-mac-11-license.txt
new file mode 100644
index 0000000000..158fa3e3c6
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-mac-11-license.txt
@@ -0,0 +1,435 @@
+Name: JavaFX
+Description: JavaFX API and Implementation
+Version: 11
+License: GPL-2-CP
+Origin: https://github.com/javafxports/openjdk-jfx/
+Source: https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
+Files: javafx-base-11-mac.jar, javafx-controls-11-mac.jar, javafx-graphics-11-mac.jar, javafx-media-11-mac.jar, javafx-swing-11-mac.jar, javafx-web-11-mac.jar
+Type: compile-time,optional
+Comment: Used at compile. Possibly downloaded later.
+
+The GNU General Public License (GPL)
+Version 2, June 1991
+
+ Copyright 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim
+ copies of this license document, but changing it is not
+ allowed.
+
+ Preamble
+
+The licenses for most software are designed to take away
+your freedom to share and change it. By contrast, the GNU
+General Public License is intended to guarantee your freedom
+to share and change free software--to make sure the software
+is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software
+and to any other program whose authors commit to using it.
+(Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can
+apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom,
+not price. Our General Public Licenses are designed to make
+sure that you have the freedom to distribute copies of free
+software (and charge for this service if you wish), that you
+receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that
+forbid anyone to deny you these rights or to ask you to
+surrender the rights. These restrictions translate to
+certain responsibilities for you if you distribute copies of
+the software, or if you modify it.
+
+For example, if you distribute copies of such a program,
+whether gratis or for a fee, you must give the recipients
+all the rights that you have. You must make sure that they,
+too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the
+software, and (2) offer you this license which gives you
+legal permission to copy, distribute and/or modify the
+software.
+
+Also, for each author's protection and ours, we want to make
+certain that everyone understands that there is no warranty
+for this free software. If the software is modified by
+someone else and passed on, we want its recipients to know
+that what they have is not the original, so that any
+problems introduced by others will not reflect on the
+original authors' reputations.
+
+Finally, any free program is threatened constantly by
+software patents. We wish to avoid the danger that
+redistributors of a free program will individually obtain
+patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution
+and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+MODIFICATION
+
+0. This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it
+may be distributed under the terms of this General Public
+License. The "Program", below, refers to any such program or
+work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into
+another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each
+licensee is addressed as "you".
+
+Activities other than copying, distribution and modification
+are not covered by this License; they are outside its scope.
+The act of running the Program is not restricted, and the
+output from the Program is covered only if its contents
+constitute a work based on the Program (independent of
+having been made by running the Program). Whether that is
+true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the
+Program's source code as you receive it, in any medium,
+provided that you conspicuously and appropriately publish on
+each copy an appropriate copyright notice and disclaimer of
+warranty; keep intact all the notices that refer to this
+License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this License along
+with the Program.
+
+You may charge a fee for the physical act of transferring a
+copy, and you may at your option offer warranty protection
+in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any
+portion of it, thus forming a work based on the Program, and
+copy and distribute such modifications or work under the
+terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+ a) You must cause the modified files to carry prominent
+ notices stating that you changed the files and the date
+ of any change.
+
+ b) You must cause any work that you distribute or
+ publish, that in whole or in part contains or is derived
+ from the Program or any part thereof, to be licensed as
+ a whole at no charge to all third parties under the
+ terms of this License.
+
+ c) If the modified program normally reads commands
+ interactively when run, you must cause it, when started
+ running for such interactive use in the most ordinary
+ way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is
+ no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program
+ under these conditions, and telling the user how to view
+ a copy of this License. (Exception: if the Program
+ itself is interactive but does not normally print such
+ an announcement, your work based on the Program is not
+ required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the
+Program, and can be reasonably considered independent and
+separate works in themselves, then this License, and its
+terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same
+sections as part of a whole which is a work based on the
+Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees
+extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights
+or contest your rights to work written entirely by you;
+rather, the intent is to exercise the right to control the
+distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on
+the Program with the Program (or with a work based on the
+Program) on a volume of a storage or distribution medium
+does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based
+on it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you
+also do one of the following:
+
+ a) Accompany it with the complete corresponding
+ machine-readable source code, which must be distributed
+ under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least
+ three years, to give any third party, for a charge no
+ more than your cost of physically performing source
+ distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the
+ terms of Sections 1 and 2 above on a medium customarily
+ used for software interchange; or,
+
+ c) Accompany it with the information you received as to
+ the offer to distribute corresponding source code. (This
+ alternative is allowed only for noncommercial
+ distribution and only if you received the program in
+ object code or executable form with such an offer, in
+ accord with Subsection b above.)
+
+The source code for a work means the preferred form of the
+work for making modifications to it. For an executable work,
+complete source code means all the source code for all
+modules it contains, plus any associated interface
+definition files, plus the scripts used to control
+compilation and installation of the executable. However, as
+a special exception, the source code distributed need not
+include anything that is normally distributed (in either
+source or binary form) with the major components (compiler,
+kernel, and so on) of the operating system on which the
+executable runs, unless that component itself accompanies
+the executable.
+
+If distribution of executable or object code is made by
+offering access to copy from a designated place, then
+offering equivalent access to copy the source code from the
+same place counts as distribution of the source code, even
+though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the
+Program except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense or distribute
+the Program is void, and will automatically terminate your
+rights under this License. However, parties who have
+received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties
+remain in full compliance.
+
+5. You are not required to accept this License, since you
+have not signed it. However, nothing else grants you
+permission to modify or distribute the Program or its
+derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or
+distributing the Program (or any work based on the Program),
+you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or
+modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based
+on the Program), the recipient automatically receives a
+license from the original licensor to copy, distribute or
+modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein. You are
+not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to
+patent issues), conditions are imposed on you (whether by
+court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as
+to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a
+consequence you may not distribute the Program at all. For
+example, if a patent license would not permit royalty-free
+redistribution of the Program by all those who receive
+copies directly or indirectly through you, then the only way
+you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or
+unenforceable under any particular circumstance, the balance
+of the section is intended to apply and the section as a
+whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to
+infringe any patents or other property right claims or to
+contest validity of any such claims; this section has the
+sole purpose of protecting the integrity of the free
+software distribution system, which is implemented by public
+license practices. Many people have made generous
+contributions to the wide range of software distributed
+through that system in reliance on consistent application of
+that system; it is up to the author/donor to decide if he or
+she is willing to distribute software through any other
+system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is
+believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is
+restricted in certain countries either by patents or by
+copyrighted interfaces, the original copyright holder who
+places the Program under this License may add an explicit
+geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or
+among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the
+body of this License.
+
+9. The Free Software Foundation may publish revised and/or
+new versions of the General Public License from time to
+time. Such new versions will be similar in spirit to the
+present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If
+the Program specifies a version number of this License which
+applies to it and "any later version", you have the option
+of following the terms and conditions either of that version
+or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number
+of this License, you may choose any version ever published
+by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into
+other free programs whose distribution conditions are
+different, write to the author to ask for permission. For
+software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be
+guided by the two goals of preserving the free status of all
+derivatives of our free software and of promoting the
+sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
+TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
+WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED
+ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
+LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the
+greatest possible use to the public, the best way to achieve
+this is to make it free software which everyone can
+redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is
+safest to attach them to the start of each source file to
+most effectively convey the exclusion of warranty; and each
+file should have at least the "copyright" line and a pointer
+to where the full notice is found.
+
+ One line to give the program's name and a brief idea of
+ what it does. Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General
+ Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General
+ Public License along with this program; if not, write to
+ the Free Software Foundation, Inc., 59 Temple Place,
+ Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and
+paper mail.
+
+If the program is interactive, make it output a short notice
+like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of
+ author Gnomovision comes with ABSOLUTELY NO WARRANTY;
+ for details type `show w'. This is free software, and
+ you are welcome to redistribute it under certain
+ conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show
+the appropriate parts of the General Public License. Of
+course, the commands you use may be called something other
+than `show w' and `show c'; they could even be mouse-clicks
+or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a
+programmer) or your school, if any, to sign a "copyright
+disclaimer" for the program, if necessary. Here is a sample;
+alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in
+ the program `Gnomovision' (which makes passes at
+ compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating
+your program into proprietary programs. If your program is a
+subroutine library, you may consider it more useful to
+permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+
+Certain source files distributed by Sun Microsystems, Inc.
+are subject to the following clarification and special
+exception to the GPL, but only where Sun has expressly
+included in the particular source file's header the words
+"Sun designates this particular file as subject to the
+"Classpath" exception as provided by Sun in the LICENSE file
+that accompanied this code."
+
+Linking this library statically or dynamically with other
+modules is making a combined work based on this library.
+Thus, the terms and conditions of the GNU General Public
+License cover the whole combination.
+
+As a special exception, the copyright holders of this
+library give you permission to link this library with
+independent modules to produce an executable, regardless of
+the license terms of these independent modules, and to copy
+and distribute the resulting executable under terms of your
+choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license
+of that module. An independent module is a module which is
+not derived from or based on this library. If you modify
+this library, you may extend this exception to your version
+of the library, but you are not obligated to do so. If you
+do not wish to do so, delete this exception statement from
+your version.
diff --git a/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external
new file mode 100644
index 0000000000..3332207efd
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-media-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1205665924
+URL: m2:/org.openjfx:javafx-media:11:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external
new file mode 100644
index 0000000000..09f4842809
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-swing-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 712623308
+URL: m2:/org.openjfx:javafx-swing:11:jar:mac
diff --git a/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external b/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external
new file mode 100644
index 0000000000..96182f5977
--- /dev/null
+++ b/extra/libs.javafx.macosx/external/javafx-web-11-mac.jar.external
@@ -0,0 +1,2 @@
+CRC: 1328872996
+URL: m2:/org.openjfx:javafx-web:11:jar:mac
\ No newline at end of file
diff --git a/extra/libs.javafx.macosx/manifest.mf b/extra/libs.javafx.macosx/manifest.mf
new file mode 100644
index 0000000000..3f2204797e
--- /dev/null
+++ b/extra/libs.javafx.macosx/manifest.mf
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.libs.javafx.macosx
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/macosx/Bundle.properties
+OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
+OpenIDE-Module-Specification-Version: 11.0
+OpenIDE-Module-Java-Dependencies: Java > 11
+OpenIDE-Module-Needs: org.openide.modules.os.MacOSX
+OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.macosx/nbproject/project.properties b/extra/libs.javafx.macosx/nbproject/project.properties
new file mode 100644
index 0000000000..b6cf0d2367
--- /dev/null
+++ b/extra/libs.javafx.macosx/nbproject/project.properties
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+javac.source=1.7
+javac.target=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+is.autoload=true
+
+release.external/javafx-base-11-mac.jar=modules/ext/javafx-base-11-mac.jar
+release.external/javafx-base-11-mac.jar.external=modules/ext/javafx-base-11-mac.jar.external
+release.external/javafx-controls-11-mac.jar=modules/ext/javafx-controls-11-mac.jar
+release.external/javafx-controls-11-mac.jar.external=modules/ext/javafx-controls-11-mac.jar.external
+release.external/javafx-graphics-11-mac.jar=modules/ext/javafx-graphics-11-mac.jar
+release.external/javafx-graphics-11-mac.jar.external=modules/ext/javafx-graphics-11-mac.jar.external
+release.external/javafx-media-11-mac.jar=modules/ext/javafx-media-11-mac.jar
+release.external/javafx-media-11-mac.jar.external=modules/ext/javafx-media-11-mac.jar.external
+release.external/javafx-swing-11-mac.jar=modules/ext/javafx-swing-11-mac.jar
+release.external/javafx-swing-11-mac.jar.external=modules/ext/javafx-swing-11-mac.jar.external
+release.external/javafx-web-11-mac.jar=modules/ext/javafx-web-11-mac.jar
+release.external/javafx-web-11-mac.jar.external=modules/ext/javafx-web-11-mac.jar.external
+
+license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.macosx/nbproject/project.xml b/extra/libs.javafx.macosx/nbproject/project.xml
new file mode 100644
index 0000000000..a2f7b9087c
--- /dev/null
+++ b/extra/libs.javafx.macosx/nbproject/project.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<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.libs.javafx.macosx</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.openide.modules</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>7.40</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.libs.javafx</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>2.10</specification-version>
+ </run-dependency>
+ </dependency>
+ </module-dependencies>
+ <public-packages/>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-base-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-base-11-mac.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-controls-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-controls-11-mac.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-graphics-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-graphics-11-mac.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-media-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-media-11-mac.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-swing-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-swing-11-mac.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-web-11-mac.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-11-mac.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
diff --git a/extra/libs.javafx.macosx/src/org/netbeans/libs/javafx/macosx/Bundle.properties b/extra/libs.javafx.macosx/src/org/netbeans/libs/javafx/macosx/Bundle.properties
new file mode 100644
index 0000000000..24a6ca15bf
--- /dev/null
+++ b/extra/libs.javafx.macosx/src/org/netbeans/libs/javafx/macosx/Bundle.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+OpenIDE-Module-Name=JavaFX Implementation for Mac OS X
diff --git a/extra/libs.javafx.win/build.xml b/extra/libs.javafx.win/build.xml
new file mode 100644
index 0000000000..aca97081a9
--- /dev/null
+++ b/extra/libs.javafx.win/build.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="extra/libs.javafx.win">
+ <description>Builds, tests, and runs the project org.netbeans.libs.javafx.win</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/extra/libs.javafx.win/external/binaries-list b/extra/libs.javafx.win/external/binaries-list
new file mode 100644
index 0000000000..57f2cdada1
--- /dev/null
+++ b/extra/libs.javafx.win/external/binaries-list
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+AD3A4ACFAA28B484D30C40C1F009445CC3F6E68B org.openjfx:javafx-base:11:win
+AF8D24DE44E16A19AE959028EB23A48C145FB682 org.openjfx:javafx-controls:11:win
+9345C7EA43DBCC73A62ECA5332717B4CE617E6C6 org.openjfx:javafx-graphics:11:win
+B7A33F3FF0CAD17AF71E883C0921BC6819CAD9C8 org.openjfx:javafx-media:11:win
+5C8A3B6CACDE832437DFF8E21A82749B5F66C1CF org.openjfx:javafx-web:11:win
+6D34FC92FBEA9AB95966380C29B06672A94F4A3E org.openjfx:javafx-swing:11:win
+
+
diff --git a/extra/libs.javafx.win/external/javafx-base-11-win.jar.external b/extra/libs.javafx.win/external/javafx-base-11-win.jar.external
new file mode 100644
index 0000000000..b4ce50c213
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-base-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC:2160969281
+URL: m2:/org.openjfx:javafx-base:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external b/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external
new file mode 100644
index 0000000000..00bbc177a3
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-controls-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC:1720323982
+URL: m2:/org.openjfx:javafx-controls:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external b/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external
new file mode 100644
index 0000000000..ea575b89f6
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-graphics-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 2670942550
+URL: m2:/org.openjfx:javafx-graphics:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-media-11-win.jar.external b/extra/libs.javafx.win/external/javafx-media-11-win.jar.external
new file mode 100644
index 0000000000..f8e4abcc74
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-media-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 2529014611
+URL: m2:/org.openjfx:javafx-media:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external b/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external
new file mode 100644
index 0000000000..031e09ba8e
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-swing-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC:3324970534
+URL: m2:/org.openjfx:javafx-swing:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-web-11-win.jar.external b/extra/libs.javafx.win/external/javafx-web-11-win.jar.external
new file mode 100644
index 0000000000..9523f7795f
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-web-11-win.jar.external
@@ -0,0 +1,2 @@
+CRC: 2985225211
+URL: m2:/org.openjfx:javafx-web:11:jar:win
diff --git a/extra/libs.javafx.win/external/javafx-win-11-license.txt b/extra/libs.javafx.win/external/javafx-win-11-license.txt
new file mode 100644
index 0000000000..1864be88ed
--- /dev/null
+++ b/extra/libs.javafx.win/external/javafx-win-11-license.txt
@@ -0,0 +1,435 @@
+Name: JavaFX
+Description: JavaFX API and Implementation
+Version: 11
+License: GPL-2-CP
+Origin: https://github.com/javafxports/openjdk-jfx/
+Source: https://github.com/javafxports/openjdk-jfx/blob/2b92eb2cd7d5676411276c6734369cc19dff8c57/LICENSE
+Files: javafx-base-11-win.jar, javafx-controls-11-win.jar, javafx-graphics-11-win.jar, javafx-media-11-win.jar, javafx-swing-11-win.jar, javafx-web-11-win.jar
+Type: compile-time,optional
+Comment: Used at compile. Possibly downloaded later.
+
+The GNU General Public License (GPL)
+Version 2, June 1991
+
+ Copyright 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim
+ copies of this license document, but changing it is not
+ allowed.
+
+ Preamble
+
+The licenses for most software are designed to take away
+your freedom to share and change it. By contrast, the GNU
+General Public License is intended to guarantee your freedom
+to share and change free software--to make sure the software
+is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software
+and to any other program whose authors commit to using it.
+(Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can
+apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom,
+not price. Our General Public Licenses are designed to make
+sure that you have the freedom to distribute copies of free
+software (and charge for this service if you wish), that you
+receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that
+forbid anyone to deny you these rights or to ask you to
+surrender the rights. These restrictions translate to
+certain responsibilities for you if you distribute copies of
+the software, or if you modify it.
+
+For example, if you distribute copies of such a program,
+whether gratis or for a fee, you must give the recipients
+all the rights that you have. You must make sure that they,
+too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the
+software, and (2) offer you this license which gives you
+legal permission to copy, distribute and/or modify the
+software.
+
+Also, for each author's protection and ours, we want to make
+certain that everyone understands that there is no warranty
+for this free software. If the software is modified by
+someone else and passed on, we want its recipients to know
+that what they have is not the original, so that any
+problems introduced by others will not reflect on the
+original authors' reputations.
+
+Finally, any free program is threatened constantly by
+software patents. We wish to avoid the danger that
+redistributors of a free program will individually obtain
+patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution
+and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+MODIFICATION
+
+0. This License applies to any program or other work which
+contains a notice placed by the copyright holder saying it
+may be distributed under the terms of this General Public
+License. The "Program", below, refers to any such program or
+work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into
+another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each
+licensee is addressed as "you".
+
+Activities other than copying, distribution and modification
+are not covered by this License; they are outside its scope.
+The act of running the Program is not restricted, and the
+output from the Program is covered only if its contents
+constitute a work based on the Program (independent of
+having been made by running the Program). Whether that is
+true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the
+Program's source code as you receive it, in any medium,
+provided that you conspicuously and appropriately publish on
+each copy an appropriate copyright notice and disclaimer of
+warranty; keep intact all the notices that refer to this
+License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this License along
+with the Program.
+
+You may charge a fee for the physical act of transferring a
+copy, and you may at your option offer warranty protection
+in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any
+portion of it, thus forming a work based on the Program, and
+copy and distribute such modifications or work under the
+terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+ a) You must cause the modified files to carry prominent
+ notices stating that you changed the files and the date
+ of any change.
+
+ b) You must cause any work that you distribute or
+ publish, that in whole or in part contains or is derived
+ from the Program or any part thereof, to be licensed as
+ a whole at no charge to all third parties under the
+ terms of this License.
+
+ c) If the modified program normally reads commands
+ interactively when run, you must cause it, when started
+ running for such interactive use in the most ordinary
+ way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is
+ no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program
+ under these conditions, and telling the user how to view
+ a copy of this License. (Exception: if the Program
+ itself is interactive but does not normally print such
+ an announcement, your work based on the Program is not
+ required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the
+Program, and can be reasonably considered independent and
+separate works in themselves, then this License, and its
+terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same
+sections as part of a whole which is a work based on the
+Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees
+extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights
+or contest your rights to work written entirely by you;
+rather, the intent is to exercise the right to control the
+distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on
+the Program with the Program (or with a work based on the
+Program) on a volume of a storage or distribution medium
+does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based
+on it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you
+also do one of the following:
+
+ a) Accompany it with the complete corresponding
+ machine-readable source code, which must be distributed
+ under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least
+ three years, to give any third party, for a charge no
+ more than your cost of physically performing source
+ distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the
+ terms of Sections 1 and 2 above on a medium customarily
+ used for software interchange; or,
+
+ c) Accompany it with the information you received as to
+ the offer to distribute corresponding source code. (This
+ alternative is allowed only for noncommercial
+ distribution and only if you received the program in
+ object code or executable form with such an offer, in
+ accord with Subsection b above.)
+
+The source code for a work means the preferred form of the
+work for making modifications to it. For an executable work,
+complete source code means all the source code for all
+modules it contains, plus any associated interface
+definition files, plus the scripts used to control
+compilation and installation of the executable. However, as
+a special exception, the source code distributed need not
+include anything that is normally distributed (in either
+source or binary form) with the major components (compiler,
+kernel, and so on) of the operating system on which the
+executable runs, unless that component itself accompanies
+the executable.
+
+If distribution of executable or object code is made by
+offering access to copy from a designated place, then
+offering equivalent access to copy the source code from the
+same place counts as distribution of the source code, even
+though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the
+Program except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense or distribute
+the Program is void, and will automatically terminate your
+rights under this License. However, parties who have
+received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties
+remain in full compliance.
+
+5. You are not required to accept this License, since you
+have not signed it. However, nothing else grants you
+permission to modify or distribute the Program or its
+derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or
+distributing the Program (or any work based on the Program),
+you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or
+modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based
+on the Program), the recipient automatically receives a
+license from the original licensor to copy, distribute or
+modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein. You are
+not responsible for enforcing compliance by third parties to
+this License.
+
+7. If, as a consequence of a court judgment or allegation of
+patent infringement or for any other reason (not limited to
+patent issues), conditions are imposed on you (whether by
+court order, agreement or otherwise) that contradict the
+conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as
+to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a
+consequence you may not distribute the Program at all. For
+example, if a patent license would not permit royalty-free
+redistribution of the Program by all those who receive
+copies directly or indirectly through you, then the only way
+you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or
+unenforceable under any particular circumstance, the balance
+of the section is intended to apply and the section as a
+whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to
+infringe any patents or other property right claims or to
+contest validity of any such claims; this section has the
+sole purpose of protecting the integrity of the free
+software distribution system, which is implemented by public
+license practices. Many people have made generous
+contributions to the wide range of software distributed
+through that system in reliance on consistent application of
+that system; it is up to the author/donor to decide if he or
+she is willing to distribute software through any other
+system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is
+believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is
+restricted in certain countries either by patents or by
+copyrighted interfaces, the original copyright holder who
+places the Program under this License may add an explicit
+geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or
+among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the
+body of this License.
+
+9. The Free Software Foundation may publish revised and/or
+new versions of the General Public License from time to
+time. Such new versions will be similar in spirit to the
+present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If
+the Program specifies a version number of this License which
+applies to it and "any later version", you have the option
+of following the terms and conditions either of that version
+or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number
+of this License, you may choose any version ever published
+by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into
+other free programs whose distribution conditions are
+different, write to the author to ask for permission. For
+software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be
+guided by the two goals of preserving the free status of all
+derivatives of our free software and of promoting the
+sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
+NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE
+OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
+TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
+WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED
+ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
+LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH
+HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the
+greatest possible use to the public, the best way to achieve
+this is to make it free software which everyone can
+redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is
+safest to attach them to the start of each source file to
+most effectively convey the exclusion of warranty; and each
+file should have at least the "copyright" line and a pointer
+to where the full notice is found.
+
+ One line to give the program's name and a brief idea of
+ what it does. Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General
+ Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General
+ Public License along with this program; if not, write to
+ the Free Software Foundation, Inc., 59 Temple Place,
+ Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and
+paper mail.
+
+If the program is interactive, make it output a short notice
+like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of
+ author Gnomovision comes with ABSOLUTELY NO WARRANTY;
+ for details type `show w'. This is free software, and
+ you are welcome to redistribute it under certain
+ conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show
+the appropriate parts of the General Public License. Of
+course, the commands you use may be called something other
+than `show w' and `show c'; they could even be mouse-clicks
+or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a
+programmer) or your school, if any, to sign a "copyright
+disclaimer" for the program, if necessary. Here is a sample;
+alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in
+ the program `Gnomovision' (which makes passes at
+ compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating
+your program into proprietary programs. If your program is a
+subroutine library, you may consider it more useful to
+permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+
+Certain source files distributed by Sun Microsystems, Inc.
+are subject to the following clarification and special
+exception to the GPL, but only where Sun has expressly
+included in the particular source file's header the words
+"Sun designates this particular file as subject to the
+"Classpath" exception as provided by Sun in the LICENSE file
+that accompanied this code."
+
+Linking this library statically or dynamically with other
+modules is making a combined work based on this library.
+Thus, the terms and conditions of the GNU General Public
+License cover the whole combination.
+
+As a special exception, the copyright holders of this
+library give you permission to link this library with
+independent modules to produce an executable, regardless of
+the license terms of these independent modules, and to copy
+and distribute the resulting executable under terms of your
+choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license
+of that module. An independent module is a module which is
+not derived from or based on this library. If you modify
+this library, you may extend this exception to your version
+of the library, but you are not obligated to do so. If you
+do not wish to do so, delete this exception statement from
+your version.
diff --git a/extra/libs.javafx.win/manifest.mf b/extra/libs.javafx.win/manifest.mf
new file mode 100644
index 0000000000..0696c478a1
--- /dev/null
+++ b/extra/libs.javafx.win/manifest.mf
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.libs.javafx.win
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/win/Bundle.properties
+OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
+OpenIDE-Module-Specification-Version: 11.0
+OpenIDE-Module-Java-Dependencies: Java > 11
+OpenIDE-Module-Needs: org.openide.modules.os.Windows
+OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.win/nbproject/project.properties b/extra/libs.javafx.win/nbproject/project.properties
new file mode 100644
index 0000000000..205dff8de6
--- /dev/null
+++ b/extra/libs.javafx.win/nbproject/project.properties
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+javac.source=1.7
+javac.target=1.7
+javac.compilerargs=-Xlint -Xlint:-serial
+is.autoload=true
+
+release.external/javafx-base-11-win.jar=modules/ext/javafx-base-11-win.jar
+release.external/javafx-base-11-win.jar.external=modules/ext/javafx-base-11-win.jar.external
+release.external/javafx-controls-11-win.jar=modules/ext/javafx-controls-11-win.jar
+release.external/javafx-controls-11-win.jar.external=modules/ext/javafx-controls-11-win.jar.external
+release.external/javafx-graphics-11-win.jar=modules/ext/javafx-graphics-11-win.jar
+release.external/javafx-graphics-11-win.jar.external=modules/ext/javafx-graphics-11-win.jar.external
+release.external/javafx-media-11-win.jar=modules/ext/javafx-media-11-win.jar
+release.external/javafx-media-11-win.jar.external=modules/ext/javafx-media-11-win.jar.external
+release.external/javafx-swing-11-win.jar=modules/ext/javafx-swing-11-win.jar
+release.external/javafx-swing-11-win.jar.external=modules/ext/javafx-swing-11-win.jar.external
+release.external/javafx-web-11-win.jar=modules/ext/javafx-web-11-win.jar
+release.external/javafx-web-11-win.jar.external=modules/ext/javafx-web-11-win.jar.external
+
+license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
diff --git a/extra/libs.javafx.win/nbproject/project.xml b/extra/libs.javafx.win/nbproject/project.xml
new file mode 100644
index 0000000000..62b8afb6c2
--- /dev/null
+++ b/extra/libs.javafx.win/nbproject/project.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<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.libs.javafx.win</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.openide.modules</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>7.40</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.libs.javafx</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>2.10</specification-version>
+ </run-dependency>
+ </dependency>
+ </module-dependencies>
+ <public-packages/>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-base-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-base-11-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-controls-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-controls-11-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-graphics-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-graphics-11-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-media-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-media-11-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-swing-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-swing-11-win.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/javafx-web-11-win.jar</runtime-relative-path>
+ <binary-origin>external/javafx-web-11-win.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
diff --git a/extra/libs.javafx.win/src/org/netbeans/libs/javafx/win/Bundle.properties b/extra/libs.javafx.win/src/org/netbeans/libs/javafx/win/Bundle.properties
new file mode 100644
index 0000000000..a0dcdeae45
--- /dev/null
+++ b/extra/libs.javafx.win/src/org/netbeans/libs/javafx/win/Bundle.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+OpenIDE-Module-Name=JavaFX Implementation for Windows
diff --git a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java
index 4a08319f3f..d03e1146a8 100644
--- a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java
+++ b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java
@@ -46,7 +46,7 @@
* Currently only resolves artifacts from Central.
* Could put repo ID in host field, but would require this to be moved to maven.indexer to use RepositoryPreferences.
*/
-@URLStreamHandlerRegistration(protocol="m2")
+@URLStreamHandlerRegistration(position = 99, protocol="m2")
public class MavenProtocolHandler extends URLStreamHandler {
protected @Override URLConnection openConnection(URL u) throws IOException {
diff --git a/nb/updatecenters/build.xml b/nb/updatecenters/build.xml
index 5e450a59f4..aa11744862 100644
--- a/nb/updatecenters/build.xml
+++ b/nb/updatecenters/build.xml
@@ -24,4 +24,27 @@
<import file="../../nbbuild/templates/projectized.xml"/>
+ <target name="compile" depends="projectized-common.compile,javafx-nbms"/>
+
+ <target name="javafx-nbms" description="Prepare NBMs for 3rd party libraries" depends="init">
+ <subant target="nbm" inheritall="false">
+ <property name="build.dir" location="build/3rdparty-nbms"/>
+ <fileset dir="${nb_all}/extra" includes="libs.javafx.*/build.xml"/>
+ </subant>
+ <taskdef name="makeupdatedesc" classname="org.netbeans.nbbuild.MakeUpdateDesc"
+ classpath="${nbantext.jar}"/>
+
+ <property name="3rdparty.dir" location="build/classes/org/netbeans/modules/updatecenters/resources"/>
+ <mkdir dir="${3rdparty.dir}"/>
+ <makeupdatedesc desc="${3rdparty.dir}/3rdparty-catalog.xml" distbase="." uselicenseurl="true">
+ <fileset dir="build/3rdparty-nbms">
+ <include name="*.nbm"/>
+ </fileset>
+ </makeupdatedesc>
+ <copy todir="${3rdparty.dir}">
+ <fileset dir="build/3rdparty-nbms">
+ <include name="*.nbm"/>
+ </fileset>
+ </copy>
+ </target>
</project>
diff --git a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
index 7393d1b0bd..8c5ec29ad0 100644
--- a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
+++ b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
@@ -35,3 +35,7 @@ URL_Default_N=http://updates.netbeans.org/netbeans/updates/dev/uc/final/main/cat
URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/10.0/catalog.xml.gz
#NOI18N
URL_82PluginPortal=http://updates.netbeans.org/netbeans/updates/8.2/uc/final/distribution/catalog.xml.gz
+
+3rdparty=3rd Party Libraries
+#NOI18N
+URL_3rdparty=nbresloc:/org/netbeans/modules/updatecenters/resources/3rdparty-catalog.xml
diff --git a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
index e5e09fdd80..268209e45d 100644
--- a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++ b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -65,6 +65,16 @@
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
<attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
</file>
+
+ <file name="3rdparty.instance">
+ <attr name="displayName" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#3rdparty"/>
+ <attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+ <attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_3rdparty"/>
+ <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>
</folder>
</folder> <!-- Services -->
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 7ee910518d..160e5fd38b 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -93,6 +93,7 @@ clusters.config.java.list=\
nb.cluster.java,\
nb.cluster.javafx,\
nb.cluster.profiler,\
+ nb.cluster.3rdparty,\
nb.cluster.nb
clusters.config.enterprise.list=\
@@ -852,6 +853,7 @@ nb.cluster.nb.dir=nb
nb.cluster.nb.depends=\
nb.cluster.platform,\
nb.cluster.ide,\
+ nb.cluster.3rdparty,\
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -865,6 +867,15 @@ nb.cluster.nb=\
updatecenters,\
welcome
+nb.cluster.3rdparty.dir=extra
+nb.cluster.3rdparty.depends=\
+ nb.cluster.platform
+nb.cluster.3rdparty=\
+ libs.javafx.linux,\
+ libs.javafx.macosx,\
+ libs.javafx.win
+
+
nb.cluster.harness.dir=harness
nb.cluster.harness.depends=nb.cluster.platform
nb.cluster.harness=\
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index 2a59564855..209c7dfbfb 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -149,6 +149,7 @@ platform/openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorT
###### external dependencies licences and notices
**/external/*-license.txt
**/external/*-notice.txt
+**/external/*.jar.external
###### generated
### signatures for past versions
diff --git a/platform/core.startup/src/org/netbeans/core/startup/MavenRepoURLHandler.java b/platform/core.startup/src/org/netbeans/core/startup/MavenRepoURLHandler.java
new file mode 100644
index 0000000000..2a43759c7e
--- /dev/null
+++ b/platform/core.startup/src/org/netbeans/core/startup/MavenRepoURLHandler.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.core.startup;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import org.openide.util.URLStreamHandlerRegistration;
+
+@URLStreamHandlerRegistration(position = 99999, protocol="m2")
+public final class MavenRepoURLHandler extends URLStreamHandler {
+ private static final URI CENTRAL_REPO_URI;
+ static {
+ try {
+ CENTRAL_REPO_URI = new URI("https://repo1.maven.org/maven2/");
+ } catch (URISyntaxException ex) {
+ throw new IllegalStateException(ex);
+ }
+ }
+
+ @Override
+ protected URLConnection openConnection(URL u) throws IOException {
+ String path = u.getPath();
+ if (!path.startsWith("/")) {
+ throw new IOException(path);
+ }
+ String stuff = path.substring(1);
+ File m2Repo = new File(new File(new File(System.getProperty("user.home")), ".m2"), "repository");
+ String[] pieces = stuff.split(":");
+ URI uri = null;
+ if (pieces.length >= 4) {
+ uri = relativeMavenURI(m2Repo.toURI(), pieces);
+ } else {
+ throw new IOException(stuff);
+ }
+ File f = new File(uri);
+ if (uri == null || !f.isFile()) {
+ uri = relativeMavenURI(CENTRAL_REPO_URI, pieces);
+ }
+ return uri.toURL().openConnection();
+
+ }
+
+ private URI relativeMavenURI(URI m2Repo, String[] pieces) {
+ URI groupId = m2Repo.resolve(pieces[0].replace('.', '/') + '/');
+ URI dir = groupId.resolve(pieces[1] + '/').resolve(pieces[2] + '/');
+ String fileName = pieces[1] + '-' + pieces[2];
+ if (pieces.length == 5) {
+ fileName += "-" + pieces[4];
+ }
+ fileName += "." + pieces[3];
+ URI uri = dir.resolve(fileName);
+ return uri;
+ }
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists