Merge pull request apache#8427 from NicolaIsotta/pf-ns

add new PrimeFaces and OmniFaces namespaces

Author: matthiasblaesing

enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java

@@ -404,7 +404,13 @@ public Enumeration<URL> findResources(String name) throws IOException {
 
             Map<String, Library> libsMap = new HashMap<>();
             for (Library lib : processor.compiler.libraries) {
-                lib.getValidNamespaces().forEach(namespace -> libsMap.put(namespace, lib));
+                for (String namespace : lib.getValidNamespaces()) {
+                    Library currentLibrary = libsMap.get(namespace);
+                    // replace the current library only if the new one supports more namespaces
+                    if (currentLibrary == null || currentLibrary.getValidNamespaces().size() < lib.getValidNamespaces().size()) {
+                        libsMap.put(namespace, lib);
+                    }
+                }
             }
 
             //4. in case of JSF2.2 include pseudo-libraries (http://java.sun.com/jsf/passthrough, http://java.sun.com/jsf)

enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/DefaultLibraryInfo.java

@@ -84,6 +84,7 @@ public enum DefaultLibraryInfo implements LibraryInfo {
     // PrimeFaces
     PRIMEFACES(
             sortedSet(
+                    "primefaces",
                     "http://primefaces.org/ui"
             ),
             "PrimeFaces",
@@ -96,6 +97,14 @@ public enum DefaultLibraryInfo implements LibraryInfo {
             "PrimeFaces Mobile",
             "pm"
     ), //NOI18N
+    PRIMEFACES_EXTENSIONS(
+            sortedSet(
+                    "primefaces.extensions",
+                    "http://primefaces.org/ui/extensions"
+            ),
+            "PrimeFaces Extensions",
+            "pe"
+    ), //NOI18N
 
     // JSF 2.2+
     JSF(
@@ -113,6 +122,16 @@ public enum DefaultLibraryInfo implements LibraryInfo {
             ),
             "Passthrough",
             "p"
+    ), //NOI18N
+
+    // OmniFaces
+    OMNIFACES(
+            sortedSet(
+                    "omnifaces",
+                    "http://omnifaces.org/ui"
+            ),
+            "OmniFaces",
+            "o"
     ); //NOI18N
 
     private final Set<String> allValidNamespaces;