diff --git a/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/persistence.xml b/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/persistence.xml
index f9982720771..60c41a30f05 100644
--- a/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/persistence.xml
+++ b/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/persistence.xml
@@ -14,8 +14,8 @@
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
org.eclipse.persistence.jpa.PersistenceProvider
org.eclipse.persistence.testing.models.jpa.beanvalidation.Employee
diff --git a/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/server/persistence.xml b/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/server/persistence.xml
index f0f5094cdca..ac832e9228f 100644
--- a/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/server/persistence.xml
+++ b/jpa/eclipselink.jpa.test/src/it/resources/eclipselink-beanvalidation-model/server/persistence.xml
@@ -14,8 +14,8 @@
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
org.eclipse.persistence.jpa.PersistenceProvider
<@datasource-type@>@data-source-name@
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java b/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
index 8aab66c8e04..815e322924c 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/src/test/java/org/eclipse/persistence/jpa/test/modelgen/TestProcessor.java
@@ -65,36 +65,40 @@ public static void prepare() throws IOException {
@Test
public void testProc() throws Exception {
testProc("testProc3030", PXML30, OXML30);
- testProc("testProc3031", PXML30, OXML31);
+ testProc("testProc3131", PXML31, OXML31);
}
@Test
public void testGenerateComment() throws Exception {
testGenerateComment("testGenerateComment3030", PXML30, OXML30);
- testGenerateComment("testGenerateComment3031", PXML30, OXML31);
+ testGenerateComment("testGenerateComment3131", PXML31, OXML31);
}
@Test
public void testGenerate() throws Exception {
testGenerate("testGenerate3030", PXML30, OXML30);
- testGenerate("testGenerate3031", PXML30, OXML31);
+ testGenerate("testGenerate3131", PXML31, OXML31);
}
@Test
public void testTypeUse() throws Exception {
testTypeUse("testTypeUse3030", PXML30, OXML30);
- testTypeUse("testTypeUse3031", PXML30, OXML31);
+ testTypeUse("testTypeUse3131", PXML31, OXML31);
}
@Test
public void testProcessorLoggingOffFromCmdLine() throws Exception {
- verifyLogging("testProcessorLoggingOffFromCmdLine", PXML30, false,
+ verifyLogging("testProcessorLoggingOffFromCmdLine30", PXML30, false,
+ "-Aeclipselink.logging.level.processor=OFF");
+ verifyLogging("testProcessorLoggingOffFromCmdLine31", PXML31, false,
"-Aeclipselink.logging.level.processor=OFF");
}
@Test
public void testGlobalLoggingOffFromCmdLine() throws Exception {
- verifyLogging("testGlobalLoggingOffFromCmdLine", PXML30, false,
+ verifyLogging("testGlobalLoggingOffFromCmdLine30", PXML30, false,
+ "-Aeclipselink.logging.level=OFF");
+ verifyLogging("testGlobalLoggingOffFromCmdLine31", PXML31, false,
"-Aeclipselink.logging.level=OFF");
}
@@ -116,13 +120,17 @@ public void testGlobalLoggingOffFromPU() throws Exception {
@Test
public void testProcessorLoggingFinestFromCmdLine() throws Exception {
- verifyLogging("testProcessorLoggingFinestFromCmdLine", PXML30, true,
+ verifyLogging("testProcessorLoggingFinestFromCmdLine30", PXML30, true,
+ "-Aeclipselink.logging.level.processor=FINEST");
+ verifyLogging("testProcessorLoggingFinestFromCmdLine31", PXML31, true,
"-Aeclipselink.logging.level.processor=FINEST");
}
@Test
public void testGlobalLoggingFinestFromCmdLine() throws Exception {
- verifyLogging("testGlobalLoggingFinestFromCmdLine", PXML30, true,
+ verifyLogging("testGlobalLoggingFinestFromCmdLine30", PXML30, true,
+ "-Aeclipselink.logging.level=FINEST");
+ verifyLogging("testGlobalLoggingFinestFromCmdLine31", PXML31, true,
"-Aeclipselink.logging.level=FINEST");
}
@@ -355,6 +363,19 @@ private static class Result {
" \n" +
"";
+ private static final String PXML31 = "\n" +
+ " \n" +
+ " org.eclipse.persistence.jpa.PersistenceProvider\n" +
+ " false\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "";
+
private static final String OXML30 = "
+
+
+
+
+
+
+
+ ...
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configuration of a persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+ Description of this persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+ Provider class that supplies EntityManagers for this
+ persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+ The container-specific name of the JTA datasource to use.
+
+
+
+
+
+
+
+
+
+
+
+ The container-specific name of a non-JTA datasource to use.
+
+
+
+
+
+
+
+
+
+
+
+ File containing mapping information. Loaded as a resource
+ by the persistence provider.
+
+
+
+
+
+
+
+
+
+
+
+ Jar file that is to be scanned for managed classes.
+
+
+
+
+
+
+
+
+
+
+
+ Managed class to be included in the persistence unit and
+ to scan for annotations. It should be annotated
+ with either @Entity, @Embeddable or @MappedSuperclass.
+
+
+
+
+
+
+
+
+
+
+
+ When set to true then only listed classes and jars will
+ be scanned for persistent classes, otherwise the
+ enclosing jar or directory will also be scanned.
+ Not applicable to Java SE persistence units.
+
+
+
+
+
+
+
+
+
+
+
+ Defines whether caching is enabled for the
+ persistence unit if caching is supported by the
+ persistence provider. When set to ALL, all entities
+ will be cached. When set to NONE, no entities will
+ be cached. When set to ENABLE_SELECTIVE, only entities
+ specified as cacheable will be cached. When set to
+ DISABLE_SELECTIVE, entities specified as not cacheable
+ will not be cached. When not specified or when set to
+ UNSPECIFIED, provider defaults may apply.
+
+
+
+
+
+
+
+
+
+
+
+ The validation mode to be used for the persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+
+ A list of standard and vendor-specific properties
+ and hints.
+
+
+
+
+
+
+
+
+ A name-value pair.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name used in code to reference this persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+ Type of transactions used by EntityManagers from this
+ persistence unit.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public enum PersistenceUnitTransactionType {JTA, RESOURCE_LOCAL};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public enum SharedCacheMode { ALL, NONE, ENABLE_SELECTIVE, DISABLE_SELECTIVE, UNSPECIFIED};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ public enum ValidationMode { AUTO, CALLBACK, NONE};
+
+
+
+
+
+
+
+
+
+
+