You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@db.apache.org by an...@apache.org on 2013/02/23 15:12:19 UTC

svn commit: r851672 [5/12] - in /websites/production/db/content/jdo: ./ guides/ releases/

Modified: websites/production/db/content/jdo/index.html
==============================================================================
--- websites/production/db/content/jdo/index.html (original)
+++ websites/production/db/content/jdo/index.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,7 +12,7 @@
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
       <meta name="author" content="JDO Documentation Team" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -210,134 +210,134 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software 
-distributed under the License is distributed on an "AS IS" BASIS, 
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-See the License for the specific language governing permissions and 
-limitations under the License. -->
-
- 
-
-<div class="section"><h2>About Apache JDO<a name="About_Apache_JDO"></a></h2>
-
-<p>
-Welcome to Apache JDO, a project of the 
-<a class="externalLink" href="http://db.apache.org/">Apache DB project</a>.  Our goal is a 
-thriving community of users and developers of object persistence technology.
-</p>
-<p>Java Data Objects (JDO) is a standard way to access persistent data in databases, using plain old Java objects (POJO) to represent persistent data. The approach separates data manipulation (done by accessing Java data members in the Java domain objects) from database manipulation (done by calling the JDO interface methods). This separation of concerns leads to a high degree of independence of the Java view of data from the database view of the data. </p>
-<p>Interfaces are defined for the user's view of persistence: </p>
-<ul>
-<li>PersistenceManager: the component responsible for the life cycle of persistent instances, Query factory, and Transaction access</li>
-<li>Query: the component responsible for querying the datastore and returning persistent instances or values</li>
-<li>Transaction: the component responsible for initiating and completing transactions</li>
-</ul>
-<p>JDO is being developed as a Java Specification Request in the Java Community Process.
-    The original JDO 1.0 is <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=12" rel="nofollow">JSR-12</a>
-    and the current JDO 3.0.1 is <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=243" rel="nofollow">JSR-243</a>.</p>
-
-<p>
-    The Apache JDO project is focused on building the JDO API and the TCK for compatibility testing of JDO implementations.
-    Commercial and open source implementations of JDO are available for relational databases, object databases, and file systems.
-    If you need an implementation for building a JDO application, see <a href="impls.html">Implementations</a>.
-</p>
-
-</div>
-
-<div class="section"><h2>JDO News<a name="JDO_News"></a></h2>
-
-    <b>JDO 3.0.1 is released</b><br />
-    <blockquote>
-        JDO 3.0.1 has been released. This release contains minor bug fixes. For a complete list of changes (features plus bug fixes) see 
-        <a class="externalLink" href="https://issues.apache.org/jira/browse/JDO/fixforversion/12317950">JDO 3.0.1 changes</a>.
-        You can download the release from the
-        <a href="downloads.html">downloads page</a>. You can also use the new release in maven projects
-        simply by referencing the jdo-api artifact in your pom.xml.</blockquote>
-
-    <b>JDO 3.0 is released</b><br />
-    <blockquote>
-        JDO 3.0 has been released. This release contains significant new features for better support of
-        tooling and runtime: enhancer API, dynamic class and metadata generation, locking, database timeouts, 
-        query cancel, and exact object ids. For a complete list of changes (features plus bug fixes) see 
-        <a class="externalLink" href="https://issues.apache.org/jira/browse/JDO/fixforversion/12313404">JDO 3.0 changes</a>.
-        You can download the release from the
-        <a href="downloads.html">downloads page</a>. You can also use the new release in maven projects
-        simply by referencing the jdo-api artifact in your pom.xml.</blockquote>
-
-    <b>JDO 2.2 is released</b><br />
-    <blockquote>
-    JDO 2.2 is now available for download from the
-    <a href="downloads.html">downloads page</a>.
-    The JDO 2.2 maintenance release provides support for copyOnAttach control, dynamic fetch groups, level2 caching control via metadata.
-    For details, see <a class="externalLink" href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html">ChangeLog for JSR-0243 JavaTM Data Objects 2.2</a></blockquote>
-
-    <b>JDO 2.1.1 is released</b><br />
-    <blockquote>
-    JDO 2.1.1 is now available for download from the <a href="downloads.html">downloads page</a>.
-    This is a minor bug fix release.</blockquote>
-
-    <b>JDO 2.1 is released</b><br />
-    <blockquote>
-    JDO 2.1 is now available for download from the
-    <a href="downloads.html">downloads page</a>.
-      The JDO 2.1 maintenance release provides support for JDK 1.5 features,including the use of annotations as a means of specifying mapping.
-      It also includes many corrections and minor changes.
-      For details, see <a class="externalLink" href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html">Change Log for JSR-000243 JavaTM Data Objects 2.0</a>
-    (<i>2007-08-02</i>)</blockquote>
-
-    <b>JDO 2.0 has been approved by the JCP</b><br />
-    <blockquote>
-    JDO 2.0 is now available for download from the <a href="downloads.html">downloads page</a>.
-    
-JDO 2.0 builds on JDO 1 and includes many features requested by users:
-<ul>
-<li>Standard mapping from objects to relational databases</li>
-<li>Multi-tier support without use of Data Transfer Objects</li>
-<li>Improved query support including projections and aggregates</li>
-<li>Stored queries in metadata</li>
-<li>Deletion by query</li>
-<li>Optimized fetching of object graphs without writing special queries</li>
-<li>Extensive List and Map support</li>
-<li>Lazy loading of large collections</li>
-<li>Improved support for single-field primary keys</li>
-<li>Object lifecycle event monitoring</li>
-<li>Improved support for bidirectional relationships</li>
-</ul>
-(<i>2006-05-03</i>)
-    </blockquote>
-
-<p>
-  <b>Java Community Process!</b><br />
-JDO is being developed under the Java Community Process. The Apache JDO
-project is developing the API and the Technology Compatibility Kit for
-the JDO standard.
-    (<i>2005-07-13</i>)
-</p>
-
-<p>
-  <b>Users!</b><br />
-We'd love to have you involved. Check out the <a class="externalLink" href="http://wiki.apache.org/jdo">Wiki</a>.
-Check out the <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=243">Specification</a>, which has been approved.
-<a href="./get-involved.html">Get Involved</a>!
-    (<i>2005-07-13</i>)
-</p>
-
-<p>
-<i>Archived articles are <a href="newshistory.html">here</a></i>.
-</p>
-
- </div>
-
- 
+        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. -->
+
+ 
+
+<div class="section"><h2>About Apache JDO<a name="About_Apache_JDO"></a></h2>
+
+<p>
+Welcome to Apache JDO, a project of the 
+<a class="externalLink" href="http://db.apache.org/">Apache DB project</a>.  Our goal is a 
+thriving community of users and developers of object persistence technology.
+</p>
+<p>Java Data Objects (JDO) is a standard way to access persistent data in databases, using plain old Java objects (POJO) to represent persistent data. The approach separates data manipulation (done by accessing Java data members in the Java domain objects) from database manipulation (done by calling the JDO interface methods). This separation of concerns leads to a high degree of independence of the Java view of data from the database view of the data. </p>
+<p>Interfaces are defined for the user's view of persistence: </p>
+<ul>
+<li>PersistenceManager: the component responsible for the life cycle of persistent instances, Query factory, and Transaction access</li>
+<li>Query: the component responsible for querying the datastore and returning persistent instances or values</li>
+<li>Transaction: the component responsible for initiating and completing transactions</li>
+</ul>
+<p>JDO is being developed as a Java Specification Request in the Java Community Process.
+    The original JDO 1.0 is <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=12" rel="nofollow">JSR-12</a>
+    and the current JDO 3.0.1 is <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=243" rel="nofollow">JSR-243</a>.</p>
+
+<p>
+    The Apache JDO project is focused on building the JDO API and the TCK for compatibility testing of JDO implementations.
+    Commercial and open source implementations of JDO are available for relational databases, object databases, and file systems.
+    If you need an implementation for building a JDO application, see <a href="impls.html">Implementations</a>.
+</p>
+
+</div>
+
+<div class="section"><h2>JDO News<a name="JDO_News"></a></h2>
+
+    <b>JDO 3.0.1 is released</b><br />
+    <blockquote>
+        JDO 3.0.1 has been released. This release contains minor bug fixes. For a complete list of changes (features plus bug fixes) see 
+        <a class="externalLink" href="https://issues.apache.org/jira/browse/JDO/fixforversion/12317950">JDO 3.0.1 changes</a>.
+        You can download the release from the
+        <a href="downloads.html">downloads page</a>. You can also use the new release in maven projects
+        simply by referencing the jdo-api artifact in your pom.xml.</blockquote>
+
+    <b>JDO 3.0 is released</b><br />
+    <blockquote>
+        JDO 3.0 has been released. This release contains significant new features for better support of
+        tooling and runtime: enhancer API, dynamic class and metadata generation, locking, database timeouts, 
+        query cancel, and exact object ids. For a complete list of changes (features plus bug fixes) see 
+        <a class="externalLink" href="https://issues.apache.org/jira/browse/JDO/fixforversion/12313404">JDO 3.0 changes</a>.
+        You can download the release from the
+        <a href="downloads.html">downloads page</a>. You can also use the new release in maven projects
+        simply by referencing the jdo-api artifact in your pom.xml.</blockquote>
+
+    <b>JDO 2.2 is released</b><br />
+    <blockquote>
+    JDO 2.2 is now available for download from the
+    <a href="downloads.html">downloads page</a>.
+    The JDO 2.2 maintenance release provides support for copyOnAttach control, dynamic fetch groups, level2 caching control via metadata.
+    For details, see <a class="externalLink" href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html">ChangeLog for JSR-0243 JavaTM Data Objects 2.2</a></blockquote>
+
+    <b>JDO 2.1.1 is released</b><br />
+    <blockquote>
+    JDO 2.1.1 is now available for download from the <a href="downloads.html">downloads page</a>.
+    This is a minor bug fix release.</blockquote>
+
+    <b>JDO 2.1 is released</b><br />
+    <blockquote>
+    JDO 2.1 is now available for download from the
+    <a href="downloads.html">downloads page</a>.
+      The JDO 2.1 maintenance release provides support for JDK 1.5 features,including the use of annotations as a means of specifying mapping.
+      It also includes many corrections and minor changes.
+      For details, see <a class="externalLink" href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html">Change Log for JSR-000243 JavaTM Data Objects 2.0</a>
+    (<i>2007-08-02</i>)</blockquote>
+
+    <b>JDO 2.0 has been approved by the JCP</b><br />
+    <blockquote>
+    JDO 2.0 is now available for download from the <a href="downloads.html">downloads page</a>.
+    
+JDO 2.0 builds on JDO 1 and includes many features requested by users:
+<ul>
+<li>Standard mapping from objects to relational databases</li>
+<li>Multi-tier support without use of Data Transfer Objects</li>
+<li>Improved query support including projections and aggregates</li>
+<li>Stored queries in metadata</li>
+<li>Deletion by query</li>
+<li>Optimized fetching of object graphs without writing special queries</li>
+<li>Extensive List and Map support</li>
+<li>Lazy loading of large collections</li>
+<li>Improved support for single-field primary keys</li>
+<li>Object lifecycle event monitoring</li>
+<li>Improved support for bidirectional relationships</li>
+</ul>
+(<i>2006-05-03</i>)
+    </blockquote>
+
+<p>
+  <b>Java Community Process!</b><br />
+JDO is being developed under the Java Community Process. The Apache JDO
+project is developing the API and the Technology Compatibility Kit for
+the JDO standard.
+    (<i>2005-07-13</i>)
+</p>
+
+<p>
+  <b>Users!</b><br />
+We'd love to have you involved. Check out the <a class="externalLink" href="http://wiki.apache.org/jdo">Wiki</a>.
+Check out the <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=243">Specification</a>, which has been approved.
+<a href="./get-involved.html">Get Involved</a>!
+    (<i>2005-07-13</i>)
+</p>
+
+<p>
+<i>Archived articles are <a href="newshistory.html">here</a></i>.
+</p>
+
+ </div>
+
+ 
  
       </div>
     </div>

