You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by gi...@apache.org on 2022/04/10 15:02:42 UTC
[db-jdo-site] branch publish updated: Auto-deploy site for commit b50fabfe62
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch publish
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git
The following commit(s) were added to refs/heads/publish by this push:
new 82d99c2 Auto-deploy site for commit b50fabfe62
82d99c2 is described below
commit 82d99c2f3a1846ac8fae4ce1936e21115fa478cd
Author: andyjefferson <an...@datanucleus.org>
AuthorDate: Sun Apr 10 15:02:39 2022 +0000
Auto-deploy site for commit b50fabfe62
---
content/jdo_dtd.html | 25 +++++++++++++++----------
content/jdoconfig_dtd.html | 15 +++++++--------
content/metadata.html | 7 +++----
content/orm_dtd.html | 25 +++++++++++++++----------
content/xmlns/jdo_3_2.dtd | 4 ++--
content/xmlns/jdo_3_2.xsd | 4 ++--
content/xmlns/jdoconfig_3_2.dtd | 4 ++--
content/xmlns/jdoconfig_3_2.xsd | 6 +++---
content/xmlns/jdoquery_3_2.dtd | 4 ++--
content/xmlns/jdoquery_3_2.xsd | 4 ++--
content/xmlns/orm_3_2.dtd | 4 ++--
content/xmlns/orm_3_2.xsd | 4 ++--
12 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/content/jdo_dtd.html b/content/jdo_dtd.html
index fcb72ea..bbb8a37 100644
--- a/content/jdo_dtd.html
+++ b/content/jdo_dtd.html
@@ -316,10 +316,16 @@ or SYSTEM versions of these.</p>
<div class="literalblock">
<div class="content">
<pre><!DOCTYPE jdo PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN"
- "http://xmlns.jcp.org/dtd/jdo_3_0.dtd">
-
-<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"></pre>
+ "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd"></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>or</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre><!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd"></pre>
</div>
</div>
<div class="paragraph">
@@ -331,18 +337,17 @@ or SYSTEM versions of these.</p>
<div class="literalblock">
<div class="content">
<pre><?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
- xmlns:xsi="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">
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
+ xmlns:xsi="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" version="3.2">
...
</jdo></pre>
</div>
</div>
<div class="paragraph">
<p>Your MetaData should match either the
-<a href="http://xmlns.jcp.org/dtd/jdo_3_0.dtd">DTD</a> or the
-<a href="http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd">XSD</a> specification.</p>
+<a href="http://db.apache.org/jdo/xmlns/jdo_3_2.dtd">DTD</a> or the
+<a href="http://db.apache.org/jdo/xmlns/jdo_3_2.xsd">XSD</a> specification.</p>
</div>
</div>
</div>
diff --git a/content/jdoconfig_dtd.html b/content/jdoconfig_dtd.html
index 8a919e5..d8b8c17 100644
--- a/content/jdoconfig_dtd.html
+++ b/content/jdoconfig_dtd.html
@@ -317,8 +317,8 @@ specifications</p>
<div class="literalblock">
<div class="content">
<pre><!DOCTYPE jdoconfig PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.0//EN"
- "http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd">
+ "-//The Apache Software Foundation//DTD Java Data Objects Configuration 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd">
<!DOCTYPE jdoconfig SYSTEM "file:/javax/jdo/jdoconfig.dtd"></pre>
</div>
@@ -332,18 +332,17 @@ specifications</p>
<div class="literalblock">
<div class="content">
<pre><?xml version="1.0" encoding="UTF-8" ?>
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
- xmlns:xsi="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">
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
+ xmlns:xsi="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" version="3.2">
...
</jdoconfig></pre>
</div>
</div>
<div class="paragraph">
<p>Your MetaData should match either the
-<a href="http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd">DTD</a> or the
-<a href="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd">XSD</a> specification.</p>
+<a href="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd">DTD</a> or the
+<a href="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">XSD</a> specification.</p>
</div>
</div>
</div>
diff --git a/content/metadata.html b/content/metadata.html
index be9b9ba..097836b 100644
--- a/content/metadata.html
+++ b/content/metadata.html
@@ -303,9 +303,8 @@ table.CodeRay td.code{padding:0 0 0 .75em}
<h2 id="index">Persistence MetaData<a id="Persistence_MetaData"></a></h2>
<div class="sectionbody">
<div class="paragraph">
-<p>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.</p>
+<p>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.</p>
</div>
<div class="sect2">
<h3 id="_xml_metadata">XML MetaData<a id="XML_MetaData"></a></h3>
@@ -354,7 +353,7 @@ information for Oracle datastores, and so on.</p>
<div class="sect2">
<h3 id="_annotations">Annotations<a id="Annotations"></a></h3>
<div class="paragraph">
-<p>JDO 2.1 provides support for annotations. Classes and fields/properties
+<p>JDO 2.1+ provides support for annotations. Classes and fields/properties
can be annotated defining the persistence and, optionally, any ORM
information.</p>
</div>
diff --git a/content/orm_dtd.html b/content/orm_dtd.html
index c36a938..3ef57fe 100644
--- a/content/orm_dtd.html
+++ b/content/orm_dtd.html
@@ -317,10 +317,16 @@ specification</p>
<div class="literalblock">
<div class="content">
<pre><!DOCTYPE orm PUBLIC
- "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.0//EN"
- "http://xmlns.jcp.org/dtd/orm_3_0.dtd">
-
-<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd"></pre>
+ "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/orm_3_2.dtd"></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>or</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre><!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd"></pre>
</div>
</div>
<div class="paragraph">
@@ -332,18 +338,17 @@ specification</p>
<div class="literalblock">
<div class="content">
<pre><?xml version="1.0" encoding="UTF-8" ?>
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
- xmlns:xsi="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">
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
+ xmlns:xsi="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" version="3.2">
...
</orm></pre>
</div>
</div>
<div class="paragraph">
<p>Your MetaData should match either the
-<a href="http://xmlns.jcp.org/dtd/orm_3_0.dtd">DTD</a> or the
-<a href="http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd">XSD</a> specification.</p>
+<a href="https://db.apache.org/jdo/xmlns/orm_3_2.dtd">DTD</a> or the
+<a href="https://db.apache.org/jdo/xmlns/orm_3_2.xsd">XSD</a> specification.</p>
</div>
</div>
</div>
diff --git a/content/xmlns/jdo_3_2.dtd b/content/xmlns/jdo_3_2.dtd
index e59fcf0..9ab6041 100644
--- a/content/xmlns/jdo_3_2.dtd
+++ b/content/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">
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+ "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/content/xmlns/jdo_3_2.xsd b/content/xmlns/jdo_3_2.xsd
index bc9fbc1..9fff4a2 100644
--- a/content/xmlns/jdo_3_2.xsd
+++ b/content/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"
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdo"
+ xmlns="https://db.apache.org/jdo/xmlns/jdo"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="3.2">
<xs:element name="jdo">
diff --git a/content/xmlns/jdoconfig_3_2.dtd b/content/xmlns/jdoconfig_3_2.dtd
index 4ae002a..f65216a 100644
--- a/content/xmlns/jdoconfig_3_2.dtd
+++ b/content/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">
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Configuration 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd">
-->
<!ELEMENT jdoconfig (persistence-manager-factory+)>
diff --git a/content/xmlns/jdoconfig_3_2.xsd b/content/xmlns/jdoconfig_3_2.xsd
index 9d468fa..eadf1f7 100644
--- a/content/xmlns/jdoconfig_3_2.xsd
+++ b/content/xmlns/jdoconfig_3_2.xsd
@@ -17,10 +17,10 @@
-->
<xs:schema
- targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+ targetNamespace="https://db.apache.org/jdo/xmlns/jdoconfig"
+ xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jdoconfig="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+ xmlns:jdoconfig="https://db.apache.org/jdo/xmlns/jdoconfig"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="3.2">
diff --git a/content/xmlns/jdoquery_3_2.dtd b/content/xmlns/jdoquery_3_2.dtd
index 05d8e5f..7a52939 100644
--- a/content/xmlns/jdoquery_3_2.dtd
+++ b/content/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">
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Query Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd">
-->
<!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
diff --git a/content/xmlns/jdoquery_3_2.xsd b/content/xmlns/jdoquery_3_2.xsd
index e25c1cb..e66e773 100644
--- a/content/xmlns/jdoquery_3_2.xsd
+++ b/content/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"
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdoquery"
+ xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="3.2">
<xs:element name="jdoquery">
diff --git a/content/xmlns/orm_3_2.dtd b/content/xmlns/orm_3_2.dtd
index ac20dc9..e6caabb 100644
--- a/content/xmlns/orm_3_2.dtd
+++ b/content/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">
+ PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+ "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
-->
<!ELEMENT orm (extension*, (package|query)+, extension*)>
<!ATTLIST orm catalog CDATA #IMPLIED>
diff --git a/content/xmlns/orm_3_2.xsd b/content/xmlns/orm_3_2.xsd
index 0764572..9c1572a 100644
--- a/content/xmlns/orm_3_2.xsd
+++ b/content/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"
- xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/orm"
+ xmlns="https://db.apache.org/jdo/xmlns/orm"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="3.2">
<xs:element name="orm">