Update moxy tests to use non-deprecated property (#1281)
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
index 2641af1..256a81c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
@@ -109,10 +109,10 @@
DynamicEntity foundEntity = find(dynamicHelper, session, 1);
assertNotNull(foundEntity);
- assertEquals(simpleInstance.get("id1"), foundEntity.get("id1"));
- assertEquals(simpleInstance.get("id2"), foundEntity.get("id2"));
- assertEquals(simpleInstance.get("value1"), foundEntity.get("value1"));
- assertEquals(simpleInstance.get("value2"), foundEntity.get("value2"));
+ assertEquals(simpleInstance.<Integer>get("id1"), foundEntity.<Integer>get("id1"));
+ assertEquals(simpleInstance.<Integer>get("id2"), foundEntity.<Integer>get("id2"));
+ assertEquals(simpleInstance.<String>get("value1"), foundEntity.<String>get("value1"));
+ assertEquals(simpleInstance.<Boolean>get("value2"), foundEntity.<Boolean>get("value2"));
return simpleInstance;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
index 9d9c539..df7a3e4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeTestSuite.java
@@ -179,9 +179,9 @@
DynamicEntity foundEntity = find(dynamicHelper, session, 1);
assertNotNull(foundEntity);
- assertEquals(simpleInstance.get("id"), foundEntity.get("id"));
- assertEquals(simpleInstance.get("value1"), foundEntity.get("value1"));
- assertEquals(simpleInstance.get("value2"), foundEntity.get("value2"));
+ assertEquals(simpleInstance.<Integer>get("id"), foundEntity.<Integer>get("id"));
+ assertEquals(simpleInstance.<String>get("value1"), foundEntity.<String>get("value1"));
+ assertEquals(simpleInstance.<Boolean>get("value2"), foundEntity.<Boolean>get("value2"));
session.release();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
index b87639b..76b8da6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/SimpleTypeWithEnumTestSuite.java
@@ -192,10 +192,10 @@
DynamicEntity foundEntity = find(dynamicHelper, session, 1);
assertNotNull(foundEntity);
- assertEquals(simpleInstance.get("id"), foundEntity.get("id"));
- assertEquals(simpleInstance.get("value1"), foundEntity.get("value1"));
- assertEquals(simpleInstance.get("value2"), foundEntity.get("value2"));
- assertSame(simpleInstance.get("color"), foundEntity.get("color"));
+ assertEquals(simpleInstance.<Integer>get("id"), foundEntity.<Integer>get("id"));
+ assertEquals(simpleInstance.<String>get("value1"), foundEntity.<String>get("value1"));
+ assertEquals(simpleInstance.<Boolean>get("value2"), foundEntity.<Boolean>get("value2"));
+ assertSame(simpleInstance.<Enum>get("color"), foundEntity.<Enum>get("color"));
session.release();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/BaseSequencingTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/BaseSequencingTestSuite.java
index 4c093d6..c1b02d6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/BaseSequencingTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/BaseSequencingTestSuite.java
@@ -84,8 +84,8 @@
DynamicEntity findResult = find(dynamicHelper, session, 1);
assertNotNull(findResult);
- assertEquals(simpleInstance.get("id"), findResult.get("id"));
- assertEquals(simpleInstance.get("value1"), findResult.get("value1"));
+ assertEquals(simpleInstance.<Integer>get("id"), findResult.<Integer>get("id"));
+ assertEquals(simpleInstance.<String>get("value1"), findResult.<String>get("value1"));
session.release();
}
@@ -112,8 +112,8 @@
assertNotNull(findResult1);
assertNotNull(findResult2);
- assertEquals(simpleInstance1.get("id"), findResult1.get("id"));
- assertEquals(simpleInstance2.get("value1"), findResult2.get("value1"));
+ assertEquals(simpleInstance1.<Integer>get("id"), findResult1.<Integer>get("id"));
+ assertEquals(simpleInstance2.<String>get("value1"), findResult2.<String>get("value1"));
session.release();
}
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
index 7a18ec5..cc3c0ab 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeCompositeKeyTestSuite.java
@@ -117,7 +117,7 @@
assertNotNull(foundEntity);
assertEquals(simpleInstance.<Number>get("id1"), foundEntity.<Number>get("id1"));
assertEquals(simpleInstance.<Number>get("id2"), foundEntity.<Number>get("id2"));
- assertEquals(simpleInstance.get("value1"), foundEntity.get("value1"));
+ assertEquals(simpleInstance.<String>get("value1"), foundEntity.<String>get("value1"));
assertEquals(simpleInstance.<Boolean>get("value2"), foundEntity.<Boolean>get("value2"));
em.close();
return simpleInstance;
diff --git a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
index 8e652a3..2627374 100644
--- a/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
+++ b/jpa/eclipselink.jpa.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/dynamic/simple/SimpleTypeTestSuite.java
@@ -182,7 +182,7 @@
DynamicEntity foundEntity = find(em, 1);
assertNotNull(foundEntity);
assertEquals(simpleInstance.<Number>get("id"), foundEntity.<Number>get("id"));
- assertEquals(simpleInstance.get("value1"), foundEntity.get("value1"));
+ assertEquals(simpleInstance.<String>get("value1"), foundEntity.<String>get("value1"));
assertEquals(simpleInstance.<Boolean>get("value2"), foundEntity.<Boolean>get("value2"));
em.close();
return simpleInstance;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
index 2befbf9..b9af29e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
@@ -61,11 +61,7 @@
import org.eclipse.persistence.internal.oxm.record.XMLStreamReaderInputSource;
import org.eclipse.persistence.internal.oxm.record.XMLStreamReaderReader;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBUnmarshaller;
-import org.eclipse.persistence.jaxb.JAXBUnmarshallerHandler;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.jaxb.compiler.CompilerHelper;
import org.eclipse.persistence.jaxb.xmlmodel.XmlBindings;
import org.eclipse.persistence.oxm.MediaType;
@@ -155,7 +151,7 @@
this.contextPath = contextPath;
Map props = getProperties();
if(props != null){
- Map overrides = (Map) props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Map overrides = (Map) props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(overrides != null){
Iterator valuesIter = overrides.values().iterator();
while(valuesIter.hasNext()){
@@ -180,7 +176,7 @@
Map props = getProperties();
if(props != null){
- Map overrides = (Map) props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Map overrides = (Map) props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(overrides != null){
Iterator valuesIter = overrides.values().iterator();
while(valuesIter.hasNext()){
@@ -207,7 +203,7 @@
if(props !=null){
- Object bindingFilesObject = props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Object bindingFilesObject = props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(bindingFilesObject != null){
JAXBContext jaxbContext = CompilerHelper.getXmlBindingsModelContext();
//unmarshal XML
@@ -262,14 +258,14 @@
StreamSource newSource = new StreamSource(new StringReader(sw.toString()));
bindingFilesList.set(i, newSource);
}
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindingFilesList);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindingFilesList);
}else{
Object unmarshalledFromXML = getXmlBindings(bindingFilesObject);
StringWriter sw = new StringWriter();
StreamResult newResult = new StreamResult(sw);
jsonMarshaller.marshal(unmarshalledFromXML, newResult);
StreamSource newSource = new StreamSource(new StringReader(sw.toString()));
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, newSource);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, newSource);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
index 562098e..57b2e7a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -90,7 +91,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put("org.eclipse.persistence.testing.jaxb.annotations.cdata", src);
HashMap properties = new HashMap();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
index 4d3d8e7..04f4781 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.w3c.dom.Document;
@@ -108,7 +109,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.annotations.xmlnullpolicy", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
index 2734a44..9222ab8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.w3c.dom.Document;
@@ -116,7 +117,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.annotations.xmlnullpolicy", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
index b1583ae..cffada6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
@@ -27,6 +27,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases;
import org.w3c.dom.Document;
@@ -108,7 +109,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put("org.eclipse.persistence.testing.jaxb.annotations.xmlpath", src);
HashMap properties = new HashMap();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
index c4eaa99..5c5c653 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -54,7 +55,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.annotations.xmlpaths.override", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
index 7950c51..78ba85b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
@@ -21,6 +21,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -75,7 +76,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put("org.eclipse.persistence.testing.jaxb.annotations.xmlreadonly", src);
HashMap properties = new HashMap();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
index c53538f..48d8f66 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
@@ -21,6 +21,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -75,7 +76,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.annotations.xmltransformation", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/DoubleTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/DoubleTransientTestCases.java
index 3eaf1c0..838c328 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/DoubleTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/DoubleTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -56,7 +57,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.annotations.xmltransient", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/TransientClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/TransientClassTestCases.java
index 821c6c7..cda3c64 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/TransientClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/TransientClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -63,7 +64,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.annotations.xmltransient", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
index eecc9ca..28d3861 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
@@ -20,6 +20,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -73,7 +74,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put("org.eclipse.persistence.testing.jaxb.annotations.xmlwriteonly", src);
HashMap properties = new HashMap();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersOverrideTestCases.java
index 7cb1ec7..1af5413 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,7 +69,7 @@
// test override of 'old' context factory property - if the override
// fails we will get errors
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new HashMap<String, Source>());
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new HashMap<String, Source>());
properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
index 7792801..b020190 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
@@ -32,6 +32,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.testing.jaxb.dynamic.util.MyList;
@@ -101,7 +102,7 @@
metadataSourceMap.put(PACKAGE, new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -138,7 +139,7 @@
metadataSourceMap.put(PACKAGE, new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -173,7 +174,7 @@
metadataSourceMap.put(PACKAGE, new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -210,7 +211,7 @@
metadataSourceMap.put(PACKAGE, new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -248,7 +249,7 @@
metadataSourceMap.put(PACKAGE, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JaxbClassLoader jcl = new JaxbClassLoader(classLoader);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
index f6fa3b5..ab1305a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
@@ -108,7 +108,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.dynamic", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
// Have to include a path to a jaxb.properties, so just reusing a context path that does contain one.
DynamicJAXBContext jaxbContext = (DynamicJAXBContext) JAXBContext.newInstance("org.eclipse.persistence.testing.jaxb.dynamic", classLoader, properties);
@@ -460,7 +460,6 @@
Map<String, Object> properties = new HashMap<String, Object>();
properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new HashMap<String, Source>());
DynamicJAXBContext jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
index b82e8c8..9ee7a3b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
@@ -49,6 +49,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.oxm.XMLConversionManager;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.mappings.transformers.AttributeTransformerAdapter;
@@ -95,7 +96,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -133,7 +134,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -174,7 +175,7 @@
metadataSourceMap.put("", new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -211,7 +212,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -236,7 +237,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -282,7 +283,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -309,7 +310,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -340,7 +341,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -381,7 +382,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -410,7 +411,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -436,7 +437,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -468,7 +469,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -503,7 +504,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -544,7 +545,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -581,7 +582,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -622,7 +623,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -647,7 +648,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -675,7 +676,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -698,7 +699,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -731,7 +732,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -792,7 +793,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -829,7 +830,7 @@
metadataSourceMap.put("", new StreamSource(iStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -865,7 +866,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -891,7 +892,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -917,7 +918,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -942,7 +943,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -966,7 +967,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1020,7 +1021,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1045,7 +1046,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1068,7 +1069,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1092,7 +1093,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1142,7 +1143,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1192,7 +1193,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1239,7 +1240,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1272,7 +1273,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1321,7 +1322,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
@@ -1361,7 +1362,7 @@
InputStream iStream = classLoader.getResourceAsStream(OXM_METADATA);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
DynamicJAXBContext jc = DynamicJAXBContextFactory.createContextFromOXM(classLoader, properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
index 023c2e1..1aed95f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
@@ -40,6 +40,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.helper.ClassConstants;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.testing.jaxb.dynamic.util.CustomEntityResolver;
@@ -366,7 +367,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Object> props = new HashMap<String, Object>();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XMLELEMENT);
jaxbContext = DynamicJAXBContextFactory.createContextFromXSD(inputStream, null, null, props);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
index d21c9c0..e94e734 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
@@ -32,6 +32,7 @@
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl.PropertyWrapper;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.JAXBHelper;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
@@ -64,7 +65,7 @@
metadataStream.close();
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataDocument);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataDocument);
DynamicJAXBContext jc = DynamicJAXBContextFactory.createContextFromOXM(classLoader, props);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
index 5e9bd6c..b34f786 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
@@ -29,11 +29,7 @@
import junit.framework.TestCase;
import org.eclipse.persistence.dynamic.DynamicEntity;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.JAXBUnmarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.oxm.NamespaceResolver;
@@ -61,7 +57,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.dynamic", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
DynamicJAXBContext jaxbContext = (DynamicJAXBContext) JAXBContext.newInstance("org.eclipse.persistence.testing.jaxb.dynamic", classLoader, properties);
DynamicEntity employee = (DynamicEntity) jaxbContext.createByQualifiedName(EMPLOYEE_NAMESPACE, EMPLOYEE_TYPE_NAME, false);
@@ -95,7 +91,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.dynamic", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
DynamicJAXBContext jaxbContext = (DynamicJAXBContext) JAXBContext.newInstance("org.eclipse.persistence.testing.jaxb.dynamic", classLoader, properties);
DynamicEntity employee = (DynamicEntity) jaxbContext.createByQualifiedName(EMPLOYEE_NAMESPACE, EMPLOYEE_TYPE_NAME, false);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
index 9b5fc87..f47ac7f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
@@ -18,6 +18,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContextFactory;
import org.eclipse.persistence.jaxb.metadata.MetadataSource;
import org.eclipse.persistence.jaxb.xmlmodel.XmlBindings;
@@ -33,7 +34,7 @@
public void testEmptyContext() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new TestMetadataSource());
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new TestMetadataSource());
DynamicJAXBContextFactory.createContextFromOXM(null, properties);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
index 5483658..da3029f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
@@ -48,7 +48,7 @@
public void testOXM() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(2);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, "org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/oxm.xml");
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, "org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/oxm.xml");
JAXBContext jc = DynamicJAXBContextFactory.createContextFromOXM(this.getClass().getClassLoader(), properties);
unmarshalTest(jc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
index 066c611..c542db1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
@@ -87,7 +88,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContext(PACKAGE, null, properties);
xmlContext = ((org.eclipse.persistence.jaxb.JAXBContext)jaxbContext).getXMLContext();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
index f630bdf..1165e39 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
@@ -87,7 +88,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContext(PACKAGE, null, properties);
xmlContext = ((org.eclipse.persistence.jaxb.JAXBContext)jaxbContext).getXMLContext();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
index e9ea959..75befc7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
@@ -87,7 +88,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContext(PACKAGE, null, properties);
xmlContext = ((org.eclipse.persistence.jaxb.JAXBContext)jaxbContext).getXMLContext();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
index 22f2999..68e27ad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.dynamic.DynamicEntity;
import org.eclipse.persistence.internal.dynamic.DynamicEntityImpl;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
@@ -91,7 +92,7 @@
}
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
jaxbContext = DynamicJAXBContextFactory.createContext(PACKAGE, null, properties);
xmlContext = ((org.eclipse.persistence.jaxb.JAXBContext)jaxbContext).getXMLContext();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
index 8b6750f..a2ee7a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
@@ -27,6 +27,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.XMLRoot;
@@ -45,7 +46,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.events", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
index 9e7c6b9..c7aa1f0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
@@ -47,6 +47,7 @@
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.compiler.Generator;
import org.eclipse.persistence.jaxb.javamodel.reflection.JavaModelImpl;
import org.eclipse.persistence.jaxb.javamodel.reflection.JavaModelInputImpl;
@@ -183,7 +184,7 @@
metadataSourceMap.put(contextPath, new StreamSource(iStream));
validateBindingsFileAgainstSchema(iStream);
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return generateSchema(contextPath, properties, expectedSchemaCount);
}
@@ -210,7 +211,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return generateSchema(contextPath, properties, expectedSchemaCount);
}
@@ -226,7 +227,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
try {
generateSchema(classes, properties, outputResolver, loader);
@@ -261,7 +262,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
validateBindingsFileAgainstSchema(iStreamCopy);
@@ -286,7 +287,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
validateBindingsFileAgainstSchema(iStreamCopy);
@@ -326,7 +327,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
try {
generateSchema(types, properties, outputResolver, classLoader);
@@ -768,7 +769,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(contextPath, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
validateBindingsFileAgainstSchema(iStreamCopy);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
index ec79c80..3fbf381 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/exceptions/contextfactory/ExceptionHandlingTestCases.java
@@ -26,6 +26,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.oxm.OXTestCase;
/**
@@ -55,7 +56,7 @@
Map<Class, Source> metadataSourceMap = new HashMap<Class, Source>();
metadataSourceMap.put(JAXBContextFactory.class, new StreamSource());
Map<String, Map<Class, Source>> properties = new HashMap<String, Map<Class, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -75,7 +76,7 @@
Map<Class, Source> metadataSourceMap = new HashMap<Class, Source>();
metadataSourceMap.put(null, new StreamSource());
Map<String, Map<Class, Source>> properties = new HashMap<String, Map<Class, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -96,7 +97,7 @@
Map<String, Class> metadataSourceMap = new HashMap<String, Class>();
metadataSourceMap.put(CONTEXT_PATH, this.getClass());
Map<String, Map<String, Class>> properties = new HashMap<String, Map<String, Class>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -116,7 +117,7 @@
Map<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, null);
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -137,7 +138,7 @@
Map<String, List<Integer>> properties = new HashMap<String, List<Integer>>();
ArrayList<Integer> ints = new ArrayList<Integer>();
ints.add(666);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, ints);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, ints);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
} catch (JAXBException e) {
@@ -162,7 +163,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -188,7 +189,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -217,7 +218,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("java.util", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContext ctx = JAXBContextFactory.createContext(contextPath, getClass().getClassLoader(), properties);
@@ -241,7 +242,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
@@ -264,7 +265,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(metadataFile));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContextFactory.createContext(CONTEXT_PATH, getClass().getClassLoader(), properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
index 072d351..984887e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
@@ -37,6 +37,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.metadata.XMLMetadataSource;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.stringarray.a.BeanA;
@@ -198,7 +199,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.properties.foo", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
outputResolver = generateSchema(contextPath, properties, 1);
@@ -262,7 +263,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.stringarray.b", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
JAXBContext jaxbContext;
@@ -309,7 +310,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.stringarray.b", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
MySchemaOutputResolver outputResolver = new MySchemaOutputResolver();
JAXBContext jaxbContext;
@@ -334,7 +335,7 @@
public void testBindingFormatFile() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new File(FILE_OXM_XML));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new File(FILE_OXM_XML));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestFile(jCtx);
@@ -342,7 +343,7 @@
public void testBindingFormatXMLMetadataSource() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new XMLMetadataSource(new File(FILE_OXM_XML)));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new XMLMetadataSource(new File(FILE_OXM_XML)));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestFile(jCtx);
@@ -350,7 +351,7 @@
public void testBindingFormatInputSource() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new InputSource(INPUT_SRC_OXM_XML.openStream()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new InputSource(INPUT_SRC_OXM_XML.openStream()));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputSrc(jCtx);
@@ -358,7 +359,7 @@
public void testBindingFormatString() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, INPUT_SRC_OXM_XML);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, INPUT_SRC_OXM_XML);
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputSrc(jCtx);
@@ -373,7 +374,7 @@
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, "subfolder/foo-oxm.xml");
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, "subfolder/foo-oxm.xml");
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, testLoader);
@@ -382,7 +383,7 @@
public void testBindingFormatStringInvalid() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, "foobar");
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, "foobar");
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
boolean exceptionThrown = false;
try {
@@ -400,7 +401,7 @@
Map<String, Object> properties = new HashMap<>();
File file = new File(INPUT_SRC_OXM_XML.toURI());
URL url = file.toURI().toURL();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, url.toExternalForm());
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, url.toExternalForm());
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputSrc(jCtx);
@@ -408,7 +409,7 @@
}
public void testBindingFormatMetadataSourceString() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new XMLMetadataSource(INPUT_SRC_OXM_XML));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new XMLMetadataSource(INPUT_SRC_OXM_XML));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputSrc(jCtx);
@@ -418,7 +419,7 @@
boolean exception = false;
try {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new XMLMetadataSource((File)null));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new XMLMetadataSource((File)null));
} catch(IllegalArgumentException ex) {
exception = true;
}
@@ -426,7 +427,7 @@
}
public void testBindingFormatMetadataSourceStringInvalid() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new XMLMetadataSource("foobar"));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new XMLMetadataSource("foobar"));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
boolean exceptionThrown = false;
try {
@@ -444,7 +445,7 @@
Map<String, Object> properties = new HashMap<>();
File file = new File(INPUT_SRC_OXM_XML.toURI());
URL url = file.toURI().toURL();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new XMLMetadataSource(url.toExternalForm()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new XMLMetadataSource(url.toExternalForm()));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputSrc(jCtx);
@@ -452,7 +453,7 @@
public void testBindingFormatInputStream() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, INPUT_STRM_OXM_XML.openStream());
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, INPUT_STRM_OXM_XML.openStream());
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputstream.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestInputStrm(jCtx);
@@ -460,7 +461,7 @@
public void testBindingsEmptyXML() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new InputStreamReader(READER_EMPTY_OXM_XML.openStream()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new InputStreamReader(READER_EMPTY_OXM_XML.openStream()));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.reader.FooWithRootElement.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, null, loader);
@@ -471,7 +472,7 @@
public void testBindingsEmptyJSON() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new InputStreamReader(READER_EMPTY_OXM_JSON.openStream()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new InputStreamReader(READER_EMPTY_OXM_JSON.openStream()));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.reader.FooWithRootElement.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, null, loader);
@@ -482,7 +483,7 @@
public void testBindingFormatReader() throws Exception {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new InputStreamReader(READER_OXM_XML.openStream()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new InputStreamReader(READER_OXM_XML.openStream()));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.reader.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestReader(jCtx);
@@ -491,7 +492,7 @@
public void testBindingFormatSource() throws Exception {
Map<String, Object> properties = new HashMap<>();
InputStream is = ClassLoader.getSystemResourceAsStream(SOURCE_OXM_XML);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new StreamSource(is));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new StreamSource(is));
Class[] classes = new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.source.Foo.class };
JAXBContext jCtx = (JAXBContext) JAXBContextFactory.createContext(classes, properties, loader);
doTestSource(jCtx);
@@ -505,7 +506,7 @@
inputFiles.add(new InputStreamReader(READER_OXM_XML.openStream()));
inputFiles.add(new StreamSource(ClassLoader.getSystemResourceAsStream(SOURCE_OXM_XML)));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -534,7 +535,7 @@
inputFiles.add(ds);
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -553,7 +554,7 @@
List<Object> inputFiles = new ArrayList<>();
inputFiles.add(new File(FILE_PATH + "foo-oxm-invalid.xml"));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class};
@@ -570,7 +571,7 @@
List<Object> inputFiles = new ArrayList<>();
inputFiles.add(new File(FILE_OXM_JSON_INVALID));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class};
@@ -587,7 +588,7 @@
List<Object> inputFiles = new ArrayList<>();
inputFiles.add(new File(FILE_PATH + "foo-oxm-invalid2.json"));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class};
try{
@@ -609,7 +610,7 @@
inputFiles.add(new InputStreamReader(READER_OXM_JSON.openStream()));
inputFiles.add(new StreamSource(ClassLoader.getSystemResourceAsStream(SOURCE_OXM_JSON)));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -634,7 +635,7 @@
inputFiles.add(new InputStreamReader(READER_OXM_JSON.openStream()));
inputFiles.add(new StreamSource(ClassLoader.getSystemResourceAsStream(SOURCE_OXM_JSON)));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -663,7 +664,7 @@
inputFiles.add(ds);
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -686,7 +687,7 @@
inputFiles.add(new InputStreamReader(READER_OXM_JSON.openStream()));
inputFiles.add(new StreamSource(ClassLoader.getSystemResourceAsStream(SOURCE_OXM_XML)));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -709,7 +710,7 @@
inputFiles.add(new InputStreamReader(READER_OXM_XML.openStream()));
inputFiles.add(new StreamSource(ClassLoader.getSystemResourceAsStream(SOURCE_OXM_JSON)));
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputFiles);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputFiles);
Class[] listClasses = new Class[] {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.file.Foo.class,
org.eclipse.persistence.testing.jaxb.externalizedmetadata.jaxbcontextfactory.bindingformat.inputsource.Foo.class,
@@ -727,7 +728,7 @@
public void testBindingFormatNoPackageSet() {
try {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, Thread.currentThread().getContextClassLoader().getResource((NO_PKG_OXM_XML)).openStream());
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, Thread.currentThread().getContextClassLoader().getResource((NO_PKG_OXM_XML)).openStream());
JAXBContextFactory.createContext(new Class[] {}, properties, loader);
} catch (org.eclipse.persistence.exceptions.JAXBException jaxbe) {
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
index 6375b6e..a816f1c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
@@ -24,10 +24,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -95,7 +92,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
index 6b2fb6b..38c869c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
@@ -24,10 +24,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AnyAttributeReadOnlyMappingTestCases extends JAXBWithJSONTestCases{
@@ -73,7 +70,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
index 0826287..19a8a22 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
@@ -25,10 +25,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -96,7 +93,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
index 07d6e75..2d2fe8a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
@@ -24,10 +24,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AnyAttributeWriteOnlyMappingTestCases extends JAXBWithJSONTestCases{
@@ -72,7 +69,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
index 7345a3e..70493a1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -68,7 +69,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anycollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
index 4cac8d7..8f6b1f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AnyCollectionReadOnlyMappingTestCases extends JAXBWithJSONTestCases {
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anycollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
index e65d838..4607b97 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AnyCollectionWriteOnlyMappingTestCases extends JAXBWithJSONTestCases{
@@ -47,7 +48,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anycollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
index fa71118..6589a1a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -80,7 +81,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyobject", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
index 1ceadac..ea86bf1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -58,7 +59,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyobject", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
index 89c9fbd..18d4091 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.anyobject", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
index deb878b..bd7612c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -98,7 +99,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.binarydata", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
index a6907bc..78a5bcb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -108,7 +109,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.binarydatacollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
index b8b2305..4a3a29b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -76,7 +77,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choice", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
index 0378fa5..ee92a24 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
@@ -22,10 +22,7 @@
import jakarta.xml.bind.JAXBException;
-import org.eclipse.persistence.jaxb.JAXBContext;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choice.reference.Address;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choice.reference.Client;
@@ -88,7 +85,7 @@
Map<String, Object> props = new HashMap<String, Object>();
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/reference/root-oxm.xml");
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputStream);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStream);
return props;
}
@@ -108,7 +105,7 @@
try {
Map<String, Object> props = new HashMap<String, Object>();
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/reference/root-invalid-oxm.xml");
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, inputStream);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStream);
JAXBContext ctx = (JAXBContext) JAXBContextFactory.createContext(new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choice.reference.Root.class }, props);
} catch (JAXBException e1) {
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
index ec99c2c..aeca980 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -104,7 +105,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choicecollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
index a7e54e6..4e3c89f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -59,7 +60,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.collectionreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
index 43f8265..eadd26b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class CollectionReferenceReadOnlyTestCases extends JAXBWithJSONTestCases{
@@ -88,7 +89,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.collectionreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
index c060453..9832303 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class CollectionReferenceWriteOnlyTestCases extends JAXBWithJSONTestCases{
@@ -113,7 +114,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.collectionreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
index 1276e6d..e1ac0d8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.w3c.dom.Document;
@@ -73,7 +74,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.composite", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
@@ -85,7 +86,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.composite.multiplenamespaces", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -96,7 +97,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.composite.cyclic", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -107,7 +108,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.composite.cyclic.multiplenamespaces", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
index 79de256..f9c40d1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -81,7 +82,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.compositecollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
index d64ad6f..8cda68b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class DirectMappingTeamTestCases extends JAXBWithJSONTestCases{
@@ -45,7 +46,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.direct", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
index ca6b9e2..66ff227 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
@@ -120,7 +121,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.direct", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
index 8c828b2..b6f5da7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class DirectMappingVehicleTestCases extends JAXBWithJSONTestCases{
@@ -45,7 +46,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.direct", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
index c256d3c..4a1e8ad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class DirectMappingXmlValueTestCases extends JAXBWithJSONTestCases {
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.direct", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
index 46433ec..577c9da 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
@@ -25,6 +25,7 @@
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -130,7 +131,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.directcollection", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
index 2bb624a..60c5044 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
@@ -28,6 +28,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -78,7 +79,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.multiple", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
index cc6ea09..dff8e0a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class ObjectReferenceMappingReadOnlyTestCases extends JAXBWithJSONTestCases{
@@ -114,7 +115,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.objectreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
index 1414e36..42d0352 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
@@ -25,6 +25,7 @@
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -115,7 +116,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.objectreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
index 3bfd682..e95b7fa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class ObjectReferenceMappingWriteOnlyTestCases extends JAXBWithJSONTestCases{
@@ -131,7 +132,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.objectreference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
index 3723ade..76e7894 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLInverseReferenceMapping;
@@ -155,7 +156,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmlinversereference", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
index f567e43..a7d8dcd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
@@ -25,6 +25,7 @@
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.compiler.Generator;
import org.eclipse.persistence.jaxb.javamodel.reflection.JavaModelImpl;
import org.eclipse.persistence.jaxb.javamodel.reflection.JavaModelInputImpl;
@@ -53,7 +54,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
@@ -75,7 +76,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
@@ -100,7 +101,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
int exceptionCount = 0;
try {
@@ -136,7 +137,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
int exceptionCount = 0;
// test exception from MappingsGenerator
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
index 9936e4f..2f1567e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class MethodSetOnTypeTestCases extends JAXBWithJSONTestCases{
@@ -57,7 +58,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
index e336d02..1a25835 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -63,7 +64,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.xmltransformation", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
index 3f99350..9f10d1f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -128,7 +129,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.multiplebindings.simple", bindingsList);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
index 46eb3d5..d52eeed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
@@ -27,6 +27,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.metadata.XMLMetadataSource;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.multiplebindings.simple.Employee;
@@ -124,7 +125,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.multiplebindings.simple", bindingsList);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
@@ -142,7 +143,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.multiplebindings.simple", bindingsList);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
index 396971f..251d674 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
@@ -28,6 +28,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.oxm.XMLTestCase;
import org.w3c.dom.Document;
@@ -73,7 +74,7 @@
public void testBasicNamespaces() throws Exception {
InputStream bindings = ClassLoader.getSystemResourceAsStream(BINDINGS1);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
JAXBContext ctx = JAXBContextFactory.createContext(new Class[]{ Customer.class }, properties);
@@ -100,7 +101,7 @@
public void testNonDefaultRootElement() throws Exception {
InputStream bindings = ClassLoader.getSystemResourceAsStream(BINDINGS2);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
JAXBContext ctx = JAXBContextFactory.createContext(new Class[]{ Customer.class }, properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SuperClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SuperClassOverrideTestCases.java
index 2694f16..443d64e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SuperClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SuperClassOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class SuperClassOverrideTestCases extends JAXBWithJSONTestCases {
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.superclassoverride", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
index 3d2fda3..7b9d65d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -56,7 +57,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessororder", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
index a9c683b..f28a3ba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -62,7 +63,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessororder.packagelevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
index 1f6c22b..3111477 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -61,7 +62,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessororder.packagelevel.classoverride", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
index 0e97161..e0bfee9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -60,7 +61,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessororder.packagelevel.javaclassoverride", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
index d6ac3cb..2e00630 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -59,7 +60,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
index e476240..f2ecdda 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -63,7 +64,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.field", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
index 88361f5..be6c0d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -68,7 +69,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.none", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
index e34e65a..703160f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -68,7 +69,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.none", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
index 1c5841b..0bca46a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -64,7 +65,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.packagelevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
index 30a4630..7129ee0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -72,7 +73,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.packagelevel.classoverride", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
index 45bdaed..906d483 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -65,7 +66,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.packagelevel.javaclassoverride", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
index 4560265..28e5a86 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -69,7 +70,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.property", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
index 8f42357..af77915 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class FieldAccessTestCases extends JAXBWithJSONTestCases {
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.propertylevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
index 13c61c6..149c9cc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class PropertyAccessTestCases extends JAXBWithJSONTestCases {
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.propertylevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
index 1f604c2..b0534b9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class UnspecifiedTestCases extends JAXBWithJSONTestCases {
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.propertylevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
index 9cdbc94..c7b57c8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -71,7 +72,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlaccessortype.publicmember", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
index fe6922e..ec57ed5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AdapterOnClassTestCases extends JAXBWithJSONTestCases{
@@ -64,7 +65,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.classlevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
index 25cb0bc..5329e7e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AdapterHexBinaryTestCases extends JAXBWithJSONTestCases{
@@ -52,7 +53,7 @@
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/hexbinary-oxm.xml");
HashMap<String, Source> properties = new HashMap<String, Source>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new StreamSource(inputStream));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new StreamSource(inputStream));
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/negative/XmlAdapterNegativeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/negative/XmlAdapterNegativeTestCases.java
index e5f1b80..91d6274 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/negative/XmlAdapterNegativeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/negative/XmlAdapterNegativeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
public class XmlAdapterNegativeTestCases extends TestCase {
@@ -39,7 +40,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.negative", new StreamSource(stream));
Map<String,Object> properties = new HashMap<String,Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
Class<?>[] classes = new Class[1];
classes[0] = Customer.class;
@@ -58,7 +59,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.negative", new StreamSource(stream));
Map<String,Object> properties = new HashMap<String,Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
Class<?>[] classes = new Class[1];
classes[0] = Customer.class;
@@ -77,7 +78,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.negative", new StreamSource(stream));
Map<String,Object> properties = new HashMap<String,Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
Class<?>[] classes = new Class[1];
classes[0] = Customer.class;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
index f89693b..5e7b242 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.packagelevel.someotherpackage.SomeLameClass;
@@ -61,7 +62,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.packagelevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
index 3f8b3ec..8523216 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.classlevel.MyCalendar;
import org.w3c.dom.Document;
@@ -94,7 +95,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.packagelevel.unspecified", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
index 8bfe016..6310114 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AdapterOnPropertyTestCases extends JAXBWithJSONTestCases{
@@ -60,7 +61,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.property", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
index f2d5bd3..ff056f4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
@@ -21,6 +21,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package1.Container;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package2.Unmappable;
@@ -48,7 +49,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package2", src2);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
index 2982e91..34e8ebb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package1.Container;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package2.Unmappable;
@@ -48,7 +49,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package1", src);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
index d0a325c..dad6616 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package1.Container;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package2.Unmappable;
@@ -44,7 +45,7 @@
metadata.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.unmappable.package1", src);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadata);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadata);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
index 026b82a..7f41eda 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AdapterWithElementRefTestCases extends JAXBWithJSONTestCases{
@@ -50,7 +51,7 @@
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/foo-oxm.xml");
HashMap<String, Source> properties = new HashMap<String, Source>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new StreamSource(inputStream));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new StreamSource(inputStream));
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
index 55313ed..c41be7d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AdapterWithElementRefsTestCases extends JAXBWithJSONTestCases{
@@ -53,7 +54,7 @@
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/foobar-oxm.xml");
HashMap<String, Source> properties = new HashMap<String, Source>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new StreamSource(inputStream));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new StreamSource(inputStream));
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
index cd81d80..8606a5a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
@@ -24,10 +24,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLAnyAttributeMapping;
@@ -79,7 +76,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
index 5660853..426592f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlAnyElementAdapterListTestCases extends JAXBWithJSONTestCases{
@@ -44,7 +45,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
index 883e624..4c96252 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlAnyElementAdapterTestCases extends JAXBWithJSONTestCases{
@@ -43,7 +44,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
index 59d3d08..3b88a40 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -49,7 +50,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
index 38a9770..4bc2325 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Element;
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
index 14355f8..e130fa0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.oxm.OXTestCase;
import org.w3c.dom.Document;
@@ -49,7 +50,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
index 1eece89..e6f503c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -47,7 +48,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
index b25767d..2cd35e1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLAnyCollectionMapping;
@@ -54,7 +55,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
index 1a32aae..d1ac38f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement.xmlelementrefs", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
index 4943fcb..30ea800 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlanyelement.xmlelementrefs", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/XmlAttachmentRefCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/XmlAttachmentRefCases.java
index 980415b..811328a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/XmlAttachmentRefCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/XmlAttachmentRefCases.java
@@ -30,6 +30,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases;
import org.w3c.dom.Document;
@@ -78,7 +79,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContext jaxbContext = null;
try {
@@ -162,7 +163,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
boolean exceptionOccurred = false;
JAXBContext jaxbContext = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
index 2f41cbd..b5df458 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
@@ -59,7 +60,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlattribute", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
index 92129bd..71a3e99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
@@ -28,6 +28,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -57,7 +58,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlclassextractor", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -69,7 +70,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlclassextractor", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
index 3409615..49d81a2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -55,7 +56,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlcustomizer", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
index 9e0943f..a617d7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
@@ -27,6 +27,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -81,7 +82,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmldiscriminator", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
index 065bc85..fb14a81 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
@@ -63,11 +63,11 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelement", new StreamSource(inputStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
// test override of 'old' context factory property - if the override
// fails we will get a ClassCastException
- properties.put(JAXBContextFactory.ANNOTATION_HELPER_KEY, "Blah");
+ properties.put(JAXBContextProperties.ANNOTATION_HELPER, "Blah");
properties.put(JAXBContextProperties.ANNOTATION_HELPER, new AnnotationHelper());
return properties;
@@ -112,7 +112,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelement", new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContext jContext = (JAXBContext) JAXBContextFactory.createContext(new Class[] { Team.class }, properties, loader);
@@ -153,7 +153,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
try {
JAXBContext jContext = (JAXBContext) JAXBContextFactory.createContext(new Class[] { Team.class }, properties, loader);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
index e4a4294..c91fd45 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -55,7 +56,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
index 7d7199f..10fbc23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLChoiceCollectionMapping;
@@ -49,7 +50,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/XmlElementRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/XmlElementRefsTestCases.java
index 6e2bc2f..07193f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/XmlElementRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/XmlElementRefsTestCases.java
@@ -26,6 +26,7 @@
import jakarta.xml.bind.Unmarshaller;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementrefs.collectiontype.Root;
import org.eclipse.persistence.testing.oxm.OXTestCase;
@@ -126,7 +127,7 @@
public void testCollectionType() {
try {
Map<String, Object> properties = new HashMap<>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, new File(Thread.currentThread().getContextClassLoader().getResource(PATH + "collectiontype/oxm.xml").toURI()));
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, new File(Thread.currentThread().getContextClassLoader().getResource(PATH + "collectiontype/oxm.xml").toURI()));
JAXBContextFactory.createContext(new Class[] { org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementrefs.collectiontype.ObjectFactory.class, Root.class }, properties);
} catch (Exception e) {
e.printStackTrace();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
index 7c6f6b1..33da0bd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XMLElementsWithWrapperTestCases extends JAXBWithJSONTestCases{
@@ -46,7 +47,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelements",
new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY,
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE,
metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
index b8f4194..22f9a36 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
@@ -28,6 +28,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLChoiceCollectionMapping;
@@ -62,7 +63,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelements", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -109,7 +110,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelements", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
List controlSchemas = new ArrayList();
InputStream is = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/schema_idref.xsd");
@@ -140,7 +141,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
// create context
boolean exception = false;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
index c109d18..8afe7d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlElemenetWrapperNilTestCases extends JAXBWithJSONTestCases{
@@ -50,7 +51,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementwrapper",
new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY,
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE,
metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
index 736dac3..23f6f0e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlElementWrapperElementOverrideTestCases extends JAXBWithJSONTestCases{
@@ -50,7 +51,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementwrapper",
new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY,
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE,
metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
index 483f96b..3c68a6b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -56,7 +57,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementwrapper",
new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY,
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE,
metadataSourceMap);
return properties;
@@ -141,7 +142,7 @@
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlelementwrapper",
new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY,
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE,
metadataSourceMap);
JAXBContext ctx = JAXBContextFactory.createContext(new Class[] { Employee.class }, properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
index 666c642..3274121 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlenum", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
index 96c3326..a3f6368 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlenum", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
index 80c7c10..72e3e51 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlenum", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
index c0a8167..e26a0b0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -51,7 +52,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlenum", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefExceptionTestCases.java
index d48ff38..54e1c1f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.oxm.OXTestCase;
public class XmlIdRefExceptionTestCases extends OXTestCase {
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlidref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(classes, properties);
} catch (JAXBException e) {
@@ -71,7 +72,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlidref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(classes, properties);
} catch (JAXBException e) {
@@ -96,7 +97,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlidref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(classes, properties);
} catch (JAXBException e) {
@@ -121,7 +122,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlidref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(classes, properties);
} catch (JAXBException e) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
index ad2841e..f67b740 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
@@ -27,6 +27,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -47,7 +48,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlidref", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
index 66aa5c7..e472e26 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
@@ -27,10 +27,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import org.eclipse.persistence.jaxb.JAXBContext;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCollectionReferenceMapping;
@@ -104,7 +101,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmljoinnode", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -149,7 +146,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmljoinnode", new StreamSource(inputStream));
Map<String, Map<String, Source>> invalidProperties = new HashMap<String, Map<String, Source>>();
- invalidProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ invalidProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(new Class[] { Company.class }, invalidProperties);
} catch (JAXBException e) {
@@ -170,7 +167,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmljoinnode", new StreamSource(inputStream));
Map<String, Map<String, Source>> invalidProperties = new HashMap<String, Map<String, Source>>();
- invalidProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ invalidProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(new Class[] { Company.class }, invalidProperties);
@@ -196,7 +193,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmljoinnode", new StreamSource(inputStream));
Map<String, Map<String, Source>> invalidProperties = new HashMap<String, Map<String, Source>>();
- invalidProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ invalidProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(new Class[] { Company.class }, invalidProperties);
@@ -216,7 +213,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmljoinnode", new StreamSource(inputStream));
Map<String, Map<String, Source>> invalidProperties = new HashMap<String, Map<String, Source>>();
- invalidProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ invalidProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
jCtx = (JAXBContext)JAXBContextFactory.createContext(new Class[] { Company.class }, invalidProperties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
index fe4b058..92c651f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlListNoStringTestCases extends JAXBWithJSONTestCases{
@@ -59,7 +60,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmllist", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
index 11a4bdf..d3fbec1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlListOnXmlAttributeTestCases extends JAXBWithJSONTestCases{
@@ -59,7 +60,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmllist", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
index dff15e5..326b7bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
@@ -25,6 +25,7 @@
import org.eclipse.persistence.jaxb.JAXBContext;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -53,7 +54,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmllist", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -86,7 +87,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmllist", new StreamSource(inputStream));
Map<String, Map<String, Source>> invalidProperties = new HashMap<String, Map<String, Source>>();
- invalidProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ invalidProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
boolean exception = false;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
index 63887db..3b2329b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -58,7 +59,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlmimetype", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
index f816154..e11fff7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.oxm.XMLConstants;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Element;
@@ -56,7 +57,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlmixed", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
index d99e5d5..0ac9318 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
@@ -32,6 +32,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBTestCases;
import org.eclipse.persistence.testing.oxm.OXTestCase;
import org.w3c.dom.Document;
@@ -117,7 +118,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlnametransformer", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
@@ -143,7 +144,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlnametransformer", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
index 11cf541..a24eb4d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -88,7 +89,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlnametransformer", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
index 05b03b5..4020edb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -141,7 +142,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlnametransformer", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameTestCases.java
index abfcbf0..1f5e0c5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlMappingDefaultNameTestCases extends JAXBWithJSONTestCases {
@@ -48,7 +49,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingSpecifiedNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingSpecifiedNameTestCases.java
index 31589a9..3932f09 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingSpecifiedNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingSpecifiedNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlMappingSpecifiedNameTestCases extends JAXBWithJSONTestCases {
@@ -48,7 +49,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
index 45640d7..9132642 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlRegistryNonLocalTestCases extends JAXBWithJSONTestCases{
@@ -52,7 +53,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlregistry", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
index 40296af..9b51632 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -56,7 +57,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlregistry", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
index 2ad4dac..b79ab67 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -52,7 +53,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlrootelement", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
index 26d78e5..604e0ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
@@ -26,6 +26,7 @@
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -69,7 +70,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlschema", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
index 4efa19c..9710180 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -89,7 +90,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlschema.namespace", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
index ae2a29a..ea7eafd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
@@ -28,6 +28,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlschematypes.Employee;
@@ -89,7 +90,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlschematypes", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
index 6c07787..fa6e3f2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -56,7 +57,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlseealso", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
index 9b5b542..722b741 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -109,7 +110,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
index 37ff37b..ab714f7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -53,7 +54,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -130,7 +131,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient.inheritance", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
JAXBContextFactory.createContext(new Class[] { ContactInfo.class }, properties);
} catch (JAXBException jaxbex) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
index 06a3785..a2032d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlTransientInheritanceTestCases extends JAXBWithJSONTestCases{
@@ -45,7 +46,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient.inheritance", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/splitpackage/SplitPackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/splitpackage/SplitPackageTestCases.java
index cd72365..7fa02cb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/splitpackage/SplitPackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/splitpackage/SplitPackageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient.splitpackage.b.Foo;
public class SplitPackageTestCases extends TestCase{
@@ -36,7 +37,7 @@
public void testJAXBContextCreation() throws Exception {
InputStream bindingFileA = SplitPackageTestCases.class.getClassLoader().getResourceAsStream(BINDING_FILE_A);
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindingFileA);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindingFileA);
JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[] {Foo.class}, properties);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
index 0717013..a06b375 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlTransientUnsetClassTestCases extends JAXBWithJSONTestCases{
@@ -45,7 +46,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient.unset.classlevel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
index 5a66bf5..e511aab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlTransientUnsetPropTestCases extends JAXBWithJSONTestCases{
@@ -43,7 +44,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltransient.unset.prop", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
index b497f06..4ca0a21 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
public class EmployeeFactoryClassTestCases extends XmlTypeTestCases {
@@ -36,7 +37,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltype", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
index 5168bf7..7ec4bd8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
/**
@@ -67,7 +68,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmltype", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
index 2e9d4ef..b80278f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
@@ -26,6 +26,7 @@
import org.eclipse.persistence.jaxb.JAXBContextFactory;
import junit.framework.TestCase;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
public class FactoryTestCases extends TestCase {
@@ -49,7 +50,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(NORMAL_FACTORY);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
jaxbContext = JAXBContextFactory.createContext(classes, properties);
@@ -67,7 +68,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(ABSTRACTFACTORY);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
jaxbContext = JAXBContextFactory.createContext(classes, properties);
@@ -85,7 +86,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(ABSTRACTFACTORY_ERROR);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
Exception caughtException = null;
try {
@@ -117,7 +118,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(NODEFAULTCONSTRUCTOR);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
jaxbContext = JAXBContextFactory.createContext(classes, properties);
@@ -135,7 +136,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(NODEFAULTCONSTRUCTOR_ERROR);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
Exception caughtException = null;
try {
@@ -167,7 +168,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(DOMAINCLASSFACTORYMETHOD);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
jaxbContext = JAXBContextFactory.createContext(classes, properties);
@@ -185,7 +186,7 @@
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream bindings = classLoader.getResourceAsStream(DOMAINCLASSFACTORYMETHOD_ERROR);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, bindings);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, bindings);
Exception caughtException = null;
try {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/AllTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/AllTestCases.java
index 7cdb4e6..91f80ab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/AllTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/AllTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class AllTestCases extends JAXBWithJSONTestCases {
@@ -37,7 +38,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/DefaultTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/DefaultTestCases.java
index 339b7d7..95171a6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/DefaultTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/DefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class DefaultTestCases extends JAXBWithJSONTestCases {
@@ -42,7 +43,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideAllTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideAllTestCases.java
index d7abf7f..732f1f2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideAllTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideAllTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class OverrideAllTestCases extends JAXBWithJSONTestCases {
@@ -39,7 +40,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideSequenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideSequenceTestCases.java
index 33ed1ad..913f988 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideSequenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/OverrideSequenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class OverrideSequenceTestCases extends JAXBWithJSONTestCases {
@@ -40,7 +41,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/SequenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/SequenceTestCases.java
index df2ee76..ec374cb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/SequenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/proporder/SequenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class SequenceTestCases extends JAXBWithJSONTestCases {
@@ -40,7 +41,7 @@
@Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>(1);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, OXM_RESOURCE);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, OXM_RESOURCE);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
index c8ec348..d391b99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlValueCdnPriceTestCases extends JAXBWithJSONTestCases{
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
index 7da5bab..bfdbdfd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.oxm.XMLDescriptor;
import org.eclipse.persistence.oxm.mappings.XMLCompositeDirectCollectionMapping;
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
index 946764c..9030e5e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
index aa2da48..006aa41 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class XmlValueInternationalPricesTestCases extends JAXBWithJSONTestCases{
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
index 1392ebe..669b94d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
@@ -23,6 +23,7 @@
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue.adapter.MyValueClass;
@@ -57,7 +58,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmlvalue.adapter", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
@@ -86,7 +87,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
boolean exceptionOccurred = false;
@@ -116,7 +117,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put(CONTEXT_PATH, new StreamSource(iStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
boolean exceptionOccurred = false;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
index 7b1d527..f860df5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
@@ -25,6 +25,7 @@
import org.eclipse.persistence.exceptions.SessionLoaderException;
import org.eclipse.persistence.exceptions.ValidationException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.jaxb.javamodel.reflection.JavaClassImpl;
import org.eclipse.persistence.testing.oxm.classloader.JARClassLoader;
@@ -159,7 +160,7 @@
InputStream oxm = ClassLoader.getSystemClassLoader().getResourceAsStream(oxmString);
Map<String, Object> props = new HashMap<String, Object>();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, oxm);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, oxm);
// Specify some other, unrelated context path -- we want to ensure that we don't fail
// due to lack of ObjectFactory/jaxb.index
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
index a62073f..66516c8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -96,7 +97,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.jaxbcontext.withjaxbindex", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
index dc4a724..91165f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
public class JAXBListNameCollisionEmployee2TestCases extends
JAXBListOfObjectsNoJSONTestCases {
@@ -135,7 +136,7 @@
@Override
public Map getProperties() {
Map props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "listOfObjectsNamespace");
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
index 6736be2..267a0ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
@@ -128,7 +128,7 @@
// test override of 'old' context factory property - if the override
// fails we will get errors
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespaceWRONG");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "listOfObjectsNamespaceWRONG");
props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "listOfObjectsNamespace");
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
index 2939694..ebed795 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.listofobjects.ClassWithInnerClass.MyInner;
public class JAXBListOfInnerClassTestCases extends JAXBListOfObjectsTestCases {
@@ -95,7 +96,7 @@
@Override
public Map getProperties() {
Map props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "listOfObjectsNamespace");
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
index 141a1c6..683ea7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
@@ -32,11 +32,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.JAXBTypeElement;
-import org.eclipse.persistence.jaxb.JAXBUnmarshaller;
-import org.eclipse.persistence.jaxb.TypeMappingInfo;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.oxm.record.XMLStreamWriterRecord;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.platform.xml.XMLPlatformFactory;
@@ -69,7 +65,7 @@
Map props = getProperties();
if(props != null){
- Map overrides = (Map) props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Map overrides = (Map) props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(overrides != null){
Iterator valuesIter = overrides.values().iterator();
while(valuesIter.hasNext()){
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
index 1d9a335..010d212 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
@@ -34,11 +34,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.JAXBUnmarshaller;
-import org.eclipse.persistence.jaxb.JAXBTypeElement;
-import org.eclipse.persistence.jaxb.TypeMappingInfo;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.oxm.record.XMLStreamWriterRecord;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.platform.xml.XMLPlatformFactory;
@@ -72,7 +68,7 @@
Map props = getProperties();
if(props != null){
- Map overrides = (Map) props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Map overrides = (Map) props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(overrides != null){
Iterator valuesIter = overrides.values().iterator();
while(valuesIter.hasNext()){
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
index 4b4643c..7c75033 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.listofobjects.ClassWithInnerClass.MyInner;
public class JAXBMapOfInnerClassTestCases extends JAXBListOfObjectsTestCases {
@@ -96,7 +97,7 @@
@Override
public Map getProperties() {
Map props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "listOfObjectsNamespace");
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
index b0ff385..7b38b65 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
@@ -31,6 +31,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.listofobjects.JAXBListOfObjectsNoJSONTestCases;
import org.eclipse.persistence.testing.jaxb.listofobjects.JAXBListOfObjectsTestCases;
import org.w3c.dom.Document;
@@ -156,7 +157,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put(pkg, getXmlSchemaOxm(pkg));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
index 8bb53b3..1fba0e6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
@@ -30,6 +30,7 @@
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.listofobjects.JAXBListOfObjectsTestCases;
import org.w3c.dom.Document;
@@ -68,7 +69,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put(pkg, generateXmlSchemaOxm());
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
index c0eba6d..9ab7aa7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
@@ -30,6 +30,7 @@
import org.eclipse.persistence.internal.jaxb.JaxbClassLoader;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.listofobjects.JAXBListOfObjectsTestCases;
import org.w3c.dom.Document;
@@ -74,7 +75,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put(pkg, generateXmlSchemaOxm());
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
index 66640ad..a50c1b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
@@ -24,6 +24,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class MapElementWrapperExternalTestCases extends JAXBWithJSONTestCases{
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.map", new StreamSource(inputStream));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
index 82e9f1d..e0e7eaa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
@@ -19,12 +19,7 @@
import javax.xml.transform.dom.DOMSource;
-import org.eclipse.persistence.jaxb.JAXBContext;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.ObjectGraph;
-import org.eclipse.persistence.jaxb.Subgraph;
-import org.eclipse.persistence.jaxb.UnmarshallerProperties;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Document;
@@ -117,7 +112,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.objectgraph", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/BinderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/BinderTestCases.java
index 53cc862..16d9bcd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/BinderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/BinderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.JAXBHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -53,7 +54,7 @@
metadataStream.close();
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataDocument);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataDocument);
JAXBContext jc = JAXBContextFactory.createContext(new Class[] {Root.class}, props);
Binder<Node> binder = jc.createBinder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/NonRefreshableMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/NonRefreshableMetadataTestCases.java
index 930d0a6..a58b3cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/NonRefreshableMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/NonRefreshableMetadataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import org.eclipse.persistence.exceptions.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.JAXBHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -44,7 +45,7 @@
InputStream metadataStream = classLoader.getResourceAsStream(XML_METADATA);
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataStream);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataStream);
JAXBContext jc = JAXBContextFactory.createContext(new Class[] {Root.class}, props);
try {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/RefreshTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/RefreshTestCases.java
index 6234b84..0e960f1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/RefreshTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/refresh/RefreshTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import javax.xml.xpath.XPathFactory;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.JAXBHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -52,7 +53,7 @@
metadataStream.close();
Map<String, Object> props = new HashMap<String, Object>(1);
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataDocument);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataDocument);
JAXBContext jc = JAXBContextFactory.createContext(new Class[] {Root.class}, props);
Unmarshaller unmarshaller = jc.createUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/anonymoustype/AnonymousTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/anonymoustype/AnonymousTypeTestCases.java
index 7ef3659..60419d1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/anonymoustype/AnonymousTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/anonymoustype/AnonymousTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases;
import org.eclipse.persistence.testing.jaxb.externalizedmetadata.ExternalizedMetadataTestCases.MySchemaOutputResolver;
@@ -46,7 +47,7 @@
TypeMappingInfo[] types = { t1 };
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, TYPES_TNS);
+ properties.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, TYPES_TNS);
JAXBContext cxt = JAXBContextFactory.createContext(types, properties, Thread.currentThread().getContextClassLoader());
MySchemaOutputResolver mysr = new MySchemaOutputResolver();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionBindingsTestCases.java
index fdb0995..d9fde26 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class SubstitutionBindingsTestCases extends JAXBWithJSONTestCases {
@@ -61,7 +62,7 @@
InputStream iStream = classLoader.getResourceAsStream(XML_BINDINGS);
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, iStream);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, iStream);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
index f065172..d2a655c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.jaxb.TypeMappingInfo.ElementScope;
import org.eclipse.persistence.testing.jaxb.typemappinginfo.pkg2.Thing;
@@ -99,7 +100,7 @@
@Override
protected Map getProperties() {
HashMap props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "namespace1");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "namespace1");
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
index 9993fec..8363431 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.jaxb.TypeMappingInfo.ElementScope;
@@ -80,7 +81,7 @@
@Override
protected Map getProperties() {
HashMap props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "overridden/namespace");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "overridden/namespace");
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
index 597db80..4b2f01b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
@@ -25,6 +25,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.jaxb.TypeMappingInfo.ElementScope;
import org.w3c.dom.Document;
@@ -96,7 +97,7 @@
HashMap<String, Source> overrides = new HashMap<String, Source>();
overrides.put("org.eclipse.persistence.testing.jaxb.typemappinginfo", getXmlSchemaOxm(pkg));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
index 6b8bb81..2c19bac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
@@ -23,6 +23,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -41,7 +42,7 @@
overrides.put(pkg, getXmlSchemaOxm(pkg));
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
index 272458b..b1831ba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
@@ -47,11 +47,7 @@
import javax.xml.validation.Validator;
import org.eclipse.persistence.internal.helper.ClassConstants;
-import org.eclipse.persistence.jaxb.JAXBContextFactory;
-import org.eclipse.persistence.jaxb.JAXBMarshaller;
-import org.eclipse.persistence.jaxb.JAXBUnmarshaller;
-import org.eclipse.persistence.jaxb.MarshallerProperties;
-import org.eclipse.persistence.jaxb.TypeMappingInfo;
+import org.eclipse.persistence.jaxb.*;
import org.eclipse.persistence.oxm.NamespaceResolver;
import org.eclipse.persistence.oxm.XMLConstants;
@@ -114,7 +110,7 @@
Map props = getProperties();
if(props != null){
- Map overrides = (Map) props.get(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY);
+ Map overrides = (Map) props.get(JAXBContextProperties.OXM_METADATA_SOURCE);
if(overrides != null){
Iterator valuesIter = overrides.values().iterator();
while(valuesIter.hasNext()){
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
index f4b8f59..007a813 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.TypeMappingInfo;
import org.eclipse.persistence.jaxb.TypeMappingInfo.ElementScope;
import org.eclipse.persistence.testing.jaxb.typemappinginfo.Employee;
@@ -147,7 +148,7 @@
@Override
public Map getProperties() {
Map props = new HashMap();
- props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "someUri");
+ props.put(JAXBContextProperties.DEFAULT_TARGET_NAMESPACE, "someUri");
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlaccessortype/none/NoneTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlaccessortype/none/NoneTestCases.java
index 813b08d..ed75eb2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlaccessortype/none/NoneTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlaccessortype/none/NoneTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import jakarta.xml.bind.JAXBException;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class NoneTestCases extends JAXBWithJSONTestCases {
@@ -58,7 +59,7 @@
Map<String, Object> properties = new HashMap<String, Object>(1);
InputStream binding = Thread.currentThread().getContextClassLoader().getResourceAsStream(BINDING_RESOURCE);
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, binding);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, binding);
try {
JAXBContextFactory.createContext(classes, properties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
index f38c05c..a6f9483 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
@@ -22,6 +22,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
public class XMLBindingsWithExternalMetadataTestCases extends XMLBindingsTestCases{
@@ -36,7 +37,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.jaxb.xmlmodel", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
index 5eb05b6..2466534 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
@@ -19,6 +19,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.junit.Before;
import org.junit.BeforeClass;
import org.w3c.dom.Document;
@@ -62,7 +63,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.xmlelement.model", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBiWriteableBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBiWriteableBindingsTestCases.java
index bf150d1..6e6e95a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBiWriteableBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBiWriteableBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class InverseBiWriteableBindingsTestCases extends JAXBWithJSONTestCases{
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlinverseref.bindings", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBindingsTestCases.java
index 9dabe0c..62ab452 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class InverseBindingsTestCases extends JAXBWithJSONTestCases{
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlinverseref.bindings", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseWriteableBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseWriteableBindingsTestCases.java
index bb7fef5..08b3d0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseWriteableBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/bindings/InverseWriteableBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class InverseWriteableBindingsTestCases extends JAXBWithJSONTestCases{
@@ -48,7 +49,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlinverseref.bindings", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeBindingsTestCases.java
index 8bd0d9f..59f8770 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
@@ -46,7 +47,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlvariablenode", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeCollectionXPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeCollectionXPathTestCases.java
index b61bff8..e827fd8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeCollectionXPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeCollectionXPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Node;
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlvariablenode", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeObjectXPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeObjectXPathTestCases.java
index 06495a6..ef26798 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeObjectXPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeObjectXPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
import org.w3c.dom.Node;
@@ -50,7 +51,7 @@
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
metadataSourceMap.put("org.eclipse.persistence.testing.jaxb.xmlvariablenode", new StreamSource(inputStream));
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, metadataSourceMap);
return properties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
index 49f56a7..54b1b6b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
@@ -26,6 +26,7 @@
import javax.xml.transform.dom.DOMSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.jaxb.MarshallerProperties;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.eclipse.persistence.oxm.MediaType;
@@ -91,7 +92,7 @@
overrides.put("org.eclipse.persistence.testing.jaxb.xmlvariablenode", src);
Map props = new HashMap();
- props.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ props.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return props;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
index e04345c..3440b9d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
@@ -32,6 +32,7 @@
import org.eclipse.persistence.internal.oxm.XMLConversionManager;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.oxm.XMLConstants;
import org.eclipse.persistence.testing.oxm.XMLTestCase;
import org.w3c.dom.*;
@@ -62,7 +63,7 @@
"org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/basic-eclipselink-oxm.xml");
Map<String, Object> ctxProperties = new HashMap<String, Object>();
- ctxProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, oxm);
+ ctxProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, oxm);
/**
* Employee extensions:
@@ -112,7 +113,7 @@
"org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/eclipselink-oxm.xml");
Map<String, Object> ctxProperties = new HashMap<String, Object>();
- ctxProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, oxm);
+ ctxProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, oxm);
/**
* Extensions:
@@ -191,7 +192,7 @@
"org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/basic-eclipselink-oxm.xml");
Map<String, Object> ctxProperties = new HashMap<String, Object>();
- ctxProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, oxm);
+ ctxProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, oxm);
ctx = JAXBContextFactory.createContext(new Class[] {Employee.class, PhoneNumber.class}, ctxProperties);
@@ -203,7 +204,7 @@
"org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/eclipselink-oxm.xml");
Map<String, Object> ctxProperties = new HashMap<String, Object>();
- ctxProperties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, oxm);
+ ctxProperties.put(JAXBContextProperties.OXM_METADATA_SOURCE, oxm);
ctx = JAXBContextFactory.createContext(new Class[] {ExtObjectRoot.class, ExtObjectA.class,
ExtObjectB.class, ExtObjectC.class}, ctxProperties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
index 7d1734a..d2a3d32 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
@@ -20,6 +20,7 @@
import java.util.Map;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
+import org.eclipse.persistence.jaxb.JAXBContextProperties;
import org.eclipse.persistence.testing.jaxb.JAXBWithJSONTestCases;
public class PropOrderTestCases extends JAXBWithJSONTestCases {
@@ -38,7 +39,7 @@
Map<String, Object> properties = new HashMap<String, Object>();
Map<String, Object> overrides = new HashMap<String, Object>();
overrides.put("org.eclipse.persistence.testing.jaxb.xmlvirtualaccessmethods.proporder", "org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/binding.xml");
- properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, overrides);
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, overrides);
return properties;
}
