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 2014/01/05 11:08:46 UTC

svn commit: r892842 [8/15] - in /websites/production/db/content/jdo: ./ guides/ releases/

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 Sun Jan  5 10:08:45 2014
@@ -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 Nov 4, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 5, 2014 -->
 <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="20131104" />
+    <meta name="Date-Revision-yyyymmdd" content="20140105" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -101,7 +101,7 @@
                   <li class="none">
                           <a href="field_types.html" title="Types of Fields">Types of Fields</a>
             </li>
-                                                                                                                          <li class="collapsed">
+                                                                                                                                            <li class="collapsed">
                           <a href="metadata.html" title="MetaData">MetaData</a>
                   </li>
                   <li class="none">
@@ -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>
@@ -291,7 +291,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-              Copyright &#169;                   2005-2013.
+              Copyright &#169;                   2005-2014.
           All Rights Reserved.      
                     
                   </div>

Modified: websites/production/db/content/jdo/jdo_v_jpa_orm.html
==============================================================================
--- websites/production/db/content/jdo/jdo_v_jpa_orm.html (original)
+++ websites/production/db/content/jdo/jdo_v_jpa_orm.html Sun Jan  5 10:08:45 2014
@@ -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 Nov 4, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 5, 2014 -->
 <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="20131104" />
+    <meta name="Date-Revision-yyyymmdd" content="20140105" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -101,7 +101,7 @@
                   <li class="none">
                           <a href="field_types.html" title="Types of Fields">Types of Fields</a>
             </li>
-                                                                                                                          <li class="collapsed">
+                                                                                                                                            <li class="collapsed">
                           <a href="metadata.html" title="MetaData">MetaData</a>
                   </li>
                   <li class="none">
