You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-dev@db.apache.org by "Bouschen, Michael" <Mi...@akquinet.de.INVALID> on 2022/04/10 15:56:21 UTC
Re: [db-jdo-site] branch main updated: update XSD/DTD to match the JDO 3.2.1 variant
Hi Andy,
just fyi: we have not yet shipped JDO 3.2.1.
Regards Michael
This is an automated email from the ASF dual-hosted git repository.
andyj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git
The following commit(s) were added to refs/heads/main by this push:
new b50fabf update XSD/DTD to match the JDO 3.2.1 variant
b50fabf is described below
commit b50fabfe621a798fc24f2e180a3bcd21252b8905
Author: andyjefferson <an...@datanucleus.org>
AuthorDate: Sun Apr 10 16:01:54 2022 +0100
update XSD/DTD to match the JDO 3.2.1 variant
---
src/main/asciidoc/jdo_dtd.adoc | 19 +++++++++++--------
src/main/asciidoc/jdoconfig_dtd.adoc | 17 ++++++++---------
src/main/asciidoc/metadata.adoc | 7 +++----
src/main/asciidoc/orm_dtd.adoc | 19 +++++++++++--------
src/main/resources/downloads/xmlns/jdo_3_2.dtd | 4 ++--
src/main/resources/downloads/xmlns/jdo_3_2.xsd | 4 ++--
src/main/resources/downloads/xmlns/jdoconfig_3_2.dtd | 4 ++--
src/main/resources/downloads/xmlns/jdoconfig_3_2.xsd | 6 +++---
src/main/resources/downloads/xmlns/jdoquery_3_2.dtd | 4 ++--
src/main/resources/downloads/xmlns/jdoquery_3_2.xsd | 4 ++--
src/main/resources/downloads/xmlns/orm_3_2.dtd | 4 ++--
src/main/resources/downloads/xmlns/orm_3_2.xsd | 4 ++--
12 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/src/main/asciidoc/jdo_dtd.adoc b/src/main/asciidoc/jdo_dtd.adoc
index 955a73a..1078cc9 100644
--- a/src/main/asciidoc/jdo_dtd.adoc
+++ b/src/main/asciidoc/jdo_dtd.adoc
@@ -20,9 +20,13 @@ Here are a few examples valid for *jdo* files with DTD specifications
....
<!DOCTYPE jdo PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN"
- "http://xmlns.jcp.org/dtd/jdo_3_0.dtd"<http://xmlns.jcp.org/dtd/jdo_3_0.dtd>>
+ "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd"<https://db.apache.org/jdo/xmlns/jdo_3_2.dtd>>
+....
+
+or
+....
<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"<file:/javax/jdo/jdo.dtd>>
....
@@ -33,15 +37,14 @@ Here is an example valid for *jdo* files with XSD specification
....
<?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"<http://xmlns.jcp.org/xml/ns/jdo/jdo>
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
- http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd"<http://xmlns.jcp.org/xml/ns/jdo/jdo-http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd>>
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"<https://db.apache.org/jdo/xmlns/jdo>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
+ xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo https://db.apache.org/jdo/xmlns/jdo_3_2.xsd"<https://db.apache.org/jdo/xmlns/jdohttps://db.apache.org/jdo/xmlns/jdo_3_2.xsd> version="3.2">
...
</jdo>
....
Your MetaData should match either the
-http://xmlns.jcp.org/dtd/jdo_3_0.dtd[DTD] or the
-http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd[XSD] specification.
+http://db.apache.org/jdo/xmlns/jdo_3_2.dtd[DTD] or the
+http://db.apache.org/jdo/xmlns/jdo_3_2.xsd[XSD] specification.
diff --git a/src/main/asciidoc/jdoconfig_dtd.adoc b/src/main/asciidoc/jdoconfig_dtd.adoc
index 9115e3b..b2e862d 100644
--- a/src/main/asciidoc/jdoconfig_dtd.adoc
+++ b/src/main/asciidoc/jdoconfig_dtd.adoc
@@ -20,9 +20,9 @@ Here are a few examples valid for *jdoconfig* files with DTD
specifications
....
-<!DOCTYPE jdoconfig PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.0//EN"
- "http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd"<http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd>>
+<!DOCTYPE jdoconfig PUBLIC
+ "-//The Apache Software Foundation//DTD Java Data Objects Configuration 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd"<https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd>>
<!DOCTYPE jdoconfig SYSTEM "file:/javax/jdo/jdoconfig.dtd"<file:/javax/jdo/jdoconfig.dtd>>
....
@@ -34,15 +34,14 @@ Here is an example valid for *jdoconfig* files with XSD specification
....
<?xml version="1.0" encoding="UTF-8" ?>
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"<http://xmlns.jcp.org/xml/ns/jdo/jdoconfig>
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig
- http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd"<http://xmlns.jcp.org/xml/ns/jdo/jdoconfig-http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd>>
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"<https://db.apache.org/jdo/xmlns/jdoconfig>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
+ xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd"<https://db.apache.org/jdo/xmlns/jdoconfighttps://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd> version="3.2">
...
</jdoconfig>
....
Your MetaData should match either the
-http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd[DTD] or the
-http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd[XSD] specification.
+https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd[DTD] or the
+https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd[XSD] specification.
diff --git a/src/main/asciidoc/metadata.adoc b/src/main/asciidoc/metadata.adoc
index b5c240e..8941600 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -7,9 +7,8 @@
== Persistence MetaDataanchor:Persistence_MetaData[]
-JDO 1.0 and JDO 2.0 support specification of persistence using XML
-MetaData. JDO 2.1 adds on the ability to specify persistence using Java5
-annotations.
+JDO 1.0 and JDO 2.0 support specification of persistence using XML MetaData.
+JDO 2.1+ adds on the ability to specify persistence using Java annotations.
=== XML MetaDataanchor:XML_MetaData[]
@@ -51,7 +50,7 @@ information for Oracle datastores, and so on.
=== Annotationsanchor:Annotations[]
-JDO 2.1 provides support for annotations. Classes and fields/properties
+JDO 2.1+ provides support for annotations. Classes and fields/properties
can be annotated defining the persistence and, optionally, any ORM
information.
diff --git a/src/main/asciidoc/orm_dtd.adoc b/src/main/asciidoc/orm_dtd.adoc
index 6451014..5673be7 100644
--- a/src/main/asciidoc/orm_dtd.adoc
+++ b/src/main/asciidoc/orm_dtd.adoc
@@ -21,9 +21,13 @@ specification
....
<!DOCTYPE orm PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.0//EN"
- "http://xmlns.jcp.org/dtd/orm_3_0.dtd"<http://xmlns.jcp.org/dtd/orm_3_0.dtd>>
+ "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/orm_3_2.dtd"<https://db.apache.org/jdo/xmlns/orm_3_2.dtd>>
+....
+
+or
+....
<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd"<file:/javax/jdo/orm.dtd>>
....
@@ -34,15 +38,14 @@ Here is an example valid for *orm* files with XSD specification
....
<?xml version="1.0" encoding="UTF-8" ?>
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"<http://xmlns.jcp.org/xml/ns/jdo/orm>
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
- http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd"<http://xmlns.jcp.org/xml/ns/jdo/orm-http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd>>
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"<https://db.apache.org/jdo/xmlns/orm>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"<http://www.w3.org/2001/XMLSchema-instance>
+ xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm https://db.apache.org/jdo/xmlns/orm_3_2.xsd"<https://db.apache.org/jdo/xmlns/ormhttps://db.apache.org/jdo/xmlns/orm_3_2.xsd> version="3.2">
...
</orm>
....
Your MetaData should match either the
-http://xmlns.jcp.org/dtd/orm_3_0.dtd[DTD] or the
-http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd[XSD] specification.
+https://db.apache.org/jdo/xmlns/orm_3_2.dtd[DTD] or the
+https://db.apache.org/jdo/xmlns/orm_3_2.xsd[XSD] specification.
diff --git a/src/main/resources/downloads/xmlns/jdo_3_2.dtd b/src/main/resources/downloads/xmlns/jdo_3_2.dtd
index e59fcf0..9ab6041 100644
--- a/src/main/resources/downloads/xmlns/jdo_3_2.dtd
+++ b/src/main/resources/downloads/xmlns/jdo_3_2.dtd
@@ -16,8 +16,8 @@
-->
<!-- The DOCTYPE should be as follows for metadata documents.
<!DOCTYPE jdo
- PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
- "http://xmlns.jcp.org/dtd/jdo_3_2.dtd"<http://xmlns.jcp.org/dtd/jdo_3_2.dtd>>
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd"<https://db.apache.org/jdo/xmlns/jdo_3_2.dtd>>
-->
<!ELEMENT jdo (extension*, (package|query|fetch-plan)+, extension*)>
<!ATTLIST jdo catalog CDATA #IMPLIED>
diff --git a/src/main/resources/downloads/xmlns/jdo_3_2.xsd b/src/main/resources/downloads/xmlns/jdo_3_2.xsd
index bc9fbc1..9fff4a2 100644
--- a/src/main/resources/downloads/xmlns/jdo_3_2.xsd
+++ b/src/main/resources/downloads/xmlns/jdo_3_2.xsd
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdo"<http://xmlns.jcp.org/xml/ns/jdo/jdo>
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"<http://xmlns.jcp.org/xml/ns/jdo/jdo>
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdo"<https://db.apache.org/jdo/xmlns/jdo>
+ xmlns="https://db.apache.org/jdo/xmlns/jdo"<https://db.apache.org/jdo/xmlns/jdo>
xmlns:xs="http://www.w3.org/2001/XMLSchema"<http://www.w3.org/2001/XMLSchema>
version="3.2">
<xs:element name="jdo">
diff --git a/src/main/resources/downloads/xmlns/jdoconfig_3_2.dtd b/src/main/resources/downloads/xmlns/jdoconfig_3_2.dtd
index 4ae002a..f65216a 100644
--- a/src/main/resources/downloads/xmlns/jdoconfig_3_2.dtd
+++ b/src/main/resources/downloads/xmlns/jdoconfig_3_2.dtd
@@ -16,8 +16,8 @@
-->
<!--
<!DOCTYPE jdoconfig
- PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.2//EN"
- "http://xmlns.jcp.org/dtd/jdoconfig_3_2.dtd"<http://xmlns.jcp.org/dtd/jdoconfig_3_2.dtd>>
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Configuration 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd"<https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd>>
-->
<!ELEMENT jdoconfig (persistence-manager-factory+)>
diff --git a/src/main/resources/downloads/xmlns/jdoconfig_3_2.xsd b/src/main/resources/downloads/xmlns/jdoconfig_3_2.xsd
index 9d468fa..eadf1f7 100644
--- a/src/main/resources/downloads/xmlns/jdoconfig_3_2.xsd
+++ b/src/main/resources/downloads/xmlns/jdoconfig_3_2.xsd
@@ -17,10 +17,10 @@
-->
<xs:schema
- targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"<http://xmlns.jcp.org/xml/ns/jdo/jdoconfig>
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"<http://xmlns.jcp.org/xml/ns/jdo/jdoconfig>
+ targetNamespace="https://db.apache.org/jdo/xmlns/jdoconfig"<https://db.apache.org/jdo/xmlns/jdoconfig>
+ xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"<https://db.apache.org/jdo/xmlns/jdoconfig>
xmlns:xs="http://www.w3.org/2001/XMLSchema"<http://www.w3.org/2001/XMLSchema>
- xmlns:jdoconfig="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"<http://xmlns.jcp.org/xml/ns/jdo/jdoconfig>
+ xmlns:jdoconfig="https://db.apache.org/jdo/xmlns/jdoconfig"<https://db.apache.org/jdo/xmlns/jdoconfig>
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="3.2">
diff --git a/src/main/resources/downloads/xmlns/jdoquery_3_2.dtd b/src/main/resources/downloads/xmlns/jdoquery_3_2.dtd
index 05d8e5f..7a52939 100644
--- a/src/main/resources/downloads/xmlns/jdoquery_3_2.dtd
+++ b/src/main/resources/downloads/xmlns/jdoquery_3_2.dtd
@@ -16,8 +16,8 @@
-->
<!-- The DOCTYPE should be as follows for jdoquery documents.
<!DOCTYPE jdoquery
- PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
- "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd"<http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd>>
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Query Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd"<https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd>>
-->
<!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
diff --git a/src/main/resources/downloads/xmlns/jdoquery_3_2.xsd b/src/main/resources/downloads/xmlns/jdoquery_3_2.xsd
index e25c1cb..e66e773 100644
--- a/src/main/resources/downloads/xmlns/jdoquery_3_2.xsd
+++ b/src/main/resources/downloads/xmlns/jdoquery_3_2.xsd
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"<http://xmlns.jcp.org/xml/ns/jdo/jdoquery>
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"<http://xmlns.jcp.org/xml/ns/jdo/jdoquery>
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdoquery"<https://db.apache.org/jdo/xmlns/jdoquery>
+ xmlns="https://db.apache.org/jdo/xmlns/jdoquery"<https://db.apache.org/jdo/xmlns/jdoquery>
xmlns:xs="http://www.w3.org/2001/XMLSchema"<http://www.w3.org/2001/XMLSchema>
version="3.2">
<xs:element name="jdoquery">
diff --git a/src/main/resources/downloads/xmlns/orm_3_2.dtd b/src/main/resources/downloads/xmlns/orm_3_2.dtd
index ac20dc9..e6caabb 100644
--- a/src/main/resources/downloads/xmlns/orm_3_2.dtd
+++ b/src/main/resources/downloads/xmlns/orm_3_2.dtd
@@ -16,8 +16,8 @@
-->
<!-- The DOCTYPE should be as follows for metadata documents.
<!DOCTYPE orm
- PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
- "http://xmlns.jcp.org/dtd/orm_3_2.dtd"<http://xmlns.jcp.org/dtd/orm_3_2.dtd>>
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/orm_3_2.dtd"<https://db.apache.org/jdo/xmlns/orm_3_2.dtd>>
-->
<!ELEMENT orm (extension*, (package|query)+, extension*)>
<!ATTLIST orm catalog CDATA #IMPLIED>
diff --git a/src/main/resources/downloads/xmlns/orm_3_2.xsd b/src/main/resources/downloads/xmlns/orm_3_2.xsd
index 0764572..9c1572a 100644
--- a/src/main/resources/downloads/xmlns/orm_3_2.xsd
+++ b/src/main/resources/downloads/xmlns/orm_3_2.xsd
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/orm"<http://xmlns.jcp.org/xml/ns/jdo/orm>
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"<http://xmlns.jcp.org/xml/ns/jdo/orm>
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/orm"<https://db.apache.org/jdo/xmlns/orm>
+ xmlns="https://db.apache.org/jdo/xmlns/orm"<https://db.apache.org/jdo/xmlns/orm>
xmlns:xs="http://www.w3.org/2001/XMLSchema"<http://www.w3.org/2001/XMLSchema>
version="3.2">
<xs:element name="orm">
--
Michael Bouschen
akquinet tech@spree GmbH
Bülowstraße 66 • D-10783 Berlin
Tel: +49 30 235520-33
Fax: +49 30 217520-12
E-Mail: michael.bouschen@akquinet.de<ma...@akquinet.de>
Web: www.akquinet.de<http://www.akquinet.de/>
Geschäftsführung: Martin Weber, Dr. Torsten Fink, Heinz Wilming
Amtsgericht Berlin HRB 86780 • USt.-Id. Nr.: DE 225 964 680
[Facebook]<http://www.facebook.com/akquinet> [XING]<https://www.xing.com/companies/akquinetag> [LinkedIn]<https://www.linkedin.com/company/akquinet-ag> [Twitter]<https://twitter.com/akquinet>