XIVY-13553 Convert to Primefaces 13

Execute Primfaces 13 Project Converter Remove not needed namespaces http://xmlns.jcp.org/jsp/jstl/core Convert p:chart to p:barChart and p:pieChart and their models accordingly
axonivy-market · Apr 8, 2024 · 0070160 · 0070160
1 parent 4d2af0e
commit 0070160
Show file tree

Hide file tree

Showing 50 changed files with 200 additions and 145 deletions.
diff --git a/connectivity/connectivity-demos-test/.settings/ch.ivyteam.ivy.designer.prefs b/connectivity/connectivity-demos-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,6 +1,6 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connectivity.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connectivity.test
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
 ch.ivyteam.ivy.project.preferences\:SYNC_TEST_USERS=true
-eclipse.preferences.version=1
+eclipse.preferences.version=1
diff --git a/connectivity/connectivity-demos/.settings/ch.ivyteam.ivy.designer.prefs b/connectivity/connectivity-demos/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,7 +1,7 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connectivity.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connectivity
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
 ch.ivyteam.ivy.project.preferences\:SYNC_TEST_USERS=true
-eclipse.preferences.version=1
+eclipse.preferences.version=1
diff --git a/connectivity/connectivity-demos/webContent/layouts/frame.xhtml b/connectivity/connectivity-demos/webContent/layouts/frame.xhtml
@@ -17,7 +17,7 @@
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}"
     library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 

diff --git a/connectivity/connectivity-demos/webContent/layouts/includes/exception-details.xhtml b/connectivity/connectivity-demos/webContent/layouts/includes/exception-details.xhtml
@@ -1,7 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-  xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+  xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions">
 
 <ui:fragment rendered="#{!errorPage.showDetails}">
   <h:outputText value="An unexpected error has occured:" />

diff --git a/connectivity/connectivity-demos/webContent/layouts/includes/exception.xhtml b/connectivity/connectivity-demos/webContent/layouts/includes/exception.xhtml
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:ic="http://ivyteam.ch/jsf/component"
+  xmlns:ic="http://ivyteam.ch/jsf/component"
   xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions">
 
 <body>

diff --git a/error-handling/error-handling-demos/.settings/ch.ivyteam.ivy.designer.prefs b/error-handling/error-handling-demos/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,5 +1,5 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=error.handling.demo.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=error.handling.demo
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
-eclipse.preferences.version=1
+eclipse.preferences.version=1
diff --git a/error-handling/error-handling-demos/webContent/layouts/frame.xhtml b/error-handling/error-handling-demos/webContent/layouts/frame.xhtml
@@ -16,7 +16,7 @@
   <h:outputScript name="js/layout.js" library="#{ivyFreyaTheme.library}" />
   <h:outputStylesheet name="#{ivyFreyaTheme.layout}"
     library="#{ivyFreyaTheme.library}" />
-  <h:outputStylesheet name="primeflex-2.min.css" library="primeflex" />
+  <h:outputStylesheet name="primeflex-3.min.css" library="primeflex" />
   <h:outputStylesheet name="custom.css" library="ivy-branding" />
   <!-- Optional Style or Script files: 
   <h:outputStylesheet name="layouts/styles/style.css" /> 

diff --git a/error-handling/error-handling-demos/webContent/layouts/includes/exception-details.xhtml b/error-handling/error-handling-demos/webContent/layouts/includes/exception-details.xhtml
@@ -1,7 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-  xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+  xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions">
 
 <ui:fragment rendered="#{!errorPage.showDetails}">
   <h:outputText value="An unexpected error has occured:" />

diff --git a/error-handling/error-handling-demos/webContent/layouts/includes/exception.xhtml b/error-handling/error-handling-demos/webContent/layouts/includes/exception.xhtml
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:ic="http://ivyteam.ch/jsf/component"
-  xmlns:p="http://primefaces.org/ui" xmlns:pe="http://primefaces.org/ui/extensions">
+  xmlns:ic="http://ivyteam.ch/jsf/component" xmlns:p="http://primefaces.org/ui" 
+  xmlns:pe="http://primefaces.org/ui/extensions">
 
 <body>
   <ui:composition>

diff --git a/error-handling/error-handling-demos/webContent/view/booking-failed.xhtml b/error-handling/error-handling-demos/webContent/view/booking-failed.xhtml
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
   xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
   xmlns:ic="http://ivyteam.ch/jsf/component"
   xmlns:p="http://primefaces.org/ui">

diff --git a/error-handling/error-handling-demos/webContent/view/booking-success.xhtml b/error-handling/error-handling-demos/webContent/view/booking-success.xhtml
@@ -2,7 +2,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
   xmlns:f="http://xmlns.jcp.org/jsf/core"
   xmlns:h="http://xmlns.jcp.org/jsf/html"
