This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 7ecdbd8 Refactor and harmonize code
7ecdbd8 is described below
commit 7ecdbd863a8dcaf741b0b73c66f17921e9847809
Author: remm <[email protected]>
AuthorDate: Fri Oct 28 14:52:52 2022 +0200
Refactor and harmonize code
---
.../apache/tomcat/jakartaee/EESpecProfiles.java | 80 ++++++++--------------
1 file changed, 30 insertions(+), 50 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
index 685d4d0..881cd01 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfiles.java
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
* Specification profile defining the replacements performed.
*/
public enum EESpecProfiles implements EESpecProfile {
+
TOMCAT("javax", "jakarta",
"javax([/\\.](annotation[/\\.](" + Patterns.ANNOTATION_CLASSES +
")" +
"|ejb" +
@@ -35,57 +36,9 @@ public enum EESpecProfiles implements EESpecProfile {
"|transaction(?![/\\.]xa)" +
"|websocket))"),
- EE("javax", "jakarta",
- "javax([/\\.](activation" +
- "|annotation[/\\.](" + Patterns.ANNOTATION_CLASSES + ")" +
- "|batch" +
- "|decorator" +
- "|ejb" +
- "|el" +
- "|enterprise" +
- "|faces" +
- "|jms" +
- "|json" +
- "|jws" +
- "|interceptor" +
- "|inject" +
- "|mail" +
- "|management[/\\.]j2ee" +
- "|persistence" +
- "|resource" +
- "|security[/\\.](auth[/\\.]message|enterprise|jacc)" +
- "|servlet" +
- "|transaction(?![/\\.]xa)" +
- "|validation" +
- "|websocket" +
- "|ws[/\\.]rs" +
- "|xml[/\\.](bind|soap|ws)))"),
+ EE("javax", "jakarta", "javax" + Patterns.EE),
- JEE8("jakarta", "javax",
- "jakarta([/\\.](activation" +
- "|annotation[/\\.](" + Patterns.ANNOTATION_CLASSES + ")" +
- "|batch" +
- "|decorator" +
- "|ejb" +
- "|el" +
- "|enterprise" +
- "|faces" +
- "|jms" +
- "|json" +
- "|jws" +
- "|interceptor" +
- "|inject" +
- "|mail" +
- "|management[/\\.]j2ee" +
- "|persistence" +
- "|resource" +
- "|security[/\\.](auth[/\\.]message|enterprise|jacc)" +
- "|servlet" +
- "|transaction(?![/\\.]xa)" +
- "|validation" +
- "|websocket" +
- "|ws[/\\.]rs" +
- "|xml[/\\.](bind|soap|ws)))");
+ JEE8("jakarta", "javax", "jakarta" + Patterns.EE);
private static final class Patterns {
/*
@@ -109,6 +62,33 @@ public enum EESpecProfiles implements EESpecProfile {
"security/RunAs",
"sql/DataSourceDefinition"
));
+ static final String EE = String.join("|",
+ Arrays.asList(
+ "([/\\.](activation",
+ "annotation(" + ANNOTATION_CLASSES + ")",
+ "batch",
+ "decorator",
+ "ejb",
+ "el",
+ "enterprise",
+ "faces",
+ "jms",
+ "json",
+ "jws",
+ "interceptor",
+ "inject",
+ "mail",
+ "management[/\\.]j2ee",
+ "persistence",
+ "resource",
+ "security[/\\.](auth[/\\.]message|enterprise|jacc)",
+ "servlet",
+ "transaction(?![/\\.]xa)",
+ "validation",
+ "websocket",
+ "ws[/\\.]rs",
+ "xml[/\\.](bind|soap|ws)))"
+ ));
}
private String source;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
