From 721a650a0f2777a78c98d0b6dbdcd7b22455b7b9 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rstoyanchev@vmware.com>
Date: Wed, 29 Mar 2023 12:14:47 +0100
Subject: [PATCH] Update primefaces-showcase to Jakarta EE

---
 pom.xml                                       |  2 +-
 primefaces-showcase/pom.xml                   | 57 ++++++++++---------
 .../webflow/autocomplete/PersonConverter.java |  8 +--
 .../samples/webflow/jsf/FacesHelper.java      |  2 +-
 .../samples/webflow/modal/ModalAction.java    |  4 +-
 .../webflow/upload/FileUploadController.java  | 11 +---
 .../samples/webflow/validation/Account.java   |  4 +-
 .../resources/JsfMessageResources.properties  |  2 +-
 .../resources/ValidationMessages.properties   |  2 +-
 .../src/main/resources/log4j2.xml             |  2 +
 .../src/main/webapp/WEB-INF/beans.xml         |  8 +++
 .../WEB-INF/flows/file-upload/view.xhtml      |  2 +-
 .../flows/spring-security-taglib/view.xhtml   |  1 -
 .../spring/{appServlet => }/controllers.xml   |  5 +-
 .../webapp/WEB-INF/spring/root-context.xml    |  1 +
 .../webapp/WEB-INF/spring/security-config.xml |  6 +-
 .../{appServlet => }/servlet-context.xml      |  2 +-
 .../spring/{appServlet => }/webflow.xml       |  0
 .../src/main/webapp/WEB-INF/web.xml           | 45 +++++++--------
 19 files changed, 86 insertions(+), 78 deletions(-)
 create mode 100644 primefaces-showcase/src/main/webapp/WEB-INF/beans.xml
 rename primefaces-showcase/src/main/webapp/WEB-INF/spring/{appServlet => }/controllers.xml (88%)
 rename primefaces-showcase/src/main/webapp/WEB-INF/spring/{appServlet => }/servlet-context.xml (96%)
 rename primefaces-showcase/src/main/webapp/WEB-INF/spring/{appServlet => }/webflow.xml (100%)

diff --git a/pom.xml b/pom.xml
index 2ef28c1..e598305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
 	<modules>
 		<module>booking-mvc</module>
 		<module>booking-faces</module>
-		<!--
 		<module>primefaces-showcase</module>
+		<!--
 		<module>webflow-showcase</module>
 		-->
 	</modules>
diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml
index 0db4424..44c65de 100644
--- a/primefaces-showcase/pom.xml
+++ b/primefaces-showcase/pom.xml
@@ -20,6 +20,16 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.webflow</groupId>
+			<artifactId>spring-binding</artifactId>
+			<version>${webflow.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.webflow</groupId>
+			<artifactId>spring-webflow</artifactId>
+			<version>${webflow.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
 			<artifactId>spring-faces</artifactId>
@@ -39,28 +49,19 @@
 		</dependency>
 		<!-- Servlet -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<!-- Sun Mojarra JSF 2 runtime -->
 		<dependency>
-			<groupId>com.sun.faces</groupId>
-			<artifactId>jsf-api</artifactId>
+			<groupId>org.glassfish</groupId>
+			<artifactId>jakarta.faces</artifactId>
 			<version>${mojarra.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.faces</groupId>
-			<artifactId>jsf-impl</artifactId>
-			<version>${mojarra.version}</version>
-		</dependency>
-		<!-- Apache MyFaces JSF 2 runtime
-		<dependency>
-			<groupId>org.apache.myfaces.core</groupId>
-			<artifactId>myfaces-api</artifactId>
-			<version>${myfaces.version}</version>
-		</dependency>
+		<!-- JSF implementation: MyFaces (also change DispatcherServletInitializer)
 		<dependency>
 			<groupId>org.apache.myfaces.core</groupId>
 			<artifactId>myfaces-impl</artifactId>
@@ -68,10 +69,23 @@
 		</dependency>
 		-->
 		<!-- PrimeFaces component library -->
+		<dependency>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+			<scope>provided</scope>
+			<version>${cdi-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld.servlet</groupId>
+			<artifactId>weld-servlet-shaded</artifactId>
+			<scope>runtime</scope>
+			<version>${weld.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.primefaces</groupId>
 			<artifactId>primefaces</artifactId>
 			<version>${primefaces.version}</version>
+			<classifier>jakarta</classifier>
 		</dependency>
 		<!-- JSF-303 Dependency Injection -->
 		<dependency>
@@ -79,20 +93,9 @@
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
 		</dependency>
-		<!-- File uploads -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>[1.3.3,)</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>[2.7,)</version>
-		</dependency>
 		<!-- JSR 303 validation -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>${hibernate-validator.version}</version>
 		</dependency>
diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/autocomplete/PersonConverter.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/autocomplete/PersonConverter.java
index 4003126..6b94294 100644
--- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/autocomplete/PersonConverter.java
+++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/autocomplete/PersonConverter.java
@@ -3,10 +3,10 @@ package org.springframework.samples.webflow.autocomplete;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.FacesConverter;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.convert.Converter;
+import jakarta.faces.convert.FacesConverter;
 
 import org.springframework.util.StringUtils;
 
diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/jsf/FacesHelper.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/jsf/FacesHelper.java
index 6ee95c5..a8e874c 100644
--- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/jsf/FacesHelper.java
+++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/jsf/FacesHelper.java
@@ -1,6 +1,6 @@
 package org.springframework.samples.webflow.jsf;
 
-import javax.faces.context.FacesContext;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.stereotype.Component;
 
diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/modal/ModalAction.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/modal/ModalAction.java
index fdb240f..38f2dd4 100644
--- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/modal/ModalAction.java
+++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/modal/ModalAction.java
@@ -1,7 +1,7 @@
 package org.springframework.samples.webflow.modal;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
 
 import org.springframework.stereotype.Component;
 
diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java
index 81a5414..2a686b3 100644
--- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java
+++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java
@@ -1,22 +1,15 @@
 package org.springframework.samples.webflow.upload;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
 import org.primefaces.event.FileUploadEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.stereotype.Component;
 
 @Component
 public class FileUploadController {
 
-	private Logger logger = LoggerFactory.getLogger(FileUploadController.class);
-
-
 	public void handleFileUpload(FileUploadEvent event) {
-		logger.info("Uploaded: {}", event.getFile().getFileName());
 		FacesMessage msg = new FacesMessage("Successful", event.getFile().getFileName() + " is uploaded.");
 		FacesContext.getCurrentInstance().addMessage(null, msg);
 	}
diff --git a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/validation/Account.java b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/validation/Account.java
index bd8f3de..6fa42d6 100644
--- a/primefaces-showcase/src/main/java/org/springframework/samples/webflow/validation/Account.java
+++ b/primefaces-showcase/src/main/java/org/springframework/samples/webflow/validation/Account.java
@@ -3,8 +3,8 @@ package org.springframework.samples.webflow.validation;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Past;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Past;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
diff --git a/primefaces-showcase/src/main/resources/JsfMessageResources.properties b/primefaces-showcase/src/main/resources/JsfMessageResources.properties
index 497baf8..76c25c3 100644
--- a/primefaces-showcase/src/main/resources/JsfMessageResources.properties
+++ b/primefaces-showcase/src/main/resources/JsfMessageResources.properties
@@ -3,4 +3,4 @@
 # the {0} is the Bean Validation constraint message (e.g. "may not be empty") and {1} is the
 # field name or the field label if defined (e.g. "First name").
 #
-javax.faces.validator.BeanValidator.MESSAGE={1} {0}
\ No newline at end of file
+jakarta.faces.validator.BeanValidator.MESSAGE={1} {0}
\ No newline at end of file
diff --git a/primefaces-showcase/src/main/resources/ValidationMessages.properties b/primefaces-showcase/src/main/resources/ValidationMessages.properties
index 6d06929..36233b4 100644
--- a/primefaces-showcase/src/main/resources/ValidationMessages.properties
+++ b/primefaces-showcase/src/main/resources/ValidationMessages.properties
@@ -1,4 +1,4 @@
 #
 # Overrides the default message for the @NotNull constraint.
 #
-javax.validation.constraints.NotNull.message=must be provided
\ No newline at end of file
+jakarta.validation.constraints.NotNull.message=must be provided
\ No newline at end of file
diff --git a/primefaces-showcase/src/main/resources/log4j2.xml b/primefaces-showcase/src/main/resources/log4j2.xml
index f495463..fb5ebf0 100644
--- a/primefaces-showcase/src/main/resources/log4j2.xml
+++ b/primefaces-showcase/src/main/resources/log4j2.xml
@@ -7,6 +7,8 @@
 	</Appenders>
 	<Loggers>
 		<Logger name="org.springframework.samples" level="debug" />
+		<Logger name="org.springframework.security" level="trace" />
+		<Logger name="org.springframework.web" level="debug" />
 		<Root level="info">
 			<AppenderRef ref="Console" />
 		</Root>
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/beans.xml b/primefaces-showcase/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..20ac74c
--- /dev/null
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans 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/beans_3_0.xsd"
+	   version="3.0"
+	   bean-discovery-mode="all">
+
+</beans>
\ No newline at end of file
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml
index 06f4160..2ca14b7 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/file-upload/view.xhtml
@@ -19,7 +19,7 @@
 
 <ui:define name="content">
 <h:form enctype="multipart/form-data">
-	<p:fileUpload fileUploadListener="#{fileUploadController.handleFileUpload}"
+	<p:fileUpload listener="#{fileUploadController.handleFileUpload}"
 				  mode="advanced" dragDropSupport="false"
 				  update="messages" sizeLimit="100000" allowTypes="/(\.|\/)(gif|jpe?g|png)$/" />
 	<p:growl id="messages" showDetail="true" />
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml
index 0f0de11..b3ce470 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/flows/spring-security-taglib/view.xhtml
@@ -1,7 +1,6 @@
 <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
 	    		xmlns:ui="http://java.sun.com/jsf/facelets"
-				xmlns:c="http://java.sun.com/jsp/jstl/core"
 	  			xmlns:h="http://java.sun.com/jsf/html"
 	  			xmlns:p="http://primefaces.org/ui"
 	  			xmlns:sec="http://www.springframework.org/security/tags"
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/controllers.xml
similarity index 88%
rename from primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
rename to primefaces-showcase/src/main/webapp/WEB-INF/spring/controllers.xml
index a77d660..df2bc19 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/controllers.xml
@@ -16,7 +16,10 @@
 	<mvc:view-controller path="/login" />
 
 	<mvc:view-controller path="/home" />
-	
+
+	<bean name="mvcHandlerMappingIntrospector"
+		  class="org.springframework.web.servlet.handler.HandlerMappingIntrospector"/>
+
 	<context:component-scan base-package="org.springframework.samples.webflow" />
 	 
 </beans>
\ No newline at end of file
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/root-context.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/root-context.xml
index adcede8..c569e4d 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -5,5 +5,6 @@
 	
 	<!-- Root Context: defines shared resources visible to all other web components -->
 	<import resource="security-config.xml"/>
+	<import resource="servlet-context.xml"/>
 	
 </beans>
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
index bd5b7cc..dacf6af 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml
@@ -5,12 +5,16 @@
 		 xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
 						http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
 
-	<http auto-config="true" use-expressions="true">
+	<b:bean id="expressionHandler"
+			class="org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler" />
+
+	<http auto-config="true">
 		<form-login login-page="/app/login" login-processing-url="/app/loginProcess"
 			default-target-url="/app/home" authentication-failure-url="/app/login?login_error=1" />
 		<logout logout-url="/app/logout" logout-success-url="/app/home" />
 		<intercept-url pattern="/secured/appleUser" method="POST" access="hasRole('ROLE_APPLE_USER')" />
 		<intercept-url pattern="/secured/androidUser" method="POST" access="hasRole('ROLE_ANDROID_USER')" />
+		<intercept-url pattern="/**" access="permitAll"/>
 		<csrf disabled="true" />
 	</http>
 
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
similarity index 96%
rename from primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
rename to primefaces-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
index a47b133..bb3a803 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/spring/servlet-context.xml
@@ -31,7 +31,7 @@
 
 	<!-- 
 		Enable processing of JSF 2 resource requests. For example:
-		/webflow-primefaces-showcase/app/javax.faces.resource/jsf.js?ln=javax.faces
+		/webflow-primefaces-showcase/app/jakarta.faces.resource/jsf.js?ln=javax.faces
 	-->
 	<faces:resources />
 
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml b/primefaces-showcase/src/main/webapp/WEB-INF/spring/webflow.xml
similarity index 100%
rename from primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml
rename to primefaces-showcase/src/main/webapp/WEB-INF/spring/webflow.xml
diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/web.xml b/primefaces-showcase/src/main/webapp/WEB-INF/web.xml
index 05bc430..11806fe 100644
--- a/primefaces-showcase/src/main/webapp/WEB-INF/web.xml
+++ b/primefaces-showcase/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,10 @@
 
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring/root-context.xml</param-value>
+		<param-value>
+			/WEB-INF/spring/root-context.xml,
+			/WEB-INF/spring/servlet-context.xml
+		</param-value>
 	</context-param>
 
 	<listener>
@@ -36,27 +39,28 @@
 
 	<!-- Use JSF view templates saved as *.xhtml, for use with Facelets -->
 	<context-param>
-		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
 		<param-value>.xhtml</param-value>
 	</context-param>
 	
 	<!-- Enables special Facelets debug output during development -->
   	<context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
    		<param-value>Development</param-value>
   	</context-param>
   	
   	<!-- Causes Facelets to refresh templates during development -->
   	<context-param>
-  		<param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
+  		<param-name>jakarta.faces.FACELETS_REFRESH_PERIOD</param-name>
   		<param-value>1</param-value>
   	</context-param>
 
 	<!-- Just here so the JSF implementation can initialize, *not* used at runtime -->
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
-		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
+		<multipart-config/>
 	</servlet>
 	
 	<!-- Just here so the JSF implementation can initialize -->
@@ -74,9 +78,10 @@
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/spring/appServlet/servlet-context.xml</param-value>
+			<param-value/>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
+		<multipart-config/>
 	</servlet>
 		
 	<servlet-mapping>
@@ -86,28 +91,18 @@
 
 	<context-param>
 		<param-name>primefaces.UPLOADER</param-name>
-		<param-value>commons</param-value>
+		<param-value>native</param-value>
 	</context-param>
 
-	<filter>
-		<filter-name>PrimeFaces FileUpload Filter</filter-name>
-		<filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class>
-	</filter>
-	
-	<filter-mapping>
-		<filter-name>PrimeFaces FileUpload Filter</filter-name>
-		<servlet-name>Spring MVC Servlet</servlet-name>
-	</filter-mapping>
+	<!--
+		Spring Security Facelets tag library declaration
+	-->
+	<context-param>
+		<param-name>jakarta.faces.FACELETS_LIBRARIES</param-name>
+		<param-value>/WEB-INF/springsecurity.taglib.xml</param-value>
+	</context-param>
 
-  	<!-- 
-  		Spring Security Facelets tag library declaration 
-  	-->
-  	<context-param>
-  		<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
-  		<param-value>/WEB-INF/springsecurity.taglib.xml</param-value>
-  	</context-param>
-
-	<!-- 
+	<!--
 		DEFAULT PAGE
 	-->