-  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
   xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
   xmlns:ic="http://ivyteam.ch/jsf/component"
   xmlns:p="http://primefaces.org/ui">

diff --git a/html-dialog/html-dialog-demos-test/.settings/ch.ivyteam.ivy.designer.prefs b/html-dialog/html-dialog-demos-test/.settings/ch.ivyteam.ivy.designer.prefs
@@ -1,6 +1,6 @@
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=ch.ivyteam.htmldialog.demo.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.htmldialog.demo.test
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
 ch.ivyteam.ivy.project.preferences\:SYNC_TEST_USERS=true
-eclipse.preferences.version=1
+eclipse.preferences.version=1
diff --git a/html-dialog/html-dialog-demos/.settings/ch.ivyteam.ivy.designer.prefs b/html-dialog/html-dialog-demos/.settings/ch.ivyteam.ivy.designer.prefs
@@ -6,6 +6,6 @@ ch.ivyteam.ivy.designer.preferences.editor.ProcessEditorPreferencePage\:NET_BACK
 ch.ivyteam.ivy.designer.preferences.editor.ProcessEditorPreferencePage\:NET_GRID_COLOR=212,212,212
 ch.ivyteam.ivy.designer.preferences.editor.ProcessEditorPreferencePage\:SHOW_GRID=true
 ch.ivyteam.ivy.designer.preferences.editor.ProcessEditorPreferencePage\:useProjectSettings=true
-ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
+ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
 ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
-eclipse.preferences.version=1
+eclipse.preferences.version=1
diff --git a/...demos/src_hd/ch/ivyteam/htmldialog/demo/component/AddressComponent/AddressComponent.xhtml b/...demos/src_hd/ch/ivyteam/htmldialog/demo/component/AddressComponent/AddressComponent.xhtml
@@ -13,7 +13,7 @@ This attributes can be accessed by the el expression cc.attrs.attributeName.
 <cc:implementation>
   <p:fieldset legend="Address Component" id="addressComponentFieldset">
     <h:outputText value="#{cc.attrs.label}" style="line-height: 3rem;" />
-    <p:panelGrid columns="2" layout="flex" contentStyleClass="p-align-baseline ui-fluid" style="max-width: 500px;">
+    <p:panelGrid columns="2" layout="flex" contentStyleClass="align-items-baseline ui-fluid" style="max-width: 500px;">
       <!-- Insert the children from the parent where the include of this component is defined -->
       <cc:insertChildren />
 

diff --git a/...g-demos/src_hd/ch/ivyteam/htmldialog/demo/component/PersonComponent/PersonComponent.xhtml b/...g-demos/src_hd/ch/ivyteam/htmldialog/demo/component/PersonComponent/PersonComponent.xhtml
@@ -6,7 +6,7 @@
 </cc:interface>
 <cc:implementation>
   <p:fieldset legend="Person Component" id="personComponentFieldset">
-    <p:panelGrid columns="2" layout="flex" contentStyleClass="p-align-baseline ui-fluid" style="max-width: 700px;">
+    <p:panelGrid columns="2" layout="flex" contentStyleClass="align-items-baseline ui-fluid" style="max-width: 700px;">
       <p:outputLabel value="First Name" for="firstname" />
       <p:inputText value="#{data.person.firstname}" id="firstname" />
       <p:outputLabel value="Last Name" for="lastname" />

diff --git a/...demos/src_hd/ch/ivyteam/htmldialog/demo/input/BeanValidationDemo/BeanValidationDemo.xhtml b/...demos/src_hd/ch/ivyteam/htmldialog/demo/input/BeanValidationDemo/BeanValidationDemo.xhtml
@@ -24,7 +24,7 @@
 
         <h4>Validation Annotations</h4>
         <p>All annotations defined in the package javax.validation.constraints are supported. For example:</p>
-        <p:panelGrid border="1" columns="2">
+        <p:panelGrid border="1" columns="2" layout="tabular">
           <h:outputText value="@NotNull" />
           <h:outputText value="means that a value is required" />
           <h:outputText value="@Size" />

diff --git a/...ivyteam/htmldialog/demo/input/FileUploadAdvancedModeDemo/FileUploadAdvancedModeDemo.xhtml b/...ivyteam/htmldialog/demo/input/FileUploadAdvancedModeDemo/FileUploadAdvancedModeDemo.xhtml
@@ -17,7 +17,7 @@
             <p:graphicImage library="ivy-cms" name="ch.ivyteam.htmldialog.demo/fileUploadImages/#{imagename}"
               alt="Image Description for #{imagename}" style="width: 100%;" />
             <f:facet name="caption">
-              <h4 class="p-mb-2">#{imagename}</h4>
+              <h4 class="mb-2">#{imagename}</h4>
               <p>"Image Description for #{imagename}</p>
             </f:facet>
             <f:facet name="thumbnail">

