Put JavaFX implementation wrappers into extra cluster. Make them avai…

…lable in a packaged in update center.

ergonomics/ide.ergonomics/java.properties

@@ -20,7 +20,10 @@ project.file.../java.base/share/classes/java/lang/Object.java=org.netbeans.modul
 projectImporter=Eclipse
 
 mainModule=org.netbeans.modules.java.kit
-extra.modules=org.netbeans.modules.nbjavac
+extra.modules=org.netbeans.modules.nbjavac,\
+    org.netbeans.libs.javafx.linux,\
+    org.netbeans.libs.javafx.win,\
+    org.netbeans.libs.javafx.mac
 extra.modules.recommended.min.jdk=9
 
 LBL_Ergonomics_Extra_Required=Additional modules are needed to run Java SE support on JDK 8.

platform/libs.javafx.linux/build.xml → extra/libs.javafx.linux/build.xml

@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="platform/libs.javafx.linux">
+<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>

platform/libs.javafx.macosx/build.xml → extra/libs.javafx.macosx/build.xml

@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="platform/libs.javafx.macosx">
+<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>

platform/libs.javafx.win/build.xml → extra/libs.javafx.win/build.xml

@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<project basedir="." default="build" name="platform/libs.javafx.win">
+<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>

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>

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/9.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

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 -->

nbbuild/cluster.properties

@@ -92,6 +92,7 @@ clusters.config.java.list=\
         nb.cluster.java,\
         nb.cluster.javafx,\
         nb.cluster.profiler,\
+        nb.cluster.3rdparty,\
         nb.cluster.nb
 
 clusters.config.enterprise.list=\
@@ -222,9 +223,6 @@ nb.cluster.platform=\
         lib.uihandler,\
         libs.felix,\
         libs.javafx,\
-        libs.javafx.linux,\
-        libs.javafx.macosx,\
-        libs.javafx.win,\
         libs.jna,\
         libs.jna.platform,\
         libs.jsr223,\
@@ -854,6 +852,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,\
@@ -867,6 +866,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=\