Skip to content

Commit 721a650

Browse files
rstoyanchevrstoyanchev
committed
Update primefaces-showcase to Jakarta EE
1 parent 558844a commit 721a650

File tree

19 files changed

+86
-78
lines changed

19 files changed

+86
-78
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<modules>
1212
<module>booking-mvc</module>
1313
<module>booking-faces</module>
14-
<!--
1514
<module>primefaces-showcase</module>
15+
<!--
1616
<module>webflow-showcase</module>
1717
-->
1818
</modules>

‎primefaces-showcase/pom.xml‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@
2020
<groupId>org.springframework</groupId>
2121
<artifactId>spring-webmvc</artifactId>
2222
</dependency>
23+
<dependency>
24+
<groupId>org.springframework.webflow</groupId>
25+
<artifactId>spring-binding</artifactId>
26+
<version>${webflow.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.webflow</groupId>
30+
<artifactId>spring-webflow</artifactId>
31+
<version>${webflow.version}</version>
32+
</dependency>
2333
<dependency>
2434
<groupId>org.springframework.webflow</groupId>
2535
<artifactId>spring-faces</artifactId>
@@ -39,60 +49,53 @@
3949
</dependency>
4050
<!-- Servlet -->
4151
<dependency>
42-
<groupId>javax.servlet</groupId>
43-
<artifactId>javax.servlet-api</artifactId>
52+
<groupId>jakarta.servlet</groupId>
53+
<artifactId>jakarta.servlet-api</artifactId>
4454
<version>${servlet.version}</version>
4555
<scope>provided</scope>
4656
</dependency>
57+
4758
<!-- Sun Mojarra JSF 2 runtime -->
4859
<dependency>
49-
<groupId>com.sun.faces</groupId>
50-
<artifactId>jsf-api</artifactId>
51-
<version>${mojarra.version}</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>com.sun.faces</groupId>
55-
<artifactId>jsf-impl</artifactId>
60+
<groupId>org.glassfish</groupId>
61+
<artifactId>jakarta.faces</artifactId>
5662
<version>${mojarra.version}</version>
5763
</dependency>
58-
<!-- Apache MyFaces JSF 2 runtime
59-
<dependency>
60-
<groupId>org.apache.myfaces.core</groupId>
61-
<artifactId>myfaces-api</artifactId>
62-
<version>${myfaces.version}</version>
63-
</dependency>
64+
<!-- JSF implementation: MyFaces (also change DispatcherServletInitializer)
6465
<dependency>
6566
<groupId>org.apache.myfaces.core</groupId>
6667
<artifactId>myfaces-impl</artifactId>
6768
<version>${myfaces.version}</version>
6869
</dependency>
6970
-->
7071
<!-- PrimeFaces component library -->
72+
<dependency>
73+
<groupId>jakarta.enterprise</groupId>
74+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
75+
<scope>provided</scope>
76+
<version>${cdi-api}</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.jboss.weld.servlet</groupId>
80+
<artifactId>weld-servlet-shaded</artifactId>
81+
<scope>runtime</scope>
82+
<version>${weld.version}</version>
83+
</dependency>
7184
<dependency>
7285
<groupId>org.primefaces</groupId>
7386
<artifactId>primefaces</artifactId>
7487
<version>${primefaces.version}</version>
88+
<classifier>jakarta</classifier>
7589
</dependency>
7690
<!-- JSF-303 Dependency Injection -->
7791
<dependency>
7892
<groupId>javax.inject</groupId>
7993
<artifactId>javax.inject</artifactId>
8094
<version>1</version>
8195
</dependency>
82-
<!-- File uploads -->
83-
<dependency>
84-
<groupId>commons-fileupload</groupId>
85-
<artifactId>commons-fileupload</artifactId>
86-
<version>[1.3.3,)</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>commons-io</groupId>
90-
<artifactId>commons-io</artifactId>
91-
<version>[2.7,)</version>
92-
</dependency>
9396
<!-- JSR 303 validation -->
9497
<dependency>
95-
<groupId>org.hibernate</groupId>
98+
<groupId>org.hibernate.validator</groupId>
9699
<artifactId>hibernate-validator</artifactId>
97100
<version>${hibernate-validator.version}</version>
98101
</dependency>

‎primefaces-showcase/src/main/java/org/springframework/samples/webflow/autocomplete/PersonConverter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import javax.faces.component.UIComponent;
7-
import javax.faces.context.FacesContext;
8-
import javax.faces.convert.Converter;
9-
import javax.faces.convert.FacesConverter;
6+
import jakarta.faces.component.UIComponent;
7+
import jakarta.faces.context.FacesContext;
8+
import jakarta.faces.convert.Converter;
9+
import jakarta.faces.convert.FacesConverter;
1010

1111
import org.springframework.util.StringUtils;
1212

‎primefaces-showcase/src/main/java/org/springframework/samples/webflow/jsf/FacesHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.springframework.samples.webflow.jsf;
22

3-
import javax.faces.context.FacesContext;
3+
import jakarta.faces.context.FacesContext;
44

55
import org.springframework.stereotype.Component;
66

‎primefaces-showcase/src/main/java/org/springframework/samples/webflow/modal/ModalAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.springframework.samples.webflow.modal;
22

3-
import javax.faces.application.FacesMessage;
4-
import javax.faces.context.FacesContext;
3+
import jakarta.faces.application.FacesMessage;
4+
import jakarta.faces.context.FacesContext;
55

66
import org.springframework.stereotype.Component;
77

‎primefaces-showcase/src/main/java/org/springframework/samples/webflow/upload/FileUploadController.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
package org.springframework.samples.webflow.upload;
22

3-
import javax.faces.application.FacesMessage;
4-
import javax.faces.context.FacesContext;
5-
3+
import jakarta.faces.application.FacesMessage;
4+
import jakarta.faces.context.FacesContext;
65
import org.primefaces.event.FileUploadEvent;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
96

107
import org.springframework.stereotype.Component;
118

129
@Component
1310
public class FileUploadController {
1411

15-
private Logger logger = LoggerFactory.getLogger(FileUploadController.class);
16-
17-
1812
public void handleFileUpload(FileUploadEvent event) {
19-
logger.info("Uploaded: {}", event.getFile().getFileName());
2013
FacesMessage msg = new FacesMessage("Successful", event.getFile().getFileName() + " is uploaded.");
2114
FacesContext.getCurrentInstance().addMessage(null, msg);
2215
}

‎primefaces-showcase/src/main/java/org/springframework/samples/webflow/validation/Account.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.io.Serializable;
44
import java.util.Date;
55

6-
import javax.validation.constraints.NotNull;
7-
import javax.validation.constraints.Past;
6+
import jakarta.validation.constraints.NotNull;
7+
import jakarta.validation.constraints.Past;
88

99
import org.hibernate.validator.constraints.NotEmpty;
1010

‎primefaces-showcase/src/main/resources/JsfMessageResources.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# the {0} is the Bean Validation constraint message (e.g. "may not be empty") and {1} is the
44
# field name or the field label if defined (e.g. "First name").
55
#
6-
javax.faces.validator.BeanValidator.MESSAGE={1} {0}
6+
jakarta.faces.validator.BeanValidator.MESSAGE={1} {0}

‎primefaces-showcase/src/main/resources/ValidationMessages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#
22
# Overrides the default message for the @NotNull constraint.
33
#
4-
javax.validation.constraints.NotNull.message=must be provided
4+
jakarta.validation.constraints.NotNull.message=must be provided

‎primefaces-showcase/src/main/resources/log4j2.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
</Appenders>
88
<Loggers>
99
<Logger name="org.springframework.samples" level="debug" />
10+
<Logger name="org.springframework.security" level="trace" />
11+
<Logger name="org.springframework.web" level="debug" />
1012
<Root level="info">
1113
<AppenderRef ref="Console" />
1214
</Root>

0 commit comments

Comments
 (0)