Skip to content

[OPENJPA-2898] Offline orm/persistence.xsd file names are named using _ . #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solomax merged 1 commit into from
Mar 16, 2025
Merged

[OPENJPA-2898] Offline orm/persistence.xsd file names are named using _ . #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,27 +243,27 @@ THE FILES OR MODULES .

===========================
openjpa-persistence -
orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
orm_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_2_0.xsd)
orm_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
orm_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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:
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:
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:
persistence_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd).
persistence_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
persistence_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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
===========================

Expand Down
22 changes: 11 additions & 11 deletions openjpa-all/src/main/appended-resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,27 +234,27 @@ The exceptions are as follows:

===========================
openjpa-persistence -
orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
orm_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_2_0.xsd)
orm_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
orm_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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:
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:
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:
persistence_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd).
persistence_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
persistence_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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
===========================

Expand Down
22 changes: 11 additions & 11 deletions openjpa-persistence/src/main/appended-resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,27 @@ The exceptions are as follows:

===========================
openjpa-persistence -
orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
orm_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_2_0.xsd)
orm_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
orm_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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:
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:
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:
persistence_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd).
persistence_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
persistence_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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
===========================

Expand Down
10 changes: 5 additions & 5 deletions ...ersistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,24 +843,24 @@ protected Object getSchemaSource() {
// persistence-unit. that is currently the only significant change
// to the schema. if more significant changes are made in the
// future, the 2.0 schema may be preferable.
String persistencexsd = "persistence-xsd.rsrc";
String persistencexsd = "persistence.xsd.rsrc";
// if the version and/or schema location is for 1.0, use the 1.0
// schema
if (XMLVersionParser.VERSION_2_0.equals(_persistenceVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_2_0) != -1)) {
persistencexsd = "persistence_2_0-xsd.rsrc";
persistencexsd = "persistence_2_0.xsd.rsrc";
}
else if (XMLVersionParser.VERSION_2_1.equals(_persistenceVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_2_1) != -1)) {
persistencexsd = "persistence_2_1-xsd.rsrc";
persistencexsd = "persistence_2_1.xsd.rsrc";
}
else if (XMLVersionParser.VERSION_2_2.equals(_persistenceVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_2_2) != -1)) {
persistencexsd = "persistence_2_2-xsd.rsrc";
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";
persistencexsd = "persistence_3_0.xsd.rsrc";
}

return getClass().getResourceAsStream(persistencexsd);
Expand Down
10 changes: 5 additions & 5 deletions ...ersistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,17 +575,17 @@ protected boolean isRuntime() {
protected Object getSchemaSource() {
// use the latest schema by default. 'unknown' docs should parse
// with the latest schema.
String ormxsd = "orm_2_0-xsd.rsrc";
String ormxsd = "orm_2_0.xsd.rsrc";
boolean useExtendedSchema = true;
// if the version and/or schema location is for 1.0, use the 1.0
// schema
if (XMLVersionParser.VERSION_1_0.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_1_0) > -1)) {
ormxsd = "orm-xsd.rsrc";
ormxsd = "orm.xsd.rsrc";
useExtendedSchema = false;
} else if (XMLVersionParser.VERSION_2_0.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_2_0) > -1)) {
ormxsd = "orm_2_0-xsd.rsrc";
ormxsd = "orm_2_0.xsd.rsrc";
} else if (XMLVersionParser.VERSION_2_1.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_2_1) > -1)) {
ormxsd = "orm_2_1.xsd.rsrc";
Expand All @@ -594,11 +594,11 @@ protected Object getSchemaSource() {
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";
ormxsd = "orm_3_0.xsd.rsrc";
useExtendedSchema = false;
} else if (XMLVersionParser.VERSION_3_1.equals(_ormVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(ORM_XSD_3_1) > -1)) {
ormxsd = "orm_3_1-xsd.rsrc";
ormxsd = "orm_3_1.xsd.rsrc";
useExtendedSchema = false;
}

Expand Down
0 ...g/apache/openjpa/persistence/orm-xsd.rsrc → ...g/apache/openjpa/persistence/orm.xsd.rsrc
View file
Open in desktop
File renamed without changes.
0 ...ache/openjpa/persistence/orm_2_0-xsd.rsrc → ...ache/openjpa/persistence/orm_2_0.xsd.rsrc
View file
Open in desktop
File renamed without changes.
0 ...ache/openjpa/persistence/orm_3_0-xsd.rsrc → ...ache/openjpa/persistence/orm_3_0.xsd.rsrc
View file
Open in desktop
File renamed without changes.
0 .../openjpa/persistence/persistence-xsd.rsrc → .../openjpa/persistence/persistence.xsd.rsrc
View file
Open in desktop
File renamed without changes.
0 ...njpa/persistence/persistence_2_0-xsd.rsrc → ...njpa/persistence/persistence_2_0.xsd.rsrc
View file
Open in desktop
File renamed without changes.
0 ...njpa/persistence/persistence_3_0-xsd.rsrc → ...njpa/persistence/persistence_3_0.xsd.rsrc
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions openjpa-project/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,27 +417,27 @@ and resource files are also released under the ASF license above.
The exceptions are as follows:

===========================
orm-xsd.rsrc - included in the openjpa jar, taken from:
orm.xsd.rsrc - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
orm_2_0-xsd.rsrc - included in the openjpa jar, taken from:
orm_2_0.xsd.rsrc - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_2_0.xsd)
orm_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
orm_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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:
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 - included in the openjpa jar, taken from:
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:
persistence_2_0.xsd.rsrc - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd)
persistence_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
persistence_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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
Expand Down
22 changes: 11 additions & 11 deletions openjpa/src/main/appended-resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,27 @@ The exceptions are as follows:

===========================
openjpa-persistence -
orm-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd)
orm_2_0-xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
orm_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/orm_2_0.xsd)
orm_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
orm_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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:
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:
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:
persistence_2_0.xsd.rsrc - CDDL 1.0 - included in the openjpa jar, taken from:
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd).
persistence_2_1-xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
persistence_2_1.xsd.rsrc - Eclipse Public License v1.0 - included in the openjpa jar, taken from:
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:
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:
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
===========================

Expand Down