@@ -209,283 +209,283 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>Which ORM specification ?<a name="Which_ORM_specification_"></a></h2>
-            <p>
-				There are 2 prevalent specification in the Java ORM world. JDO provides the most complete
-                definition, whilst JPA is the most recent. 
-            </p>
-
-            <div class="section"><h3>Relationships<a name="Relationships"></a></h3>
-                <p>
-                    In this guide we show the different types of ORM relation commonly used, and mark 
-                    against it which specification supports it. This list is not yet complete but will be 
-                    added to to provide a comprehensive list of relationship type and where you can find it.
-                </p>
-                <table border="0" class="bodyTable">
-                    <tr class="a">
-                        <th>Field Type</th>
-                        <th>Relation</th>
-                        <th width="50">JDO</th>
-                        <th width="50">JPA</th>
-                    </tr>
-                    <tr class="b">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#uni">1-1 Unidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#bi">1-1 Bidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#PC">1-1 serialised</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_1_uni">1-1 CompoundIdentity Unidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_coll_bi">1-N CompoundIdentity Collection Bidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>PC</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_map_bi">1-N CompoundIdentity Map Bidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Interface</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1 Unidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Interface</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1 Bidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Interface</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Reference">1-1 serialised</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td>?</td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_uni">1-N ForeignKey Unidirectional Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_bi">1-N ForeignKey Bidirectional Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_uni">1-N JoinTable Unidirectional Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_bi">1-N JoinTable Bidirectional Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;Non-PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_nonpc">1-N JoinTable Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_join">1-N JoinTable Collection using shared JoinTable</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_fk">1-N ForeignKey Collection using shared ForeignKey</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/many_to_many.html">M-N JoinTable</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_uni">1-N CompoundIdentity Unidirectional</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Collection">1-N serialised Collection</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Collection&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#CollectionElements">1-N JoinTable Collection of serialised elements</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_uni">1-N ForeignKey Unidirectional Indexed List</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_bi">1-N ForeignKey Bidirectional Indexed List</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_uni">1-N JoinTable Unidirectional Indexed List</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_bi">1-N JoinTable Bidirectional Indexed List</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>List&lt;Non-PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_nonpc">1-N JoinTable Indexed List</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_uni">1-N ForeignKey Unidirectional Ordered List</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_bi">1-N ForeignKey Bidirectional Ordered List</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_uni">1-N JoinTable Unidirectional Ordered List</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>List&lt;PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_bi">1-N JoinTable Bidirectional Ordered List</a></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Map&lt;PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_pc">1-N JoinTable Map</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Map&lt;Non-PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_pc">1-N JoinTable Map</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Map&lt;PC, Non-PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_simple">1-N JoinTable Map</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Map&lt;Non-PC, Non-PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_simple">1-N JoinTable Map</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Map&lt;Non-PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_key">1-N ForeignKey Map Unidirectional (key stored in value)</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Map&lt;Non-PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_bi_key">1-N ForeignKey Map Bidirectional (key stored in value)</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Map&lt;PC, Non-PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_value">1-N ForeignKey Map Unidirectional (value stored in key)</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>Map&lt;PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Map">1-N serialised Map</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Map&lt;PC, PC&gt;</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#MapKeysValues">1-N JoinTable Map of serialised keys/values</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>PC[   ]</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#fk">1-N ForeignKey Unidirectional Array</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>PC[   ]</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N JoinTable Unidirectional Array</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="b">
-                        <td>PC[   ]</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Array">1-N serialised Array</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                    <tr class="a">
-                        <td>Non-PC[   ]</td>
-                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N JoinTable Unidirectional Array</a></td>
-                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
-                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    
+        
+    
+        <div class="section"><h2>Which ORM specification ?<a name="Which_ORM_specification_"></a></h2>
+            <p>
+				There are 2 prevalent specification in the Java ORM world. JDO provides the most complete
+                definition, whilst JPA is the most recent. 
+            </p>
+
+            <div class="section"><h3>Relationships<a name="Relationships"></a></h3>
+                <p>
+                    In this guide we show the different types of ORM relation commonly used, and mark 
+                    against it which specification supports it. This list is not yet complete but will be 
+                    added to to provide a comprehensive list of relationship type and where you can find it.
+                </p>
+                <table border="0" class="bodyTable">
+                    <tr class="a">
+                        <th>Field Type</th>
+                        <th>Relation</th>
+                        <th width="50">JDO</th>
+                        <th width="50">JPA</th>
+                    </tr>
+                    <tr class="b">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#uni">1-1 Unidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_one.html#bi">1-1 Bidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#PC">1-1 serialised</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_1_uni">1-1 CompoundIdentity Unidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_coll_bi">1-N CompoundIdentity Collection Bidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>PC</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_map_bi">1-N CompoundIdentity Map Bidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Interface</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1 Unidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Interface</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/interfaces.html">1-1 Bidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Interface</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Reference">1-1 serialised</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td>?</td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_uni">1-N ForeignKey Unidirectional Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#fk_bi">1-N ForeignKey Bidirectional Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_uni">1-N JoinTable Unidirectional Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_bi">1-N JoinTable Bidirectional Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;Non-PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#join_nonpc">1-N JoinTable Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_join">1-N JoinTable Collection using shared JoinTable</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_collection.html#shared_fk">1-N ForeignKey Collection using shared ForeignKey</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/many_to_many.html">M-N JoinTable</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/compound_identity.html#1_N_uni">1-N CompoundIdentity Unidirectional</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Collection">1-N serialised Collection</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Collection&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#CollectionElements">1-N JoinTable Collection of serialised elements</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_uni">1-N ForeignKey Unidirectional Indexed List</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#fk_bi">1-N ForeignKey Bidirectional Indexed List</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_uni">1-N JoinTable Unidirectional Indexed List</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_bi">1-N JoinTable Bidirectional Indexed List</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>List&lt;Non-PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_list.html#join_nonpc">1-N JoinTable Indexed List</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_uni">1-N ForeignKey Unidirectional Ordered List</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#fk_bi">1-N ForeignKey Bidirectional Ordered List</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_uni">1-N JoinTable Unidirectional Ordered List</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>List&lt;PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jpa/orm/one_to_many_list.html#join_bi">1-N JoinTable Bidirectional Ordered List</a></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Map&lt;PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_pc">1-N JoinTable Map</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Map&lt;Non-PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_pc">1-N JoinTable Map</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Map&lt;PC, Non-PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_pc_simple">1-N JoinTable Map</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Map&lt;Non-PC, Non-PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#join_simple_simple">1-N JoinTable Map</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Map&lt;Non-PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_key">1-N ForeignKey Map Unidirectional (key stored in value)</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Map&lt;Non-PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_bi_key">1-N ForeignKey Map Bidirectional (key stored in value)</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Map&lt;PC, Non-PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/one_to_many_map.html#fk_uni_value">1-N ForeignKey Map Unidirectional (value stored in key)</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>Map&lt;PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Map">1-N serialised Map</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Map&lt;PC, PC&gt;</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#MapKeysValues">1-N JoinTable Map of serialised keys/values</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>PC[   ]</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#fk">1-N ForeignKey Unidirectional Array</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>PC[   ]</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N JoinTable Unidirectional Array</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="b">
+                        <td>PC[   ]</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/serialised.html#Array">1-N serialised Array</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                    <tr class="a">
+                        <td>Non-PC[   ]</td>
+                        <td><a class="externalLink" href="http://www.datanucleus.org/products/accessplatform/jdo/orm/arrays.html#join">1-N JoinTable Unidirectional Array</a></td>
+                        <td><img src="images/icon_success_sml.gif" alt="" border="0" /></td>
+                        <td><img src="images/icon_error_sml.gif" alt="" border="0" /></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    
 
       </div>
     </div>
