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 an...@apache.org on 2015/06/01 19:12:29 UTC
svn commit: r1682955 - in /db/jdo/site/src/site/xdoc: jdo_dtd.xml
jdoconfig_dtd.xml jdoquery_dtd.xml metadata.xml orm_dtd.xml references.xml
specifications.xml
Author: andyj
Date: Mon Jun 1 17:12:28 2015
New Revision: 1682955
URL: http://svn.apache.org/r1682955
Log:
fix various inaccuracies
Modified:
db/jdo/site/src/site/xdoc/jdo_dtd.xml
db/jdo/site/src/site/xdoc/jdoconfig_dtd.xml
db/jdo/site/src/site/xdoc/jdoquery_dtd.xml
db/jdo/site/src/site/xdoc/metadata.xml
db/jdo/site/src/site/xdoc/orm_dtd.xml
db/jdo/site/src/site/xdoc/references.xml
db/jdo/site/src/site/xdoc/specifications.xml
Modified: db/jdo/site/src/site/xdoc/jdo_dtd.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/jdo_dtd.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/jdo_dtd.xml (original)
+++ db/jdo/site/src/site/xdoc/jdo_dtd.xml Mon Jun 1 17:12:28 2015
@@ -8,7 +8,7 @@
<body>
<section name="Meta-Data - JDO">
<p>
- JDO2 defines XML MetaData in <b>jdo</b> files as well as <b>orm</b> files.
+ JDO defines XML MetaData in <b>jdo</b> files as well as <b>orm</b> files.
As always with XML, the metadata must match the defined DTD/XSD for that file type.
This section describes the content of the <b>jdo</b> files.
The content of <b>orm</b> files can be found <a href="orm_dtd.html">here</a>.
@@ -20,8 +20,7 @@
<source><![CDATA[
<!DOCTYPE jdo PUBLIC
"-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN"
- "http://java.sun.com/dtd/jdo_3_0.dtd">
-
+ "http://xmlns.jcp.org/dtd/jdo_3_0.dtd">
<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">]]></source>
<br/>
@@ -30,15 +29,15 @@
</p>
<source><![CDATA[
<?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
- http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+ http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd">
...
</jdo>]]></source>
<p>
- Your MetaData should match either the <a href="http://java.sun.com/dtd/jdo_3_0.dtd" target="_blank">DTD</a>
- or the <a href="http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd" target="_blank">XSD</a> specification.
+ Your MetaData should match either the <a href="http://xmlns.jcp.org/dtd/jdo_3_0.dtd" target="_blank">DTD</a>
+ or the <a href="http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd" target="_blank">XSD</a> specification.
</p>
</section>
</body>
Modified: db/jdo/site/src/site/xdoc/jdoconfig_dtd.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/jdoconfig_dtd.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/jdoconfig_dtd.xml (original)
+++ db/jdo/site/src/site/xdoc/jdoconfig_dtd.xml Mon Jun 1 17:12:28 2015
@@ -20,8 +20,7 @@
<source><![CDATA[
<!DOCTYPE jdoconfig PUBLIC
"-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.0//EN"
- "http://java.sun.com/dtd/jdoconfig_3_0.dtd">
-
+ "http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd">
<!DOCTYPE jdoconfig SYSTEM "file:/javax/jdo/jdoconfig.dtd">]]></source>
<br/>
@@ -30,15 +29,15 @@
</p>
<source><![CDATA[
<?xml version="1.0" encoding="UTF-8" ?>
-<jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig
- http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig
+ http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd">
...
</jdoconfig>]]></source>
<p>
- Your MetaData should match either the <a href="http://java.sun.com/dtd/jdoconfig_3_0.dtd" target="_blank">DTD</a>
- or the <a href="http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd" target="_blank">XSD</a> specification.
+ Your MetaData should match either the <a href="http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd" target="_blank">DTD</a>
+ or the <a href="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd" target="_blank">XSD</a> specification.
</p>
</section>
</body>
Modified: db/jdo/site/src/site/xdoc/jdoquery_dtd.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/jdoquery_dtd.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/jdoquery_dtd.xml (original)
+++ db/jdo/site/src/site/xdoc/jdoquery_dtd.xml Mon Jun 1 17:12:28 2015
@@ -8,7 +8,7 @@
<body>
<section name="Meta-Data - JDOQuery">
<p>
- JDO2 defines XML MetaData in <b>jdo</b> files as well as <b>orm</b> files, but also
+ JDO defines XML MetaData in <b>jdo</b> files as well as <b>orm</b> files, but also
specifies that named queries can be defined in <i>jdoquery</i> files.
As always with XML, the metadata must match the defined DTD/XSD for that file type.
This section describes the content of the <b>jdoquery</b> files.
@@ -21,8 +21,7 @@
<source><![CDATA[
<!DOCTYPE jdoquery PUBLIC
"-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.0//EN"
- "http://java.sun.com/dtd/jdoquery_3_0.dtd">
-
+ "http://xmlns.jcp.org/dtd/jdoquery_3_0.dtd">
<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery.dtd">]]></source>
<br/>
@@ -31,15 +30,15 @@
</p>
<source><![CDATA[
<?xml version="1.0" encoding="UTF-8" ?>
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery
- http://java.sun.com/xml/ns/jdo/jdoquery_3_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+ http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_0.xsd">
...
</jdo>]]></source>
<p>
- Your MetaData should match either the <a href="http://java.sun.com/dtd/jdoquery_3_0.dtd" target="_blank">DTD</a>
- or the <a href="http://java.sun.com/xml/ns/jdo/jdoquery_3_0.xsd" target="_blank">XSD</a> specification.
+ Your MetaData should match either the <a href="http://xmlns.jcp.org/dtd/jdoquery_3_0.dtd" target="_blank">DTD</a>
+ or the <a href="http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_0.xsd" target="_blank">XSD</a> specification.
</p>
</section>
</body>
Modified: db/jdo/site/src/site/xdoc/metadata.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/metadata.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/metadata.xml (original)
+++ db/jdo/site/src/site/xdoc/metadata.xml Mon Jun 1 17:12:28 2015
@@ -13,7 +13,7 @@
</p>
<subsection name="XML MetaData">
<p>
- JDO (1.0.1, 2.0, 2.1) expects any XML MetaData to be specified in a file or files
+ JDO expects any XML MetaData to be specified in a file or files
in particular positions in the file system. For example, if you have a class
<i>com.mycompany.sample.MyExample</i>, JDO will look for any of the following files
until it finds one (in the order stated) :-
Modified: db/jdo/site/src/site/xdoc/orm_dtd.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/orm_dtd.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/orm_dtd.xml (original)
+++ db/jdo/site/src/site/xdoc/orm_dtd.xml Mon Jun 1 17:12:28 2015
@@ -20,8 +20,7 @@
<source><![CDATA[
<!DOCTYPE orm PUBLIC
"-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.0//EN"
- "http://java.sun.com/dtd/orm_3_0.dtd">
-
+ "http://xmlns.jcp.org/dtd/orm_3_0.dtd">
<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd">]]></source>
<br/>
@@ -30,15 +29,15 @@
</p>
<source><![CDATA[
<?xml version="1.0" encoding="UTF-8" ?>
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
- http://java.sun.com/xml/ns/jdo/orm_3_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+ http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd">
...
</orm>]]></source>
<p>
- Your MetaData should match either the <a href="http://java.sun.com/dtd/orm_3_0.dtd" target="_blank">DTD</a>
- or the <a href="http://java.sun.com/xml/ns/jdo/orm_3_0.xsd" target="_blank">XSD</a> specification.
+ Your MetaData should match either the <a href="http://xmlns.jcp.org/dtd/orm_3_0.dtd" target="_blank">DTD</a>
+ or the <a href="http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd" target="_blank">XSD</a> specification.
</p>
</section>
Modified: db/jdo/site/src/site/xdoc/references.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/references.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/references.xml (original)
+++ db/jdo/site/src/site/xdoc/references.xml Mon Jun 1 17:12:28 2015
@@ -33,8 +33,7 @@ limitations under the License.
There have been several articles about JDO on various websites. Some are listed below
</p>
<ul>
- <li>SUN : <a target="_blank" href="http://java.sun.com/products/jdo/">JDO Web Site</a></li>
- <li>SUN : <a target="_blank" href="http://java.sun.com/developer/technicalArticles/J2SE/jdo/">Getting started with JDO</a></li>
+ <li>SUN : <a target="_blank" href="http://www.oracle.com/technetwork/java/index-jsp-135919.html">Oracle JDO Web Site</a></li>
<li>TheServerSide.com : <a href="http://www.theserverside.com/discussions/thread.tss?thread_id=771">discussion on JDO and Entity Beans</a></li>
<li>TheServerSide.com : <a target="_blank" href="http://www.theserverside.com/articles/article.tss?l=JDOQueryPart1">JDO 2 Queries - Methods, Paging, Unbound Variables</a></li>
<li>TheServerSide.com : <a target="_blank" href="http://www.theserverside.com/articles/article.tss?l=JDOQueryPart2">JDO 2 Queries - Projections, Aggregates</a></li>
Modified: db/jdo/site/src/site/xdoc/specifications.xml
URL: http://svn.apache.org/viewvc/db/jdo/site/src/site/xdoc/specifications.xml?rev=1682955&r1=1682954&r2=1682955&view=diff
==============================================================================
--- db/jdo/site/src/site/xdoc/specifications.xml (original)
+++ db/jdo/site/src/site/xdoc/specifications.xml Mon Jun 1 17:12:28 2015
@@ -45,7 +45,7 @@ limitations under the License.
The following specifications for JDO are snapshots of the current Maintenance
Release specification under development. The specification has not been released.
Additions and changes are underway. Send comments to
- <a href="mailto:jdo-experts-ext@sun.com">jdo-experts-ext@sun.com</a>.
+ <a href="mailto:jdo-dev@db.apache.org">jdo-dev@db.apache.org</a>.
</p>
<ul>
<li>None at this time </li>