[tomcat-jakartaee-migration] 01/06: Convert the javax.resource package with the EE profile (Java EE Connector API)

[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 be600249852b4f38f01dad91e11edb7f5e0e6467
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Wed Dec 30 10:16:53 2020 +0100

    Convert the javax.resource package with the EE profile (Java EE Connector 
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 78d4103..9fcf726 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)|decorator|ejb|el|enterprise|jms|json|interceptor|inject|mail|persistence|"
-                + 
"security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
+                + 
"resource|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
                 + 
"xml[/\\.](bind|namespace|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 1c97339..7078858 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -45,6 +45,7 @@ public class EESpecProfileTest {
         assertEquals("javax.json", profile.convert("javax.json"));
         assertEquals("javax.interceptor", 
profile.convert("javax.interceptor"));
         assertEquals("javax.inject", profile.convert("javax.inject"));
+        assertEquals("javax.resource", profile.convert("javax.resource"));
         assertEquals("javax.validation", profile.convert("javax.validation"));
         assertEquals("javax.ws.rs", profile.convert("javax.ws.rs"));
         assertEquals("javax.xml.bind", profile.convert("javax.xml.bind"));
@@ -79,6 +80,7 @@ public class EESpecProfileTest {
         assertEquals("jakarta.inject", profile.convert("javax.inject"));
         assertEquals("jakarta.mail", profile.convert("javax.mail"));
         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.servlet", profile.convert("javax.servlet"));
         assertEquals("jakarta.transaction", 
profile.convert("javax.transaction"));


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