@@ -494,7 +494,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-              Copyright &#169;                   2005-2013.
+              Copyright &#169;                   2005-2014.
           All Rights Reserved.      
                     
                   </div>

Modified: websites/production/db/content/jdo/jdocentral.html
==============================================================================
--- websites/production/db/content/jdo/jdocentral.html (original)
+++ websites/production/db/content/jdo/jdocentral.html Sun Jan  5 10:08:45 2014
@@ -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 Nov 4, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 5, 2014 -->
 <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="20131104" />
+    <meta name="Date-Revision-yyyymmdd" content="20140105" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -102,7 +102,7 @@
                   <li class="none">
                           <a href="field_types.html" title="Types of Fields">Types of Fields</a>
             </li>
-                                                                                                                          <li class="collapsed">
+                                                                                                                                            <li class="collapsed">
                           <a href="metadata.html" title="MetaData">MetaData</a>
                   </li>
                   <li class="none">
@@ -210,38 +210,38 @@
     </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>JDOCentral at Apache JDO<a name="JDOCentral_at_Apache_JDO"></a></h2>
-      <p>
-      Welcome to the new home of JDOCentral!
-      </p>
-      <p>
-      JDOCentral was a privately maintained site.
-      Apache JDO is home for the development of the JDO specification and the TCK. 
-      The <a class="externalLink" href="http://www.datanucleus.org">DataNucleus</a> site is home for the development of 
-      the Reference Implementation of the JDO specification.
-      </p>
-      <p>
-      Visit the other pages on the Apache JDO site to find out what's going on with JDO.
-      Join the <a class="externalLink" href="http://db.apache.org/jdo/mail-lists.html">mailing lists</a> to get involved 
-      and provide feedback.
-      </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>JDOCentral at Apache JDO<a name="JDOCentral_at_Apache_JDO"></a></h2>
+      <p>
+      Welcome to the new home of JDOCentral!
+      </p>
+      <p>
+      JDOCentral was a privately maintained site.
+      Apache JDO is home for the development of the JDO specification and the TCK. 
+      The <a class="externalLink" href="http://www.datanucleus.org">DataNucleus</a> site is home for the development of 
+      the Reference Implementation of the JDO specification.
+      </p>
+      <p>
+      Visit the other pages on the Apache JDO site to find out what's going on with JDO.
+      Join the <a class="externalLink" href="http://db.apache.org/jdo/mail-lists.html">mailing lists</a> to get involved 
+      and provide feedback.
+      </p>
+    </div>
+  
 
       </div>
     </div>
