Fix beanvalidation and sdo related failures in LRG (#753)

Signed-off-by: Lukas Jungmann <[email protected]>

Author: lukasj

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/SDOExceptionResource.java

@@ -79,7 +79,7 @@ public class SDOExceptionResource extends ListResourceBundle {
                                            { "45205", "SDO/JAXB - An SDO type could not be found that corresponds to the Java class [{0}], ensure that an SDO type corresponds to the XML type [{1}]." },
                                            { "45206", "SDO/JAXB - An error occurred creating a JAXB Unmarshaller." },
                                            { "45207", "An error occurred attempting to resolve a schema using the provided SchemaResolver."},
-                                           { "45208", "Unable to map property {0} from type {1}. The jakarta.activation and javax.mail packages are required to map properties of type DataHandler. Ensure that both of these are available on the classpath."},
+                                           { "45208", "Unable to map property {0} from type {1}. The jakarta.activation and jakarta.mail packages are required to map properties of type DataHandler. Ensure that both of these are available on the classpath."},
                                            { "45209", "An attempt was made to reset the ApplicationResolver instance on SDOHelperContext.  Only one set is permitted."},
                                            { "45210", "The DataObject being marshalled is not from the same HelperContext as the XMLHelper."},
                                            { "45211", "The type could not be defined with the [{0}] name. The name is not a valid XML name."},

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLBinaryDataCollectionMapping.java

@@ -64,7 +64,7 @@
  *  <li>byte[]</li>
  *  <li>jakarta.activation.DataHandler</li>
  *  <li>javax.xml.transform.Source</li>
- *  <li>javax.mail.internet.MimeMultipart</li>
+ *  <li>jakarta.mail.internet.MimeMultipart</li>
  *  </ul>
  *  <p><b>Setting the XPath</b>: TopLink XML mappings make use of XPath statements to find the relevant
  * data in an XML document.  The XPath statement is relative to the context node specified in the descriptor.

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceCollectionMapping.java

@@ -123,7 +123,7 @@ public class XMLChoiceCollectionMapping extends DatabaseMapping implements Choic
     private XMLAnyCollectionMapping anyMapping;
 
     private static final String DATA_HANDLER = "jakarta.activation.DataHandler";
-    private static final String MIME_MULTIPART = "javax.mail.MimeMultipart";
+    private static final String MIME_MULTIPART = "jakarta.mail.internet.MimeMultipart";
     private static final String IMAGE = "java.awt.Image";
 
     public XMLChoiceCollectionMapping() {

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceObjectMapping.java

@@ -113,7 +113,7 @@ public class XMLChoiceObjectMapping extends DatabaseMapping implements ChoiceObj
     private static final AttributeAccessor temporaryAccessor = new InstanceVariableAttributeAccessor();
 
     private static final String DATA_HANDLER = "jakarta.activation.DataHandler";
-    private static final String MIME_MULTIPART = "javax.mail.MimeMultipart";
+    private static final String MIME_MULTIPART = "jakarta.mail.internet.MimeMultipart";
     private static final String IMAGE = "java.awt.Image";
 
     public XMLChoiceObjectMapping() {

jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-dynamic-model/employee-constraints.xml

@@ -14,8 +14,8 @@
 -->
 
 <constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/mapping validation-mapping-1.0.xsd"
-                     xmlns="http://jboss.org/xml/ns/jakarta.validation/mapping">
+                     xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
+                     xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
     <default-package>org.eclipse.persistence.testing.models.jpa.beanvalidation</default-package>
     <bean class="DynamicEmployee" ignore-annotations="true">
         <getter name="name" ignore-annotations="true">

jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-dynamic-model/server/employee-constraints.xml

@@ -14,8 +14,8 @@
 -->
 
 <constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/mapping validation-mapping-1.0.xsd"
-                     xmlns="http://jboss.org/xml/ns/jakarta.validation/mapping">
+                     xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
+                     xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
     <default-package>org.eclipse.persistence.testing.models.jpa.beanvalidation</default-package>
     <bean class="DynamicEmployee" ignore-annotations="true">
         <getter name="name" ignore-annotations="true">

jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-dynamic-model/server/validation.xml

@@ -13,9 +13,9 @@
 
 -->
 
-<validation-config version="1.1" xmlns="http://jboss.org/xml/ns/jakarta.validation/configuration"
+<validation-config version="1.1" xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/configuration">
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration">
     <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
     <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
    <!--  <traversable-resolver>org.hibernate.validator.internal.engine.resolver.CachingJPATraversableResolverForSingleValidation</traversable-resolver> -->

jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-dynamic-model/validation.xml

@@ -13,9 +13,9 @@
 
 -->
 
-<validation-config version="1.1" xmlns="http://jboss.org/xml/ns/jakarta.validation/configuration"
+<validation-config version="1.1" xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/configuration">
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration">
     <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
     <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
     <!-- <traversable-resolver>org.hibernate.validator.internal.engine.resolver.CachingJPATraversableResolverForSingleValidation</traversable-resolver> -->

moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java

@@ -196,7 +196,7 @@ public final class AnnotationsProcessor {
 
     static final String ARRAY_PACKAGE_NAME = "jaxb.dev.java.net.array";
     static final String JAVAX_ACTIVATION_DATAHANDLER = "jakarta.activation.DataHandler";
-    static final String JAVAX_MAIL_INTERNET_MIMEMULTIPART = "javax.mail.internet.MimeMultipart";
+    static final String JAVAX_MAIL_INTERNET_MIMEMULTIPART = "jakarta.mail.internet.MimeMultipart";
     private static final String JAVAX_XML_BIND_JAXBELEMENT = "jakarta.xml.bind.JAXBElement";
     private static final String JAVAX_XML_BIND_ANNOTATION = "jakarta.xml.bind.annotation";
     private static final String OXM_ANNOTATIONS = "org.eclipse.persistence.oxm.annotations";

moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java

@@ -3453,7 +3453,7 @@ public JaxbClassLoader getJaxbClassLoader() {
     }
 
     private boolean isBinaryData(JavaClass type){
-        return areEquals(type, CoreClassConstants.APBYTE) ||areEquals(type, "jakarta.activation.DataHandler") || areEquals(type, "java.awt.Image") || areEquals(type, "javax.xml.transform.Source") || areEquals(type, "javax.mail.internet.MimeMultipart");
+        return areEquals(type, CoreClassConstants.APBYTE) ||areEquals(type, "jakarta.activation.DataHandler") || areEquals(type, "java.awt.Image") || areEquals(type, "javax.xml.transform.Source") || areEquals(type, "jakarta.mail.internet.MimeMultipart");
     }
 
     // Made static final for performance reasons.

moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/SchemaGenerator.java

@@ -113,7 +113,7 @@ public class SchemaGenerator {
     private Map<String, Class> arrayClassesToGeneratedClasses;
 
     private static final String JAVAX_ACTIVATION_DATAHANDLER = "jakarta.activation.DataHandler";
-    private static final String JAVAX_MAIL_INTERNET_MIMEMULTIPART = "javax.mail.internet.MimeMultipart";
+    private static final String JAVAX_MAIL_INTERNET_MIMEMULTIPART = "jakarta.mail.internet.MimeMultipart";
     private static final String SWA_REF_IMPORT = "http://ws-i.org/profiles/basic/1.1/swaref.xsd";
 
     private static final String COLON = ":";

moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/LargeInlineBinaryDataXMLStreamReaderReader.java

@@ -29,7 +29,7 @@
 public class LargeInlineBinaryDataXMLStreamReaderReader extends XMLStreamReaderReader {
 
     static Image IMAGE = new BufferedImage(1,1,BufferedImage.TYPE_INT_RGB);
-    static DataHandler DATA_HANDLER = new DataHandler(IMAGE, "iamge/jpg");
+    static DataHandler DATA_HANDLER = new DataHandler(IMAGE, "image/jpg");
     static Source SOURCE  = new StreamSource(System.in);
     static MimeMultipart MIME_MULTIPART = new MimeMultipart();
     static LargeInlineBinaryCharSequence CHAR_SEQUENCE = new LargeInlineBinaryCharSequence();

moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/beanvalidation/constraints.xml

@@ -14,13 +14,13 @@
 
 <constraint-mappings
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/mapping validation-mapping-1.1.xsd"
-        xmlns="http://jboss.org/xml/ns/jakarta.validation/mapping" version="1.1">
+        xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.1.xsd"
+        xmlns="http://jboss.org/xml/ns/javax/validation/mapping" version="1.1">
 
     <default-package>org.eclipse.persistence.testing.jaxb.beanvalidation.special</default-package>
     <bean class="ExternallyConstrainedEmployee" ignore-annotations="false">
         <field name="id">
             <constraint annotation="jakarta.validation.constraints.NotNull"/>
         </field>
     </bean>
-</constraint-mappings>
+</constraint-mappings>

moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/beanvalidation/constraints2.xml

@@ -14,8 +14,8 @@
 
 <constraint-mappings
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/mapping validation-mapping-1.1.xsd"
-        xmlns="http://jboss.org/xml/ns/jakarta.validation/mapping" version="1.1">
+        xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.1.xsd"
+        xmlns="http://jboss.org/xml/ns/javax/validation/mapping" version="1.1">
 
     <default-package>org.eclipse.persistence.testing.jaxb.beanvalidation.special</default-package>
     <bean class="ExternallyConstrainedEmployee2" ignore-annotations="false">
@@ -25,4 +25,4 @@
             </constraint>
         </field>
     </bean>
-</constraint-mappings>
+</constraint-mappings>

moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/dom/jaxb.properties moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/beanvalidation/dom/jaxb.properties

@@ -18,9 +18,9 @@ Unmarshaller - Validator - Unmarshaller. -->
 <!-- Having this file deactivated prevents HV from flooding logs each time it discovers this file. -->
 <!-- Required for testing that BV optimizations do not surpass objects constrained via xml conf. -->
 <validation-config
-        xmlns="http://jboss.org/xml/ns/jakarta.validation/configuration"
+        xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://jboss.org/xml/ns/jakarta.validation/configuration">
+        xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration">
 
     <constraint-mapping>META-INF/validation/constraints.xml</constraint-mapping>
     <constraint-mapping>META-INF/validation/constraints2.xml</constraint-mapping>

moxy/org.eclipse.persistence.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/beanvalidation/validation.xml

@@ -108,7 +108,7 @@ public class SDOProperty implements Property, Serializable {
         isActivationAvailable = false;
         try {
             PrivilegedAccessHelper.getClassForName("jakarta.activation.DataHandler");
-            PrivilegedAccessHelper.getClassForName("javax.mail.internet.MimeMultipart");
+            PrivilegedAccessHelper.getClassForName("jakarta.mail.internet.MimeMultipart");
             isActivationAvailable = true;
         } catch(ClassNotFoundException ex) {
             //ignore this exception and let the boolean remain false;