Update descriptors to version 4.0

Signed-off-by: avpinchuk <alexander.v.pinchuk@gmail.com>
eclipse-ee4j · Oct 25, 2022 · 04a42ea · 04a42ea
1 parent a6cd348
commit 04a42ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/jsft/src/main/resources/META-INF/jsft.taglib.xml b/jsft/src/main/resources/META-INF/jsft.taglib.xml
@@ -18,11 +18,10 @@
 
 -->
 
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-
-<facelet-taglib>
+<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
+				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facelettaglibrary_4_0.xsd"
+				version="4.0">
 
     <namespace>http://jsftemplating.java.net/jsft</namespace>
 

diff --git a/jsftemplating/src/main/java/com/sun/jsftemplating/layout/LayoutDefinitionManager.java b/jsftemplating/src/main/java/com/sun/jsftemplating/layout/LayoutDefinitionManager.java
@@ -685,7 +685,7 @@ private static void processTaglibXml(URL url, Map<String, ComponentType> types)
             Document document = builder.parse(is);
             XPath xpath = XPathFactory.newInstance().newXPath();
             NSContext ns = new NSContext();
-            ns.addNamespace("f", "http://java.sun.com/JSF/Facelet");
+            ns.addNamespace("f", "jakarta.faces.facelets");
             // Although the following should work, XPath doesn't attempt to
             // get the namespace when no namespace is supplied.
             // ns.setDefaultNSURI("http://java.sun.com/JSF/Facelet");

diff --git a/jsftemplating/src/main/resources/META-INF/faces-config.xml b/jsftemplating/src/main/resources/META-INF/faces-config.xml
@@ -17,10 +17,10 @@
 
 -->
 
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-facesconfig_1_2.xsd"
-        version="1.2">
+        xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+        version="4.0">
 
 
     <!--

diff --git a/samples/eventdemo/deferredFragment.xhtml b/samples/eventdemo/deferredFragment.xhtml
@@ -13,11 +13,11 @@
 -->
 
     xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:c="http://java.sun.com/jsp/jstl/core"
-    xmlns:jsft="http://jsftemplating.java.net/jsft">
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core"
+	xmlns:c="jakarta.tags.core"
+	xmlns:jsft="http://jsftemplating.java.net/jsft">
 
 <ui:composition>
 <f:view contentType="text/html">