Modified: websites/production/db/content/jdo/issuetracking.html
==============================================================================
--- websites/production/db/content/jdo/issuetracking.html (original)
+++ websites/production/db/content/jdo/issuetracking.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,7 +12,7 @@
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
       <meta name="author" content="JDO Documentation Team" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -210,54 +210,54 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software 
-distributed under the License is distributed on an "AS IS" BASIS, 
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-See the License for the specific language governing permissions and 
-limitations under the License. -->
-
- 
-
-<div class="section"><h2>Process<a name="Process"></a></h2>
-            <p>
-                The JDO project uses <a class="externalLink" href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630">JIRA</a> to track issues.
-            </p>
-            <p>
- We use the following workflow for our JIRA issues:
-            </p>
-            <blockquote>
-Open-&gt;Resolved(&lt;-&gt;Reopened)-&gt;Closed
-            </blockquote>
-            <blockquote>
-When the engineer has fixed an issue, she sets the issue to resolved. The submitter can reopen it if there is some problem with it. When the release in which the issue is fixed ships, the issue is set to closed.
-            </blockquote>
-            <blockquote>
-If the same issue comes up again after release, another JIRA is opened, referring to the original issue. This accommodates fixes being backported (if ever necessary) to dot releases after the original release ships.
-            </blockquote>
-</div>
-            <div class="section"><h2>View Issues<a name="View_Issues"></a></h2>
-        <ul>
-            <li>
-                <a class="externalLink" href="http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:openissues-panel">Open Issues</a>
-            </li>
-            <li>
-                <a class="externalLink" href="http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:changelog-panel">Change Log for released versions</a>
-            </li>
-            <li>
-                <a class="externalLink" href="http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12310830&amp;styleName=Html&amp;projectId=10630&amp;Create=Create">Release Notes for released versions</a>
-            </li>
-        </ul>
-</div>
-
+        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. -->
+
+ 
+
+<div class="section"><h2>Process<a name="Process"></a></h2>
+            <p>
+                The JDO project uses <a class="externalLink" href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630">JIRA</a> to track issues.
+            </p>
+            <p>
+ We use the following workflow for our JIRA issues:
+            </p>
+            <blockquote>
+Open-&gt;Resolved(&lt;-&gt;Reopened)-&gt;Closed
+            </blockquote>
+            <blockquote>
+When the engineer has fixed an issue, she sets the issue to resolved. The submitter can reopen it if there is some problem with it. When the release in which the issue is fixed ships, the issue is set to closed.
+            </blockquote>
+            <blockquote>
+If the same issue comes up again after release, another JIRA is opened, referring to the original issue. This accommodates fixes being backported (if ever necessary) to dot releases after the original release ships.
+            </blockquote>
+</div>
+            <div class="section"><h2>View Issues<a name="View_Issues"></a></h2>
+        <ul>
+            <li>
+                <a class="externalLink" href="http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:openissues-panel">Open Issues</a>
+            </li>
+            <li>
+                <a class="externalLink" href="http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:changelog-panel">Change Log for released versions</a>
+            </li>
+            <li>
+                <a class="externalLink" href="http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12310830&amp;styleName=Html&amp;projectId=10630&amp;Create=Create">Release Notes for released versions</a>
+            </li>
+        </ul>
+</div>
+
 
       </div>
     </div>

Modified: websites/production/db/content/jdo/javadoc.html
==============================================================================
--- websites/production/db/content/jdo/javadoc.html (original)
+++ websites/production/db/content/jdo/javadoc.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,7 +12,7 @@
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
       <meta name="author" content="JDO Documentation Team" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -210,63 +210,63 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software 
