[tomcat-jakartaee-migration] 01/02: Convert the javax.security.enterprise package with the EE profile (Java EE Security API)

[eb...@apache.org]

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 77967f9db1a2490441c514177715126f1b7c4aa3
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Wed Dec 30 11:21:57 2020 +0100

    Convert the javax.security.enterprise package with the EE profile (Java EE Security API)
---
 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 d12f4e4..3d3a097 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -27,7 +27,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|faces|jms|json|jws|interceptor|inject|mail|persistence|"
-                + "resource|security[/\\.](auth[/\\.]message|jacc)|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
+                + "resource|security[/\\.](auth[/\\.]message|enterprise|jacc)|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
                 + "xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))");
 
     private Pattern pattern;
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index b2fe945..564789f 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -49,6 +49,7 @@ public class EESpecProfileTest {
         assertEquals("javax.interceptor", profile.convert("javax.interceptor"));
         assertEquals("javax.inject", profile.convert("javax.inject"));
         assertEquals("javax.resource", profile.convert("javax.resource"));
+        assertEquals("javax.security.enterprise", profile.convert("javax.security.enterprise"));
         assertEquals("javax.security.jacc", profile.convert("javax.security.jacc"));
         assertEquals("javax.validation", profile.convert("javax.validation"));
         assertEquals("javax.ws.rs", profile.convert("javax.ws.rs"));
@@ -90,6 +91,7 @@ public class EESpecProfileTest {
         assertEquals("jakarta.persistence", profile.convert("javax.persistence"));
         assertEquals("jakarta.resource", profile.convert("javax.resource"));
         assertEquals("jakarta.security.auth.message", profile.convert("javax.security.auth.message"));
+        assertEquals("jakarta.security.enterprise", profile.convert("javax.security.enterprise"));
         assertEquals("jakarta.security.jacc", profile.convert("javax.security.jacc"));
         assertEquals("jakarta.servlet", profile.convert("javax.servlet"));
         assertEquals("jakarta.transaction", profile.convert("javax.transaction"));


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