[tomcat-jakartaee-migration] 04/06: Convert the javax.faces package with the EE profile (Java Server Faces)

[ebourg]

This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 3fbd31178f8654511495a5d53032ffe9d83bd928
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Wed Dec 30 10:37:31 2020 +0100

    Convert the javax.faces package with the EE profile (Java Server Faces)
---
 src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java     | 2 +-
 src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java 
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index 929303f..8db88b5 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -26,7 +26,7 @@ public enum EESpecProfile {
 
     
TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"),
 
-    
EE("javax([/\\.](activation|annotation(?![/\\.]processing)|batch|decorator|ejb|el|enterprise|jms|json|jws|interceptor|inject|mail|persistence|"
+    
EE("javax([/\\.](activation|annotation(?![/\\.]processing)|batch|decorator|ejb|el|enterprise|faces|jms|json|jws|interceptor|inject|mail|persistence|"
                 + 
"resource|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
                 + 
"xml[/\\.](bind|namespace|rpc|soap|stream|ws|XMLConstants)))");
 
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index 924fbcc..48610fc 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -42,6 +42,7 @@ public class EESpecProfileTest {
         assertEquals("javax.batch", profile.convert("javax.batch"));
         assertEquals("javax.decorator", profile.convert("javax.decorator"));
         assertEquals("javax.enterprise", profile.convert("javax.enterprise"));
+        assertEquals("javax.faces", profile.convert("javax.faces"));
         assertEquals("javax.jms", profile.convert("javax.jms"));
         assertEquals("javax.json", profile.convert("javax.json"));
         assertEquals("javax.jws", profile.convert("javax.jws"));
@@ -77,6 +78,7 @@ public class EESpecProfileTest {
         assertEquals("jakarta.ejb", profile.convert("javax.ejb"));
         assertEquals("jakarta.el", profile.convert("javax.el"));
         assertEquals("jakarta.enterprise", 
profile.convert("javax.enterprise"));
+        assertEquals("jakarta.faces", profile.convert("javax.faces"));
         assertEquals("jakarta.jms", profile.convert("javax.jms"));
         assertEquals("jakarta.json", profile.convert("javax.json"));
         assertEquals("jakarta.jws", profile.convert("javax.jws"));


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org