You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/03 03:04:09 UTC
[tomee-jakarta] 02/02: Add 'jakarta' strings next 'javax' references
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit fe82ddbddaf4bda2fc548e2a35d8956a85c08595
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Apr 2 20:03:48 2021 -0700
Add 'jakarta' strings next 'javax' references
---
.../apache/cxf/jaxb/JAXBContextInitializer.java | 24 ++++++++++++----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 0067581..1a04e67 100644
--- a/transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -36,15 +36,15 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
@@ -316,7 +316,8 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
addClass(String.class);
} else if (claz.getName().startsWith("java.")
- || claz.getName().startsWith("javax.")) {
+ || claz.getName().startsWith("javax.")
+ || claz.getName().startsWith("jakarta.")) {
return;
} else {
Class<?> cls = JAXBUtils.getValidClass(claz);
@@ -375,7 +376,8 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return;
}
if (cls.getName().startsWith("java.")
- || cls.getName().startsWith("javax.")) {
+ || cls.getName().startsWith("javax.")
+ || cls.getName().startsWith("jakarta.")) {
return;
}
//walk the public fields/methods to try and find all the classes. JAXB will only load the