You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2021/01/02 23:23:47 UTC
[tomcat-jakartaee-migration] branch master updated (f393d76 ->
b577e28)
This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.
from f393d76 Test for javax.xml.xpath.XPathConstants
new 7902f20 Better formatting for the EESpecProfile regexps
new 8341e81 Convert the javax.management.j2ee package with the EE profile (Java EE Management API - JSR 77)
new b577e28 No longer convert the javax.xml.namespace package (Fixes #9)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/tomcat/jakartaee/EESpecProfile.java | 37 +++++++++++++++++++---
.../apache/tomcat/jakartaee/EESpecProfileTest.java | 8 +++--
2 files changed, 39 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-jakartaee-migration] 02/03: Convert the
javax.management.j2ee package with the EE profile (Java EE Management API -
JSR 77)
Posted by 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 8341e815ca50b00a78f53ca3738f5a4ef361ad50
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Sat Jan 2 23:32:52 2021 +0100
Convert the javax.management.j2ee package with the EE profile (Java EE Management API - JSR 77)
---
src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java | 1 +
src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index da77667..d3b4b1b 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -48,6 +48,7 @@ public enum EESpecProfile {
"|interceptor" +
"|inject" +
"|mail" +
+ "|management[/\\.]j2ee" +
"|persistence" +
"|resource" +
"|security[/\\.](auth[/\\.]message|enterprise|jacc)" +
diff --git a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
index 7abfbbf..e481dde 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -48,6 +48,7 @@ public class EESpecProfileTest {
assertEquals("javax.jws", profile.convert("javax.jws"));
assertEquals("javax.interceptor", profile.convert("javax.interceptor"));
assertEquals("javax.inject", profile.convert("javax.inject"));
+ assertEquals("javax.management.j2ee", profile.convert("javax.management.j2ee"));
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"));
@@ -64,6 +65,7 @@ public class EESpecProfileTest {
// non EE javax packages
assertEquals("javax.annotation.processing", profile.convert("javax.annotation.processing"));
+ assertEquals("javax.management", profile.convert("javax.management"));
assertEquals("javax.security", profile.convert("javax.security"));
assertEquals("javax.security.auth", profile.convert("javax.security.auth"));
assertEquals("javax.swing", profile.convert("javax.swing"));
@@ -89,6 +91,7 @@ public class EESpecProfileTest {
assertEquals("jakarta.interceptor", profile.convert("javax.interceptor"));
assertEquals("jakarta.inject", profile.convert("javax.inject"));
assertEquals("jakarta.mail", profile.convert("javax.mail"));
+ assertEquals("jakarta.management.j2ee", profile.convert("javax.management.j2ee"));
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"));
@@ -110,6 +113,7 @@ public class EESpecProfileTest {
// non EE javax packages
assertEquals("javax.annotation.processing", profile.convert("javax.annotation.processing"));
+ assertEquals("javax.management", profile.convert("javax.management"));
assertEquals("javax.security", profile.convert("javax.security"));
assertEquals("javax.security.auth", profile.convert("javax.security.auth"));
assertEquals("javax.swing", profile.convert("javax.swing"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-jakartaee-migration] 01/03: Better formatting for the
EESpecProfile regexps
Posted by 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 7902f20d0b6b5aaf77f2440f73e083243ff2044e
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Sat Jan 2 23:26:44 2021 +0100
Better formatting for the EESpecProfile regexps
---
.../org/apache/tomcat/jakartaee/EESpecProfile.java | 36 +++++++++++++++++++---
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index 3d3a097..da77667 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -24,11 +24,39 @@ import java.util.regex.Pattern;
*/
public enum EESpecProfile {
- TOMCAT("javax([/\\.](annotation(?![/\\.]processing)|ejb|el|mail|persistence|security[/\\.]auth[/\\.]message|servlet|transaction(?![/\\.]xa)|websocket))"),
+ 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|enterprise|jacc)|servlet|transaction(?![/\\.]xa)|validation|websocket|ws[/\\.]rs|"
- + "xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))");
+ EE("javax([/\\.](activation" +
+ "|annotation(?![/\\.]processing)" +
+ "|batch" +
+ "|decorator" +
+ "|ejb" +
+ "|el" +
+ "|enterprise" +
+ "|faces" +
+ "|jms" +
+ "|json" +
+ "|jws" +
+ "|interceptor" +
+ "|inject" +
+ "|mail" +
+ "|persistence" +
+ "|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;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-jakartaee-migration] 03/03: No longer convert the
javax.xml.namespace package (Fixes #9)
Posted by 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 b577e28a5daa5c0e74e3876101c94761acde4fb9
Author: Emmanuel Bourg <eb...@apache.org>
AuthorDate: Sun Jan 3 00:21:42 2021 +0100
No longer convert the javax.xml.namespace package (Fixes #9)
---
src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java | 2 +-
src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index d3b4b1b..128c1a6 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -57,7 +57,7 @@ public enum EESpecProfile {
"|validation" +
"|websocket" +
"|ws[/\\.]rs" +
- "|xml[/\\.](bind|namespace|registry|rpc|soap|stream|ws|XMLConstants)))");
+ "|xml[/\\.](bind|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 e481dde..ae21b36 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/EESpecProfileTest.java
@@ -55,7 +55,6 @@ public class EESpecProfileTest {
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"));
- assertEquals("javax.xml.namespace", profile.convert("javax.xml.namespace"));
assertEquals("javax.xml.rpc", profile.convert("javax.xml.rpc"));
assertEquals("javax.xml.registry", profile.convert("javax.xml.registry"));
assertEquals("javax.xml.soap", profile.convert("javax.xml.soap"));
@@ -70,6 +69,7 @@ public class EESpecProfileTest {
assertEquals("javax.security.auth", profile.convert("javax.security.auth"));
assertEquals("javax.swing", profile.convert("javax.swing"));
assertEquals("javax.transaction.xa", profile.convert("javax.transaction.xa"));
+ assertEquals("javax.xml.namespace", profile.convert("javax.xml.namespace"));
assertEquals("javax.xml.xpath.XPathConstants", profile.convert("javax.xml.xpath.XPathConstants"));
}
@@ -103,7 +103,6 @@ public class EESpecProfileTest {
assertEquals("jakarta.websocket", profile.convert("javax.websocket"));
assertEquals("jakarta.ws.rs", profile.convert("javax.ws.rs"));
assertEquals("jakarta.xml.bind", profile.convert("javax.xml.bind"));
- assertEquals("jakarta.xml.namespace", profile.convert("javax.xml.namespace"));
assertEquals("jakarta.xml.registry", profile.convert("javax.xml.registry"));
assertEquals("jakarta.xml.rpc", profile.convert("javax.xml.rpc"));
assertEquals("jakarta.xml.soap", profile.convert("javax.xml.soap"));
@@ -118,6 +117,7 @@ public class EESpecProfileTest {
assertEquals("javax.security.auth", profile.convert("javax.security.auth"));
assertEquals("javax.swing", profile.convert("javax.swing"));
assertEquals("javax.transaction.xa", profile.convert("javax.transaction.xa"));
+ assertEquals("javax.xml.namespace", profile.convert("javax.xml.namespace"));
assertEquals("javax.xml.xpath.XPathConstants", profile.convert("javax.xml.xpath.XPathConstants"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org