diff --git a/.../html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/CreditCard.xhtml b/.../html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/CreditCard.xhtml
@@ -12,7 +12,7 @@
         <h:panelGroup layout="block" id="panel">
           <h3>Payment - Credit Card</h3>
           <p:messages id="msgs" />
-          <p:panelGrid columns="2" layout="flex" contentStyleClass="p-align-baseline ui-fluid" style="max-width: 500px;">
+          <p:panelGrid columns="2" layout="flex" contentStyleClass="align-items-baseline ui-fluid" style="max-width: 500px;">
             <p:outputLabel value="Credit Card Number" />
             <p:inputMask required="true" value="#{data.creditCardNumber}" id="CreditCardNumber"
               mask="9999-9999-9999-9999"></p:inputMask>

diff --git a/...log/html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/Invoice.xhtml b/...log/html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/Invoice.xhtml
@@ -12,7 +12,7 @@
         <h:panelGroup layout="block" id="panel">
           <h3>Payment - Invoice</h3>
           <p:messages id="msgs" />
-          <p:panelGrid columns="2" layout="flex" contentStyleClass="p-align-baseline ui-fluid" style="max-width: 500px;">
+          <p:panelGrid columns="2" layout="flex" contentStyleClass="align-items-baseline ui-fluid" style="max-width: 500px;">
             <p:outputLabel value="Address" for="Address" />
             <p:inputText required="true" value="#{data.address}" id="Address"></p:inputText>
           </p:panelGrid>

diff --git a/...ml-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/MultiViewDemo.xhtml b/...ml-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/input/MultiViewDemo/MultiViewDemo.xhtml
@@ -16,7 +16,7 @@
             Dialog.</p>
           <h3>Payment</h3>
           <p:messages id="msgs" />
-          <p:panelGrid columns="2" layout="flex" contentStyleClass="p-align-baseline ui-fluid" style="max-width: 500px;">
+          <p:panelGrid columns="2" layout="flex" contentStyleClass="align-items-baseline ui-fluid" style="max-width: 500px;">
             <p:outputLabel value="Name" for="Name" />
             <p:inputText required="true" value="#{data.name}" id="Name"></p:inputText>
             <p:outputLabel value="First Name" for="FirstName" />

diff --git a/...ialog-demos/src_hd/ch/ivyteam/htmldialog/demo/other/ManagedBeanDemo/ManagedBeanDemo.xhtml b/...ialog-demos/src_hd/ch/ivyteam/htmldialog/demo/other/ManagedBeanDemo/ManagedBeanDemo.xhtml
@@ -37,7 +37,7 @@
           <p>MangedBeans can be annotated with a scope. The scope defines the lifecycle of a ManageBean. Currently three
             scopes for ivy project
             beans are supported:</p>
-          <p:panelGrid border="1" columns="2">
+          <p:panelGrid border="1" columns="2" layout="tabular">
             <h:outputText value="Scope" />
             <h:outputText value="Lifetime" />
             <h:outputText value="@ApplicationScoped" />

diff --git a/...alog/html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/output/ChartDemo/ChartDemo.xhtml b/...alog/html-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/output/ChartDemo/ChartDemo.xhtml
@@ -11,16 +11,16 @@
       <h:form id="form">
         <p:growl id="growl" showDetail="true" />
         <br />
-        <p:chart type="line" model="#{data.comboChartModel}" style="width:450px;height:300px;" id="comboChart">
+        <p:barChart model="#{data.comboChartModel}" style="width:450px;height:300px;" id="comboChart">
 
           <p:ajax event="itemSelect" update="growl" listener="#{logic.itemSelected}" />
-        </p:chart>
+        </p:barChart>
         <br />
         <br />
-        <p:chart type="pie" model="#{data.pieChartModel}" style="width:450px;height:300px" id="pieChart">
+        <p:pieChart model="#{data.pieChartModel}" style="width:450px;height:300px" id="pieChart">
 
           <p:ajax event="itemSelect" update="growl" listener="#{logic.sliceSelected}" />
-        </p:chart>
+        </p:pieChart>
       </h:form>
 
       <h:outputScript>

diff --git a/...ml-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/output/ChartDemo/ChartDemoData.ivyClass b/...ml-dialog-demos/src_hd/ch/ivyteam/htmldialog/demo/output/ChartDemo/ChartDemoData.ivyClass
@@ -1,4 +1,4 @@
 ChartDemoData #class
 ch.ivyteam.htmldialog.demo.output.ChartDemo #namespace
-comboChartModel org.primefaces.model.chart.LineChartModel #field
-pieChartModel org.primefaces.model.chart.PieChartModel #field
+comboChartModel org.primefaces.model.charts.bar.BarChartModel #field
+pieChartModel org.primefaces.model.charts.pie.PieChartModel #field