@@ -250,7 +250,7 @@ limitations under the License. -->
     </div>
     <div id="footer">
       <div class="xright">
-              Copyright &#169;                   2005-2013.
+              Copyright &#169;                   2005-2014.
           All Rights Reserved.      
                     
                   </div>

Modified: websites/production/db/content/jdo/jdoconfig_dtd.html
==============================================================================
--- websites/production/db/content/jdo/jdoconfig_dtd.html (original)
+++ websites/production/db/content/jdo/jdoconfig_dtd.html Sun Jan  5 10:08:45 2014
@@ -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 Nov 4, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 5, 2014 -->
 <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="20131104" />
+    <meta name="Date-Revision-yyyymmdd" content="20140105" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -101,10 +101,13 @@
                   <li class="none">
                           <a href="field_types.html" title="Types of Fields">Types of Fields</a>
             </li>
-                                                                                                                                    <li class="expanded">
+                                                                                                                                                      <li class="expanded">
                           <a href="metadata.html" title="MetaData">MetaData</a>
                     <ul>
                       <li class="none">
+                          <a href="annotations.html" title="Annotations">Annotations</a>
+            </li>
+                      <li class="none">
                           <a href="jdo_dtd.html" title="jdo DTD/XSD">jdo DTD/XSD</a>
             </li>
                       <li class="none">
@@ -223,44 +226,44 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>Meta-Data - JDOConfig<a name="Meta-Data_-_JDOConfig"></a></h2>
-            <p> 
-                JDO allows you to define a file <i>jdoconfig.xml</i> that specifies the properties
-				for a named PMF. As always with XML, the metadata must match the defined DTD/XSD for 
-				that file type. This section describes the content of the <b>jdoconfig</b> files.
-                All <b>jdoconfig</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>jdoconfig</b> files with DTD specifications
-            </p>
-            <div class="source"><pre>
-&lt;!DOCTYPE jdoconfig PUBLIC 
-    &quot;-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.0//EN&quot;
-    &quot;http://java.sun.com/dtd/jdoconfig_3_0.dtd&quot;&gt;
-
-
-&lt;!DOCTYPE jdoconfig SYSTEM &quot;file:/javax/jdo/jdoconfig.dtd&quot;&gt;</pre></div>
-            <br />
-            <p>
-                Here is an example valid for <b>jdoconfig</b> files with XSD specification
-            </p>
-            <div class="source"><pre>
-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
-&lt;jdoconfig xmlns=&quot;http://java.sun.com/xml/ns/jdo/jdoconfig&quot;
-     xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-     xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/jdo/jdoconfig
-        http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd&quot;&gt;
-    ...
-&lt;/jdoconfig&gt;</pre></div>
-            <p>
-                Your MetaData should match either the <a class="externalLink" href="http://java.sun.com/dtd/jdoconfig_3_0.dtd" target="_blank">DTD</a>
-                or the <a class="externalLink" href="http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd" target="_blank">XSD</a> specification.
-            </p>
-        </div>
-    
+        
+    
+        <div class="section"><h2>Meta-Data - JDOConfig<a name="Meta-Data_-_JDOConfig"></a></h2>
+            <p> 
+                JDO allows you to define a file <i>jdoconfig.xml</i> that specifies the properties
+				for a named PMF. As always with XML, the metadata must match the defined DTD/XSD for 
+				that file type. This section describes the content of the <b>jdoconfig</b> files.
+                All <b>jdoconfig</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>jdoconfig</b> files with DTD specifications
+            </p>
+            <div class="source"><pre>
+&lt;!DOCTYPE jdoconfig PUBLIC 
+    &quot;-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.0//EN&quot;
+    &quot;http://java.sun.com/dtd/jdoconfig_3_0.dtd&quot;&gt;
+
+
+&lt;!DOCTYPE jdoconfig SYSTEM &quot;file:/javax/jdo/jdoconfig.dtd&quot;&gt;</pre></div>
+            <br />
+            <p>
+                Here is an example valid for <b>jdoconfig</b> files with XSD specification
+            </p>
+            <div class="source"><pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;
+&lt;jdoconfig xmlns=&quot;http://java.sun.com/xml/ns/jdo/jdoconfig&quot;
+     xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+     xsi:schemaLocation=&quot;http://java.sun.com/xml/ns/jdo/jdoconfig
+        http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd&quot;&gt;
+    ...
+&lt;/jdoconfig&gt;</pre></div>
+            <p>
+                Your MetaData should match either the <a class="externalLink" href="http://java.sun.com/dtd/jdoconfig_3_0.dtd" target="_blank">DTD</a>
+                or the <a class="externalLink" href="http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd" target="_blank">XSD</a> specification.
+            </p>
+        </div>
+    
 
       </div>
     </div>
