WFLY-19315 Faces XHTML migration for Jakarta EE 10

wildfly · May 16, 2024 · 8684293 · 8684293
1 parent 4d80d45
commit 8684293
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 33 deletions.
diff --git a/batch-processing/src/main/webapp/batch.xhtml b/batch-processing/src/main/webapp/batch.xhtml
@@ -16,8 +16,8 @@
 -->
 
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:h="http://java.sun.com/jsf/html"
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
 >
 <h:head>
     <title>Batch Processing</title>

diff --git a/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml b/ejb-multi-server/app-main/web/src/main/webapp/ejbinvoke.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html 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">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:h="jakarta.faces.html"
+    xmlns:f="jakarta.faces.core">
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

diff --git a/helloworld-singleton/src/main/webapp/home.xhtml b/helloworld-singleton/src/main/webapp/home.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core"
+	xmlns:ui="jakarta.faces.facelets">
 <body>
 	<ui:composition template="/template.xhtml">
 		<ui:define name="title">

diff --git a/helloworld-singleton/src/main/webapp/template.xhtml b/helloworld-singleton/src/main/webapp/template.xhtml
@@ -16,7 +16,7 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+	xmlns:ui="jakarta.faces.facelets">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>helloworld-singleton</title>

diff --git a/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml b/hibernate/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -17,8 +17,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:h="http://java.sun.com/jsf/html"
-   xmlns:ui="http://java.sun.com/jsf/facelets">
+   xmlns:h="jakarta.faces.html"
+   xmlns:ui="jakarta.faces.facelets">
 <h:head>
    <title>hibernate</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

diff --git a/hibernate/src/main/webapp/index.xhtml b/hibernate/src/main/webapp/index.xhtml
@@ -16,9 +16,9 @@
     limitations under the License.
 -->
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:ui="http://java.sun.com/jsf/facelets"
-   xmlns:f="http://java.sun.com/jsf/core"
-   xmlns:h="http://java.sun.com/jsf/html"
+   xmlns:ui="jakarta.faces.facelets"
+   xmlns:f="jakarta.faces.core"
+   xmlns:h="jakarta.faces.html"
    template="/WEB-INF/templates/default.xhtml">
    <ui:define name="content">
       <h1>Welcome to JBoss!</h1>

diff --git a/jsonp/src/main/webapp/jsonp.xhtml b/jsonp/src/main/webapp/jsonp.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:h="http://java.sun.com/jsf/html"
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core"
+    xmlns:h="jakarta.faces.html"
 >
 <h:body>
     <h:form id="form">

diff --git a/jts/application-component-1/src/main/webapp/addCustomer.xhtml b/jts/application-component-1/src/main/webapp/addCustomer.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/customers.xhtml b/jts/application-component-1/src/main/webapp/customers.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/duplicate.xhtml b/jts/application-component-1/src/main/webapp/duplicate.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <ui:composition template="template.xhtml">
 	<ui:define name="content">

diff --git a/jts/application-component-1/src/main/webapp/template.xhtml b/jts/application-component-1/src/main/webapp/template.xhtml
@@ -16,9 +16,9 @@
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html 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:ui="jakarta.faces.facelets"
+	xmlns:h="jakarta.faces.html"
+	xmlns:f="jakarta.faces.core">
 
 <!-- The template for our app, defines some regions and imports styles -->
 

diff --git a/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml b/kitchensink/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -17,8 +17,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+    xmlns:h="jakarta.faces.html"
+    xmlns:ui="jakarta.faces.facelets">
 <h:head>
     <title>kitchensink</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

diff --git a/tasks-jsf/src/main/webapp/index.xhtml b/tasks-jsf/src/main/webapp/index.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="jakarta.faces.html" xmlns:f="jakarta.faces.core"
+    xmlns:ui="jakarta.faces.facelets">
 
 <h:head>
     <title>tasks-jsf</title>

diff --git a/tasks-jsf/src/main/webapp/tasks.xhtml b/tasks-jsf/src/main/webapp/tasks.xhtml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="jakarta.faces.html" xmlns:f="jakarta.faces.core"
+    xmlns:ui="jakarta.faces.facelets">
 
 <h:head>
     <title>tasks-jsf</title>