-distributed under the License is distributed on an "AS IS" BASIS, 
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-See the License for the specific language governing permissions and 
-limitations under the License. -->
-
-
-<div class="section"><h2>Javadoc Formats<a name="Javadoc_Formats"></a></h2>
-    <p>
-    JDO Javadoc is available in two formats. You can browse the
-    javadoc online, or you can download it as a .zip file and
-    unzip it to a local directory.
-    </p>
-</div>
-
-<div class="section"><h2>JDO 3.0 javadoc<a name="JDO_3.0_javadoc"></a></h2>
-    <p>JDO 3.0 is the current release of the Apache JDO implementation of JSR-243.</p>
-    <p><a href="api30/apidocs/index.html">Browse JDO 3.0 javadoc online</a></p>
-    <p><a href="api30/apidocs.zip">Download JDO 3.0 javadoc</a></p>
-</div>
-
-<div class="section"><h2>JDO 2.2 javadoc<a name="JDO_2.2_javadoc"></a></h2>
-    <p>JDO 2.2 is the Maintenance Release 2 of the Apache JDO implementation of JSR-243.</p>
-    <p><a href="api22/apidocs/index.html">Browse JDO 2.2 javadoc online</a></p>
-    <p><a href="api22/apidocs.zip">Download JDO 2.2 javadoc</a></p>
-</div>
-
-<div class="section"><h2>JDO 2.1 javadoc<a name="JDO_2.1_javadoc"></a></h2>
-    <p>JDO 2.1 is the Maintenance Release 1 of the Apache JDO implementation of JSR-243.</p>
-    <p><a href="api21/apidocs/index.html">Browse JDO 2.1 javadoc online</a></p>
-    <p><a href="api21/apidocs.zip">Download JDO 2.1 javadoc</a></p>
-    <p><a href="api21-legacy/apidocs/index.html">Browse JDO 2.1-legacy javadoc online</a></p>
-    <p><a href="api21-legacy/apidocs.zip">Download JDO 2.1-legacy javadoc</a></p>
-</div>
-
-<div class="section"><h2>JDO 2.0 javadoc<a name="JDO_2.0_javadoc"></a></h2>
-    <p>JDO 2.0 is the Apache JDO implementation of JSR-243.</p>
-    <p><a href="api20/apidocs/index.html">Browse JDO 2.0 javadoc online</a></p>
-    <p><a href="api20/apidocs.zip">Download JDO 2.0 javadoc</a></p>
-</div>
-
-<div class="section"><h2>JDO 1.1 javadoc<a name="JDO_1.1_javadoc"></a></h2>
-    <p>JDO 1.1 is the Apache JDO implementation of JSR-12.</p>
-    <p><a href="api11/apidocs/index.html">Browse JDO 1.1 javadoc online</a></p>
-    <p><a href="api11/apidocs.zip">Download JDO 1.1 javadoc</a></p>
-</div>
-
-
+        <!-- Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. -->
+
+
+<div class="section"><h2>Javadoc Formats<a name="Javadoc_Formats"></a></h2>
+    <p>
+    JDO Javadoc is available in two formats. You can browse the
+    javadoc online, or you can download it as a .zip file and
+    unzip it to a local directory.
+    </p>
+</div>
+
+<div class="section"><h2>JDO 3.0 javadoc<a name="JDO_3.0_javadoc"></a></h2>
+    <p>JDO 3.0 is the current release of the Apache JDO implementation of JSR-243.</p>
+    <p><a href="api30/apidocs/index.html">Browse JDO 3.0 javadoc online</a></p>
+    <p><a href="api30/apidocs.zip">Download JDO 3.0 javadoc</a></p>
+</div>
+
+<div class="section"><h2>JDO 2.2 javadoc<a name="JDO_2.2_javadoc"></a></h2>
+    <p>JDO 2.2 is the Maintenance Release 2 of the Apache JDO implementation of JSR-243.</p>
+    <p><a href="api22/apidocs/index.html">Browse JDO 2.2 javadoc online</a></p>
+    <p><a href="api22/apidocs.zip">Download JDO 2.2 javadoc</a></p>
+</div>
+
+<div class="section"><h2>JDO 2.1 javadoc<a name="JDO_2.1_javadoc"></a></h2>
+    <p>JDO 2.1 is the Maintenance Release 1 of the Apache JDO implementation of JSR-243.</p>
+    <p><a href="api21/apidocs/index.html">Browse JDO 2.1 javadoc online</a></p>
+    <p><a href="api21/apidocs.zip">Download JDO 2.1 javadoc</a></p>
+    <p><a href="api21-legacy/apidocs/index.html">Browse JDO 2.1-legacy javadoc online</a></p>
+    <p><a href="api21-legacy/apidocs.zip">Download JDO 2.1-legacy javadoc</a></p>
+</div>
+
+<div class="section"><h2>JDO 2.0 javadoc<a name="JDO_2.0_javadoc"></a></h2>
+    <p>JDO 2.0 is the Apache JDO implementation of JSR-243.</p>
+    <p><a href="api20/apidocs/index.html">Browse JDO 2.0 javadoc online</a></p>
+    <p><a href="api20/apidocs.zip">Download JDO 2.0 javadoc</a></p>
+</div>
+
+<div class="section"><h2>JDO 1.1 javadoc<a name="JDO_1.1_javadoc"></a></h2>
+    <p>JDO 1.1 is the Apache JDO implementation of JSR-12.</p>
+    <p><a href="api11/apidocs/index.html">Browse JDO 1.1 javadoc online</a></p>
+    <p><a href="api11/apidocs.zip">Download JDO 1.1 javadoc</a></p>
+</div>
+
+
 
       </div>
     </div>