@@ -269,7 +272,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-              Copyright &#169;                   2005-2013.
+              Copyright &#169;                   2005-2014.
           All Rights Reserved.      
                     
                   </div>

Modified: websites/production/db/content/jdo/jdohelper.html
==============================================================================
--- websites/production/db/content/jdo/jdohelper.html (original)
+++ websites/production/db/content/jdo/jdohelper.html Sun Jan  5 10:08:45 2014
@@ -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 Nov 4, 2013 -->
+<!-- Generated by Apache Maven Doxia Site Renderer 1.3 at Jan 5, 2014 -->
 <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="20131104" />
+    <meta name="Date-Revision-yyyymmdd" content="20140105" />
     <meta http-equiv="Content-Language" content="en" />
         
         </head>
@@ -101,7 +101,7 @@
                   <li class="none">
                           <a href="field_types.html" title="Types of Fields">Types of Fields</a>
             </li>
-                                                                                                                          <li class="collapsed">
+                                                                                                                                            <li class="collapsed">
                           <a href="metadata.html" title="MetaData">MetaData</a>
                   </li>
                   <li class="none">
@@ -209,90 +209,90 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        
-    
-        <div class="section"><h2>JDOHelper<a name="JDOHelper"></a></h2>
-            <p>
-                JDO provides a standard utility that gives access to useful parts of the JDO persistence process.
-                This is known as <b>JDOHelper</b> (javax.jdo.JDOHelper)
-                <a href="api20/apidocs/javax/jdo/JDOHelper.html" target="_blank"><img src="images/javadoc.gif" alt="" /></a>
-            </p>
-
-            <div class="section"><h3>PersistenceManagerFactory methods<a name="PersistenceManagerFactory_methods"></a></h3>
-                <p>
-                    The methods in JDOHelper can be split into categories. Here we start with the methods
-					for creating the starting point for persistence, the PersistenceManagerFactory (PMF)
-                </p>
-                <ul>
-                    <li><b>getPersistenceManagerFactory(Map props)</b> - 
-                        creates a PMF given a Map of the properties</li>
-                    <li><b>getPersistenceManagerFactory(Map props, ClassLoader cl)</b> - 
-                        creates a PMF given a Map of the properties, and a ClassLoader to use</li>
-                    <li><b>getPersistenceManagerFactory(String resource)</b> - 
-                        creates a PMF given a resource defining the properties.
-                        This can be used to create a named PMF in JDO2.1</li>
-                    <li><b>getPersistenceManagerFactory(String props, ClassLoader cl)</b> - 
-                        creates a PMF given a resource defining the properties, and a ClassLoader to use</li>
-                    <li><b>getPersistenceManagerFactory(File props)</b> - 
-                        creates a PMF given a file containing the properties</li>
-                    <li><b>getPersistenceManagerFactory(File props, ClassLoader cl)</b> - 
-                        creates a PMF given a file containing the properties and a ClassLoader to use</li>
-                    <li><b>getPersistenceManagerFactory(String jndi, Context ctx)</b> - 
-                        creates a PMF given a JNDI resource</li>
-                    <li><b>getPersistenceManagerFactory(String jndi, Context ctx, ClassLoader cl)</b> - 
-                        creates a PMF given a JNDI resource and a ClassLoader to use</li>
-                    <li><b>getPersistenceManagerFactory(InputStream strm)</b> - 
-                        creates a PMF given an InputStream</li>
-                    <li><b>getPersistenceManagerFactory(InputStream strm, ClassLoader cl)</b> - 
-                       creates a PMF given an InputStream and a ClassLoader to use</li>
-                </ul>
-	            <br />
-			</div>
-			<div class="section"><h3>Persistence methods<a name="Persistence_methods"></a></h3>
-                <p>
-                    Now we move onto the operations for persistence.
-                </p>
-                <ul>
-                    <li><b>getPersistenceManager(Object pc)</b> - 
-                        returns the PersistenceManager associated with the passed object (if any)</li>
-                    <li><b>makeDirty(Object pc, String fieldName)</b> - 
-                       marks the field of the passed object as dirty (meaning that it needs updating in ther datastore)</li>
-                    <li><b>getObjectId(Object pc)</b> - 
-                        returns the object identity for the passed object (if persistent)</li>
-                    <li><b>getObjectIds(Collection pc)</b> - 
-                        returns the object identities for the passed objects (if persistent)</li>
-                    <li><b>getObjectIds(Object[] pc)</b> - 
-                        returns the object identities for the passed objects (if persistent)</li>
-                    <li><b>getVersion(Object pc)</b> - 
-                        returns the version for the passed object (if persistent)</li>
-                </ul>
-	            <br />
-            </div>
-
-            <div class="section"><h3>Lifecycle methods<a name="Lifecycle_methods"></a></h3>
-                <p>
-                    Now we move onto lifecycle operations
-                </p>
-                <ul>
-                    <li><b>getObjectState(Object pc)</b> - 
-                        returns the object state (JDO2.1 JDK1.5+ only)</li>
-                    <li><b>isDirty(Object pc)</b> - 
-                        returns whether the passed object is dirty</li>
-                    <li><b>isTransactional(Object pc)</b> - 
-                        returns whether the passed object is transactional</li>
-                    <li><b>isPersistent(Object pc)</b> - 
-                        returns whether the passed object is persistent</li>
-                    <li><b>isNew(Object pc)</b> -
-                        returns whether the passed object is new</li>
-                    <li><b>isDeleted(Object pc)</b> - 
-                        returns whether the passed object is deleted</li>
-                    <li><b>isDetached(Object pc)</b> - 
-                        returns whether the passed object is detached</li>
-                </ul>
-			</div>
-        </div>
-
-    
+        
+    
+        <div class="section"><h2>JDOHelper<a name="JDOHelper"></a></h2>
+            <p>
+                JDO provides a standard utility that gives access to useful parts of the JDO persistence process.
+                This is known as <b>JDOHelper</b> (javax.jdo.JDOHelper)
+                <a href="api20/apidocs/javax/jdo/JDOHelper.html" target="_blank"><img src="images/javadoc.gif" alt="" /></a>
+            </p>
+
+            <div class="section"><h3>PersistenceManagerFactory methods<a name="PersistenceManagerFactory_methods"></a></h3>
+                <p>
+                    The methods in JDOHelper can be split into categories. Here we start with the methods
+					for creating the starting point for persistence, the PersistenceManagerFactory (PMF)
+                </p>
+                <ul>
+                    <li><b>getPersistenceManagerFactory(Map props)</b> - 
+                        creates a PMF given a Map of the properties</li>
+                    <li><b>getPersistenceManagerFactory(Map props, ClassLoader cl)</b> - 
+                        creates a PMF given a Map of the properties, and a ClassLoader to use</li>
+                    <li><b>getPersistenceManagerFactory(String resource)</b> - 
+                        creates a PMF given a resource defining the properties.
+                        This can be used to create a named PMF in JDO2.1</li>
+                    <li><b>getPersistenceManagerFactory(String props, ClassLoader cl)</b> - 
+                        creates a PMF given a resource defining the properties, and a ClassLoader to use</li>
+                    <li><b>getPersistenceManagerFactory(File props)</b> - 
+                        creates a PMF given a file containing the properties</li>
+                    <li><b>getPersistenceManagerFactory(File props, ClassLoader cl)</b> - 
+                        creates a PMF given a file containing the properties and a ClassLoader to use</li>
+                    <li><b>getPersistenceManagerFactory(String jndi, Context ctx)</b> - 
+                        creates a PMF given a JNDI resource</li>
+                    <li><b>getPersistenceManagerFactory(String jndi, Context ctx, ClassLoader cl)</b> - 
+                        creates a PMF given a JNDI resource and a ClassLoader to use</li>
+                    <li><b>getPersistenceManagerFactory(InputStream strm)</b> - 
+                        creates a PMF given an InputStream</li>
+                    <li><b>getPersistenceManagerFactory(InputStream strm, ClassLoader cl)</b> - 
+                       creates a PMF given an InputStream and a ClassLoader to use</li>
+                </ul>
+	            <br />
+			</div>
+			<div class="section"><h3>Persistence methods<a name="Persistence_methods"></a></h3>
+                <p>
+                    Now we move onto the operations for persistence.
+                </p>
+                <ul>
+                    <li><b>getPersistenceManager(Object pc)</b> - 
+                        returns the PersistenceManager associated with the passed object (if any)</li>
+                    <li><b>makeDirty(Object pc, String fieldName)</b> - 
+                       marks the field of the passed object as dirty (meaning that it needs updating in ther datastore)</li>
+                    <li><b>getObjectId(Object pc)</b> - 
+                        returns the object identity for the passed object (if persistent)</li>
+                    <li><b>getObjectIds(Collection pc)</b> - 
+                        returns the object identities for the passed objects (if persistent)</li>
+                    <li><b>getObjectIds(Object[] pc)</b> - 
+                        returns the object identities for the passed objects (if persistent)</li>
+                    <li><b>getVersion(Object pc)</b> - 
+                        returns the version for the passed object (if persistent)</li>
+                </ul>
+	            <br />
+            </div>
+
+            <div class="section"><h3>Lifecycle methods<a name="Lifecycle_methods"></a></h3>
+                <p>
+                    Now we move onto lifecycle operations
+                </p>
+                <ul>
+                    <li><b>getObjectState(Object pc)</b> - 
+                        returns the object state (JDO2.1 JDK1.5+ only)</li>
+                    <li><b>isDirty(Object pc)</b> - 
+                        returns whether the passed object is dirty</li>
+                    <li><b>isTransactional(Object pc)</b> - 
+                        returns whether the passed object is transactional</li>
+                    <li><b>isPersistent(Object pc)</b> - 
+                        returns whether the passed object is persistent</li>
+                    <li><b>isNew(Object pc)</b> -
+                        returns whether the passed object is new</li>
+                    <li><b>isDeleted(Object pc)</b> - 
+                        returns whether the passed object is deleted</li>
+                    <li><b>isDetached(Object pc)</b> - 
+                        returns whether the passed object is detached</li>
+                </ul>
+			</div>
+        </div>
+
+    
 
       </div>
     </div>
@@ -301,7 +301,7 @@
     </div>
     <div id="footer">
       <div class="xright">
-              Copyright &#169;                   2005-2013.
+              Copyright &#169;                   2005-2014.
           All Rights Reserved.      
                     
                   </div>