synchronize web resources code with joinfaces-maven-jar-example

joinfaces · Dec 19, 2023 · ddb6629 · ddb6629
1 parent e4a59a5
commit ddb6629
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 47 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -41,7 +41,7 @@ jobs:
         run: ./mvnw -B -Pcheck-duplicate,check-checkstyle,check-cycles,check-cpd,check-pmd,check-spotbugs,check-dependency -DskipTests=true -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} install
 
       - name: Tests with Maven
-        run: ./mvnw -B -DwebDriverType=firefox verify
+        run: ./mvnw -B -DwebDriverType=chrome verify
 
       - uses: codecov/codecov-action@v3
         with:

diff --git a/src/main/resources/META-INF/resources/cc/textComponent.xhtml b/src/main/resources/META-INF/resources/cc/textComponent.xhtml
@@ -2,9 +2,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:cc="http://xmlns.jcp.org/jsf/composite"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
+<html 
+      xmlns:cc="jakarta.faces.composite"
+      xmlns:h="jakarta.faces.html"
       xmlns:p="http://primefaces.org/ui">
 
     <!-- INTERFACE -->

diff --git a/src/main/resources/META-INF/resources/tags/mytag.xhtml b/src/main/resources/META-INF/resources/tags/mytag.xhtml
@@ -2,10 +2,10 @@
 <!DOCTYPE html
     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
+<ui:composition 
+	xmlns:h="jakarta.faces.html"
 	xmlns:p="http://primefaces.org/ui"
-        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+        xmlns:ui="jakarta.faces.facelets">
     <p:panelGrid columns="1" layout="grid" id="panel">
         <h:outputText id="outputTextTagId" value="#{text}" />
     </p:panelGrid>

diff --git a/src/main/resources/META-INF/resources/tags/tags.taglib.xml b/src/main/resources/META-INF/resources/tags/tags.taglib.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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_3_0.xsd"
-    version="3.0">
+<facelet-taglib xmlns="https://jakarta.ee/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/javaee https://jakarta.ee/xml/ns/javaee/web-facelettaglibary_4_0.xsd">
     <namespace>http://joinfaces.org/tags</namespace>
     <tag>
         <tag-name>mytag</tag-name>

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,9 +1,13 @@
+spring:
+  threads:
+    virtual:
+      enabled: true    
 joinfaces:
-  jsf:
-    PROJECT_STAGE: Production
-    FACELETS_LIBRARIES: /tags/tags.taglib.xml
   primefaces:
     theme: vela
+  faces:
+    project-stage: Production
+    facelets-libraries: /tags/tags.taglib.xml
 tomcat:
   version: @tomcat.version@
 jetty:

diff --git a/src/main/resources/templates/pom.ftl b/src/main/resources/templates/pom.ftl
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>org.joinfaces</groupId>
-            <artifactId>joinfaces-dependencies</artifactId>
+            <artifactId>joinfaces-bom</artifactId>
             <version>${"$"}{joinfaces.version}</version>
             <type>pom</type>
             <scope>import</scope>

diff --git a/src/main/webapp/customInput.xhtml b/src/main/webapp/customInput.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+<ui:composition 
+                xmlns:ui="jakarta.faces.facelets"
                 xmlns:p="http://primefaces.org/ui"
                 xmlns:custom="http://joinfaces.org/example"
                 template="/template.xhtml">

diff --git a/src/main/webapp/fileUpload.xhtml b/src/main/webapp/fileUpload.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+<ui:composition 
+                xmlns:ui="jakarta.faces.facelets"
                 xmlns:p="http://primefaces.org/ui"
                 template="/template.xhtml">
     <ui:define name="content" >

diff --git a/src/main/webapp/helloTag.xhtml b/src/main/webapp/helloTag.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+<ui:composition 
+                xmlns:ui="jakarta.faces.facelets"
                 xmlns:m="http://joinfaces.org/tags"
                 template="/template.xhtml">
     <ui:define name="content" >

diff --git a/src/main/webapp/hiCC.xhtml b/src/main/webapp/hiCC.xhtml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:e="http://xmlns.jcp.org/jsf/composite/cc"
+<ui:composition 
+                xmlns:ui="jakarta.faces.facelets"
+                xmlns:e="jakarta.faces.composite/cc"
                 template="/template.xhtml">
     <ui:define name="content" >
         <e:textComponent id="hiCC" text="Hi Composite Component"/>