Modified: websites/production/db/content/jdo/jdo_3_0_overview.html
==============================================================================
--- websites/production/db/content/jdo/jdo_3_0_overview.html (original)
+++ websites/production/db/content/jdo/jdo_3_0_overview.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -209,190 +209,190 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>JDO 3.0 Overview<a name="JDO_3.0_Overview"></a></h2>
-            <div class="section"><h3>Background<a name="Background"></a></h3>
-                <p>
-                    Java Data Objects (JDO) is a specification begun in 2000, with 2 major releases
-                    JDO1 (2002 under JSR0012) and JDO2 (2006 under JSR0243). It was placed under 
-                    Apache in 2005 and is the rare example of a specification that has undergone
-                    continual improvement during its lifetime, for the last 4 years being developed
-                    totally in the open, accepting input from everyone.
-                </p>
-                <p>
-                    JDO 3.0 was started in October 2008, and encompasses additions to the specification
-                    in the areas of a metadata API, an enhancer API, addition of cancel/timeout control
-                    to queries, and addition of control to the locking of objects when read.
-                </p>
-            </div>
-
-            <div class="section"><h3>Metadata API<a name="Metadata_API"></a></h3>
-                <p>
-                    To persist Java objects you need to specify which classes are persistable, and
-                    how they are persisted. This was traditionally handled using XML configuration. With
-                    the advent of JDK1.5, annotations were added as another possible way of defining such
-                    information. JDO 3.0 takes this further and provides a <b>Metadata API</b>, allowing
-                    runtime definition. This is of particular use for systems that don't know at application
-                    startup which classes should be persistable, maybe because the class hasn't been
-                    written yet.
-                </p>
-                <p>
-                    To demonstrate the Metadata API, lets assume that we have a PersistenceManagerFactory
-                    created for our datastore. So we request a new Metadata object.
-                </p>
-                <div class="source"><pre>
-PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory(props);
-JDOMetaData jdomd = pmf.newMetadata();</pre></div>
-                <p>
-                    So we can now start defining the metadata for the package/class(es) we want to persist.
-                    The Metadata is structured in a similar way to the XML DTD/XSD. So let's add a class
-                </p>
-                <div class="source"><pre>
-ClassMetadata cmd = jdomd.newClassMetadata(&quot;test.Client&quot;);
-cmd.setTable(&quot;CLIENT&quot;).setDetachable(true).setIdentityType(javax.jdo.annotations.IdentityType.DATASTORE);
-cmd.setPersistenceModifier(javax.jdo.metadata.ClassPersistenceModifier.PERSISTENCE_CAPABLE);</pre></div>
-                <p>
-                    So we have a class <i>test.Client</i> using datastore-identity, that is detachable, 
-                    and is persisted to a table <i>CLIENT</i>. As you can see, you can chain setters
-                    for convenient coding.
-                </p>
-                <div class="source"><pre>
-InheritanceMetadata inhmd = cmd.newInheritanceMetadata();
-inhmd.setStrategy(javax.jdo.annotations.InheritanceStrategy.NEW_TABLE);
-DiscriminatorMetadata dmd = inhmd.newDiscriminatorMetadata();
-dmd.setColumn(&quot;disc&quot;).setValue(&quot;Client&quot;).setStrategy(javax.jdo.annotations.DiscriminatorStrategy.VALUE_MAP);
-dmd.setIndexed(Indexed.TRUE);
-
-VersionMetadata vermd = cmd.newVersionMetadata();
-vermd.setStrategy(javax.jdo.annotations.VersionStrategy.VERSION_NUMBER).setColumn(&quot;version&quot;);
-vermd.setIndexed(Indexed.TRUE);</pre></div>
-                <p>
-                    So we will use &quot;new-table&quot; inheritance for this class, and it will have a discriminator
-                    stored in column <i>disc</i> of type &quot;value-map&quot;. The class will also be versioned, using
-                    column <i>version</i>, that is indexed. All of this was for the class as a whole, so let's
-                    look at the fields/properties of the class.
-                </p>
-                <div class="source"><pre>
-FieldMetadata fmd = cmd.newFieldMetadata(&quot;name&quot;);
-fmd.setNullValue(javax.jdo.annotations.NullValue.DEFAULT).setColumn(&quot;name&quot;).setIndexed(true).setUnique(true);
-</pre></div>
-                <p>
-                    So we have a field <i>name</i> that is persisted into column <i>name</i>, and is unique
-                    and indexed. The API metadata components all follow the DTD as stated earlier, so if
-                    our field was a collection we could then define <i>CollectionMetadata</i> below it.
-                </p>
-                <p>
-                    The only thing left to do is register the metadata with the PersistenceManagerFactory,
-                    like this
-                </p>
-                <div class="source"><pre>
-pmf.registerMetadata(jdomd);</pre></div>
-                <p>
-                    and any contact with the class will now persist according to this API.
-                </p>
-                <p>
-                    You can similarly browse already registered metadata using
-                </p>
-                <div class="source"><pre>
-ComponentMetadata compmd = pmf.getMetadata(&quot;mydomain.MyClass&quot;);</pre></div>
-                <p>
-                    Note that you cannot change already registered metadata with JDO 3.0.
-                </p>
-                <p>
-                    You can view the Javadocs for the Metadata API
-                    <a class="externalLink" href="http://db.apache.org/jdo/api30/apidocs/javax/jdo/metadata/package-summary.html">here</a>.
-                </p>
-            </div>
-
-            <div class="section"><h3>Enhancer API<a name="Enhancer_API"></a></h3>
-                <p>
-                    JDO implementations typically (but aren't compelled to) include a bytecode enhancement
-                    step, allowing for efficient change detection of objects.
-                    While the Metadata API above is very useful, if we just define metadata for a class
-                    we still need to enhance the class using this metadata. This is where the 
-                    <b>Enhancer API</b> comes in. To start we need to get a JDOEnhancer
-                </p>
-                <div class="source"><pre>
-JDOEnhancer enhancer = JDOHelper.getEnhancer();</pre></div>
-                <p>
-                    and now that we have the enhancer and want to enhance our class above so we
-                    need to register our new metadata with it (generate the metadata as shown above)
-                </p>
-                <div class="source"><pre>
-enhancer.registerMetadata(jdomd);</pre></div>
-                <p>
-                    Now we can handle the enhancement using a separate class loader if required (for
-                    example if the classes were defined dynamically, e.g by ASM)
-                </p>
-                <div class="source"><pre>
-enhancer.setClassLoader(myClassLoader);</pre></div>
-                <p>
-                    Finally we select what to enhance, and perform the enhancement
-                </p>
-                <div class="source"><pre>
-String[] classes = {&quot;test.Client&quot;};
-enhancer.addClasses(classes);
-enhancer.enhance();</pre></div>
-                <p>
-                    So the class is now enhanced and is ready for use.
-                </p>
-                <p>
-                    You can view the Javadocs for the Enhancer API
-                    <a class="externalLink" href="http://db.apache.org/jdo/api30/apidocs/index.html">here</a>.
-                </p>
-            </div>
-
-            <div class="section"><h3>Query Cancel/Timeout API<a name="Query_CancelTimeout_API"></a></h3>
-                <p>
-                    On occasions a query may be inefficient, or may suffer from problems in the underlying
-                    datastore, and so we don't want to affect the application. In this case it would make
-                    sense to have control over a timeout for the query, or be able to cancel it.
-                    JDO 3.0 introduces the Query cancel/timeout control, via the following new methods
-                    to <i>javax.jdo.Query</i>
-                </p>
-                <div class="source"><pre>
-void setTimeoutMillis(Integer interval);
-Integer getTimeoutMillis();
-void cancelAll();
-void cancel(Thread thread);</pre></div>
-                <p>
-                    So we have the ability to cancel a query as required, or just let it timeout.
-                </p>
-            </div>
-
-            <div class="section"><h3>Control of read objects locking<a name="Control_of_read_objects_locking"></a></h3>
-                <p>
-                    When we are using datastore (pessimistic) transactions it often doesn't make sense
-                    to just lock all objects read in the transaction. For this reason JDO 3.0 introduces
-                    control over which objects are locked and which aren't.
-                </p>
-                <p>
-                    In metadata for each class you can specify the &quot;serialize-read&quot; setting. 
-                    True will mean that objects of this type will be locked when read.
-                </p>
-                <p>
-                    On a Transaction you can override the metadata settings via the following
-                    method
-                </p>
-                <div class="source"><pre>
-void setSerializeRead(Boolean serialize);
-Boolean getSerializeRead();</pre></div>
-                <p>
-                    On a Query you can override the metadata and Transaction settings via the following
-                    method
-                </p>
-                <div class="source"><pre>
-void setSerializeRead(Boolean serialize);
-Boolean getSerializeRead();</pre></div>
-            </div>
-
-            <p>
-                This concludes our simple overview of JDO3. We hope you enjoy using it
-            </p>
-        </div>
-
-    
+        
+    
+        <div class="section"><h2>JDO 3.0 Overview<a name="JDO_3.0_Overview"></a></h2>
+            <div class="section"><h3>Background<a name="Background"></a></h3>
+                <p>
+                    Java Data Objects (JDO) is a specification begun in 2000, with 2 major releases
+                    JDO1 (2002 under JSR0012) and JDO2 (2006 under JSR0243). It was placed under 
+                    Apache in 2005 and is the rare example of a specification that has undergone
+                    continual improvement during its lifetime, for the last 4 years being developed
+                    totally in the open, accepting input from everyone.
+                </p>
+                <p>
+                    JDO 3.0 was started in October 2008, and encompasses additions to the specification
+                    in the areas of a metadata API, an enhancer API, addition of cancel/timeout control
+                    to queries, and addition of control to the locking of objects when read.
+                </p>
+            </div>
+
+            <div class="section"><h3>Metadata API<a name="Metadata_API"></a></h3>
+                <p>
+                    To persist Java objects you need to specify which classes are persistable, and
+                    how they are persisted. This was traditionally handled using XML configuration. With
+                    the advent of JDK1.5, annotations were added as another possible way of defining such
+                    information. JDO 3.0 takes this further and provides a <b>Metadata API</b>, allowing
+                    runtime definition. This is of particular use for systems that don't know at application
+                    startup which classes should be persistable, maybe because the class hasn't been
+                    written yet.
+                </p>
+                <p>
+                    To demonstrate the Metadata API, lets assume that we have a PersistenceManagerFactory
+                    created for our datastore. So we request a new Metadata object.
+                </p>
+                <div class="source"><pre>
+PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory(props);
+JDOMetaData jdomd = pmf.newMetadata();</pre></div>
+                <p>
+                    So we can now start defining the metadata for the package/class(es) we want to persist.
+                    The Metadata is structured in a similar way to the XML DTD/XSD. So let's add a class
+                </p>
+                <div class="source"><pre>
+ClassMetadata cmd = jdomd.newClassMetadata(&quot;test.Client&quot;);
+cmd.setTable(&quot;CLIENT&quot;).setDetachable(true).setIdentityType(javax.jdo.annotations.IdentityType.DATASTORE);
+cmd.setPersistenceModifier(javax.jdo.metadata.ClassPersistenceModifier.PERSISTENCE_CAPABLE);</pre></div>
+                <p>
+                    So we have a class <i>test.Client</i> using datastore-identity, that is detachable, 
+                    and is persisted to a table <i>CLIENT</i>. As you can see, you can chain setters
+                    for convenient coding.
+                </p>
+                <div class="source"><pre>
+InheritanceMetadata inhmd = cmd.newInheritanceMetadata();
+inhmd.setStrategy(javax.jdo.annotations.InheritanceStrategy.NEW_TABLE);
+DiscriminatorMetadata dmd = inhmd.newDiscriminatorMetadata();
+dmd.setColumn(&quot;disc&quot;).setValue(&quot;Client&quot;).setStrategy(javax.jdo.annotations.DiscriminatorStrategy.VALUE_MAP);
+dmd.setIndexed(Indexed.TRUE);
+
+VersionMetadata vermd = cmd.newVersionMetadata();
+vermd.setStrategy(javax.jdo.annotations.VersionStrategy.VERSION_NUMBER).setColumn(&quot;version&quot;);
+vermd.setIndexed(Indexed.TRUE);</pre></div>
+                <p>
+                    So we will use &quot;new-table&quot; inheritance for this class, and it will have a discriminator
+                    stored in column <i>disc</i> of type &quot;value-map&quot;. The class will also be versioned, using
+                    column <i>version</i>, that is indexed. All of this was for the class as a whole, so let's
+                    look at the fields/properties of the class.
+                </p>
+                <div class="source"><pre>
+FieldMetadata fmd = cmd.newFieldMetadata(&quot;name&quot;);
+fmd.setNullValue(javax.jdo.annotations.NullValue.DEFAULT).setColumn(&quot;name&quot;).setIndexed(true).setUnique(true);
+</pre></div>
+                <p>
+                    So we have a field <i>name</i> that is persisted into column <i>name</i>, and is unique
+                    and indexed. The API metadata components all follow the DTD as stated earlier, so if
+                    our field was a collection we could then define <i>CollectionMetadata</i> below it.
+                </p>
+                <p>
+                    The only thing left to do is register the metadata with the PersistenceManagerFactory,
+                    like this
+                </p>
+                <div class="source"><pre>
+pmf.registerMetadata(jdomd);</pre></div>
+                <p>
+                    and any contact with the class will now persist according to this API.
+                </p>
+                <p>
+                    You can similarly browse already registered metadata using
+                </p>
+                <div class="source"><pre>
+ComponentMetadata compmd = pmf.getMetadata(&quot;mydomain.MyClass&quot;);</pre></div>
+                <p>
+                    Note that you cannot change already registered metadata with JDO 3.0.
+                </p>
+                <p>
+                    You can view the Javadocs for the Metadata API
+                    <a class="externalLink" href="http://db.apache.org/jdo/api30/apidocs/javax/jdo/metadata/package-summary.html">here</a>.
+                </p>
+            </div>
+
+            <div class="section"><h3>Enhancer API<a name="Enhancer_API"></a></h3>
+                <p>
+                    JDO implementations typically (but aren't compelled to) include a bytecode enhancement
+                    step, allowing for efficient change detection of objects.
+                    While the Metadata API above is very useful, if we just define metadata for a class
+                    we still need to enhance the class using this metadata. This is where the 
+                    <b>Enhancer API</b> comes in. To start we need to get a JDOEnhancer
+                </p>
+                <div class="source"><pre>
+JDOEnhancer enhancer = JDOHelper.getEnhancer();</pre></div>
+                <p>
+                    and now that we have the enhancer and want to enhance our class above so we
+                    need to register our new metadata with it (generate the metadata as shown above)
+                </p>
+                <div class="source"><pre>
+enhancer.registerMetadata(jdomd);</pre></div>
+                <p>
+                    Now we can handle the enhancement using a separate class loader if required (for
+                    example if the classes were defined dynamically, e.g by ASM)
+                </p>
+                <div class="source"><pre>
+enhancer.setClassLoader(myClassLoader);</pre></div>
+                <p>
+                    Finally we select what to enhance, and perform the enhancement
+                </p>
+                <div class="source"><pre>
+String[] classes = {&quot;test.Client&quot;};
+enhancer.addClasses(classes);
+enhancer.enhance();</pre></div>
+                <p>
+                    So the class is now enhanced and is ready for use.
+                </p>
+                <p>
+                    You can view the Javadocs for the Enhancer API
+                    <a class="externalLink" href="http://db.apache.org/jdo/api30/apidocs/index.html">here</a>.
+                </p>
+            </div>
+
+            <div class="section"><h3>Query Cancel/Timeout API<a name="Query_CancelTimeout_API"></a></h3>
+                <p>
+                    On occasions a query may be inefficient, or may suffer from problems in the underlying
+                    datastore, and so we don't want to affect the application. In this case it would make
+                    sense to have control over a timeout for the query, or be able to cancel it.
+                    JDO 3.0 introduces the Query cancel/timeout control, via the following new methods
+                    to <i>javax.jdo.Query</i>
+                </p>
+                <div class="source"><pre>
+void setTimeoutMillis(Integer interval);
+Integer getTimeoutMillis();
+void cancelAll();
+void cancel(Thread thread);</pre></div>
+                <p>
+                    So we have the ability to cancel a query as required, or just let it timeout.
+                </p>
+            </div>
+
+            <div class="section"><h3>Control of read objects locking<a name="Control_of_read_objects_locking"></a></h3>
+                <p>
+                    When we are using datastore (pessimistic) transactions it often doesn't make sense
+                    to just lock all objects read in the transaction. For this reason JDO 3.0 introduces
+                    control over which objects are locked and which aren't.
+                </p>
+                <p>
+                    In metadata for each class you can specify the &quot;serialize-read&quot; setting. 
+                    True will mean that objects of this type will be locked when read.
+                </p>
+                <p>
+                    On a Transaction you can override the metadata settings via the following
+                    method
+                </p>
+                <div class="source"><pre>
+void setSerializeRead(Boolean serialize);
+Boolean getSerializeRead();</pre></div>
+                <p>
+                    On a Query you can override the metadata and Transaction settings via the following
+                    method
+                </p>
+                <div class="source"><pre>
+void setSerializeRead(Boolean serialize);
+Boolean getSerializeRead();</pre></div>
+            </div>
+
+            <p>
+                This concludes our simple overview of JDO3. We hope you enjoy using it
+            </p>
+        </div>
+
+    
 
       </div>
     </div>

Modified: websites/production/db/content/jdo/jdo_dtd.html
==============================================================================
--- websites/production/db/content/jdo/jdo_dtd.html (original)
+++ websites/production/db/content/jdo/jdo_dtd.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -223,44 +223,44 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>Meta-Data - JDO<a name="Meta-Data_-_JDO"></a></h2>
-            <p> 
-                JDO2 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>.
-                All <b>jdo</b> files must contain a valid DTD/DOCTYPE specification. You can use PUBLIC or SYSTEM versions of these.
-            </p>
-            <p>
-                Here are a few examples valid for <b>jdo</b> files with DTD specifications
-            </p>
-            <div class="source"><pre>
-&lt;!DOCTYPE jdo PUBLIC
-    &quot;-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN&quot;
-    &quot;http://java.sun.com/dtd/jdo_3_0.dtd&quot;&gt;
-
-
-&lt;!DOCTYPE jdo SYSTEM &quot;file:/javax/jdo/jdo.dtd&quot;&gt;</pre></div>
-            <br />
-            <p>
-                Here is an example valid for <b>jdo</b> files with XSD specification
-            </p>
-            <div class="source"><pre>
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
-&lt;jdo xmlns=&quot;http://java.sun.com/xml/ns/jdo/jdo&quot;
-     xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-     xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/jdo/jdo
-        http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd&quot;&gt;
-    ...
-&lt;/jdo&gt;</pre></div>
-            <p>
-                Your MetaData should match either the <a class="externalLink" href="http://java.sun.com/dtd/jdo_3_0.dtd" target="_blank">DTD</a>
-                or the <a class="externalLink" href="http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd" target="_blank">XSD</a> specification.
-            </p>
-        </div>
-    
+        
+    
+        <div class="section"><h2>Meta-Data - JDO<a name="Meta-Data_-_JDO"></a></h2>
+            <p> 
+                JDO2 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>.
+                All <b>jdo</b> files must contain a valid DTD/DOCTYPE specification. You can use PUBLIC or SYSTEM versions of these.
+            </p>
+            <p>
+                Here are a few examples valid for <b>jdo</b> files with DTD specifications
+            </p>
+            <div class="source"><pre>
+&lt;!DOCTYPE jdo PUBLIC
+    &quot;-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.0//EN&quot;
+    &quot;http://java.sun.com/dtd/jdo_3_0.dtd&quot;&gt;
+
+
+&lt;!DOCTYPE jdo SYSTEM &quot;file:/javax/jdo/jdo.dtd&quot;&gt;</pre></div>
+            <br />
+            <p>
+                Here is an example valid for <b>jdo</b> files with XSD specification
+            </p>
+            <div class="source"><pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
+&lt;jdo xmlns=&quot;http://java.sun.com/xml/ns/jdo/jdo&quot;
+     xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+     xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/jdo/jdo
+        http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd&quot;&gt;
+    ...
+&lt;/jdo&gt;</pre></div>
+            <p>
+                Your MetaData should match either the <a class="externalLink" href="http://java.sun.com/dtd/jdo_3_0.dtd" target="_blank">DTD</a>
+                or the <a class="externalLink" href="http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd" target="_blank">XSD</a> specification.
+            </p>
+        </div>
+    
 
       </div>
     </div>

Modified: websites/production/db/content/jdo/jdo_v_jpa.html
==============================================================================
--- websites/production/db/content/jdo/jdo_v_jpa.html (original)
+++ websites/production/db/content/jdo/jdo_v_jpa.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -209,206 +209,206 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>Which Persistence Specification ?<a name="Which_Persistence_Specification_"></a></h2>
-            <p>
-                There are several competing persistence technologies available for Java. 
-				Two of these are &quot;standardised&quot; (via the JCP). When developing your application you need 
-				to choose the most appropriate technology for your needs. <b>Java Data Objects (JDO)</b> 
-				has been a standard since 2001 with the release of JDO1. It was improved with the release 
-				of JDO2. Just to confuse issues the <b>Java Persistence API (JPA)</b> was approved 
-				in its JPA1 form, and JDO2.1/JDO2.2 provide updates to JDO2 building on some of the new 
-                features of JPA1. Since then we have had JDO3 adding on extra metadata and enhancer
-                standardisation, and JPA2 providing criteria queries. 
-                Below we show some of the differences of these 2 standards to give you 
-                assistance in selecting what you need. Highlighted in bold are the notable differences where one 
-                specification provides something not available in the other.
-            </p>
-            <table border="0" class="bodyTable">
-                <tr class="a">
-                    <th width="20%">Feature</th>
-                    <th width="40%">JDO</th>
-                    <th width="40%">JPA</th>
-                </tr>
-                <tr class="b">
-                    <td>JDK Requirement</td>
-                    <td><b>1.3+</b></td>
-                    <td>1.5+</td>
-                </tr>
-                <tr class="a">
-                    <td>Usage</td>
-                    <td>J2EE, J2SE</td>
-                    <td>J2EE, J2SE</td>
-                </tr>
-                <tr class="b">
-                    <td>Persistence specification mechanism</td>
-                    <td>XML, Annotations, <b>API</b></td>
-                    <td>XML, Annotations</td>
-                </tr>
-                <tr class="a">
-                    <td>Datastore supported</td>
-                    <td><b>Any</b></td>
-                    <td>RDBMS only</td>
-                </tr>
-                <tr class="b">
-                    <td>Restrictions on persisted classes</td>
-                    <td><b>no-arg constructor (could be added by compiler/enhancer)</b></td>
-                    <td>No final classes. No final methods. Non-private no-arg constructor. Identity Field.
-					    Version Field.</td>
-                </tr>
-                <tr class="a">
-                    <td>Ability to persist &quot;transient&quot; fields</td>
-                    <td><b>Yes</b></td>
-                    <td>No</td>
-                </tr>
-                <tr class="b">
-                    <td>Persist static/final fields</td>
-                    <td>No</td>
-                    <td>Not specified</td>
-                </tr>
-                <tr class="a">
-                    <td>Transactions</td>
-                    <td><b>Pessimistic</b>, Optimistic</td>
-                    <td>Optimistic, some locking</td>
-                </tr>
-                <tr class="b">
-                    <td>Object Identity</td>
-                    <td><b>datastore-identity</b>, application-identity</td>
-                    <td>application-identity</td>
-                </tr>
-                <tr class="a">
-                    <td>Object Identity generation</td>
-                    <td>Sequence, Table, Identity, Auto, <b>UUID String, UUID Hex</b></td>
-                    <td>Sequence, Table, Identity, Auto</td>
-                </tr>
-                <tr class="b">
-                    <td>Change objects identity</td>
-                    <td><b>Throw exception when not allowed</b></td>
-                    <td>Undefined !!</td>
-                </tr>
-                <tr class="a">
-                    <td>Supported types</td>
-                    <td>Java primitive types, wrappers of primitive types, java.lang.String, <b>java.lang.Number</b>, java.math.BigInteger, java.math.BigDecimal,
-                        <b>java.util.Currency, java.util.Locale</b>, java.util.Date, java.sql.Time, java.sql.Date, java.sql.Timestamp, java.io.Serializable,
-                        <b>boolean[]</b>, byte[], char[], <b>double[], float[], int[], long[], short[]</b>,
-                        <b>java.lang.Object</b>, <b>interface</b>,
-                        <b>Boolean[]</b>, Byte[], Character[], <b>Double[], Float[], Integer[], Long[], Short[], BigDecimal[], BigInteger[], String[]</b>,
-                        <b>PersistenceCapable[]</b>, <b>interface[]</b>, <b>Object[]</b>, Enums,
-                        java.util.Collection, java.util.Set, java.util.List, java.util.Map,
-                        <b>Collection/List/Map of simple types</b>, <b>Collection/List/Map of reference (interface/Object) types</b>,
-                        Collection/List/Map of persistable types
-                    </td>
-                    <td>Java primitive types, wrappers of the primitive types, java.lang.String, java.math.BigInteger, java.math.BigDecimal, 
-                        java.util.Date, <b>java.util.Calendar</b>, java.sql.Date, java.sql.Time, java.sql.Timestamp, java.io.Serializable,
-                        byte[], Byte[], char[], Character[], Enums,
-                        java.util.Collection, java.util.Set, java.util.List, java.util.Map
-                        Collection/List/Map of persistable types</td>
-                </tr>
-                <tr class="b">
-                    <td>Embedded Fields</td>
-                    <td>Embedded persistent objects, <b>Embedded Collections, Embedded Maps</b></td>
-                    <td>Embedded persistent objects</td>
-                </tr>
-                <tr class="a">
-                    <td>Access a non-detached field</td>
-                    <td><b>Throw exception</b></td>
-                    <td>Undefined !!</td>
-                </tr>
-                <tr class="b">
-                    <td>Inheritance</td>
-                    <td><b>Each class has its own strategy</b></td>
-                    <td>Root class defines the strategy</td>
-                </tr>
-                <tr class="a">
-                    <td>Operation cascade default</td>
-                    <td>persist, (delete)</td>
-                    <td></td>
-                </tr>
-                <tr class="b">
-                    <td>Operation Cascade configuration</td>
-                    <td>delete</td>
-                    <td>persist, delete, refresh</td>
-                </tr>
-                <tr class="a">
-                    <td>Query Language</td>
-                    <td>JDOQL, SQL, others</td>
-                    <td>JPQL, SQL</td>
-                </tr>
-                <tr class="b">
-                    <td>Query candidates</td>
-                    <td><b>Candidate without subclasses</b>, Candidate and its subclasses</td>
-                    <td>Candidate and its subclasses</td>
-                </tr>
-                <tr class="a">
-                    <td>Query of candidate collection</td>
-                    <td><b>yes</b></td>
-                    <td>no</td>
-                </tr>
-                <tr class="b">
-                    <td>Query language case sensitivity</td>
-                    <td>JDOQL lowercase/UPPERCASE</td>
-                    <td>JPQL case-insensitive</td>
-                </tr>
-                <tr class="a">
-                    <td>Query language aliases</td>
-                    <td>No, but has variables in JDOQL</td>
-                    <td>Yes in JPQL</td>
-                </tr>
-                <tr class="b">
-                    <td>Query Criteria API</td>
-                    <td>No, available as extension in QueryDSL</td>
-                    <td><b>Yes</b></td>
-                </tr>
-                <tr class="a">
-                    <td>Object retrieval control</td>
-                    <td>Lazy/Eager control, <b>fetch groups</b></td>
-                    <td>Lazy/Eager control</td>
-                </tr>
-                <tr class="b">
-                    <td>Bulk update/delete</td>
-                    <td>JDOQL Bulk Delete</td>
-                    <td>JPQL Bulk Delete, <b>JPQL Bulk Update</b></td>
-                </tr>
-                <tr class="a">
-                    <td>RDBMS Schema Control</td>
-                    <td>Tables, columns, PK columns, <b>PK constraints</b>, FK columns, <b>FK constraints</b>, <b>index columns</b>, 
-                        <b>index constraints</b>, unique key columns, <b>unique key constraints</b></td>
-                    <td>Tables, columns, PK columns, FK columns, unique key columns</td>
-                </tr>
-                <tr class="b">
-                    <td>ORM Relationships</td>
-                    <td><a href="jdo_v_jpa_orm.html"><b>Full range of Collection, Map, List, Array, 1-1, 1-N, M-N using 
-                        PC, Non-PC and interface objects</b></a></td>
-                    <td>Basic 1-1, 1-N, M-N, Collection&lt;NonPC&gt;, Map&lt;NonPC&gt;</td>
-                </tr>
-                <tr class="a">
-                    <td>Default ORM column size</td>
-                    <td>256</td>
-                    <td>255</td>
-                </tr>
-                <tr class="b">
-                    <td>Default ORM identifiers (tables/columns)</td>
-                    <td>No</td>
-                    <td>Yes</td>
-                </tr>
-                <tr class="a">
-                    <td>Default ORM mappings</td>
-                    <td>Yes, JDBC types defined for Java types</td>
-                    <td>No</td>
-                </tr>
-                <tr class="b">
-                    <td>Caching interface</td>
-                    <td>L2 Caching API</td>
-                    <td>L2 Caching API</td>
-                </tr>
-            </table>
-            <p>
-                As an overall conclusion &quot;JPA&quot; is a subset of what is already available in &quot;JDO&quot;.
-            </p>
-        </div>
-
-    
+        
+    
+        <div class="section"><h2>Which Persistence Specification ?<a name="Which_Persistence_Specification_"></a></h2>
+            <p>
+                There are several competing persistence technologies available for Java. 
+				Two of these are &quot;standardised&quot; (via the JCP). When developing your application you need 
+				to choose the most appropriate technology for your needs. <b>Java Data Objects (JDO)</b> 
+				has been a standard since 2001 with the release of JDO1. It was improved with the release 
+				of JDO2. Just to confuse issues the <b>Java Persistence API (JPA)</b> was approved 
+				in its JPA1 form, and JDO2.1/JDO2.2 provide updates to JDO2 building on some of the new 
+                features of JPA1. Since then we have had JDO3 adding on extra metadata and enhancer
+                standardisation, and JPA2 providing criteria queries. 
+                Below we show some of the differences of these 2 standards to give you 
+                assistance in selecting what you need. Highlighted in bold are the notable differences where one 
+                specification provides something not available in the other.
+            </p>
+            <table border="0" class="bodyTable">
+                <tr class="a">
+                    <th width="20%">Feature</th>
+                    <th width="40%">JDO</th>
+                    <th width="40%">JPA</th>
+                </tr>
+                <tr class="b">
+                    <td>JDK Requirement</td>
+                    <td><b>1.3+</b></td>
+                    <td>1.5+</td>
+                </tr>
+                <tr class="a">
+                    <td>Usage</td>
+                    <td>J2EE, J2SE</td>
+                    <td>J2EE, J2SE</td>
+                </tr>
+                <tr class="b">
+                    <td>Persistence specification mechanism</td>
+                    <td>XML, Annotations, <b>API</b></td>
+                    <td>XML, Annotations</td>
+                </tr>
+                <tr class="a">
+                    <td>Datastore supported</td>
+                    <td><b>Any</b></td>
+                    <td>RDBMS only</td>
+                </tr>
+                <tr class="b">
+                    <td>Restrictions on persisted classes</td>
+                    <td><b>no-arg constructor (could be added by compiler/enhancer)</b></td>
+                    <td>No final classes. No final methods. Non-private no-arg constructor. Identity Field.
+					    Version Field.</td>
+                </tr>
+                <tr class="a">
+                    <td>Ability to persist &quot;transient&quot; fields</td>
+                    <td><b>Yes</b></td>
+                    <td>No</td>
+                </tr>
+                <tr class="b">
+                    <td>Persist static/final fields</td>
+                    <td>No</td>
+                    <td>Not specified</td>
+                </tr>
+                <tr class="a">
+                    <td>Transactions</td>
+                    <td><b>Pessimistic</b>, Optimistic</td>
+                    <td>Optimistic, some locking</td>
+                </tr>
+                <tr class="b">
+                    <td>Object Identity</td>
+                    <td><b>datastore-identity</b>, application-identity</td>
+                    <td>application-identity</td>
+                </tr>
+                <tr class="a">
+                    <td>Object Identity generation</td>
+                    <td>Sequence, Table, Identity, Auto, <b>UUID String, UUID Hex</b></td>
+                    <td>Sequence, Table, Identity, Auto</td>
+                </tr>
+                <tr class="b">
+                    <td>Change objects identity</td>
+                    <td><b>Throw exception when not allowed</b></td>
+                    <td>Undefined !!</td>
+                </tr>
+                <tr class="a">
+                    <td>Supported types</td>
+                    <td>Java primitive types, wrappers of primitive types, java.lang.String, <b>java.lang.Number</b>, java.math.BigInteger, java.math.BigDecimal,
+                        <b>java.util.Currency, java.util.Locale</b>, java.util.Date, java.sql.Time, java.sql.Date, java.sql.Timestamp, java.io.Serializable,
+                        <b>boolean[]</b>, byte[], char[], <b>double[], float[], int[], long[], short[]</b>,
+                        <b>java.lang.Object</b>, <b>interface</b>,
+                        <b>Boolean[]</b>, Byte[], Character[], <b>Double[], Float[], Integer[], Long[], Short[], BigDecimal[], BigInteger[], String[]</b>,
+                        <b>PersistenceCapable[]</b>, <b>interface[]</b>, <b>Object[]</b>, Enums,
+                        java.util.Collection, java.util.Set, java.util.List, java.util.Map,
+                        <b>Collection/List/Map of simple types</b>, <b>Collection/List/Map of reference (interface/Object) types</b>,
+                        Collection/List/Map of persistable types
+                    </td>
+                    <td>Java primitive types, wrappers of the primitive types, java.lang.String, java.math.BigInteger, java.math.BigDecimal, 
+                        java.util.Date, <b>java.util.Calendar</b>, java.sql.Date, java.sql.Time, java.sql.Timestamp, java.io.Serializable,
+                        byte[], Byte[], char[], Character[], Enums,
+                        java.util.Collection, java.util.Set, java.util.List, java.util.Map
+                        Collection/List/Map of persistable types</td>
+                </tr>
+                <tr class="b">
+                    <td>Embedded Fields</td>
+                    <td>Embedded persistent objects, <b>Embedded Collections, Embedded Maps</b></td>
+                    <td>Embedded persistent objects</td>
+                </tr>
+                <tr class="a">
+                    <td>Access a non-detached field</td>
+                    <td><b>Throw exception</b></td>
+                    <td>Undefined !!</td>
+                </tr>
+                <tr class="b">
+                    <td>Inheritance</td>
+                    <td><b>Each class has its own strategy</b></td>
+                    <td>Root class defines the strategy</td>
+                </tr>
+                <tr class="a">
+                    <td>Operation cascade default</td>
+                    <td>persist, (delete)</td>
+                    <td></td>
+                </tr>
+                <tr class="b">
+                    <td>Operation Cascade configuration</td>
+                    <td>delete</td>
+                    <td>persist, delete, refresh</td>
+                </tr>
+                <tr class="a">
+                    <td>Query Language</td>
+                    <td>JDOQL, SQL, others</td>
+                    <td>JPQL, SQL</td>
+                </tr>
+                <tr class="b">
+                    <td>Query candidates</td>
+                    <td><b>Candidate without subclasses</b>, Candidate and its subclasses</td>
+                    <td>Candidate and its subclasses</td>
+                </tr>
+                <tr class="a">
+                    <td>Query of candidate collection</td>
+                    <td><b>yes</b></td>
+                    <td>no</td>
+                </tr>
+                <tr class="b">
+                    <td>Query language case sensitivity</td>
+                    <td>JDOQL lowercase/UPPERCASE</td>
+                    <td>JPQL case-insensitive</td>
+                </tr>
+                <tr class="a">
+                    <td>Query language aliases</td>
+                    <td>No, but has variables in JDOQL</td>
+                    <td>Yes in JPQL</td>
+                </tr>
+                <tr class="b">
+                    <td>Query Criteria API</td>
+                    <td>No, available as extension in QueryDSL</td>
+                    <td><b>Yes</b></td>
+                </tr>
+                <tr class="a">
+                    <td>Object retrieval control</td>
+                    <td>Lazy/Eager control, <b>fetch groups</b></td>
+                    <td>Lazy/Eager control</td>
+                </tr>
+                <tr class="b">
+                    <td>Bulk update/delete</td>
+                    <td>JDOQL Bulk Delete</td>
+                    <td>JPQL Bulk Delete, <b>JPQL Bulk Update</b></td>
+                </tr>
+                <tr class="a">
+                    <td>RDBMS Schema Control</td>
+                    <td>Tables, columns, PK columns, <b>PK constraints</b>, FK columns, <b>FK constraints</b>, <b>index columns</b>, 
+                        <b>index constraints</b>, unique key columns, <b>unique key constraints</b></td>
+                    <td>Tables, columns, PK columns, FK columns, unique key columns</td>
+                </tr>
+                <tr class="b">
+                    <td>ORM Relationships</td>
+                    <td><a href="jdo_v_jpa_orm.html"><b>Full range of Collection, Map, List, Array, 1-1, 1-N, M-N using 
+                        PC, Non-PC and interface objects</b></a></td>
+                    <td>Basic 1-1, 1-N, M-N, Collection&lt;NonPC&gt;, Map&lt;NonPC&gt;</td>
+                </tr>
+                <tr class="a">
+                    <td>Default ORM column size</td>
+                    <td>256</td>
+                    <td>255</td>
+                </tr>
+                <tr class="b">
+                    <td>Default ORM identifiers (tables/columns)</td>
+                    <td>No</td>
+                    <td>Yes</td>
+                </tr>
+                <tr class="a">
+                    <td>Default ORM mappings</td>
+                    <td>Yes, JDBC types defined for Java types</td>
+                    <td>No</td>
+                </tr>
+                <tr class="b">
+                    <td>Caching interface</td>
+                    <td>L2 Caching API</td>
+                    <td>L2 Caching API</td>
+                </tr>
+            </table>
+            <p>
+                As an overall conclusion &quot;JPA&quot; is a subset of what is already available in &quot;JDO&quot;.
+            </p>
+        </div>
+
+    
 
       </div>
     </div>

Modified: websites/production/db/content/jdo/jdo_v_jpa_api.html
==============================================================================
--- websites/production/db/content/jdo/jdo_v_jpa_api.html (original)
+++ websites/production/db/content/jdo/jdo_v_jpa_api.html Sat Feb 23 14:12:18 2013
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 20, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Feb 23, 2013 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11,7 +11,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20130120" />
+    <meta name="Date-Revision-yyyymmdd" content="20130223" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -209,80 +209,80 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>JDO .v. JPA : API<a name="JDO_.v._JPA_:_API"></a></h2>
-            <p>
-                The two persistence standards in Java have very similar API's on the face of it.
-                Here we give a comparison of the method calls and their equivalent in the other
-                API.
-            </p>
-            <table border="0" class="bodyTable">
-                <tr class="a">
-                    <th width="20%">Operation</th>
-                    <th width="40%">JDO</th>
-                    <th width="40%">JPA</th>
-                </tr>
-                <tr class="b">
-                    <td>Persist Object</td>
-                    <td>pm.makePersistent()</td>
-                    <td>em.persist</td>
-                </tr>
-                <tr class="a">
-                    <td>Update Object</td>
-                    <td>pm.makePersistent()</td>
-                    <td>em.merge()</td>
-                </tr>
-                <tr class="b">
-                    <td>Remove Object</td>
-                    <td>pm.deletePersistent()</td>
-                    <td>em.remove()</td>
-                </tr>
-                <tr class="a">
-                    <td>Retrieve Object</td>
-                    <td>pm.getObjectById()<br />
-                        pm.getExtent()</td>
-                    <td>em.find()</td>
-                </tr>
-                <tr class="b">
-                    <td>Refresh Object</td>
-                    <td>pm.refresh()</td>
-                    <td>em.refresh()</td>
-                </tr>
-                <tr class="a">
-                    <td>Detach single Object</td>
-                    <td>pm.detachCopy()</td>
-                    <td>em.detach()</td>
-                </tr>
-                <tr class="b">
-                    <td>Flush changes</td>
-                    <td>pm.flush()</td>
-                    <td>em.flush()</td>
-                </tr>
-                <tr class="a">
-                    <td>Access transaction</td>
-                    <td>pm.currentTransaction()</td>
-                    <td>em.getTransaction()</td>
-                </tr>
-                <tr class="b">
-                    <td>New Query</td>
-                    <td>pm.newQuery()</td>
-                    <td>em.createQuery()</td>
-                </tr>
-                <tr class="a">
-                    <td>New Named Query</td>
-                    <td>pm.newNamedQuery()</td>
-                    <td>em.createNamedQuery()</td>
-                </tr>
-                <tr class="b">
-                    <td>New SQL Query</td>
-                    <td>pm.newQuery()</td>
-                    <td>em.createNativeQuery()</td>
-                </tr>
-            </table>
-        </div>
-
-    
+        
+    
+        <div class="section"><h2>JDO .v. JPA : API<a name="JDO_.v._JPA_:_API"></a></h2>
+            <p>
+                The two persistence standards in Java have very similar API's on the face of it.
+                Here we give a comparison of the method calls and their equivalent in the other
+                API.
+            </p>
+            <table border="0" class="bodyTable">
+                <tr class="a">
+                    <th width="20%">Operation</th>
+                    <th width="40%">JDO</th>
+                    <th width="40%">JPA</th>
+                </tr>
+                <tr class="b">
+                    <td>Persist Object</td>
+                    <td>pm.makePersistent()</td>
+                    <td>em.persist</td>
+                </tr>
+                <tr class="a">
+                    <td>Update Object</td>
+                    <td>pm.makePersistent()</td>
+                    <td>em.merge()</td>
+                </tr>
+                <tr class="b">
+                    <td>Remove Object</td>
+                    <td>pm.deletePersistent()</td>
+                    <td>em.remove()</td>
+                </tr>
+                <tr class="a">
+                    <td>Retrieve Object</td>
+                    <td>pm.getObjectById()<br />
+                        pm.getExtent()</td>
+                    <td>em.find()</td>
+                </tr>
+                <tr class="b">
+                    <td>Refresh Object</td>
+                    <td>pm.refresh()</td>
+                    <td>em.refresh()</td>
+                </tr>
+                <tr class="a">
+                    <td>Detach single Object</td>
+                    <td>pm.detachCopy()</td>
+                    <td>em.detach()</td>
+                </tr>
+                <tr class="b">
+                    <td>Flush changes</td>
+                    <td>pm.flush()</td>
+                    <td>em.flush()</td>
+                </tr>
+                <tr class="a">
+                    <td>Access transaction</td>
+                    <td>pm.currentTransaction()</td>
+                    <td>em.getTransaction()</td>
+                </tr>
+                <tr class="b">
+                    <td>New Query</td>
+                    <td>pm.newQuery()</td>
+                    <td>em.createQuery()</td>
+                </tr>
+                <tr class="a">
+                    <td>New Named Query</td>
+                    <td>pm.newNamedQuery()</td>
+                    <td>em.createNamedQuery()</td>
+                </tr>
+                <tr class="b">
+                    <td>New SQL Query</td>
+                    <td>pm.newQuery()</td>
+                    <td>em.createNativeQuery()</td>
+                </tr>
+            </table>
+        </div>
+
+    
 
       </div>
     </div>