From c16c8348a0d7a3da6da3a2c2774631a5359e6241 Mon Sep 17 00:00:00 2001 From: Guenter Date: Mon, 30 Sep 2024 17:33:48 +0200 Subject: [PATCH] [OPENJPA-2928] Add xsd schemas for offline processing (#120) --- LICENSE | 4 + .../appended-resources/META-INF/LICENSE.vm | 4 + .../openjpa/lib/meta/XMLVersionParser.java | 1 + .../xml/TestSchemaVersionValidation.java | 5 + .../persistence/xml/offline_orm_3_0.xml | 47 + .../xml/offline_persistence-3_0-orm-3_0.xml | 30 + .../appended-resources/META-INF/LICENSE.vm | 4 + .../PersistenceProductDerivation.java | 5 + .../XMLPersistenceMetaDataParser.java | 4 + .../openjpa/persistence/orm_3_0-xsd.rsrc | 2324 +++++++++++++++++ .../persistence/persistence_3_0-xsd.rsrc | 342 +++ openjpa-project/LICENSE | 4 + .../src/doc/manual/jpa_overview_meta.xml | 6 +- .../appended-resources/META-INF/LICENSE.vm | 4 + 14 files changed, 2781 insertions(+), 3 deletions(-) create mode 100644 openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_orm_3_0.xml create mode 100644 openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_persistence-3_0-orm-3_0.xml create mode 100644 openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_0-xsd.rsrc create mode 100644 openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_3_0-xsd.rsrc diff --git a/LICENSE b/LICENSE index 7761cb6b10..cecd3a10d3 100644 --- a/LICENSE +++ b/LICENSE @@ -251,6 +251,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd) orm_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd) + orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: @@ -259,6 +261,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd). persistence_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd). + persistence_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd =========================== COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm b/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm index db8feab981..e397ee2e01 100644 --- a/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm +++ b/openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm @@ -242,6 +242,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd) orm_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd) + orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: @@ -250,6 +252,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd). persistence_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd). + persistence_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd =========================== COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLVersionParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLVersionParser.java index 67e6f95f66..e9d3cbff7a 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLVersionParser.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLVersionParser.java @@ -33,6 +33,7 @@ public class XMLVersionParser extends XMLMetaDataParser { public static final String VERSION_2_0 = "2.0"; public static final String VERSION_2_1 = "2.1"; public static final String VERSION_2_2 = "2.2"; + public static final String VERSION_3_0 = "3.0"; static private final String VERSION_ATTR = "version"; static private final String XSI_NS = diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java index 4aca48ad3d..0474eae511 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xml/TestSchemaVersionValidation.java @@ -90,6 +90,11 @@ public void testOffline2_1Persistence2_2OrmXml() { doCreateEmf("XSDTest", "offline_persistence-2_1-orm-2_2.xml"); } + @Test + public void testOffline3_0Persistence3_0OrmXml() { + doCreateEmf("XSDTest", "offline_persistence-3_0-orm-3_0.xml"); + } + private void doCreateEmf(String name, String xml) { doCreateEmf(name, xml, true); } diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_orm_3_0.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_orm_3_0.xml new file mode 100644 index 0000000000..93c050eb5a --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_orm_3_0.xml @@ -0,0 +1,47 @@ + + + + + + This is an orm 3.0 element + + + + org.apache.openjpa.persistence.xml + + + + select o from SimpleXml o + + + select o from SimpleXmlEntity o + + + + + + + + + + diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_persistence-3_0-orm-3_0.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_persistence-3_0-orm-3_0.xml new file mode 100644 index 0000000000..afcdb804ba --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xml/offline_persistence-3_0-orm-3_0.xml @@ -0,0 +1,30 @@ + + + + + PU for schema validation testing + org.apache.openjpa.persistence.PersistenceProviderImpl + org/apache/openjpa/persistence/xml/offline_orm_3_0.xml + + \ No newline at end of file diff --git a/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm b/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm index b5a6bb99a6..bd3f7cfc5a 100644 --- a/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm +++ b/openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm @@ -40,6 +40,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd) orm_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd) + orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: @@ -48,6 +50,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd). persistence_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd). + persistence_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd =========================== COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java index 13fe71ebef..18863dbb1d 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java @@ -778,6 +778,7 @@ public static class ConfigurationParser private static final String PERSISTENCE_XSD_2_0 = "persistence_2_0.xsd"; private static final String PERSISTENCE_XSD_2_1 = "persistence_2_1.xsd"; private static final String PERSISTENCE_XSD_2_2 = "persistence_2_2.xsd"; + private static final String PERSISTENCE_XSD_3_0 = "persistence_3_0.xsd"; private static final Localizer _loc = Localizer.forPackage (ConfigurationParser.class); @@ -857,6 +858,10 @@ else if (XMLVersionParser.VERSION_2_2.equals(_persistenceVersion) || (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_2_2) != -1)) { persistencexsd = "persistence_2_2-xsd.rsrc"; } + else if (XMLVersionParser.VERSION_3_0.equals(_persistenceVersion) + || (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_3_0) != -1)) { + persistencexsd = "persistence_3_0-xsd.rsrc"; + } return getClass().getResourceAsStream(persistencexsd); } diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java index 0c7b67a910..bb43046e12 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java @@ -308,6 +308,7 @@ protected static enum localDBIdentifiers { private static final String ORM_XSD_2_0 = "orm_2_0.xsd"; private static final String ORM_XSD_2_1 = "orm_2_1.xsd"; private static final String ORM_XSD_2_2 = "orm_2_2.xsd"; + private static final String ORM_XSD_3_0 = "orm_3_0.xsd"; /** * Constructor; supply configuration. @@ -590,6 +591,9 @@ protected Object getSchemaSource() { } else if (XMLVersionParser.VERSION_2_2.equals(_ormVersion) || (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_2_2) > -1)) { ormxsd = "orm_2_2.xsd.rsrc"; + } else if (XMLVersionParser.VERSION_3_0.equals(_ormVersion) + || (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_3_0) > -1)) { + ormxsd = "orm_3_0-xsd.rsrc"; } List schema = new ArrayList<>(); diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_0-xsd.rsrc b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_0-xsd.rsrc new file mode 100644 index 0000000000..ea95fd89d6 --- /dev/null +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_0-xsd.rsrc @@ -0,0 +1,2324 @@ + + + + + + + + + ... + + + + ]]> + + + + + + + + + + + + + + + + + + The entity-mappings element is the root element of a mapping + file. It contains the following four types of elements: + + 1. The persistence-unit-metadata element contains metadata + for the entire persistence unit. It is undefined if this element + occurs in multiple mapping files within the same persistence unit. + + 2. The package, schema, catalog and access elements apply to all of + the entity, mapped-superclass and embeddable elements defined in + the same file in which they occur. + + 3. The sequence-generator, table-generator, converter, named-query, + named-native-query, named-stored-procedure-query, and + sql-result-set-mapping elements are global to the persistence + unit. It is undefined to have more than one sequence-generator + or table-generator of the same name in the same or different + mapping files in a persistence unit. It is undefined to have + more than one named-query, named-native-query, sql-result-set-mapping, + or named-stored-procedure-query of the same name in the same + or different mapping files in a persistence unit. It is also + undefined to have more than one converter for the same target + type in the same or different mapping files in a persistence unit. + + 4. The entity, mapped-superclass and embeddable elements each define + the mapping information for a managed persistent class. The mapping + information contained in these elements may be complete or it may + be partial. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Metadata that applies to the persistence unit and not just to + the mapping file in which it is contained. + + If the xml-mapping-metadata-complete element is specified, + the complete set of mapping metadata for the persistence unit + is contained in the XML mapping files for the persistence unit. + + + + + + + + + + + + + + + + + These defaults are applied to the persistence unit as a whole + unless they are overridden by local annotation or XML + element settings. + + schema - Used as the schema for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + catalog - Used as the catalog for all tables, secondary tables, join + tables, collection tables, sequence generators, and table + generators that apply to the persistence unit + delimited-identifiers - Used to treat database identifiers as + delimited identifiers. + access - Used as the access type for all managed classes in + the persistence unit + cascade-persist - Adds cascade-persist to the set of cascade options + in all entity relationships of the persistence unit + entity-listeners - List of default entity listeners to be invoked + on each entity in the persistence unit. + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for an entity. Is allowed to be + sparsely populated and used in conjunction with the annotations. + Alternatively, the metadata-complete attribute can be used to + indicate that no annotations on the entity class (and its fields + or properties) are to be processed. If this is the case then + the defaulting rules for the entity and its subelements will + be recursively applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface Entity { + String name() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This element determines how the persistence provider accesses the + state of an entity or embedded object. + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AssociationOverride { + String name(); + JoinColumn[] joinColumns() default{}; + JoinTable joinTable() default @JoinTable; + } + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface AttributeOverride { + String name(); + Column column(); + } + + + + + + + + + + + + + + + + + This element contains the entity field or property mappings. + It may be sparsely populated to include only a subset of the + fields or properties. If metadata-complete for the entity is true + then the remainder of the attributes will be defaulted according + to the default rules. + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Basic { + FetchType fetch() default EAGER; + boolean optional() default true; + } + + + + + + + + + + + + + + + + + + + + + + + + + public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH}; + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface CollectionTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Column { + String name() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ColumnResult { + String name(); + Class type() default void.class; + } + + + + + + + + + + + + + + public enum ConstraintMode {CONSTRAINT, NO_CONSTRAINT, PROVIDER_DEFAULT}; + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ConstructorResult { + Class targetClass(); + ColumnResult[] columns(); + } + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Convert { + Class converter() default void.class; + String attributeName() default ""; + boolean disableConversion() default false; + } + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface Converter { + boolean autoApply() default false; + } + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorColumn { + String name() default "DTYPE"; + DiscriminatorType discriminatorType() default STRING; + String columnDefinition() default ""; + int length() default 31; + } + + + + + + + + + + + + + + + + public enum DiscriminatorType { STRING, CHAR, INTEGER }; + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface DiscriminatorValue { + String value(); + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ElementCollection { + Class targetClass() default void.class; + FetchType fetch() default LAZY; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for embeddable objects. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + in the class. If this is the case then the defaulting rules will + be recursively applied. + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Embeddable {} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Embedded {} + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface EmbeddedId {} + + + + + + + + + + + + + + + + + Defines an entity listener to be invoked at lifecycle events + for the entities that list this listener. + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface EntityListeners { + Class[] value(); + } + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface EntityResult { + Class entityClass(); + FieldResult[] fields() default {}; + String discriminatorColumn() default ""; + } + + + + + + + + + + + + + + + + + public enum EnumType { + ORDINAL, + STRING + } + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Enumerated { + EnumType value() default ORDINAL; + } + + + + + + + + + + + + + public enum FetchType { LAZY, EAGER }; + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface FieldResult { + String name(); + String column(); + } + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface ForeignKey { + String name() default ""; + ConstraintMode value() default CONSTRAINT; + String foreign-key-definition() default ""; + + Note that the elements that embed the use of the annotation + default this use as @ForeignKey(PROVIDER_DEFAULT). + + } + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface GeneratedValue { + GenerationType strategy() default AUTO; + String generator() default ""; + } + + + + + + + + + + + + + + public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO }; + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Id {} + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface IdClass { + Class value(); + } + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface Index { + String name() default ""; + String columnList(); + boolean unique() default false; + } + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Inheritance { + InheritanceType strategy() default SINGLE_TABLE; + } + + + + + + + + + + + + + public enum InheritanceType + { SINGLE_TABLE, JOINED, TABLE_PER_CLASS}; + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + ForeignKey foreignKey() default @ForeignKey(); + } + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface JoinTable { + String name() default ""; + String catalog() default ""; + String schema() default ""; + JoinColumn[] joinColumns() default {}; + JoinColumn[] inverseJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Lob {} + + + + + + + + + + + + public enum LockModeType { READ, WRITE, OPTIMISTIC, OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ, PESSIMISTIC_WRITE, PESSIMISTIC_FORCE_INCREMENT, NONE}; + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface ManyToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKey { + String name() default ""; + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyClass { + Class value(); + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyColumn { + String name() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + int length() default 255; + int precision() default 0; // decimal precision + int scale() default 0; // decimal scale + } + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface MapKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + boolean unique() default false; + boolean nullable() default false; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + String table() default ""; + } + + + + + + + + + + + + + + + + + + + + + Defines the settings and mappings for a mapped superclass. Is + allowed to be sparsely populated and used in conjunction with + the annotations. Alternatively, the metadata-complete attribute + can be used to indicate that no annotations are to be processed + If this is the case then the defaulting rules will be recursively + applied. + + @Target(TYPE) @Retention(RUNTIME) + public @interface MappedSuperclass{} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface NamedAttributeNode { + String value(); + String subgraph() default ""; + String keySubgraph() default ""; + } + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedEntityGraph { + String name() default ""; + NamedAttributeNode[] attributeNodes() default {}; + boolean includeAllAttributes() default false; + NamedSubgraph[] subgraphs() default {}; + NamedSubGraph[] subclassSubgraphs() default {}; + } + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedNativeQuery { + String name(); + String query(); + QueryHint[] hints() default {}; + Class resultClass() default void.class; + String resultSetMapping() default ""; //named SqlResultSetMapping + } + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedQuery { + String name(); + String query(); + LockModeType lockMode() default NONE; + QueryHint[] hints() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface NamedStoredProcedureQuery { + String name(); + String procedureName(); + StoredProcedureParameter[] parameters() default {}; + Class[] resultClasses() default {}; + String[] resultSetMappings() default{}; + QueryHint[] hints() default {}; + } + + + + + + + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface NamedSubgraph { + String name(); + Class type() default void.class; + NamedAttributeNode[] attributeNodes(); + } + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToMany { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default LAZY; + String mappedBy() default ""; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OneToOne { + Class targetEntity() default void.class; + CascadeType[] cascade() default {}; + FetchType fetch() default EAGER; + boolean optional() default true; + String mappedBy() default ""; + boolean orphanRemoval() default false; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderBy { + String value() default ""; + } + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface OrderColumn { + String name() default ""; + boolean nullable() default true; + boolean insertable() default true; + boolean updatable() default true; + String columnDefinition() default ""; + } + + + + + + + + + + + + + + + + + public enum ParameterMode { IN, INOUT, OUT, REF_CURSOR}; + + + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostLoad {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostPersist {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostRemove {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PostUpdate {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PrePersist {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreRemove {} + + + + + + + + + + + + + + + + @Target({METHOD}) @Retention(RUNTIME) + public @interface PreUpdate {} + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface PrimaryKeyJoinColumn { + String name() default ""; + String referencedColumnName() default ""; + String columnDefinition() default ""; + } + + + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface QueryHint { + String name(); + String value(); + } + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SecondaryTable { + String name(); + String catalog() default ""; + String schema() default ""; + PrimaryKeyJoinColumn[] pkJoinColumns() default {}; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface SequenceGenerator { + String name(); + String sequenceName() default ""; + String catalog() default ""; + String schema() default ""; + int initialValue() default 1; + int allocationSize() default 50; + } + + + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface SqlResultSetMapping { + String name(); + EntityResult[] entities() default {}; + ConstructorResult[] classes() default{}; + ColumnResult[] columns() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface StoredProcedureParameter { + String name() default ""; + ParameterMode mode() default ParameterMode.IN; + Class type(); + } + + + + + + + + + + + + + + + + + + @Target({TYPE}) @Retention(RUNTIME) + public @interface Table { + String name() default ""; + String catalog() default ""; + String schema() default ""; + UniqueConstraint[] uniqueConstraints() default {}; + Index[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) + public @interface TableGenerator { + String name(); + String table() default ""; + String catalog() default ""; + String schema() default ""; + String pkColumnName() default ""; + String valueColumnName() default ""; + String pkColumnValue() default ""; + int initialValue() default 0; + int allocationSize() default 50; + UniqueConstraint[] uniqueConstraints() default {}; + Indexes[] indexes() default {}; + } + + + + + + + + + + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Temporal { + TemporalType value(); + } + + + + + + + + + + + + + public enum TemporalType { + DATE, // java.sql.Date + TIME, // java.sql.Time + TIMESTAMP // java.sql.Timestamp + } + + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Transient {} + + + + + + + + + + + + + @Target({}) @Retention(RUNTIME) + public @interface UniqueConstraint { + String name() default ""; + String[] columnNames(); + } + + + + + + + + + + + + + + + + @Target({METHOD, FIELD}) @Retention(RUNTIME) + public @interface Version {} + + + + + + + + + + + + diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_3_0-xsd.rsrc b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_3_0-xsd.rsrc new file mode 100644 index 0000000000..b04572ed24 --- /dev/null +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/persistence_3_0-xsd.rsrc @@ -0,0 +1,342 @@ + + + + + + + + + ... + + + ]]> + + + + + + + + + + + + + + + + + + + + + + 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}; + + + + + + + + + + + diff --git a/openjpa-project/LICENSE b/openjpa-project/LICENSE index 37c0c4a4c2..b61bfb46c2 100644 --- a/openjpa-project/LICENSE +++ b/openjpa-project/LICENSE @@ -425,6 +425,8 @@ The exceptions are as follows: http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd) orm_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd) + orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd persistence-xsd.rsrc - included in the openjpa jar, taken from: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) persistence_2_0-xsd.rsrc - included in the openjpa jar, taken from: @@ -433,6 +435,8 @@ The exceptions are as follows: http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd). persistence_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/persistence_2_2.xsd). + persistence_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd websphere-uow-api.jar - this jar file contains WebSphere proprietary API code which is licensed for use when compiling OpenJPA. The jar is not distributed with OpenJPA and is only included with the diff --git a/openjpa-project/src/doc/manual/jpa_overview_meta.xml b/openjpa-project/src/doc/manual/jpa_overview_meta.xml index d913471095..8e77b05740 100644 --- a/openjpa-project/src/doc/manual/jpa_overview_meta.xml +++ b/openjpa-project/src/doc/manual/jpa_overview_meta.xml @@ -720,10 +720,10 @@ public class PaymentContract { The equivalent declarations in XML: -<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm" +<entity-mappings xmlns="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd" - version="2.2"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_3_0.xsd" + version="3.0"> <entity class="org.xyz.PaymentContract" access="FIELD"> <attributes> <id name="id"/> diff --git a/openjpa/src/main/appended-resources/META-INF/LICENSE.vm b/openjpa/src/main/appended-resources/META-INF/LICENSE.vm index b5a6bb99a6..bd3f7cfc5a 100644 --- a/openjpa/src/main/appended-resources/META-INF/LICENSE.vm +++ b/openjpa/src/main/appended-resources/META-INF/LICENSE.vm @@ -40,6 +40,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd) orm_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd) + orm_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd persistence-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) persistence_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from: @@ -48,6 +50,8 @@ openjpa-persistence - http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd). persistence_2_2-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from: http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd). + persistence_3_0-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa jar, taken from: + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd =========================== COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0