diff --git a/src/main/webapp/login.xhtml b/src/main/webapp/login.xhtml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en-us"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://xmlns.jcp.org/jsf/html" 
-      xmlns:f="http://xmlns.jcp.org/jsf/core"
+
+      xmlns:h="jakarta.faces.html" 
+      xmlns:f="jakarta.faces.core"
       xmlns:p="http://primefaces.org/ui"
       xmlns:pe="http://primefaces.org/ui/extensions">
 
@@ -21,7 +21,7 @@
                     <h:form prependId="false">
                         <div id="mainDiv" class="ui-fluid center">
                             <p:panelGrid columns="1" layout="grid">
-                                <p:outputLabel value="Connection failed: user and/or password are wrong."
+                                <p:outputLabel value="Connection failed: user and/or password are wrong." 
                                                rendered="${!empty param['error']}"/>
                             </p:panelGrid>
                             <p:focus />

diff --git a/src/main/webapp/starter.xhtml b/src/main/webapp/starter.xhtml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+<ui:composition 
+                xmlns:h="jakarta.faces.html"
+                xmlns:f="jakarta.faces.core"
+                xmlns:ui="jakarta.faces.facelets"
                 xmlns:p="http://primefaces.org/ui"
                 xmlns:pe="http://primefaces.org/ui/extensions"
                 xmlns:o="http://omnifaces.org/ui"
@@ -39,7 +39,7 @@
         </sec:authorize>
         <sec:anonymous>
             <p:panelGrid columns="1" layout="grid">
-                <p:link title="Login" href="/login.jsf">
+                <p:link title="Login" href="/login.faces">
                     <p:outputLabel id="labelAnonymous" value="Choose your starter as anonymous user" />
                 </p:link>
             </p:panelGrid>

diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="en-us"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
+
+      xmlns:h="jakarta.faces.html"
       xmlns:p="http://primefaces.org/ui"
       xmlns:pe="http://primefaces.org/ui/extensions"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+      xmlns:ui="jakarta.faces.facelets">
 
     <h:head>
         <title>.:: JoinFaces Example ::.</title>
@@ -17,7 +17,7 @@
 
     <h:body>
         <pe:layout fullPage="true" >
-            <pe:layoutPane id="mainLayoutPane" position="center" >
+            <pe:layoutPane id="mainLayoutPane" position="center">
                 <h:form id="contentForm" prependId="false" enctype="multipart/form-data">
                     <p:ajaxStatus onstart="PF('statusDialog').show();"
                                   onsuccess="PF('statusDialog').hide();" />
@@ -28,12 +28,12 @@
                     </p:dialog>
                     <div id="mainDiv" class="ui-fluid center">
                         <p:menubar>
-                            <p:menuitem value="Starter" url="/starter.jsf" />
-                            <p:menuitem value="File Upload" url="fileUpload.jsf" />
-                            <p:menuitem value="Custom Input" url="customInput.jsf" />
-                            <p:menuitem value="My Tag" url="helloTag.jsf" />
-                            <p:menuitem value="Hi CC" url="hiCC.jsf" />
-                            <p:menuitem value="Welcome Converter" url="welcomeConverter.jsf" />
+                            <p:menuitem value="Starter" url="/starter.faces" />
+                            <p:menuitem value="File Upload" url="fileUpload.faces" />
+                            <p:menuitem value="Custom Input" url="customInput.faces" />
+                            <p:menuitem value="My Tag" url="helloTag.faces" />
+                            <p:menuitem value="Hi CC" url="hiCC.faces" />
+                            <p:menuitem value="Welcome Converter" url="welcomeConverter.faces" />
                         </p:menubar>
 
                         <p:spacer height="10" />

diff --git a/src/main/webapp/welcomeConverter.xhtml b/src/main/webapp/welcomeConverter.xhtml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:h="http://xmlns.jcp.org/jsf/html"
+<ui:composition 
+                xmlns:ui="jakarta.faces.facelets"
+                xmlns:h="jakarta.faces.html"
                 xmlns:p="http://primefaces.org/ui"
                 template="/template.xhtml">
     <ui:define name="content" >