This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new 63f631d78 [OPENJPA-2898] typos were fixed by Patrice DUROUX (#126)
63f631d78 is described below
commit 63f631d78ddf4070f12e0a4bd18385c8784796ce
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 14 11:08:22 2025 +0700
[OPENJPA-2898] typos were fixed by Patrice DUROUX (#126)
---
LICENSE | 2 ++
.../org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java | 3 ++-
.../org/apache/openjpa/persistence/{orm_3_1.xsd => orm_3_1.xsd.rsrc} | 0
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/LICENSE b/LICENSE
index cecd3a10d..b7f95ec1d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -253,6 +253,8 @@ openjpa-persistence -
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
+ orm_3_1-xsd.rsrc - Eclipse Public License v2.0 - included in the openjpa
jar, taken from:
+ https://jakarta.ee/xml/ns/persistence/orm/orm_3_1.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:
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 7c0eddeb9..ceb0eed03 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
@@ -309,6 +309,7 @@ public class XMLPersistenceMetaDataParser
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";
+ private static final String ORM_XSD_3_1 = "orm_3_1.xsd";
/**
* Constructor; supply configuration.
@@ -596,7 +597,7 @@ public class XMLPersistenceMetaDataParser
ormxsd = "orm_3_0-xsd.rsrc";
useExtendedSchema = false;
} else if (XMLVersionParser.VERSION_3_1.equals(_ormVersion)
- || (_schemaLocation != null &&
_schemaLocation.indexOf(ORM_XSD_3_0) > -1)) {
+ || (_schemaLocation != null &&
_schemaLocation.indexOf(ORM_XSD_3_1) > -1)) {
ormxsd = "orm_3_1-xsd.rsrc";
useExtendedSchema = false;
}
diff --git
a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_1.xsd
b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_1.xsd.rsrc
similarity index 100%
rename from
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_1.xsd
rename to
openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_3_1.xsd.rsrc
