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:50 UTC

[tomcat-jakartaee-migration] 03/03: No longer convert the javax.xml.namespace package (Fixes #9)

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