This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch release110
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git


The following commit(s) were added to refs/heads/release110 by this push:
     new 8c8757c  [NETBEANS-2246] Adjusted the update center URL-s
8c8757c is described below

commit 8c8757c5579543603be3fd98ccc12bd8acd72b54
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Sun Mar 17 08:49:38 2019 -0700

    [NETBEANS-2246] Adjusted the update center URL-s
---
 .../updatecenters/resources/Bundle.properties      | 11 +-----
 .../modules/updatecenters/resources/mf-layer.xml   | 43 ++++++----------------
 2 files changed, 14 insertions(+), 40 deletions(-)

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 6e80834..e7336fc 100644
--- 
a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
+++ 
b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
@@ -23,19 +23,12 @@ OpenIDE-Module-Display-Category=Infrastructure
 OpenIDE-Module-Long-Description=It's module which contains the declaration of 
NetBeans update centers for Autoupdate module.
 OpenIDE-Module-Short-Description=Declares NetBeans autoupdate centers.
 
-Services/AutoupdateType/dev-update-provider.instance=Additional Development 
Plugins
-Services/AutoupdateType/standard-update-provider.instance=Latest Development 
Build
 Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal
 Services/AutoupdateType/82pluginportal-update-provider.instance=NetBeans 8.2 
Plugin Portal
-#NOI18N
-URL_LatestBuild=http://bits.netbeans.org/dev/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz
-#NOI18N
-URL_Default_N=http://updates.netbeans.org/netbeans/updates/dev/uc/final/main/catalog.xml.gz?{$netbeans.hash.code}
+Services/AutoupdateType/distribution-update-provider.instance=NetBeans 
Distribution
 #NOI18N
 
URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/11.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
+URL_Distribution=https://netbeans.apache.org/nb/updates/11.0/updates.xml.gz?{$netbeans.hash.code}
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 268209e..50206ff 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
@@ -26,20 +26,10 @@
 
     <folder name="AutoupdateType">
       <!-- this ordering left because backward compatibility with deserialized 
autoupdate types -->
-      <file name="standard-update-provider.instance">
-        <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/standard-update-provider.instance"/>
-        <attr name="iconBase" 
stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-        <attr name="url" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_LatestBuild"/>
-        <attr name="category" stringvalue="STANDARD"/>
-        <attr name="enabled" boolvalue="true"/>
-        <attr name="instanceOf" 
stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
-        <attr name="instanceCreate" 
methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"
 />
-      </file>
-
-      <file name="dev-update-provider.instance">
-          <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/dev-update-provider.instance"/>
+      <file name="distribution-update-provider.instance">
+          <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/distribution-update-provider.instance"/>
           <attr name="iconBase" 
stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-          <attr name="url" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Default_N"/>
+          <attr name="url" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Distribution"/>
           <attr name="category" stringvalue="STANDARD"/>
           <attr name="enabled" boolvalue="true"/>
           <attr name="instanceOf" 
stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
@@ -47,15 +37,15 @@
       </file>
 
       <file name="pluginportal-update-provider.instance">
-         <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/pluginportal-update-provider.instance"/>
-         <attr name="iconBase" 
stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
-         <attr name="url" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_PluginPortal"/>
-         <attr name="category" stringvalue="COMMUNITY"/>
-         <attr name="enabled" boolvalue="true"/>
-         <attr name="instanceOf" 
stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
-         <attr name="instanceCreate" 
methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
+          <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/pluginportal-update-provider.instance"/>
+          <attr name="iconBase" 
stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
+          <attr name="url" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_PluginPortal"/>
+          <attr name="category" stringvalue="COMMUNITY"/>
+          <attr name="enabled" boolvalue="true"/>
+          <attr name="instanceOf" 
stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
+          <attr name="instanceCreate" 
methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
       </file>
-      
+
       <file name="82pluginportal-update-provider.instance">
           <attr name="displayName" 
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#Services/AutoupdateType/82pluginportal-update-provider.instance"/>
           <attr name="iconBase" 
stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
@@ -66,17 +56,8 @@
           <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 -->
 
 </filesystem>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to