DataNucleus

Revision: 15006
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15006&view=rev
Author:   andy_jefferson
Date:     2012-07-02 18:18:51 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
more validation-type nonsense that Maven2 requires

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/spatial_tutorial.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/index.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pmproxy.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/index.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/spatial_tutorial.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/spatial_tutorial.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/spatial_tutorial.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -50,8 +50,7 @@
 
             <a name="step3"/>
             <subsection name="Step 3 : Design and implement the persistent data model">
-                <p>
-                    <source>
+                <source>
 package org.datanucleus.samples.spatial.tutorial;
 
 import org.postgis.Point;
@@ -83,7 +82,7 @@
         return "[name] "+ name + " [point] "+point;
     }
 }</source>
-                    <source><![CDATA[
+<source><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
 <jdo>
@@ -98,7 +97,6 @@
 		</class>
 	</package>
 </jdo>]]></source>
-                </p>
                 <p>
                     The above JDO metadata has two extensions <i>spatial-dimension</i> and <i>spatial-srid</i>. These
                     settings specifies the format of the spatial data. <i>SRID</i> stands for spatial referencing system

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -106,11 +106,13 @@
                     Now we need to be able to persist objects of all of these types, so we need to <b>define persistence
                     for them</b>. There are many things that you can define when deciding how to persist objects of a type
                     but the essential parts are
-                    <ul>
-                        <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
-                        <li>Identify which field(s) represent the identity of the object (or use datastore-identity
-                        if no field meets this requirement).</li>
-                    </ul>
+                </p>
+                <ul>
+                    <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
+                    <li>Identify which field(s) represent the identity of the object (or use datastore-identity
+                    if no field meets this requirement).</li>
+                </ul>
+                <p>
                     So this is what we do now. Note that we could define persistence using XML metadata, annotations or
                     via the JDO API. In this tutorial we will use annotations.
                 </p>
@@ -284,13 +286,13 @@
 }</source>
                 <p>
                     Note the following
-                    <ul>
-                        <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
-                        then that is also persisted.</li>
-                        <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
-                        close the PersistenceManager</li>
-                    </ul>
                 </p>
+                <ul>
+                    <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
+                    then that is also persisted.</li>
+                    <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
+                    close the PersistenceManager</li>
+                </ul>
                 <p> 
                     If you want to retrieve an object from persistent storage, something like this will give 
                     what you need. This uses a "Query", and retrieves all Product objects that have a price
@@ -416,8 +418,8 @@
             </subsection>
         </section>
 
-        <a name="part2"/>
         <section name="Part 2 : Next steps">
+            <a name="part2"/>
 			<a name="step5"/>
             <p>
                 In the above simple tutorial we showed how to employ JDO and persist objects to Excel.
@@ -556,7 +558,7 @@
                     If you have any questions about this tutorial and how to develop applications for use 
                     with <b>DataNucleus</b> please read the online documentation since answers are to be 
                     found there. If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -106,11 +106,13 @@
                     Now we need to be able to persist objects of all of these types, so we need to <b>define persistence
                     for them</b>. There are many things that you can define when deciding how to persist objects of a type
                     but the essential parts are
-                    <ul>
-                        <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
-                        <li>Identify which field(s) represent the identity of the object (or use datastore-identity
-                        if no field meets this requirement).</li>
-                    </ul>
+                </p>
+                <ul>
+                    <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
+                    <li>Identify which field(s) represent the identity of the object (or use datastore-identity
+                    if no field meets this requirement).</li>
+                </ul>
+                <p>
                     So this is what we do now. Note that we could define persistence using XML metadata, annotations or
                     via the JDO API. In this tutorial we will use annotations.
                 </p>
@@ -141,7 +143,7 @@
 package org.datanucleus.samples.jdo.tutorial;
 
 @PersistenceCapable
-public class Book extends Product
+public class Book extends Product 
 {
     ...
 }]]></source>
@@ -284,13 +286,13 @@
 }</source>
                 <p>
                     Note the following
-                    <ul>
-                        <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
-                        then that is also persisted.</li>
-                        <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
-                        close the PersistenceManager</li>
-                    </ul>
                 </p>
+                <ul>
+                    <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
+                    then that is also persisted.</li>
+                    <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
+                    close the PersistenceManager</li>
+                </ul>
                 <p> 
                     If you want to retrieve an object from persistent storage, something like this will give 
                     what you need. This uses a "Query", and retrieves all Product objects that have a price
@@ -418,8 +420,8 @@
             </subsection>
         </section>
 
-        <a name="part2"/>
         <section name="Part 2 : Next steps">
+            <a name="part2"/>
 			<a name="step5"/>
             <p>
                 In the above simple tutorial we showed how to employ JDO and persist objects to HBase.
@@ -553,7 +555,7 @@
                     If you have any questions about this tutorial and how to develop applications for use 
                     with <b>DataNucleus</b> please read the online documentation since answers are to be 
                     found there. If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_TOP">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 
@@ -564,6 +566,5 @@
                 </p>
             </subsection>
         </section>
-
     </body>
 </document>
\ No newline at end of file

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -106,11 +106,13 @@
                     Now we need to be able to persist objects of all of these types, so we need to <b>define persistence
                     for them</b>. There are many things that you can define when deciding how to persist objects of a type
                     but the essential parts are
-                    <ul>
-                        <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
-                        <li>Identify which field(s) represent the identity of the object (or use datastore-identity
-                        if no field meets this requirement).</li>
-                    </ul>
+                </p>
+                <ul>
+                    <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
+                    <li>Identify which field(s) represent the identity of the object (or use datastore-identity
+                    if no field meets this requirement).</li>
+                </ul>
+                <p>
                     So this is what we do now. Note that we could define persistence using XML metadata, annotations or
                     via the JDO API. In this tutorial we will use annotations.
                 </p>
@@ -284,13 +286,13 @@
 }</source>
                 <p>
                     Note the following
-                    <ul>
-                        <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
-                        then that is also persisted.</li>
-                        <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
-                        close the PersistenceManager</li>
-                    </ul>
                 </p>
+                <ul>
+                    <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
+                    then that is also persisted.</li>
+                    <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
+                    close the PersistenceManager</li>
+                </ul>
                 <p> 
                     If you want to retrieve an object from persistent storage, something like this will give 
                     what you need. This uses a "Query", and retrieves all Product objects that have a price
@@ -418,8 +420,8 @@
             </subsection>
         </section>
 
-        <a name="part2"/>
         <section name="Part 2 : Next steps">
+            <a name="part2"/>
 			<a name="step5"/>
             <p>
                 In the above simple tutorial we showed how to employ JDO and persist objects to MongoDB.
@@ -551,7 +553,7 @@
                     If you have any questions about this tutorial and how to develop applications for use 
                     with <b>DataNucleus</b> please read the online documentation since answers are to be 
                     found there. If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_TOP">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -106,11 +106,13 @@
                     Now we need to be able to persist objects of all of these types, so we need to <b>define persistence
                     for them</b>. There are many things that you can define when deciding how to persist objects of a type
                     but the essential parts are
-                    <ul>
-                        <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
-                        <li>Identify which field(s) represent the identity of the object (or use datastore-identity
-                        if no field meets this requirement).</li>
-                    </ul>
+                </p>
+                <ul>
+                    <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
+                    <li>Identify which field(s) represent the identity of the object (or use datastore-identity
+                    if no field meets this requirement).</li>
+                </ul>
+                <p>
                     So this is what we do now. Note that we could define persistence using XML metadata, annotations or
                     via the JDO API. In this tutorial we will use annotations.
                 </p>
@@ -284,13 +286,13 @@
 }</source>
                 <p>
                     Note the following
-                    <ul>
-                        <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
-                        then that is also persisted.</li>
-                        <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
-                        close the PersistenceManager</li>
-                    </ul>
                 </p>
+                <ul>
+                    <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
+                    then that is also persisted.</li>
+                    <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
+                    close the PersistenceManager</li>
+                </ul>
                 <p> 
                     If you want to retrieve an object from persistent storage, something like this will give 
                     what you need. This uses a "Query", and retrieves all Product objects that have a price
@@ -416,8 +418,8 @@
             </subsection>
         </section>
 
-        <a name="part2"/>
         <section name="Part 2 : Next steps">
+            <a name="part2"/>
 			<a name="step5"/>
             <p>
                 In the above simple tutorial we showed how to employ JDO and persist objects to ODF.
@@ -558,7 +560,7 @@
                     If you have any questions about this tutorial and how to develop applications for use 
                     with <b>DataNucleus</b> please read the online documentation since answers are to be 
                     found there. If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -106,11 +106,13 @@
                     Now we need to be able to persist objects of all of these types, so we need to <b>define persistence
                     for them</b>. There are many things that you can define when deciding how to persist objects of a type
                     but the essential parts are
-                    <ul>
-                        <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
-                        <li>Identify which field(s) represent the identity of the object (or use datastore-identity
-                        if no field meets this requirement).</li>
-                    </ul>
+                </p>
+                <ul>
+                    <li>Mark the class as <i>PersistenceCapable</i> so it is visible to the persistence mechanism</li>
+                    <li>Identify which field(s) represent the identity of the object (or use datastore-identity
+                    if no field meets this requirement).</li>
+                </ul>
+                <p>
                     So this is what we do now. Note that we could define persistence using XML metadata, annotations or
                     via the JDO API. In this tutorial we will use annotations.
                 </p>
@@ -287,13 +289,13 @@
 }</source>
                 <p>
                     Note the following
-                    <ul>
-                        <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
-                        then that is also persisted.</li>
-                        <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
-                        close the PersistenceManager</li>
-                    </ul>
                 </p>
+                <ul>
+                    <li>We have persisted the <i>Inventory</i> but since this referenced the <i>Product</i>
+                    then that is also persisted.</li>
+                    <li>The <i>finally</i> step is important to tidy up any connection to the datastore, and
+                    close the PersistenceManager</li>
+                </ul>
                 <p> 
                     If you want to retrieve an object from persistent storage, something like this will give 
                     what you need. This uses a "Query", and retrieves all Product objects that have a price
@@ -421,8 +423,8 @@
             </subsection>
         </section>
 
-        <a name="part2"/>
         <section name="Part 2 : Next steps">
+            <a name="part2"/>
 			<a name="step5"/>
             <p>
                 In the above simple tutorial we showed how to employ JDO and persist objects to an RDBMS.
@@ -558,7 +560,7 @@
                     If you have any questions about this tutorial and how to develop applications for use 
                     with <b>DataNucleus</b> please read the online documentation since answers are to be 
                     found there. If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/index.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/index.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/index.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -28,7 +28,7 @@
             </ul>
             <p>
                 DataNucleus can be used in all of these modes, though provides significant assistance for <b>Forward Mapping</b> cases.
-                In particular, when using this mode you can use the <a HREF="../../schematool.html">DataNucleus SchemaTool</a> to generate
+                In particular, when using this mode you can use the <a href="../../schematool.html">DataNucleus SchemaTool</a> to generate
                 the datastore schema, based on a set of input classes and MetaData files. It should be noted though that
                 <b>DataNucleus SchemaTool</b> also provides modes of operation for updating an existing schema, and hence can also
                 be used for <b>Meet in the Middle Mapping</b>. Additionally, it can be used as a validation mechanism when designing

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -67,7 +67,7 @@
 
             <subsection name="PersistenceManagerFactory creation">
                 <p>
-                    Creation of <a HREF="pmf.html">PersistenceManagerFactory</a> objects can be expensive and should 
+                    Creation of <a href="pmf.html">PersistenceManagerFactory</a> objects can be expensive and should 
                     be kept to a minimum. Depending on the structure of your application, use a single factory per 
                     datastore wherever possible. Clearly if your application spans multiple servers then this 
                     may be impractical, but should be borne in mind.

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -7,7 +7,7 @@
     <body>
         <section name="JDO : Persistence Manager">
             <p>
-                As you read in the guide for <a HREF="pmf.html">PersistenceManagerFactory</a>, to control the 
+                As you read in the guide for <a href="pmf.html">PersistenceManagerFactory</a>, to control the 
                 persistence of your objects you will require at least one <i>PersistenceManagerFactory</i>. 
                 Once you have obtained this object you then use this to obtain a <i>PersistenceManager</i>. 
                 A <i>PersistenceManager</i> provides access to the operations for persistence of your objects. 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pmproxy.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pmproxy.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pmproxy.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -7,7 +7,7 @@
     <body>
         <section name="JDO : PersistenceManager Proxies">
             <p>
-                As you read in the guide for <a HREF="pm.html">PersistenceManager</a>, you perform
+                As you read in the guide for <a href="pm.html">PersistenceManager</a>, you perform
                 all operations using a <i>PersistenceManager</i>. This means that you need to obtain
                 this when you want to start datastore operations. 
                 In some architectures (e.g in a web environment) it can be convenient to maintain a 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -7,7 +7,7 @@
     <body>
         <section name="JPA : Entity Manager">
             <p>
-                As you read in the guide for <a HREF="emf.html">EntityManagerFactory</a>, to control the persistence of your objects
+                As you read in the guide for <a href="emf.html">EntityManagerFactory</a>, to control the persistence of your objects
                 you will require at least one <i>EntityManagerFactory</i>. Once you have obtained this object you then use
                 this to obtain an <i>EntityManager</i>. An <i>EntityManager</i> provides access to the operations for persistence
                 of your objects. This short guide will demonstrate some of the more common operations.

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -569,7 +569,7 @@
                     If you have any questions about this tutorial and how to develop applications for use with 
                     <b>DataNucleus</b> please read the online documentation since answers are to be found there. 
                     If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -569,7 +569,7 @@
                     If you have any questions about this tutorial and how to develop applications for use with 
                     <b>DataNucleus</b> please read the online documentation since answers are to be found there. 
                     If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -569,7 +569,7 @@
                     If you have any questions about this tutorial and how to develop applications for use with 
                     <b>DataNucleus</b> please read the online documentation since answers are to be found there. 
                     If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -569,7 +569,7 @@
                     If you have any questions about this tutorial and how to develop applications for use with 
                     <b>DataNucleus</b> please read the online documentation since answers are to be found there. 
                     If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -571,7 +571,7 @@
                     If you have any questions about this tutorial and how to develop applications for use with 
                     <b>DataNucleus</b> please read the online documentation since answers are to be found there. 
                     If you don't find what you're looking for go to our 
-                    <a HREF="http://forum.datanucleus.org" TARGET="_TOP">Forums</a>. 
+                    <a href="http://forum.datanucleus.org" target="_top">Forums</a>. 
                 </p>
                 <p> 
                     Again, you can download the sample classes from this tutorial from 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/index.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/index.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/index.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -28,7 +28,7 @@
             </ul>
             <p>
                 DataNucleus can be used in all of these modes, though provides significant assistance for <b>Forward Mapping</b> cases.
-                In particular, when using this mode you can use the <a HREF="../../schematool.html">DataNucleus SchemaTool</a> to generate
+                In particular, when using this mode you can use the <a href="../../schematool.html">DataNucleus SchemaTool</a> to generate
                 the datastore schema, based on a set of input classes and MetaData files. It should be noted though that
                 <b>DataNucleus SchemaTool</b> also provides modes of operation for updating an existing schema, and hence can also
                 be used for <b>Meet in the Middle Mapping</b>. Additionally, it can be used as a validation mechanism when designing

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml	2012-07-02 17:18:40 UTC (rev 15005)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml	2012-07-02 18:18:51 UTC (rev 15006)
@@ -67,7 +67,7 @@
 
             <subsection name="EntityManagerFactory creation">
                 <p>
-                    Creation of <a HREF="emf.html">EntityManagerFactory</a> objects can be expensive and should be 
+                    Creation of <a href="emf.html">EntityManagerFactory</a> objects can be expensive and should be 
                     kept to a minimum. Depending on the structure of your application, use a single factory per datastore
                     wherever possible. Clearly if your application spans multiple servers then this may be impractical, 
                     but should be borne in mind.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15007
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15007&view=rev
Author:   andy_jefferson
Date:     2012-07-03 06:49:54 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
fix syntax of nested <ul> so they will work with Maven3

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/metadata_xml.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/metadata_xml.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/metadata_xml.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/metadata_xml.xml	2012-07-02 18:18:51 UTC (rev 15006)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/metadata_xml.xml	2012-07-03 06:49:54 UTC (rev 15007)
@@ -20,199 +20,195 @@
             </p>
             <p>
             <ul>
-                <li>jdo</li>
+                <li>jdo
                 <ul>
-                    <li><a href="#package">package</a></li>
+                    <li><a href="#package">package</a>
                     <ul>
-                        <li><a href="#class">class</a></li>
+                        <li><a href="#class">class</a>
                         <ul>
-                            <li><a href="#datastore-identity">datastore-identity</a></li>
+                            <li><a href="#datastore-identity">datastore-identity</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
                                 <li><a href="#datastoreidentityextension">extension</a></li>
-                            </ul>
-                            <li><a href="#primary-key">primary-key</a></li>
+                            </ul></li>
+                            <li><a href="#primary-key">primary-key</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
-                            </ul>
-                            <li><a href="#inheritance">inheritance</a></li>
+                            </ul></li>
+                            <li><a href="#inheritance">inheritance</a>
                             <ul>
-                                <li><a href="#discriminator">discriminator</a></li>
+                                <li><a href="#discriminator">discriminator</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#join">join</a></li>
+                                </ul></li>
+                                <li><a href="#join">join</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                            </ul>
-                            <li><a href="#version">version</a></li>
+                                </ul></li>
+                            </ul></li>
+                            <li><a href="#version">version</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
                                 <li><a href="#versionextension">extension</a></li>
-                            </ul>
-                            <li><a href="#join">join</a></li>
+                            </ul></li>
+                            <li><a href="#join">join</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
-                            </ul>
-                            <li><a href="#foreignkey">foreign-key</a></li>
+                            </ul></li>
+                            <li><a href="#foreignkey">foreign-key</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
                                 <li><a href="#field">field</a></li>
                                 <li><a href="#property">property</a></li>
-                            </ul>
-                            <li><a href="#index">index</a></li>
+                            </ul></li>
+                            <li><a href="#index">index</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
                                 <li><a href="#field">field</a></li>
                                 <li><a href="#property">property</a></li>
-                            </ul>
-                            <li><a href="#unique">unique</a></li>
+                            </ul></li>
+                            <li><a href="#unique">unique</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
                                 <li><a href="#field">field</a></li>
                                 <li><a href="#property">property</a></li>
-                            </ul>
+                            </ul></li>
 
-                            <li><a href="#field">field</a></li>
+                            <li><a href="#field">field</a>
                             <ul>
-                                <li>
-                                    <a href="#collection">collection</a>
-                                </li>
+                                <li><a href="#collection">collection</a>
                                 <ul>
                                     <li><a href="#collectionextension">extension</a></li>
-                                </ul>
-                                <li><a href="#map">map</a></li>
+                                </ul></li>
+                                <li><a href="#map">map</a>
                                 <ul>
                                     <li><a href="#mapextension">extension</a></li>
-                                </ul>
+                                </ul></li>
                                 <li><a href="#array">array</a></li>
-                                <li><a href="#join">join</a></li>
+                                <li><a href="#join">join</a>
                                 <ul>
                                     <li><a href="#primary-key">primary-key</a></li>
                                     <li><a href="#index">index</a></li>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#embedded">embedded</a></li>
+                                </ul></li>
+                                <li><a href="#embedded">embedded</a>
+                                <ul>
+                                    <li><a href="#field">field</a>
                                     <ul>
-                                    <li><a href="#field">field</a></li>
-                                    <ul>
                                         <li><a href="#column">column</a></li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#element">element</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#element">element</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#key">key</a></li>
+                                </ul></li>
+                                <li><a href="#key">key</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#value">value</a></li>
+                                </ul></li>
+                                <li><a href="#value">value</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#order">order</a></li>
+                                </ul></li>
+                                <li><a href="#order">order</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
                                     <li><a href="#orderextension">extension</a></li>
-                                </ul>
-                                <li><a href="#column">column</a></li>
+                                </ul></li>
+                                <li><a href="#column">column</a>
                                 <ul>
                                     <li><a href="#columnextension">extension</a></li>
-                                </ul>
-                                <li><a href="#foreignkey">foreign-key</a></li>
+                                </ul></li>
+                                <li><a href="#foreignkey">foreign-key</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#index">index</a></li>
+                                </ul></li>
+                                <li><a href="#index">index</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#unique">unique</a></li>
+                                </ul></li>
+                                <li><a href="#unique">unique</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
+                                </ul></li>
 
                                 <li><a href="#fieldextension">extension</a></li>
-                            </ul>
+                            </ul></li>
                             
-                            <li><a href="#property">property</a></li>
+                            <li><a href="#property">property</a>
                             <ul>
-                                <li>
-                                    <a href="#collection">collection</a>
-                                </li>
+                                <li><a href="#collection">collection</a>
                                 <ul>
                                     <li><a href="#collectionextension">extension</a></li>
-                                </ul>
-                                <li><a href="#map">map</a></li>
+                                </ul></li>
+                                <li><a href="#map">map</a>
                                 <ul>
                                     <li><a href="#mapextension">extension</a></li>
-                                </ul>
+                                </ul></li>
                                 <li><a href="#array">array</a></li>
-                                <li><a href="#join">join</a></li>
+                                <li><a href="#join">join</a>
                                 <ul>
                                     <li><a href="#primary-key">primary-key</a></li>
                                     <li><a href="#index">index</a></li>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#embedded">embedded</a></li>
+                                </ul></li>
+                                <li><a href="#embedded">embedded</a>
+                                <ul>
+                                    <li><a href="#field">field</a>
                                     <ul>
-                                    <li><a href="#field">field</a></li>
-                                    <ul>
                                         <li><a href="#column">column</a></li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#element">element</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#element">element</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#key">key</a></li>
+                                </ul></li>
+                                <li><a href="#key">key</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#value">value</a></li>
+                                </ul></li>
+                                <li><a href="#value">value</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#order">order</a></li>
+                                </ul></li>
+                                <li><a href="#order">order</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#column">column</a></li>
+                                </ul></li>
+                                <li><a href="#column">column</a>
                                 <ul>
                                     <li><a href="#columnextension">extension</a></li>
-                                </ul>
-                                <li><a href="#foreignkey">foreign-key</a></li>
+                                </ul></li>
+                                <li><a href="#foreignkey">foreign-key</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#index">index</a></li>
+                                </ul></li>
+                                <li><a href="#index">index</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#unique">unique</a></li>
+                                </ul></li>
+                                <li><a href="#unique">unique</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
+                                </ul></li>
 
                                 <li><a href="#propertyextension">extension</a></li>
-                            </ul>
+                            </ul></li>
 
-                            <li><a href="#fetch-group">fetch-group</a></li>
+                            <li><a href="#fetch-group">fetch-group</a>
                             <ul>
                                 <li><a href="#field">field</a></li>
-                            </ul>
+                            </ul></li>
                             <li><a href="#query">query</a></li>
-                        </ul>
-                        <li><a href="#sequence">sequence</a></li>
+                        </ul></li>
+                        <li><a href="#sequence">sequence</a>
                         <ul>
                             <li><a href="#sequenceextension">extension</a></li>
-                        </ul>
+                        </ul></li>
                         <li><a href="#fetch-plan">fetch-plan</a></li>
                         <li><a href="#classextension">extension</a></li>
-                    </ul>
-                </ul>
+                    </ul></li>
+                </ul></li>
                 <li><a href="#extension">extension</a></li>
             </ul>
             </p>
@@ -976,7 +972,6 @@
                             the objects placed in the join table need discriminating for which relation they are for.</td>
                         <td>Fully-qualified class name</td>
                     </tr>
-                    <a name="field_select_function"/>
                     <tr class="c">
                         <td>select-function</td>
                         <td>Permits to use a function when fetching contents from the database. A ? (question mark) is mandatory to have 
@@ -986,7 +981,6 @@
                         </td>
                         <td></td>
                     </tr>
-                    <a name="field_insert_function"/>
                     <tr class="c">
                         <td>insert-function</td>
                         <td>Permits to use a function when inserting into the database. A ? (question mark) is optional and will be 
@@ -996,7 +990,6 @@
                         </td>
                         <td></td>
                     </tr>
-                    <a name="field_update_function"/>
                     <tr class="c">
                         <td>update-function</td>
                         <td>Permits to use a function when updating into the database. A ? (question mark) is optional and will be replaced
@@ -1350,7 +1343,6 @@
                             the objects placed in the join table need discriminating for which relation they are for.</td>
                         <td>Fully-qualified class name</td>
                     </tr>
-                    <a name="field_select_function"/>
                     <tr class="c">
                         <td>select-function</td>
                         <td>Permits to use a function when fetching contents from the database. A ? (question mark) is mandatory to have 
@@ -1360,7 +1352,6 @@
                         </td>
                         <td></td>
                     </tr>
-                    <a name="field_insert_function"/>
                     <tr class="c">
                         <td>insert-function</td>
                         <td>Permits to use a function when inserting into the database. A ? (question mark) is optional and will be 
@@ -1370,7 +1361,6 @@
                         </td>
                         <td></td>
                     </tr>
-                    <a name="field_update_function"/>
                     <tr class="c">
                         <td>update-function</td>
                         <td>Permits to use a function when updating into the database. A ? (question mark) is optional and will be replaced

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/metadata_xml.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/metadata_xml.xml	2012-07-02 18:18:51 UTC (rev 15006)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/metadata_xml.xml	2012-07-03 06:49:54 UTC (rev 15007)
@@ -14,45 +14,45 @@
 
             <p>
                 <ul>
-                    <li>entity-mappings</li>
+                    <li>entity-mappings
                     <ul>
                         <li><a href="#description">description</a></li>
-                        <li>persistence-unit-metadata</li>
+                        <li>persistence-unit-metadata
                         <ul>
                             <li><a href="#xml-mapping-metadata-complete">xml-mapping-metadata-complete</a></li>
-                        </ul>
+                        </ul></li>
                         <li><a href="#package">package</a></li>
                         <li><a href="#schema">schema</a></li>
                         <li><a href="#catalog">catalog</a></li>
                         <li><a href="#access">access</a></li>
                         <li><a href="#sequence-generator">sequence-generator</a></li>
                         <li><a href="#table-generator">table-generator</a></li>
-                        <li><a href="#named-query">named-query</a></li>
+                        <li><a href="#named-query">named-query</a>
                         <ul>
                             <li>query</li>
-                        </ul>
-                        <li><a href="#named-native-query">named-native-query</a></li>
+                        </ul></li>
+                        <li><a href="#named-native-query">named-native-query</a>
                         <ul>
                             <li>query</li>
-                        </ul>
-                        <li><a href="#sql-result-set-mapping">sql-result-set-mapping</a></li>
+                        </ul></li>
+                        <li><a href="#sql-result-set-mapping">sql-result-set-mapping</a>
                         <ul>
-                            <li><a href="#entity-result">entity-result</a></li>
+                            <li><a href="#entity-result">entity-result</a>
                             <ul>
                                 <li><a href="#field-result">field-result</a></li>
-                            </ul>
+                            </ul></li>
                             <li><a href="#column-result">column-result</a></li>
-                        </ul>
+                        </ul></li>
 
-                        <li><a href="#mapped-superclass">mapped-superclass</a></li>
+                        <li><a href="#mapped-superclass">mapped-superclass</a>
                         <ul>
                             <li><a href="#entity-description">description</a></li>
                             <li><a href="#id-class">id-class</a></li>
                             <li><a href="#exclude-default-listeners">exclude-default-listeners</a></li>
                             <li><a href="#exclude-superclass-listeners">exclude-superclass-listeners</a></li>
-                            <li>entity-listeners</li>
+                            <li>entity-listeners
                             <ul>
-                                <li><a href="#entity-listener">entity-listener</a></li>
+                                <li><a href="#entity-listener">entity-listener</a>
                                 <ul>
                                     <li><a href="#pre-persist">pre-persist</a></li>
                                     <li><a href="#post-persist">post-persist</a></li>
@@ -61,8 +61,8 @@
                                     <li><a href="#pre-update">pre-update</a></li>
                                     <li><a href="#post-update">post-update</a></li>
                                     <li><a href="#post-load">post-load</a></li>
-                                </ul>
-                            </ul>
+                                </ul></li>
+                            </ul></li>
                             <li><a href="#pre-persist">pre-persist</a></li>
                             <li><a href="#post-persist">post-persist</a></li>
                             <li><a href="#pre-remove">pre-remove</a></li>
@@ -70,30 +70,30 @@
                             <li><a href="#pre-update">pre-update</a></li>
                             <li><a href="#post-update">post-update</a></li>
                             <li><a href="#post-load">post-load</a></li>
-                            <li>attributes</li>
+                            <li>attributes
                             <ul>
                                 <li>Same elements as under &lt;entity&gt;-&gt;&lt;attributes&gt;</li>
-                            </ul>
-                        </ul>
+                            </ul></li>
+                        </ul></li>
 
-                        <li><a href="#entity">entity</a></li>
+                        <li><a href="#entity">entity</a>
                         <ul>
                             <li><a href="#entity-description">description</a></li>
-                            <li><a href="#table">table</a></li>
+                            <li><a href="#table">table</a>
                             <ul>
-                                <li><a href="#unique-constraint">unique-constraint</a></li>
+                                <li><a href="#unique-constraint">unique-constraint</a>
                                 <ul>
                                     <li>column-name</li>
-                                </ul>
-                            </ul>
-                            <li><a href="#secondary-table">secondary-table</a></li>
+                                </ul></li>
+                            </ul></li>
+                            <li><a href="#secondary-table">secondary-table</a>
                             <ul>
                                 <li><a href="#primary-key-join-column">primary-key-join-column</a></li>
-                                <li><a href="#unique-constraint">unique-constraint</a></li>
+                                <li><a href="#unique-constraint">unique-constraint</a>
                                 <ul>
                                     <li>column-name</li>
-                                </ul>
-                            </ul>
+                                </ul></li>
+                            </ul></li>
                             <li><a href="#primary-key-join-column">primary-key-join-column</a></li>
                             <li><a href="#id-class">id-class</a></li>
                             <li><a href="#inheritance">inheritance</a></li>
@@ -101,27 +101,27 @@
                             <li><a href="#discriminator-column">discriminator-column</a></li>
                             <li><a href="#sequence-generator">sequence-generator</a></li>
                             <li><a href="#table-generator">table-generator</a></li>
-                            <li><a href="#named-query">named-query</a></li>
+                            <li><a href="#named-query">named-query</a>
                             <ul>
                                 <li>query</li>
-                            </ul>
-                            <li><a href="#named-native-query">named-native-query</a></li>
+                            </ul></li>
+                            <li><a href="#named-native-query">named-native-query</a>
                             <ul>
                                 <li>query</li>
-                            </ul>
-                            <li><a href="#sql-result-set-mapping">sql-result-set-mapping</a></li>
+                            </ul></li>
+                            <li><a href="#sql-result-set-mapping">sql-result-set-mapping</a>
                             <ul>
-                                <li><a href="#entity-result">entity-result</a></li>
+                                <li><a href="#entity-result">entity-result</a>
                                 <ul>
                                     <li><a href="#field-result">field-result</a></li>
-                                </ul>
+                                </ul></li>
                                 <li><a href="#column-result">column-result</a></li>
-                            </ul>
+                            </ul></li>
                             <li><a href="#exclude-default-listeners">exclude-default-listeners</a></li>
                             <li><a href="#exclude-superclass-listeners">exclude-superclass-listeners</a></li>
-                            <li>entity-listeners</li>
+                            <li>entity-listeners
                             <ul>
-                                <li><a href="#entity-listener">entity-listener</a></li>
+                                <li><a href="#entity-listener">entity-listener</a>
                                 <ul>
                                     <li><a href="#pre-persist">pre-persist</a></li>
                                     <li><a href="#post-persist">post-persist</a></li>
@@ -130,8 +130,8 @@
                                     <li><a href="#pre-update">pre-update</a></li>
                                     <li><a href="#post-update">post-update</a></li>
                                     <li><a href="#post-load">post-load</a></li>
-                                </ul>
-                            </ul>
+                                </ul></li>
+                            </ul></li>
                             <li><a href="#pre-persist">pre-persist</a></li>
                             <li><a href="#post-persist">post-persist</a></li>
                             <li><a href="#pre-remove">pre-remove</a></li>
@@ -139,141 +139,141 @@
                             <li><a href="#pre-update">pre-update</a></li>
                             <li><a href="#post-update">post-update</a></li>
                             <li><a href="#post-load">post-load</a></li>
-                            <li><a href="#attribute-override">attribute-override</a></li>
+                            <li><a href="#attribute-override">attribute-override</a>
                             <ul>
                                 <li><a href="#column">column</a></li>
-                            </ul>
-                            <li><a href="#association-override">association-override</a></li>
+                            </ul></li>
+                            <li><a href="#association-override">association-override</a>
                             <ul>
                                 <li><a href="#join-column">join-column</a></li>
-                            </ul>
-                            <li>attributes</li>
+                            </ul></li>
+                            <li>attributes
                             <ul>
-                                <li><a href="#id">id</a></li>
+                                <li><a href="#id">id</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
                                     <li><a href="#generated-value">generated-value</a></li>
                                     <li><a href="#sequence-generator">sequence-generator</a></li>
                                     <li><a href="#table-generator">table-generator</a></li>
-                                </ul>
+                                </ul></li>
                                 <li><a href="#embedded-id">embedded-id</a></li>
-                                <li><a href="#basic">basic</a></li>
+                                <li><a href="#basic">basic</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
                                     <li>lob</li>
                                     <li><a href="#temporal">temporal</a></li>
                                     <li><a href="#enumerated">enumerated</a></li>
-                                </ul>
-                                <li><a href="#version">version</a></li>
+                                </ul></li>
+                                <li><a href="#version">version</a>
                                 <ul>
                                     <li><a href="#column">column</a></li>
-                                </ul>
-                                <li><a href="#many-to-one">many-to-one</a></li>
+                                </ul></li>
+                                <li><a href="#many-to-one">many-to-one</a>
                                 <ul>
                                     <li><a href="#join-column">join-column</a></li>
-                                    <li><a href="#join-table">join-table</a></li>
+                                    <li><a href="#join-table">join-table</a>
                                     <ul>
                                         <li><a href="#join-column">join-column</a></li>
                                         <li><a href="#inverse-join-column">inverse-join-column</a></li>
-                                        <li><a href="#unique-constraint">unique-constraint</a></li>
+                                        <li><a href="#unique-constraint">unique-constraint</a>
                                         <ul>
                                             <li>column-name</li>
-                                        </ul>
-                                    </ul>
-                                    <li>cascade</li>
+                                        </ul></li>
+                                    </ul></li>
+                                    <li>cascade
                                     <ul>
                                         <li>cascade-all</li>
                                         <li>cascade-persist</li>
                                         <li>cascade-merge</li>
                                         <li>cascade-remove</li>
                                         <li>cascade-refresh</li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#one-to-many">one-to-many</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#one-to-many">one-to-many</a>
                                 <ul>
                                     <li><a href="#order-by">order-by</a></li>
                                     <li><a href="#order-column">order-column</a></li>
                                     <li><a href="#map-key">map-key</a></li>
-                                    <li><a href="#join-table">join-table</a></li>
+                                    <li><a href="#join-table">join-table</a>
                                     <ul>
                                         <li><a href="#join-column">join-column</a></li>
                                         <li><a href="#inverse-join-column">inverse-join-column</a></li>
-                                        <li><a href="#unique-constraint">unique-constraint</a></li>
+                                        <li><a href="#unique-constraint">unique-constraint</a>
                                         <ul>
                                             <li>column-name</li>
-                                        </ul>
-                                    </ul>
+                                        </ul></li>
+                                    </ul></li>
                                     <li><a href="#join-column">join-column</a></li>
-                                    <li>cascade</li>
+                                    <li>cascade
                                     <ul>
                                         <li>cascade-all</li>
                                         <li>cascade-persist</li>
                                         <li>cascade-merge</li>
                                         <li>cascade-remove</li>
                                         <li>cascade-refresh</li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#one-to-one">one-to-one</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#one-to-one">one-to-one</a>
                                 <ul>
                                     <li><a href="#join-column">join-column</a></li>
-                                    <li><a href="#join-table">join-table</a></li>
+                                    <li><a href="#join-table">join-table</a>
                                     <ul>
                                         <li><a href="#join-column">join-column</a></li>
                                         <li><a href="#inverse-join-column">inverse-join-column</a></li>
-                                        <li><a href="#unique-constraint">unique-constraint</a></li>
+                                        <li><a href="#unique-constraint">unique-constraint</a>
                                         <ul>
                                             <li>column-name</li>
-                                        </ul>
-                                    </ul>
-                                    <li>cascade</li>
+                                        </ul></li>
+                                    </ul></li>
+                                    <li>cascade
                                     <ul>
                                         <li>cascade-all</li>
                                         <li>cascade-persist</li>
                                         <li>cascade-merge</li>
                                         <li>cascade-remove</li>
                                         <li>cascade-refresh</li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#many-to-many">many-to-many</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#many-to-many">many-to-many</a>
                                 <ul>
                                     <li><a href="#order-by">order-by</a></li>
                                     <li><a href="#order-column">order-column</a></li>
                                     <li><a href="#map-key">map-key</a></li>
-                                    <li><a href="#join-table">join-table</a></li>
+                                    <li><a href="#join-table">join-table</a>
                                     <ul>
                                         <li><a href="#join-column">join-column</a></li>
                                         <li><a href="#inverse-join-column">inverse-join-column</a></li>
-                                        <li><a href="#unique-constraint">unique-constraint</a></li>
+                                        <li><a href="#unique-constraint">unique-constraint</a>
                                         <ul>
                                             <li>column-name</li>
-                                        </ul>
-                                    </ul>
-                                    <li>cascade</li>
+                                        </ul></li>
+                                    </ul></li>
+                                    <li>cascade
                                     <ul>
                                         <li>cascade-all</li>
                                         <li>cascade-persist</li>
                                         <li>cascade-merge</li>
                                         <li>cascade-remove</li>
                                         <li>cascade-refresh</li>
-                                    </ul>
-                                </ul>
-                                <li><a href="#embedded">embedded</a></li>
+                                    </ul></li>
+                                </ul></li>
+                                <li><a href="#embedded">embedded</a>
                                 <ul>
                                     <li><a href="#attribute-override">attribute-override</a></li>
-                                </ul>
+                                </ul></li>
                                 <li><a href="#transient">transient</a></li>
-                            </ul>
-                        </ul>
+                            </ul></li>
+                        </ul></li>
 
-                        <li><a href="#embeddable">embeddable</a></li>
+                        <li><a href="#embeddable">embeddable</a>
                         <ul>
-                            <li>embeddable-attributes</li>
+                            <li>embeddable-attributes
                             <ul>
                                 <li><a href="#basic">basic</a></li>
                                 <li><a href="#transient">transient</a></li>
-                            </ul>
-                        </ul>
-                    </ul>
+                            </ul></li>
+                        </ul></li>
+                    </ul></li>
                 </ul>
             </p>
             <br/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15020
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15020&view=rev
Author:   andy_jefferson
Date:     2012-07-03 13:35:25 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
better transaction docs for JPA including joinTransaction

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/navigation.xml

Removed Paths:
-------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transaction_types.xml

Deleted: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transaction_types.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transaction_types.xml	2012-07-03 10:48:53 UTC (rev 15019)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transaction_types.xml	2012-07-03 13:35:25 UTC (rev 15020)
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<document>
-    <properties>
-        <title>Transaction Types</title>
-    </properties>
-
-    <body>
-        <section name="JPA : Transaction Types">
-            <p>
-                A Transaction forms a unit of work. The Transaction manages what happens within that unit of work, 
-                and when an error occurs the Transaction can roll back any changes performed. 
-                There are the following types of transaction.
-            </p>
-            <ul>
-                <li>Transactions can lock all records in a datastore and keep them locked until they are ready 
-                    to commit their changes. These are known as 
-                    <a href="#pessimistic">Pessimistic (or datastore) Transactions</a>.</li>
-                <li>Transactions can simply assume that things in the datastore will not change until they are 
-                    ready to commit, not lock any records and then just before committing make a check for changes. 
-                    These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
-                <li><a href="#nontransactional">Non-transactional</a> where you perform operations effectively
-                    in "auto-commit" mode</li>
-            </ul>
-
-            <a name="pessimistic"/>
-            <subsection name="Pessimistic (Datastore) Transactions">
-                <img src="../images/nucleus_extension.gif" border="0" alt=""/>
-                <p>
-                    <b>Pessimistic</b> transactions arent supported in JPA but are provided as a vendor extension. 
-                    They are suitable for short lived operations where no user interaction is taking place and 
-                    so it is possible to block access to datastore entities for the duration of the transaction.
-                    You would select pessimistic transactions by adding the persistence property
-                    <b>datanucleus.Optimistic</b> as <i>false</i>.
-                </p>
-                <p>
-                    By default DataNucleus does not currently lock the objects fetched in a pessimistic transaction, 
-                    but you can configure this behaviour for RDBMS datastores by setting the persistence property 
-                    <i>datanucleus.rdbms.useUpdateLock</i> to <u>true</u>. 
-                    This will result in all "SELECT ... FROM ..." statements being changed to be 
-                    "SELECT ... FROM ... FOR UPDATE". This will be applied only where the underlying RDBMS 
-                    supports the "FOR UPDATE" syntax.
-                </p>
-                <p>
-                    With a pessimistic transaction DataNucleus will grab a datastore connection at the first 
-                    operation, and maintain it for the duration of the transaction. 
-                    A single connection is used for the transaction (with the exception of any 
-                    <a href="value_generation.html">Identity Generation</a> operations which need datastore 
-                    access, so these can use their own connection).
-                </p>
-                <p>
-                    In terms of the process of a pessimistic (datastore) transaction, we demonstrate this below.
-                </p>
-                <table>
-                    <tr>
-                        <th>Operation</th>
-                        <th>DataNucleus process</th>
-                        <th>Datastore process</th>
-                    </tr>
-                    <tr>
-                        <td>Start transaction</td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (1) for persistence</td>
-                        <td><b>Open connection.</b><br/>
-                            Insert the object (1) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (2) for update</td>
-                        <td>Update the object (2) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (3) for persistence</td>
-                        <td>Insert the object (3) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (4) for update</td>
-                        <td>Update the object (4) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Flush</td>
-                        <td>No outstanding changes so do nothing</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Perform query</td>
-                        <td>Generate query in datastore language</td>
-                        <td>Query the datastore and return selected objects</td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (5) for persistence</td>
-                        <td>Insert the object (5) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (6) for update</td>
-                        <td>Update the object (6) into the datastore</td>
-                    </tr>
-                    <tr>
-                        <td>Commit transaction</td>
-                        <td></td>
-                        <td><b>Commit connection</b></td>
-                    </tr>
-                </table>
-                <p>
-                    So here whenever an operation is performed, DataNucleus pushes it straight to the datastore.
-                    Consequently any queries will always reflect the current state of all objects in use.
-                    However this mode of operation has no version checking of objects and so if they were updated
-                    by external processes in the meantime then they will overwrite those changes.
-                </p>
-                <p>
-                    It should be noted that DataNucleus provides two persistence properties that allow an amount of
-                    control over when flushing happens with datastore transactions.
-                </p>
-                <ul>
-                    <li><i>datanucleus.flush.mode</i> when set to MANUAL will try to
-                    delay all datastore operations until commit/flush.</li>
-                    <li><i>datanucleus.datastoreTransactionFlushLimit</i> represents the number of dirty objects
-                    before a flush is performed. This defaults to 1.</li>
-                </ul>
-
-                <br/>
-            </subsection>
-
-            <a name="optimistic"/>
-            <subsection name="Optimistic Transactions">
-                <p>
-                    <b>Optimistic</b> transactions are the only official option in JPA. 
-                    They are suitable for longer lived operations maybe where user interaction is taking place and 
-                    where it would be undesirable to block access to datastore entities for the duration of the 
-                    transaction. The assumption is that data altered in this transaction will not be updated by 
-                    other transactions during the duration of this transaction, so the changes are not propagated 
-                    to the datastore until commit()/flush(). The data is checked just before commit to ensure the 
-                    integrity in this respect. The most convenient way of checking data for updates is to maintain 
-                    a column on each table that handles optimistic transaction data. The user will decide this 
-                    when generating their MetaData.
-                </p>
-                <p>
-                    Rather than placing version/timestamp columns on all user datastore tables, JPA1 allows
-                    the user to notate particular classes as requiring <b>optimistic</b> treatment. This is 
-                    performed by specifying in MetaData or annotations the details of the field/column to use for 
-                    storing the version - see versioning for <a href="orm/versioning.html">JPA</a>. 
-                    With JPA1 you must have a field in your class ready to store the version.
-                </p>
-                <p>
-                    In JPA1 you can read the version by inspecting the field marked as storing the version value.
-                </p>
-                <p>
-                    In terms of the process of an optimistic transaction, we demonstrate this below.
-                </p>
-                <table>
-                    <tr>
-                        <th>Operation</th>
-                        <th>DataNucleus process</th>
-                        <th>Datastore process</th>
-                    </tr>
-                    <tr>
-                        <td>Start transaction</td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (1) for persistence</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (2) for update</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (3) for persistence</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (4) for update</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Flush</td>
-                        <td>Flush all outstanding changes to the datastore</td>
-                        <td><b>Open connection.</b><br/>
-                            Version check of object (1)<br/>
-                            Insert the object (1) in the datastore.<br/>
-                            Version check of object (2)<br/>
-                            Update the object (2) in the datastore.<br/>
-                            Version check of object (3)<br/>
-                            Insert the object (3) in the datastore.<br/>
-                            Version check of object (4)<br/>
-                            Update the object (4) in the datastore.</td>
-                    </tr>
-                    <tr>
-                        <td>Perform query</td>
-                        <td>Generate query in datastore language</td>
-                        <td>Query the datastore and return selected objects</td>
-                    </tr>
-                    <tr>
-                        <td>Persist object</td>
-                        <td>Prepare object (5) for persistence</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Update object</td>
-                        <td>Prepare object (6) for update</td>
-                        <td></td>
-                    </tr>
-                    <tr>
-                        <td>Commit transaction</td>
-                        <td>Flush all outstanding changes to the datastore</td>
-                        <td>Version check of object (5)<br/>
-                            Insert the object (5) in the datastore<br/>
-                            Version check of object (6)<br/>
-                            Update the object (6) in the datastore.<br/>
-                            <b>Commit connection.</b></td>
-                    </tr>
-                </table>
-                <p>
-                    Here no changes make it to the datastore until the user either commits the transaction, or
-                    they invoke flush(). The impact of this is that when performing a query, by default, the results
-                    may not contain the modified objects unless they are flushed to the datastore before invoking the
-                    query. Depending on whether you need the modified objects to be reflected in the results of the
-                    query governs what you do about that. If you invoke flush() just before running the query
-                    the query results will include the changes. The obvious benefit of optimistic transaction is that
-                    all changes are made in a block and version checking of objects is performed before application 
-                    of changes, hence this mode copes better with external processes updating the objects.
-                </p>
-                <p>
-                    Please note that for some datastores (e.g RDBMS) the version check followed by update/delete is 
-                    performed in a single statement.
-                </p>
-
-                <p>See also :-</p>
-                <ul>
-                    <li><a href="metadata_xml.html#version">JPA MetaData reference for &lt;version&gt; element</a></li>
-                    <li><a href="annotations.html#Version">JPA Annotations reference for @Version</a></li>
-                </ul>
-                <br/>
-            </subsection>
-
-            <a name="nontransactional"/>
-            <subsection name="No Transactions">
-                <p>
-                    DataNucleus allows the ability to operate without transactions. With JDO this can be enabled 
-                    by setting the 2 properties <b>datanucleus.NontransactionalRead</b>,
-                    <b>datanucleus.NontransactionalWrite</b> to <i>true</i> (they default to true). 
-                    DataNucleus supports these allowing the ability to read objects and make updates outside of 
-                    transactions.
-                </p>
-                <p>
-                    When using non-transactional operations, you need to pay attention to the persistence property
-                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
-                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
-                    the next transaction and committed with that.
-                </p>
-                <br/>
-            </subsection>
-        </section>
-    </body>
-</document>
\ No newline at end of file

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 10:48:53 UTC (rev 15019)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 13:35:25 UTC (rev 15020)
@@ -10,21 +10,16 @@
                 A Transaction forms a unit of work. The Transaction manages what happens within that unit of work, 
                 and when an error occurs the Transaction can roll back any changes performed. Transactions can be 
                 managed by the users application, or can be managed by a framework (such as Spring), or can be 
-                managed by a J2EE container. These are described below.
+                managed by a JEE container. These are described below.
             </p>
-            <p>
-                See also :-
-            </p>
-            <ul>
-                <li><a href="transaction_types.html">Transaction Types</a></li>
-            </ul>
+            <br/>
 
             <a name="local"/>
-            <subsection name="Locally Managed Transactions">
+            <subsection name="Locally-Managed Transactions">
                 <p>
-                    When using a JPA implementation such as DataNucleus in a J2SE environment, the Transactions 
-                    are known as <b>Locally Managed Transactions</b>. The users code will manage the transactions 
-                    by starting, and commiting the transaction itself. With these transactions with JPA
+                    If using DataNucleus JPA in a J2SE environment the normal type of transaction is <i>RESOURCE_LOCAL</i>.
+                    With this type of transaction the user manages the transactions themselves, starting, committing
+                    or rolling back the transaction. With these transactions with JPA
                     <a href="http://java.sun.com/javaee/5/docs/api/javax/persistence/EntityTransaction.html" target="_blank"><img src="../images/javadoc.gif" alt=""/></a> 
                     you would do something like
                 </p>
@@ -48,25 +43,115 @@
 }
 em.close();]]></source>
                 <p>
-                    When you use a framework like <a href="http://www.springframework.org" target="_blank">Spring</a> 
-                    you would not need to specify the <i>tx.begin(), tx.commit(), tx.rollback()</i> since that would 
-                    be done for you. The basic idea with <u>Locally Managed transactions</u> is that you are 
+                    In this case you will have defined your <a href="persistence_unit.html">persistence-unit</a>
+                    to be like this
+                </p>
+<source><![CDATA[
+<persistence-unit name="MyUnit" transaction-type="RESOURCE_LOCAL">
+    <properties>
+        <property key="javax.persistence.jdbc.url" value="jdbc:mysql:..."/>
+        ...
+    </properties>
+    ...
+</persistence-unit>]]></source>
+                <p>or</p>
+<source><![CDATA[
+<persistence-unit name="MyUnit" transaction-type="RESOURCE_LOCAL">
+    <non-jta-data-source>java:comp/env/myDS</properties>
+    ...
+</persistence-unit>]]></source>
+                <p>
+                    The basic idea with <u>Locally-Managed transactions</u> is that you are 
                     managing the transaction start and end.
                 </p>
                 <br/>
             </subsection>
 
+            <a name="jta"/>
+            <subsection name="JTA Transactions">
+                <p>
+                    The other type of transaction with JPA is using JTA. With this type, where you have a JTA data source 
+                    from which you have a <i>UserTransaction</i>. This <i>UserTransaction</i> can have resources "joined" 
+                    to it. In the case of JPA, you have two scenarios. The first scenario is where you have the
+                    <i>UserTransaction</i> created before you create your <i>EntityManager</i>. The create of
+                    the <i>EntityManager</i> will automatically join it to the current <i>UserTransaction</i>, like this
+                </p>
+<source><![CDATA[
+UserTransaction ut = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
+ut.setTransactionTimeout(300);
+
+EntityManager em = emf.createEntityManager();
+try
+{
+    ut.begin();
+
+    .. perform persistence/query operations
+
+    ut.commit();
+}
+finally
+{
+    em.close();
+}]]></source>
+                <p>
+                    so we control the transaction using the <i>UserTransaction</i>.
+                    The second scenario is where the <i>UserTransaction</i> is started after you have the
+                    <i>EntityManager</i>. In this case we need to join our <i>EntityManager</i> to the 
+                    newly created <i>UserTransaction</i>, like this
+                </p>
+<source><![CDATA[
+EntityManager em = emf.createEntityManager();
+try
+{
+    .. perform persistence, query operations
+
+    UserTransaction ut = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction");
+    ut.setTransactionTimeout(300);
+    ut.begin();
+
+    // Join the EntityManager operations to this UserTransaction
+    em.joinTransaction();
+
+    // Commit the persistence/query operations performed above
+    ut.commit();
+}
+finally
+{
+    em.close();
+}]]></source>
+                <p>
+                    In the JTA case you will have defined your <a href="persistence_unit.html">persistence-unit</a>
+                    to be like this
+                </p>
+<source><![CDATA[
+<persistence-unit name="MyUnit" transaction-type="JTA">
+    <jta-data-source>java:comp/env/myDS</properties>
+    ...
+</persistence-unit>]]></source>
+                <br/>
+            </subsection>
+
             <a name="container"/>
-            <subsection name="Container Managed Transactions">
+            <subsection name="Container-Managed Transactions">
                 <p>
-                    When using a J2EE container you are giving over control of the transactions to the container. 
+                    When using a JEE container you are giving over control of the transactions to the container. 
                     Here you have <b>Container Managed Transactions</b>. In terms of your code, you would do like 
-                    the previous example <b>except</b> that you would OMIT the <i>tx.begin(), tx.commit(), 
-                    tx.rollback()</i> since the J2EE container will be doing this for you.
+                    the above examples <b>except</b> that you would OMIT the <i>tx.begin(), tx.commit(), 
+                    tx.rollback()</i> since the JEE container will be doing this for you.
             	</p>
                 <br/>
             </subsection>
 
+            <a name="spring"/>
+            <subsection name="Spring-Managed Transactions">
+                <p>
+                    When you use a framework like <a href="http://www.springframework.org" target="_blank">Spring</a> 
+                    you would not need to specify the <i>tx.begin(), tx.commit(), tx.rollback()</i> since that would 
+                    be done for you.
+            	</p>
+                <br/>
+            </subsection>
+
             <a name="isolation"/>
             <subsection name="Transaction Isolation">
                 <img src="images/nucleus_extension.gif" alt=""/>
@@ -92,7 +177,268 @@
 org.datanucleus.api.jpa.EntityTransactionImpl tx = 
         (org.datanucleus.api.jpa.EntityTransactionImpl)pm.currentTransaction();
 tx.setOption("transaction.isolation", 2);</source>
+                <br/>
             </subsection>
         </section>
+
+        <section name="JPA : Transaction Locking">
+            <p>
+                A Transaction forms a unit of work. The Transaction manages what happens within that unit of work, 
+                and when an error occurs the Transaction can roll back any changes performed. 
+                There are the following locking types for a transaction.
+            </p>
+            <ul>
+                <li>Transactions can lock all records in a datastore and keep them locked until they are ready 
+                    to commit their changes. These are known as 
+                    <a href="#pessimistic">Pessimistic (or datastore) Transactions</a>.</li>
+                <li>Transactions can simply assume that things in the datastore will not change until they are 
+                    ready to commit, not lock any records and then just before committing make a check for changes. 
+                    These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
+                <li><a href="#nontransactional">Non-transactional</a> where you perform operations effectively
+                    in "auto-commit" mode</li>
+            </ul>
+
+            <a name="pessimistic"/>
+            <subsection name="Pessimistic (Datastore) Transactions">
+                <img src="../images/nucleus_extension.gif" border="0" alt=""/>
+                <p>
+                    <b>Pessimistic</b> transactions arent supported in JPA but are provided as a vendor extension. 
+                    They are suitable for short lived operations where no user interaction is taking place and 
+                    so it is possible to block access to datastore entities for the duration of the transaction.
+                    You would select pessimistic transactions by adding the persistence property
+                    <b>datanucleus.Optimistic</b> as <i>false</i>.
+                </p>
+                <p>
+                    By default DataNucleus does not currently lock the objects fetched in a pessimistic transaction, 
+                    but you can configure this behaviour for RDBMS datastores by setting the persistence property 
+                    <i>datanucleus.rdbms.useUpdateLock</i> to <u>true</u>. 
+                    This will result in all "SELECT ... FROM ..." statements being changed to be 
+                    "SELECT ... FROM ... FOR UPDATE". This will be applied only where the underlying RDBMS 
+                    supports the "FOR UPDATE" syntax.
+                </p>
+                <p>
+                    With a pessimistic transaction DataNucleus will grab a datastore connection at the first 
+                    operation, and maintain it for the duration of the transaction. 
+                    A single connection is used for the transaction (with the exception of any 
+                    <a href="value_generation.html">Identity Generation</a> operations which need datastore 
+                    access, so these can use their own connection).
+                </p>
+                <p>
+                    In terms of the process of a pessimistic (datastore) transaction, we demonstrate this below.
+                </p>
+                <table>
+                    <tr>
+                        <th>Operation</th>
+                        <th>DataNucleus process</th>
+                        <th>Datastore process</th>
+                    </tr>
+                    <tr>
+                        <td>Start transaction</td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (1) for persistence</td>
+                        <td><b>Open connection.</b><br/>
+                            Insert the object (1) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (2) for update</td>
+                        <td>Update the object (2) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (3) for persistence</td>
+                        <td>Insert the object (3) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (4) for update</td>
+                        <td>Update the object (4) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Flush</td>
+                        <td>No outstanding changes so do nothing</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Perform query</td>
+                        <td>Generate query in datastore language</td>
+                        <td>Query the datastore and return selected objects</td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (5) for persistence</td>
+                        <td>Insert the object (5) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (6) for update</td>
+                        <td>Update the object (6) into the datastore</td>
+                    </tr>
+                    <tr>
+                        <td>Commit transaction</td>
+                        <td></td>
+                        <td><b>Commit connection</b></td>
+                    </tr>
+                </table>
+                <p>
+                    So here whenever an operation is performed, DataNucleus pushes it straight to the datastore.
+                    Consequently any queries will always reflect the current state of all objects in use.
+                    However this mode of operation has no version checking of objects and so if they were updated
+                    by external processes in the meantime then they will overwrite those changes.
+                </p>
+                <p>
+                    It should be noted that DataNucleus provides two persistence properties that allow an amount of
+                    control over when flushing happens with datastore transactions.
+                </p>
+                <ul>
+                    <li><i>datanucleus.flush.mode</i> when set to MANUAL will try to
+                    delay all datastore operations until commit/flush.</li>
+                    <li><i>datanucleus.datastoreTransactionFlushLimit</i> represents the number of dirty objects
+                    before a flush is performed. This defaults to 1.</li>
+                </ul>
+
+                <br/>
+            </subsection>
+
+            <a name="optimistic"/>
+            <subsection name="Optimistic Transactions">
+                <p>
+                    <b>Optimistic</b> transactions are the only official option in JPA. 
+                    They are suitable for longer lived operations maybe where user interaction is taking place and 
+                    where it would be undesirable to block access to datastore entities for the duration of the 
+                    transaction. The assumption is that data altered in this transaction will not be updated by 
+                    other transactions during the duration of this transaction, so the changes are not propagated 
+                    to the datastore until commit()/flush(). The data is checked just before commit to ensure the 
+                    integrity in this respect. The most convenient way of checking data for updates is to maintain 
+                    a column on each table that handles optimistic transaction data. The user will decide this 
+                    when generating their MetaData.
+                </p>
+                <p>
+                    Rather than placing version/timestamp columns on all user datastore tables, JPA1 allows
+                    the user to notate particular classes as requiring <b>optimistic</b> treatment. This is 
+                    performed by specifying in MetaData or annotations the details of the field/column to use for 
+                    storing the version - see versioning for <a href="orm/versioning.html">JPA</a>. 
+                    With JPA1 you must have a field in your class ready to store the version.
+                </p>
+                <p>
+                    In JPA1 you can read the version by inspecting the field marked as storing the version value.
+                </p>
+                <p>
+                    In terms of the process of an optimistic transaction, we demonstrate this below.
+                </p>
+                <table>
+                    <tr>
+                        <th>Operation</th>
+                        <th>DataNucleus process</th>
+                        <th>Datastore process</th>
+                    </tr>
+                    <tr>
+                        <td>Start transaction</td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (1) for persistence</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (2) for update</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (3) for persistence</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (4) for update</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Flush</td>
+                        <td>Flush all outstanding changes to the datastore</td>
+                        <td><b>Open connection.</b><br/>
+                            Version check of object (1)<br/>
+                            Insert the object (1) in the datastore.<br/>
+                            Version check of object (2)<br/>
+                            Update the object (2) in the datastore.<br/>
+                            Version check of object (3)<br/>
+                            Insert the object (3) in the datastore.<br/>
+                            Version check of object (4)<br/>
+                            Update the object (4) in the datastore.</td>
+                    </tr>
+                    <tr>
+                        <td>Perform query</td>
+                        <td>Generate query in datastore language</td>
+                        <td>Query the datastore and return selected objects</td>
+                    </tr>
+                    <tr>
+                        <td>Persist object</td>
+                        <td>Prepare object (5) for persistence</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Update object</td>
+                        <td>Prepare object (6) for update</td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td>Commit transaction</td>
+                        <td>Flush all outstanding changes to the datastore</td>
+                        <td>Version check of object (5)<br/>
+                            Insert the object (5) in the datastore<br/>
+                            Version check of object (6)<br/>
+                            Update the object (6) in the datastore.<br/>
+                            <b>Commit connection.</b></td>
+                    </tr>
+                </table>
+                <p>
+                    Here no changes make it to the datastore until the user either commits the transaction, or
+                    they invoke flush(). The impact of this is that when performing a query, by default, the results
+                    may not contain the modified objects unless they are flushed to the datastore before invoking the
+                    query. Depending on whether you need the modified objects to be reflected in the results of the
+                    query governs what you do about that. If you invoke flush() just before running the query
+                    the query results will include the changes. The obvious benefit of optimistic transaction is that
+                    all changes are made in a block and version checking of objects is performed before application 
+                    of changes, hence this mode copes better with external processes updating the objects.
+                </p>
+                <p>
+                    Please note that for some datastores (e.g RDBMS) the version check followed by update/delete is 
+                    performed in a single statement.
+                </p>
+
+                <p>See also :-</p>
+                <ul>
+                    <li><a href="metadata_xml.html#version">JPA MetaData reference for &lt;version&gt; element</a></li>
+                    <li><a href="annotations.html#Version">JPA Annotations reference for @Version</a></li>
+                </ul>
+                <br/>
+            </subsection>
+
+            <a name="nontransactional"/>
+            <subsection name="No Transactions">
+                <p>
+                    DataNucleus allows the ability to operate without transactions. With JPA this can be enabled 
+                    by setting the 2 properties <b>datanucleus.NontransactionalRead</b>,
+                    <b>datanucleus.NontransactionalWrite</b> to <i>true</i> (they default to true). 
+                    DataNucleus supports these allowing the ability to read objects and make updates outside of 
+                    transactions.
+                </p>
+                <p>
+                    When using non-transactional operations, you need to pay attention to the persistence property
+                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
+                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
+                    the next transaction and committed with that.
+                </p>
+                <br/>
+            </subsection>
+        </section>
     </body>
 </document>
\ No newline at end of file

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/navigation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/navigation.xml	2012-07-03 10:48:53 UTC (rev 15019)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/navigation.xml	2012-07-03 13:35:25 UTC (rev 15020)
@@ -280,10 +280,7 @@
                 <item name="Lifecycle Callbacks" href="/jpa/lifecycle_callbacks.html"/>
                 <item name="Datastore Connection" href="/jpa/datastore_connection.html"/>
             </item>
-            <item name="Transactions" href="/jpa/transactions.html">
-                <item name="Optimistic Transactions" href="/jpa/transaction_types.html#optimistic"/>
-                <item name="Pessimistic Transactions" href="/jpa/transaction_types.html#pessimistic"/>
-            </item>
+            <item name="Transactions" href="/jpa/transactions.html"/>
             <item name="Fetch Groups" href="/jpa/fetchgroup.html"/>
             <item name="Query API" href="/jpa/query.html">
                 <item name="Query Cache" href="/jpa/query_cache.html"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15023
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15023&view=rev
Author:   andy_jefferson
Date:     2012-07-03 13:52:48 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
formatting

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 13:48:15 UTC (rev 15022)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 13:52:48 UTC (rev 15023)
@@ -51,7 +51,7 @@
 }
 pm.close();</source>
                 <p>
-                    The basic idea with <u>Locally-Managed transactions</u> is that you are 
+                    The basic idea with <b>Locally-Managed transactions</b> is that you are 
                     managing the transaction start and end.
                 </p>
                 <br/>
@@ -118,7 +118,7 @@
             <subsection name="Container-Managed Transactions">
                 <p>
                     When using a JEE container you are giving over control of the transactions to the container. 
-                    Here you have <b>Container Managed Transactions</b>. In terms of your code, you would do like 
+                    Here you have <b>Container-Managed Transactions</b>. In terms of your code, you would do like 
                     the previous example <b>except</b> that you would OMIT the <i>tx.begin(), tx.commit(), 
                     tx.rollback()</i> since the JEE container will be doing this for you.
             	</p>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 13:48:15 UTC (rev 15022)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 13:52:48 UTC (rev 15023)
@@ -61,7 +61,7 @@
     ...
 </persistence-unit>]]></source>
                 <p>
-                    The basic idea with <u>Locally-Managed transactions</u> is that you are 
+                    The basic idea with <b>Locally-Managed transactions</b> is that you are 
                     managing the transaction start and end.
                 </p>
                 <br/>
@@ -135,7 +135,7 @@
             <subsection name="Container-Managed Transactions">
                 <p>
                     When using a JEE container you are giving over control of the transactions to the container. 
-                    Here you have <b>Container Managed Transactions</b>. In terms of your code, you would do like 
+                    Here you have <b>Container-Managed Transactions</b>. In terms of your code, you would do like 
                     the above examples <b>except</b> that you would OMIT the <i>tx.begin(), tx.commit(), 
                     tx.rollback()</i> since the JEE container will be doing this for you.
             	</p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15027
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15027&view=rev
Author:   andy_jefferson
Date:     2012-07-03 18:00:17 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
More transaction updates

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 16:21:49 UTC (rev 15026)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:00:17 UTC (rev 15027)
@@ -7,10 +7,10 @@
     <body>
         <section name="JDO : Transactions">
             <p>
-                A Transaction forms a unit of work. The Transaction manages what happens within that unit 
-                of work, and when an error occurs the Transaction can roll back any changes performed. 
-                Transactions can be managed by the users application, or can be managed by a framework 
-                (such as Spring), or can be managed by a J2EE container. These are described below.
+                A Transaction forms a unit of work. The Transaction manages what happens within that unit of work,
+                and when an error occurs the Transaction can roll back any changes performed. Transactions can be 
+                managed by the users application, or can be managed by a framework (such as Spring), or can be 
+                managed by a JEE container. These are described below.
             </p>
             <ul>
                 <li><a href="#local">Local transactions</a> : managed using the JDO Transaction API</li>
@@ -18,6 +18,7 @@
                     the JDO Transaction API</li>
                 <li><a href="#container">Container-managed transactions</a> : managed by a JEE environment</li>
                 <li><a href="#spring">Spring-managed transactions</a> : managed by SpringFramework</li>
+                <li><a href="#nontransactional">No transactions</a></li>
             </ul>
             <br/>
 
@@ -135,6 +136,23 @@
                 <br/>
             </subsection>
 
+            <a name="nontransactional"/>
+            <subsection name="No Transactions">
+                <p>
+                    DataNucleus allows the ability to operate without transactions. With JDO this is enabled by
+                    default (see the 2 properties <b>datanucleus.NontransactionalRead</b>,
+                    <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
+                    and make updates outside of transactions.
+                </p>
+                <p>
+                    When using non-transactional operations, you need to pay attention to the persistence property
+                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
+                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
+                    the next transaction and committed with that.
+                </p>
+                <br/>
+            </subsection>
+
             <a name="isolation"/>
             <subsection name="Transaction Isolation">
                 <p>
@@ -463,24 +481,6 @@
                 <br/>
             </subsection>
 
-            <a name="nontransactional"/>
-            <subsection name="No Transactions">
-                <p>
-                    DataNucleus allows the ability to operate without transactions. With JDO this can be enabled 
-                    by setting the 2 properties <b>datanucleus.NontransactionalRead</b>,
-                    <b>datanucleus.NontransactionalWrite</b> to <i>true</i> (they default to true). 
-                    DataNucleus supports these allowing the ability to read objects and make updates outside of 
-                    transactions.
-                </p>
-                <p>
-                    When using non-transactional operations, you need to pay attention to the persistence property
-                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
-                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
-                    the next transaction and committed with that.
-                </p>
-                <br/>
-            </subsection>
-
             <subsection name="Persistence-by-Reachability at commit()">
                 <p>
                     When a transaction is committed JDO will, by default, run its reachability algorithm

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 16:21:49 UTC (rev 15026)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:00:17 UTC (rev 15027)
@@ -12,6 +12,13 @@
                 managed by the users application, or can be managed by a framework (such as Spring), or can be 
                 managed by a JEE container. These are described below.
             </p>
+            <ul>
+                <li><a href="#local">Local transactions</a> : managed using the JPA Transaction API</li>
+                <li><a href="#jta">JTA transactions</a> : managed using the JTA UserTransaction API</li>
+                <li><a href="#container">Container-managed transactions</a> : managed by a JEE environment</li>
+                <li><a href="#spring">Spring-managed transactions</a> : managed by SpringFramework</li>
+                <li><a href="#nontransactional">No transactions</a></li>
+            </ul>
             <br/>
 
             <a name="local"/>
@@ -152,6 +159,23 @@
                 <br/>
             </subsection>
 
+            <a name="nontransactional"/>
+            <subsection name="No Transactions">
+                <p>
+                    DataNucleus allows the ability to operate without transactions. With JPA this is enabled 
+                    by default (see the 2 properties <b>datanucleus.NontransactionalRead</b>,
+                    <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
+                    and make updates outside of transactions.
+                </p>
+                <p>
+                    When using non-transactional operations, you need to pay attention to the persistence property
+                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
+                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
+                    the next transaction and committed with that.
+                </p>
+                <br/>
+            </subsection>
+
             <a name="isolation"/>
             <subsection name="Transaction Isolation">
                 <img src="../images/nucleus_extension.gif" alt=""/>
@@ -168,14 +192,13 @@
                 </ul>
                 <p>
                     The default is <u>read-committed</u>. If the datastore doesn't support a particular 
-                    isolation level then it will silently be changed to one that is supported (for example 
-                    DB4O only supports <i>read-committed</i> so will always use that). As an alternative you 
+                    isolation level then it will silently be changed to one that is supported. As an alternative you 
                     can also specify it on a per-transaction basis as follows (using the values in parentheses 
                     above).
                 </p>
                 <source>
-org.datanucleus.api.jpa.EntityTransactionImpl tx = 
-        (org.datanucleus.api.jpa.EntityTransactionImpl)pm.currentTransaction();
+org.datanucleus.api.jpa.JPAEntityTransaction tx = 
+        (org.datanucleus.api.jpa.JPAEntityTransaction)pm.currentTransaction();
 tx.setOption("transaction.isolation", 2);</source>
                 <br/>
             </subsection>
@@ -421,24 +444,6 @@
                 </ul>
                 <br/>
             </subsection>
-
-            <a name="nontransactional"/>
-            <subsection name="No Transactions">
-                <p>
-                    DataNucleus allows the ability to operate without transactions. With JPA this can be enabled 
-                    by setting the 2 properties <b>datanucleus.NontransactionalRead</b>,
-                    <b>datanucleus.NontransactionalWrite</b> to <i>true</i> (they default to true). 
-                    DataNucleus supports these allowing the ability to read objects and make updates outside of 
-                    transactions.
-                </p>
-                <p>
-                    When using non-transactional operations, you need to pay attention to the persistence property
-                    <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
-                    to the datastore immediately. If this is false then any persist/delete/update will be queued up until
-                    the next transaction and committed with that.
-                </p>
-                <br/>
-            </subsection>
         </section>
     </body>
 </document>
\ No newline at end of file

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml	2012-07-03 16:21:49 UTC (rev 15026)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml	2012-07-03 18:00:17 UTC (rev 15027)
@@ -15,6 +15,7 @@
                 <li>JPA2.1 <a href="jpa/stored_procedures.html">Stored Procedure API</a> supported for RDBMS</li>
                 <li>JPA2.1 <a href="jpa/types.html#typeconverter">Type Converter API</a> supported for RDBMS, Excel, 
                     ODF, HBase, MongoDB and JSON datastores</li>
+                <li>JPA : Fully working JTA integration</li>
                 <li>JPA : Support for specifying named query annotations on non-Entity classes (vendor extension)</li>
                 <li>Enhancer : works with JDK1.7 too, using ASM v4</li>
                 <li>Only for use with JDK1.6+ (though many plugins will work with JDK1.5)</li>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15028
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15028&view=rev
Author:   andy_jefferson
Date:     2012-07-03 18:07:50 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
more details/corrections

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:00:17 UTC (rev 15027)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:07:50 UTC (rev 15028)
@@ -32,7 +32,7 @@
                     <a href="http://db.apache.org/jdo/api20/apidocs/javax/jdo/Transaction.html" target="_blank"><img src="../images/javadoc.gif" alt=""/></a>
                     you would do something like
                 </p>
-                <source>
+                <source><![CDATA[
 PersistenceManager pm = pmf.getPersistenceManager();
 Transaction tx = pm.currentTransaction();
 try
@@ -50,7 +50,7 @@
         tx.rollback();
     }
 }
-pm.close();</source>
+pm.close();]]></source>
                 <p>
                     The basic idea with <b>Locally-Managed transactions</b> is that you are 
                     managing the transaction start and end.
@@ -67,7 +67,7 @@
                     Then you make use of JTA (or JDO) to demarcate the transactions. 
                     So you could do something like
                 </p>
-                <source>
+                <source><![CDATA[
 UserTransaction ut = (UserTransaction)
     new InitialContext().lookup("java:comp/UserTransaction");
 PersistenceManager pm = pmf.getPersistenceManager();
@@ -82,7 +82,7 @@
 finally
 {
     pm.close();
-}</source>
+}]]></source>
                 <p>
                     So here we used the JTA API to begin/commit the controlling 
                     (<i>javax.transaction.UserTransaction</i>).
@@ -91,7 +91,7 @@
                     An alternative is where you don't have a UserTransaction started and just use the
                     JDO API, which will start the UserTransaction for you.
                 </p>
-                <source>
+                <source><![CDATA[
 UserTransaction ut = (UserTransaction)
     new InitialContext().lookup("java:comp/UserTransaction");
 PersistenceManager pm = pmf.getPersistenceManager();
@@ -107,7 +107,7 @@
 finally
 {
     pm.close();
-}</source>
+}]]></source>
                 <p>
                     <b>Important</b> : please note that you need to set both transactional and 
                     nontransactional datasources, and <b>the nontransactional cannot be JTA</b>.
@@ -144,11 +144,17 @@
                     <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
                     and make updates outside of transactions.
                 </p>
+                <source><![CDATA[
+PersistenceManager pm = pmf.getPersistenceManager();
+    
+{users code to persist objects}
+
+pm.close();]]></source>
                 <p>
                     When using non-transactional operations, you need to pay attention to the persistence property
                     <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
                     to the datastore immediately. If this is false then any persist/delete/update will be queued up until
-                    the next transaction and committed with that.
+                    the next transaction (or <i>pm.close()</i>) and committed with that.
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:00:17 UTC (rev 15027)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:07:50 UTC (rev 15028)
@@ -31,7 +31,7 @@
                     you would do something like
                 </p>
                 <source><![CDATA[
-EntityManager em = emf.getEntityManager();
+EntityManager em = emf.createEntityManager();
 EntityTransaction tx = em.getTransaction();
 try
 {
@@ -167,11 +167,17 @@
                     <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
                     and make updates outside of transactions.
                 </p>
+                <source><![CDATA[
+EntityManager em = emf.createEntityManager();
+    
+{users code to persist objects}
+
+em.close();]]></source>
                 <p>
                     When using non-transactional operations, you need to pay attention to the persistence property
                     <b>datanucleus.nontx.atomic</b>. If this is true then any persist/delete/update will be committed
                     to the datastore immediately. If this is false then any persist/delete/update will be queued up until
-                    the next transaction and committed with that.
+                    the next transaction (or <i>em.close()</i>) and committed with that.
                 </p>
                 <br/>
             </subsection>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15029
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15029&view=rev
Author:   andy_jefferson
Date:     2012-07-03 18:41:59 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
more on nontx mode

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:07:50 UTC (rev 15028)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:41:59 UTC (rev 15029)
@@ -142,7 +142,8 @@
                     DataNucleus allows the ability to operate without transactions. With JDO this is enabled by
                     default (see the 2 properties <b>datanucleus.NontransactionalRead</b>,
                     <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
-                    and make updates outside of transactions.
+                    and make updates outside of transactions. This is
+                    effectively "auto-commit" mode.
                 </p>
                 <source><![CDATA[
 PersistenceManager pm = pmf.getPersistenceManager();
@@ -236,7 +237,7 @@
             <p>
                 A Transaction forms a unit of work. The Transaction manages what happens within that unit of work, 
                 and when an error occurs the Transaction can roll back any changes performed. 
-                There are the following types of transaction.
+                There are the following types of locking :-
             </p>
             <ul>
                 <li>Transactions can lock all records in a datastore and keep them locked until they are ready 
@@ -245,8 +246,6 @@
                 <li>Transactions can simply assume that things in the datastore will not change until they are 
                     ready to commit, not lock any records and then just before committing make a check for changes. 
                     These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
-                <li><a href="#nontransactional">Non-transactional</a> where you perform operations effectively
-                    in "auto-commit" mode</li>
             </ul>
 
             <a name="pessimistic"/>
@@ -500,4 +499,4 @@
             </subsection>
         </section>
     </body>
-</document>
\ No newline at end of file
+</document>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:07:50 UTC (rev 15028)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:41:59 UTC (rev 15029)
@@ -165,7 +165,8 @@
                     DataNucleus allows the ability to operate without transactions. With JPA this is enabled 
                     by default (see the 2 properties <b>datanucleus.NontransactionalRead</b>,
                     <b>datanucleus.NontransactionalWrite</b> set to <i>true</i>). This means that you can read objects
-                    and make updates outside of transactions.
+                    and make updates outside of transactions. This is
+                    effectively an "auto-commit" mode.
                 </p>
                 <source><![CDATA[
 EntityManager em = emf.createEntityManager();
@@ -223,8 +224,6 @@
                 <li>Transactions can simply assume that things in the datastore will not change until they are 
                     ready to commit, not lock any records and then just before committing make a check for changes. 
                     These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
-                <li><a href="#nontransactional">Non-transactional</a> where you perform operations effectively
-                    in "auto-commit" mode</li>
             </ul>
 
             <a name="pessimistic"/>
@@ -452,4 +451,4 @@
             </subsection>
         </section>
     </body>
-</document>
\ No newline at end of file
+</document>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15030
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15030&view=rev
Author:   andy_jefferson
Date:     2012-07-03 18:52:48 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
more on nontx mode

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:41:59 UTC (rev 15029)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/transactions.xml	2012-07-03 18:52:48 UTC (rev 15030)
@@ -242,21 +242,21 @@
             <ul>
                 <li>Transactions can lock all records in a datastore and keep them locked until they are ready 
                     to commit their changes. These are known as 
-                    <a href="#pessimistic">Pessimistic (or datastore) Transactions</a>.</li>
+                    <a href="#pessimistic">Pessimistic (or datastore) Locking</a>.</li>
                 <li>Transactions can simply assume that things in the datastore will not change until they are 
                     ready to commit, not lock any records and then just before committing make a check for changes. 
-                    These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
+                    This is known as <a href="#optimistic">Optimistic Locking</a>.</li>
             </ul>
 
             <a name="pessimistic"/>
-            <subsection name="Pessimistic (Datastore) Transactions">
+            <subsection name="Pessimistic (Datastore) Locking">
                 <p>
-                    <b>Pessimistic</b> transactions are the default in JDO. They are 
+                    <b>Pessimistic</b> locking is the default in JDO. It is 
                     suitable for short lived operations where no user interaction is taking place and so it is 
                     possible to block access to datastore entities for the duration of the transaction.
                 </p>
                 <p>
-                    By default DataNucleus does not currently lock the objects fetched in a pessimistic transaction, 
+                    By default DataNucleus does not currently lock the objects fetched with pessimistic locking, 
                     but you can configure this behaviour for RDBMS datastores by setting the persistence property 
                     <b>datanucleus.SerializeRead</b> to <i>true</i>. 
                     This will result in all "SELECT ... FROM ..." statements being changed to be 
@@ -276,14 +276,14 @@
     (org.datanucleus.api.jdo.JDOQuery)pm.newQuery(...);
 jdoQuery.setSerializeRead(true);]]></source>
                 <p>
-                    With a pessimistic transaction DataNucleus will grab a datastore connection at the first 
+                    With pessimistic locking DataNucleus will grab a datastore connection at the first 
                     operation, and maintain it for the duration of the transaction. A single connection is used for 
                     the transaction (with the exception of any 
                     <a href="value_generation.html">Identity Generation</a> operations which need datastore 
                     access, so these can use their own connection).
                 </p>
                 <p>
-                    In terms of the process of a pessimistic (datastore) transaction, we demonstrate this below.
+                    In terms of the process of pessimistic (datastore) locking, we demonstrate this below.
                 </p>
                 <table>
                     <tr>
@@ -364,16 +364,16 @@
             </subsection>
 
             <a name="optimistic"/>
-            <subsection name="Optimistic Transactions">
+            <subsection name="Optimistic Locking">
                 <p>
-                    <b>Optimistic</b> transactions are the other option in JDO. 
-                    They are suitable for longer lived operations maybe where user interaction is taking place and 
+                    <b>Optimistic</b> locking is the other option in JDO. 
+                    It is suitable for longer lived operations maybe where user interaction is taking place and 
                     where it would be undesirable to block access to datastore entities for the duration of the 
                     transaction. The assumption is that data altered in this transaction will not be updated by 
                     other transactions during the duration of this transaction, so the changes are not propagated 
                     to the datastore until commit()/flush(). The data is checked just before commit to ensure the 
                     integrity in this respect. The most convenient way of checking data for updates is to maintain 
-                    a column on each table that handles optimistic transaction data. The user will decide this 
+                    a column on each table that handles optimistic locking data. The user will decide this 
                     when generating their MetaData.
                 </p>
                 <p>
@@ -392,7 +392,7 @@
                     not <i>PersistenceCapable</i> then it will also return null.
                 </p>
                 <p>
-                    In terms of the process of an optimistic transaction, we demonstrate this below.
+                    In terms of the process of optimistic locking, we demonstrate this below.
                 </p>
                 <table>
                     <tr>
@@ -469,7 +469,7 @@
                     may not contain the modified objects unless they are flushed to the datastore before invoking the
                     query. Depending on whether you need the modified objects to be reflected in the results of the
                     query governs what you do about that. If you invoke flush() just before running the query
-                    the query results will include the changes. The obvious benefit of optimistic transaction is that
+                    the query results will include the changes. The obvious benefit of optimistic locking is that
                     all changes are made in a block and version checking of objects is performed before application 
                     of changes, hence this mode copes better with external processes updating the objects.
                 </p>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:41:59 UTC (rev 15029)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-03 18:52:48 UTC (rev 15030)
@@ -220,24 +220,24 @@
             <ul>
                 <li>Transactions can lock all records in a datastore and keep them locked until they are ready 
                     to commit their changes. These are known as 
-                    <a href="#pessimistic">Pessimistic (or datastore) Transactions</a>.</li>
+                    <a href="#pessimistic">Pessimistic (or datastore) Locking</a>.</li>
                 <li>Transactions can simply assume that things in the datastore will not change until they are 
                     ready to commit, not lock any records and then just before committing make a check for changes. 
-                    These are known as <a href="#optimistic">Optimistic Transactions</a>.</li>
+                    This is known as <a href="#optimistic">Optimistic Locking</a>.</li>
             </ul>
 
             <a name="pessimistic"/>
-            <subsection name="Pessimistic (Datastore) Transactions">
+            <subsection name="Pessimistic (Datastore) Locking">
                 <img src="../images/nucleus_extension.gif" border="0" alt=""/>
                 <p>
-                    <b>Pessimistic</b> transactions arent supported in JPA but are provided as a vendor extension. 
-                    They are suitable for short lived operations where no user interaction is taking place and 
+                    <b>Pessimistic</b> locking isn't directly supported in JPA but are provided as a vendor extension. 
+                    It is suitable for short lived operations where no user interaction is taking place and 
                     so it is possible to block access to datastore entities for the duration of the transaction.
-                    You would select pessimistic transactions by adding the persistence property
+                    You would select pessimistic locking by adding the persistence property
                     <b>datanucleus.Optimistic</b> as <i>false</i>.
                 </p>
                 <p>
-                    By default DataNucleus does not currently lock the objects fetched in a pessimistic transaction, 
+                    By default DataNucleus does not currently lock the objects fetched in pessimistic locking, 
                     but you can configure this behaviour for RDBMS datastores by setting the persistence property 
                     <i>datanucleus.rdbms.useUpdateLock</i> to <u>true</u>. 
                     This will result in all "SELECT ... FROM ..." statements being changed to be 
@@ -245,14 +245,14 @@
                     supports the "FOR UPDATE" syntax.
                 </p>
                 <p>
-                    With a pessimistic transaction DataNucleus will grab a datastore connection at the first 
+                    With pessimistic locking DataNucleus will grab a datastore connection at the first 
                     operation, and maintain it for the duration of the transaction. 
                     A single connection is used for the transaction (with the exception of any 
                     <a href="value_generation.html">Identity Generation</a> operations which need datastore 
                     access, so these can use their own connection).
                 </p>
                 <p>
-                    In terms of the process of a pessimistic (datastore) transaction, we demonstrate this below.
+                    In terms of the process of pessimistic (datastore) locking, we demonstrate this below.
                 </p>
                 <table>
                     <tr>
@@ -320,7 +320,7 @@
                 </p>
                 <p>
                     It should be noted that DataNucleus provides two persistence properties that allow an amount of
-                    control over when flushing happens with datastore transactions.
+                    control over when flushing happens with pessimistic locking
                 </p>
                 <ul>
                     <li><i>datanucleus.flush.mode</i> when set to MANUAL will try to
@@ -333,20 +333,20 @@
             </subsection>
 
             <a name="optimistic"/>
-            <subsection name="Optimistic Transactions">
+            <subsection name="Optimistic Locking">
                 <p>
-                    <b>Optimistic</b> transactions are the only official option in JPA. 
-                    They are suitable for longer lived operations maybe where user interaction is taking place and 
+                    <b>Optimistic</b> locking is the only official option in JPA. 
+                    It is suitable for longer lived operations maybe where user interaction is taking place and 
                     where it would be undesirable to block access to datastore entities for the duration of the 
                     transaction. The assumption is that data altered in this transaction will not be updated by 
                     other transactions during the duration of this transaction, so the changes are not propagated 
                     to the datastore until commit()/flush(). The data is checked just before commit to ensure the 
                     integrity in this respect. The most convenient way of checking data for updates is to maintain 
-                    a column on each table that handles optimistic transaction data. The user will decide this 
+                    a column on each table that handles optimistic locking data. The user will decide this 
                     when generating their MetaData.
                 </p>
                 <p>
-                    Rather than placing version/timestamp columns on all user datastore tables, JPA1 allows
+                    Rather than placing version/timestamp columns on all user datastore tables, JPA allows
                     the user to notate particular classes as requiring <b>optimistic</b> treatment. This is 
                     performed by specifying in MetaData or annotations the details of the field/column to use for 
                     storing the version - see versioning for <a href="orm/versioning.html">JPA</a>. 
@@ -356,7 +356,7 @@
                     In JPA1 you can read the version by inspecting the field marked as storing the version value.
                 </p>
                 <p>
-                    In terms of the process of an optimistic transaction, we demonstrate this below.
+                    In terms of the process of optimistic locking, we demonstrate this below.
                 </p>
                 <table>
                     <tr>
@@ -433,7 +433,7 @@
                     may not contain the modified objects unless they are flushed to the datastore before invoking the
                     query. Depending on whether you need the modified objects to be reflected in the results of the
                     query governs what you do about that. If you invoke flush() just before running the query
-                    the query results will include the changes. The obvious benefit of optimistic transaction is that
+                    the query results will include the changes. The obvious benefit of optimistic locking is that
                     all changes are made in a block and version checking of objects is performed before application 
                     of changes, hence this mode copes better with external processes updating the objects.
                 </p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15038
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15038&view=rev
Author:   andy_jefferson
Date:     2012-07-04 12:55:38 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
updated images without border

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_enhancer.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_general.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_schematool.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_schematool.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_enhancer.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_general.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_schematool.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_schematool.jpg

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_enhancer.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_general.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_prefs_schematool.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_schematool.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_enhancer.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_general.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_prefs_schematool.jpg
===================================================================
(Binary files differ)

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_schematool.jpg
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15057
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15057&view=rev
Author:   andy_jefferson
Date:     2012-07-08 08:04:36 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
wording

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml	2012-07-06 14:58:50 UTC (rev 15056)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/performance_tuning.xml	2012-07-08 08:04:36 UTC (rev 15057)
@@ -108,8 +108,10 @@
                 <p>
                     Where you have an inheritance tree it is best to add a <b>discriminator</b> to the base 
                     class so that it's simple for DataNucleus to determine the class name for a particular row.
-                    This results in cleaner/simpler SQL which is faster to execute. Otherwise it would be
-                    necessary to do a UNION of all possible tables.
+                    For RDBMS : this results in cleaner/simpler SQL which is faster to execute, otherwise it would be
+                    necessary to do a UNION of all possible tables. For other datastores the instantiation of objects
+                    on retrieval ought to be faster with a discriminator since there is no work needed to determine
+                    the type of the object.
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml	2012-07-06 14:58:50 UTC (rev 15056)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/pm.xml	2012-07-08 08:04:36 UTC (rev 15057)
@@ -177,7 +177,7 @@
                     "enlisted") during its lifetime. This is termed the <b>Level 1 Cache</b>. It is enabled by default
                     and you should only ever disable it if you really know what you are doing.
                     There are inbuilt types for the Level 1 (L1) Cache available for selection.
-                    DataNucleus supports the following types of Level 1 Cache.
+                    DataNucleus supports the following types of L1 Cache :-
                 </p>
                 <ul>
                     <li><b>weak</b> - uses a weak reference backing map. If JVM garbage collection clears 
@@ -192,20 +192,20 @@
                         and you are performing bulk operations</b></li>
                 </ul>
                 <p>
-                    You can specify the type of <b>Level 1 Cache</b> by providing the persistence property 
+                    You can specify the type of L1 cache by providing the persistence property 
                     <b>datanucleus.cache.level1.type</b>. You set this to the value of the type required. 
-                    If you want to remove objects from the L1 cache programmatically you should use 
-                    <i>pm.evict()</i> or <i>pm.evictAll()</i>.
+                    If you want to remove objects from the L1 cache programmatically you should use the
+                    <i>pm.evict</i> or <i>pm.evictAll</i> methods.
                 </p>
                 <p>
                     Objects are placed in the L1 cache (and updated there) during the course of the transaction.
                     This provides rapid access to the objects in use in the users application and is used to
                     guarantee that there is only one object with a particular identity at any one time
-                    for that PersistenceManager. When the PersistenceManager is closed the cache is cleared.
+                    for that PersistenceManager. When the PersistenceManager is closed the L1 cache is cleared.
                 </p>
                 <p>
                     <a href="http://www.datanucleus.org/extensions/level1_cache.html"><img src="../images/nucleus_plugin.gif" border="0" alt=""/></a>
-                    The Level 1 cache is a DataNucleus plugin point allowing you to provide your own cache
+                    The L1 cache is a DataNucleus plugin point allowing you to provide your own cache
                     where you require it.
                 </p>
                 <br/>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml	2012-07-06 14:58:50 UTC (rev 15056)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/em.xml	2012-07-08 08:04:36 UTC (rev 15057)
@@ -117,7 +117,7 @@
                     "enlisted") during its lifetime. This is termed the <b>Level 1 Cache</b>. It is enabled by default
                     and you should only ever disable it if you really know what you are doing.
                     There are inbuilt types for the Level 1 (L1) Cache available for selection.
-                    DataNucleus supports the following types of L1 Cache.
+                    DataNucleus supports the following types of L1 Cache :-
                 </p>
                 <ul>
                     <li><u>weak</u> - uses a weak reference backing map. If JVM garbage collection clears 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml	2012-07-06 14:58:50 UTC (rev 15056)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/performance_tuning.xml	2012-07-08 08:04:36 UTC (rev 15057)
@@ -27,7 +27,7 @@
                     <b>datanucleus.autoCreateConstraints</b> that allow creation of the datastore tables. This can 
                     cause performance issues at startup. We recommend setting these to <i>false</i> at runtime, and 
                     instead using <a href="../schematool.html">SchemaTool</a> to <b>generate any required database 
-                    schema before running DataNucleus (for RDBMS, HBase)</b>.
+                    schema before running DataNucleus (for RDBMS, HBase, etc)</b>.
                 </p>
                 <br/>
             </subsection>
@@ -106,8 +106,10 @@
                 <p>
                     Where you have an inheritance tree it is best to add a <b>discriminator</b> to the base 
                     class so that it's simple for DataNucleus to determine the class name for a particular row.
-                    This results in cleaner/simpler SQL which is faster to execute. Otherwise it would be
-                    necessary to do a UNION of all possible tables.
+                    For RDBMS : this results in cleaner/simpler SQL which is faster to execute, otherwise it would be
+                    necessary to do a UNION of all possible tables. For other datastores, a discriminator stores the
+                    key information necessary to instantiate the resultant class on retrieval so ought to be more
+                    efficient also.
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-06 14:58:50 UTC (rev 15056)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/transactions.xml	2012-07-08 08:04:36 UTC (rev 15057)
@@ -17,7 +17,7 @@
                 <li><a href="#jta">JTA transactions</a> : managed using the JTA UserTransaction API</li>
                 <li><a href="#container">Container-managed transactions</a> : managed by a JEE environment</li>
                 <li><a href="#spring">Spring-managed transactions</a> : managed by SpringFramework</li>
-                <li><a href="#nontransactional">No transactions</a></li>
+                <li><a href="#nontransactional">No transactions</a> : "auto-commit" mode</li>
             </ul>
             <br/>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15082
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15082&view=rev
Author:   andy_jefferson
Date:     2012-07-10 12:39:23 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Add Derby to those that support IDENTITY

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-07-10 11:33:32 UTC (rev 15081)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-07-10 12:39:23 UTC (rev 15082)
@@ -209,6 +209,7 @@
                         <li>HSQLDB (IDENTITY)</li>
                         <li>H2 (IDENTITY)</li>
                         <li>PostgreSQL (SERIAL)</li>
+                        <li>Derby (IDENTITY)</li>
                     </ul>
                 </p>
                 <p>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-07-10 11:33:32 UTC (rev 15081)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-07-10 12:39:23 UTC (rev 15082)
@@ -154,6 +154,7 @@
                         <li>HSQLDB (IDENTITY)</li>
                         <li>H2 (IDENTITY)</li>
                         <li>PostgreSQL (SERIAL)</li>
+                        <li>Derby (IDENTITY)</li>
                     </ul>
                 </p>
                 <p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15099
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15099&view=rev
Author:   andy_jefferson
Date:     2012-07-12 13:20:33 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
missing image

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse.xml

Added Paths:
-----------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_enable.jpg
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_enable.jpg

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse.xml	2012-07-12 12:45:41 UTC (rev 15098)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse.xml	2012-07-12 13:20:33 UTC (rev 15099)
@@ -127,11 +127,10 @@
                 <p>
                     First thing to note is that the DataNucleus plugin is for Eclipse "Java project"s only.
                     After having configured the plugin you can now add DataNucleus support on your projects. 
-                    Simply right-click on your project and select 
-                    <cite>DataNucleus->"Add DataNucleus Support"</cite> 
-                    from the context menu. 
+                    Simply right-click on your project in <b>Package Explorer</b> and select 
+                    <cite>DataNucleus->"Add DataNucleus Support"</cite> from the context menu. 
                 </p>
-                <img src="enable.jpg" alt=""/>
+                <img src="eclipse_enable.jpg" alt=""/>
                 <br/>
                 <br/>
             </subsection>

Added: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_enable.jpg
===================================================================
(Binary files differ)


Property changes on: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/eclipse_enable.jpg
___________________________________________________________________
Added: svn:mime-type
   + image/jpeg

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse.xml	2012-07-12 12:45:41 UTC (rev 15098)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse.xml	2012-07-12 13:20:33 UTC (rev 15099)
@@ -126,11 +126,10 @@
                 <p>
                     First thing to note is that the DataNucleus plugin is for Eclipse "Java project"s only.
                     After having configured the plugin you can now add DataNucleus support on your projects. 
-                    Simply right-click on your project and select 
-                    <cite>DataNucleus->"Add DataNucleus Support"</cite> 
-                    from the context menu. 
+                    Simply right-click on your project in <b>Package Explorer</b> and select 
+                    <cite>DataNucleus->"Add DataNucleus Support"</cite> from the context menu. 
                 </p>
-                <img src="enable.jpg" alt=""/>
+                <img src="eclipse_enable.jpg" alt=""/>
                 <br/>
                 <br/>
             </subsection>

Added: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_enable.jpg
===================================================================
(Binary files differ)


Property changes on: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/eclipse_enable.jpg
___________________________________________________________________
Added: svn:mime-type
   + image/jpeg

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15297
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15297&view=rev
Author:   andy_jefferson
Date:     2012-07-30 07:39:53 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
neo4j links

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/index.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/index.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/index.xml	2012-07-30 07:28:13 UTC (rev 15296)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/index.xml	2012-07-30 07:39:53 UTC (rev 15297)
@@ -43,6 +43,7 @@
                                 <a href="hbase/support.html">HBase</a>,
                                 <a href="mongodb/support.html">MongoDB</a>,
                                 <a href="appengine/support.html">Google AppEngine</a>,
+                                <a href="neo4j/support.html">Neo4j</a>,
                                 <a href="json/support.html">JSON</a>,
                                 <a href="amazons3/support.html">Amazon S3</a>,
                                 <a href="googlestorage/support.html">GoogleStorage</a>,

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml	2012-07-30 07:28:13 UTC (rev 15296)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/whats_new.xml	2012-07-30 07:39:53 UTC (rev 15297)
@@ -31,6 +31,7 @@
                 <li>REST : Support for bulk delete</li>
                 <li>REST : Support for datastore identity</li>
                 <li>SchemaTool : support for delete+create mode of operation</li>
+                <li>Neo4j : persistence to Neo4j graph datastore</li>
                 <li>HBase : support for multitenancy</li>
                 <li>HBase : support JDO/JPA table/column naming strategies</li>
                 <li>MongoDB : support JDO/JPA table/column naming strategies</li>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15301
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15301&view=rev
Author:   andy_jefferson
Date:     2012-07-30 10:35:41 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
add MongoDB, Neo4j to IDENTITY strategy support

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-07-30 10:30:30 UTC (rev 15300)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-07-30 10:35:41 UTC (rev 15301)
@@ -210,6 +210,8 @@
                         <li>H2 (IDENTITY)</li>
                         <li>PostgreSQL (SERIAL)</li>
                         <li>Derby (IDENTITY)</li>
+                        <li>MongoDB - String based</li>
+                        <li>Neo4j - long based</li>
                     </ul>
                 </p>
                 <p>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-07-30 10:30:30 UTC (rev 15300)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-07-30 10:35:41 UTC (rev 15301)
@@ -155,6 +155,8 @@
                         <li>H2 (IDENTITY)</li>
                         <li>PostgreSQL (SERIAL)</li>
                         <li>Derby (IDENTITY)</li>
+                        <li>MongoDB - String based</li>
+                        <li>Neo4j - long based</li>
                     </ul>
                 </p>
                 <p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15315
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15315&view=rev
Author:   andy_jefferson
Date:     2012-07-31 08:29:08 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
fix orm files in tutorials since only the column name is used

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml	2012-07-31 08:16:58 UTC (rev 15314)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml	2012-07-31 08:29:08 UTC (rev 15315)
@@ -445,7 +445,7 @@
     "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.datanucleus.samples.jdo.tutorial">
-        <class name="Inventory" identity-type="datastore" table="INVENTORIES">
+        <class name="Inventory" identity-type="datastore">
             <inheritance strategy="new-table"/>
             <field name="name">
                 <column name="INVENTORY_NAME"/>
@@ -455,7 +455,7 @@
             </field>
         </class>
 
-        <class name="Product" identity-type="datastore" table="PRODUCTS">
+        <class name="Product" identity-type="datastore">
             <inheritance strategy="new-table"/>
             <field name="name">
                 <column name="PRODUCT_NAME"/>
@@ -464,7 +464,7 @@
             </field>
         </class>
 
-        <class name="Book" identity-type="datastore" table="BOOKS">
+        <class name="Book" identity-type="datastore">
             <inheritance strategy="new-table"/>
             <field name="isbn">
                 <column name="ISBN"/>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-07-31 08:16:58 UTC (rev 15314)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-07-31 08:29:08 UTC (rev 15315)
@@ -460,10 +460,10 @@
                 <generated-value strategy="TABLE"/>
             </id>
             <basic name="name">
-                <column name="PRODUCT_NAME" length="100"/>
+                <column name="PRODUCT_NAME"/>
             </basic>
             <basic name="description">
-                <column length="255"/>
+                <column name="Desc"/>
             </basic>
         </attributes>
     </entity>
@@ -472,13 +472,13 @@
         <table name="JPA_BOOKS"/>
         <attributes>
             <basic name="isbn">
-                <column name="ISBN" length="20"></column>
+                <column name="ISBN"/>
             </basic>
             <basic name="author">
-                <column name="AUTHOR" length="40"/>
+                <column name="AUTHOR"/>
             </basic>
             <basic name="publisher">
-                <column name="PUBLISHER" length="40"/>
+                <column name="PUBLISHER"/>
             </basic>
         </attributes>
     </entity>
@@ -490,10 +490,6 @@
                 <column name="NAME" length="40"></column>
             </id>
             <one-to-many name="products">
-                <join-table name="JPA_INVENTORY_PRODUCTS">
-                    <join-column name="INVENTORY_ID_OID"/>
-                    <inverse-join-column name="PRODUCT_ID_EID"/>
-                </join-table>
             </one-to-many>
         </attributes>
     </entity>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml	2012-07-31 08:16:58 UTC (rev 15314)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml	2012-07-31 08:29:08 UTC (rev 15315)
@@ -452,7 +452,6 @@
     <description>DataNucleus JPA tutorial</description>
     <package>org.datanucleus.samples.jpa.tutorial</package>
     <entity class="org.datanucleus.samples.jpa.tutorial.Product" name="Product">
-        <table name="JPA_PRODUCTS"/>
         <attributes>
             <id name="id">
                 <generated-value strategy="AUTO"/>
@@ -467,31 +466,25 @@
     </entity>
 
     <entity class="org.datanucleus.samples.jpa.tutorial.Book" name="Book">
-        <table name="JPA_BOOKS"/>
         <attributes>
             <basic name="isbn">
-                <column name="ISBN" length="20"></column>
+                <column name="ISBN"/>
             </basic>
             <basic name="author">
-                <column name="AUTHOR" length="40"/>
+                <column name="AUTHOR"/>
             </basic>
             <basic name="publisher">
-                <column name="PUBLISHER" length="40"/>
+                <column name="PUBLISHER"/>
             </basic>
         </attributes>
     </entity>
 
     <entity class="org.datanucleus.samples.jpa.tutorial.Inventory" name="Inventory">
-        <table name="JPA_INVENTORY"/>
         <attributes>
             <id name="name">
-                <column name="NAME" length="40"></column>
+                <column name="NAME"/>
             </id>
             <one-to-many name="products">
-                <join-table name="JPA_INVENTORY_PRODUCTS">
-                    <join-column name="INVENTORY_ID_OID"/>
-                    <inverse-join-column name="PRODUCT_ID_EID"/>
-                </join-table>
             </one-to-many>
         </attributes>
     </entity>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15321
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15321&view=rev
Author:   andy_jefferson
Date:     2012-07-31 13:26:00 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Remove db4o, add neo4j

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/datastore_features.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml

Added Paths:
-----------
    documentation/accessplatform.datanucleus.org/trunk/docs/images/datastore_neo4j.gif

Removed Paths:
-------------
    documentation/accessplatform.datanucleus.org/trunk/docs/images/datastore_db4o.gif

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/datastore_features.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/datastore_features.xml	2012-07-31 11:09:17 UTC (rev 15320)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/datastore_features.xml	2012-07-31 13:26:00 UTC (rev 15321)
@@ -43,8 +43,8 @@
                         <img src="images/datastore_googlestorage.gif" border="0" alt=""/></a></th>
                     <th width="25"><a href="#" onclick="activateColumn('col_ldap');return false;">
                         <img src="images/datastore_ldap.gif" border="0" alt=""/></a></th>
-                    <th width="25"><a href="#" onclick="activateColumn('col_db4o');return false;">
-                        <img src="images/datastore_db4o.gif" border="0" alt=""/></a></th>
+                    <th width="25"><a href="#" onclick="activateColumn('col_neo4j');return false;">
+                        <img src="images/datastore_neo4j.gif" border="0" alt=""/></a></th>
                     <th width="25"><a href="#" onclick="activateColumn('col_neodatis');return false;">
                         <img src="images/datastore_neodatis.gif" border="0" alt=""/></a></th>
                 </tr>
@@ -70,7 +70,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -87,7 +87,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -104,7 +104,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -121,7 +121,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -138,7 +138,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -155,7 +155,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -172,7 +172,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -189,7 +189,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -206,7 +206,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -223,7 +223,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -240,7 +240,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -257,11 +257,11 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
-                    <td>Cascade Persist - Pessimistic</td>
+                    <td>Cascade Persist</td>
                     <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
@@ -274,11 +274,11 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
-                    <td>Cascade Persist - Optimistic</td>
+                    <td>Cascade Update</td>
                     <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
@@ -291,49 +291,15 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
-                    <td>Cascade Update - Pessimistic</td>
+                    <td>Cascade Delete</td>
                     <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ooxml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_xml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_hbase"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_mongodb"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_gae"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_json"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                </tr>
-                <tr>
-                    <td>Cascade Update - Optimistic</td>
-                    <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ooxml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_xml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_hbase"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_mongodb"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_gae"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_json"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                </tr>
-                <tr>
-                    <td>Cascade Delete - Pessimistic</td>
-                    <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ooxml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_xml"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_hbase"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_mongodb"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
@@ -342,27 +308,10 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
-                    <td>Cascade Delete - Optimistic</td>
-                    <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_odf"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_excel"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ooxml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_xml"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_hbase"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_mongodb"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_gae"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_json"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                </tr>
-                <tr>
                     <td>Schema Evolution - New fields <a href="#3">[3]</a></td>
                     <td class="col_rdbms"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_odf"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
@@ -376,7 +325,7 @@
                     <td class="col_amazons3"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -401,7 +350,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -418,7 +367,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -435,7 +384,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -452,7 +401,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -469,7 +418,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -486,7 +435,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -503,7 +452,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -520,7 +469,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -537,7 +486,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -554,7 +503,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -579,7 +528,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -596,7 +545,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -613,7 +562,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -630,7 +579,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -647,7 +596,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -664,7 +613,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -681,7 +630,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -698,7 +647,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -715,7 +664,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -732,7 +681,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -749,7 +698,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -766,7 +715,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -783,7 +732,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -800,7 +749,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -817,7 +766,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -834,7 +783,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -851,7 +800,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -868,7 +817,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -885,7 +834,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -902,7 +851,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -919,7 +868,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -936,7 +885,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -953,7 +902,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -978,7 +927,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -995,7 +944,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1012,7 +961,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1029,7 +978,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1046,7 +995,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1063,7 +1012,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1080,7 +1029,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1097,7 +1046,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1114,7 +1063,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1131,7 +1080,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1148,7 +1097,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1173,7 +1122,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1190,7 +1139,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1207,7 +1156,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1224,7 +1173,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1241,7 +1190,7 @@
                     <td class="col_amazons3"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_success_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1258,7 +1207,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1275,7 +1224,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_warning_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
                 <tr>
@@ -1292,7 +1241,7 @@
                     <td class="col_amazons3"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_googlestorage"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_ldap"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
-                    <td class="col_db4o"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
+                    <td class="col_neo4j"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                     <td class="col_neodatis"><img src="images/icon_error_sml.gif" border="0" alt=""/></td>
                 </tr>
             </table>

Deleted: documentation/accessplatform.datanucleus.org/trunk/docs/images/datastore_db4o.gif
===================================================================
(Binary files differ)

Added: documentation/accessplatform.datanucleus.org/trunk/docs/images/datastore_neo4j.gif
===================================================================
(Binary files differ)


Property changes on: documentation/accessplatform.datanucleus.org/trunk/docs/images/datastore_neo4j.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml	2012-07-31 11:09:17 UTC (rev 15320)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml	2012-07-31 13:26:00 UTC (rev 15321)
@@ -100,6 +100,7 @@
                         <li>XML : org.w3c.dom.Document</li>
                         <li>NeoDatis : org.neodatis.odb.ODB</li>
                         <li>GAE BigTable : com.google.appengine.api.datastore.DatastoreService</li>
+                        <li>Neo4j : org.neo4j.graphdb.GraphDatabaseService</li>
                     </ul>
                 </p>
                 <p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15370
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15370&view=rev
Author:   andy_jefferson
Date:     2012-08-08 15:02:36 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
comments on applicability of embedded

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/embedded.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/embedded.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/embedded.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/embedded.xml	2012-08-08 13:43:37 UTC (rev 15369)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/embedded.xml	2012-08-08 15:02:36 UTC (rev 15370)
@@ -49,7 +49,7 @@
 
             <a name="PC"/>
             <subsection name="Embedding PersistenceCapable objects">
-                <table><tr><td>Applicable to RDBMS, Excel, OOXML, HBase, MongoDB.</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, Excel, OOXML, ODF, HBase, MongoDB, Neo4j.</td></tr></table>
                 <p>
                     In a typical 1-1 relationship between 2 classes, the 2 classes in the relationship are persisted 
                     to their own table, and a foreign key is managed between them. With JDO and DataNucleus you can 
@@ -189,7 +189,7 @@
 
             <a name="NestedPC"/>
             <subsection name="Embedding Nested PersistenceCapable objects">
-                <table><tr><td>Applicable to RDBMS, Excel, OOXML, HBase, MongoDB.</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, Excel, OOXML, ODF, HBase, MongoDB, Neo4j.</td></tr></table>
                 <p>
                     In the above example we had an embedded PersistenceCapable object within a persisted object. What 
                     if our embedded PersistenceCapable object also contain another PersistenceCapable object. So, 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/embedded.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/embedded.xml	2012-08-08 13:43:37 UTC (rev 15369)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/embedded.xml	2012-08-08 15:02:36 UTC (rev 15370)
@@ -40,7 +40,7 @@
 
             <a name="PC"/>
             <subsection name="Embedding entities (1-1)">
-                <table><tr><td>Applicable to RDBMS, Excel, OOXML, HBase, MongoDB</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, Excel, OOXML, ODF, HBase, MongoDB, Neo4j</td></tr></table>
                 <p>
                     In a typical 1-1 relationship between 2 classes, the 2 classes in the relationship are 
                     persisted to their own table, and a foreign key is managed between them. With JPA and 
@@ -149,10 +149,9 @@
                 </p>
                 <b>
                 <ul>
-                    <li>Versions up to and including 3.0.3 with RDBMS datastores cannot have inheritance in embedded
-                        objects. In version 3.0.4 and later a discriminator is added (you must define it in the metadata
-                        of the embedded type. Note that this is a DataNucleus extension since JPA doesn't define
-                        any support for embedded inherited persistable objects</li>
+                    <li>You can represent inheritence of embedded objects using a discriminator (you must define it in 
+                        the metadata of the embedded type. Note that this is a DataNucleus extension since JPA doesn't 
+                        define any support for embedded inherited persistable objects</li>
                 </ul>
                 </b>
                 <p>See also :-</p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15384
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15384&view=rev
Author:   andy_jefferson
Date:     2012-08-11 11:45:50 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
examples

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/mongodb/support.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/neo4j/support.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/mongodb/support.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/mongodb/support.xml	2012-08-11 08:23:49 UTC (rev 15383)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/mongodb/support.xml	2012-08-11 11:45:50 UTC (rev 15384)
@@ -14,6 +14,10 @@
             </p>
             <source>datanucleus.ConnectionURL=mongodb:[{server}][/{dbName}] [,{server2}[,server3}]]</source>
             <p>
+                For example, to connect to a local server, with database called "myMongoDB"
+            </p>
+            <source>datanucleus.ConnectionURL=mongodb:/myMongoDB</source>
+            <p>
                 If you just specify the URL as <i>mongodb</i> then you have a local MongoDB datastore 
                 called "DataNucleus", otherwise it tries to connect to the datastore <i>{dbName}</i> at 
                 <i>{server}</i>. The multiple <i>{server}</i> option allows you to run against MongoDB 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/neo4j/support.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/neo4j/support.xml	2012-08-11 08:23:49 UTC (rev 15383)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/neo4j/support.xml	2012-08-11 11:45:50 UTC (rev 15384)
@@ -14,15 +14,26 @@
             </p>
             <source>datanucleus.ConnectionURL=neo4j:{db_location}</source>
             <p>
+                For example
+            </p>
+            <source>datanucleus.ConnectionURL=neo4j:myNeo4jDB</source>
+            <p>
                 You then create your PMF/EMF as normal and use JDO/JPA as normal.
             </p>
             <p>
+                There are tutorials available for use of DataNucleus with Neo4j 
+                <a href="../guides/jdo/tutorial_neo4j.html">for JDO</a> and
+                <a href="../guides/jpa/tutorial_neo4j.html">for JPA</a>
+            </p>
+            <p>
                 Things to bear in mind with Neo4j usage :-
                 <ul>
                     <li>Querying can be performed using JDOQL or JPQL. 
                         Some components of a filter are handled in the datastore, and the remainder in-memory.
                         Currently any expression of a field (in the same 'table'), or a literal are handled in-datastore, 
-                        as are the operators &amp;&amp;, ||, &gt;, &gt;=, &lt;, &lt;=, ==, and !=.</li>
+                        as are the operators &amp;&amp;, ||, &gt;, &gt;=, &lt;, &lt;=, ==, and !=. Also
+                        the majority of ordering and result clauses are evaluatable in the datastore, as well
+                        as query result range restrictions.</li>
                     <li>When an object is persisted it becomes a Node in Neo4j. You define the names of the
                         properties of that node by specifying the "column" name using JDO/JPA metadata</li>
                     <li>Any 1-1, 1-N, M-N, N-1 relation is persisted as a Relationship object in Neo4j

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15518
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15518&view=rev
Author:   andy_jefferson
Date:     2012-09-17 15:14:30 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
fix name of downloadable file in tutorials

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_excel.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -272,7 +272,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_hbase.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -272,7 +272,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_mongodb.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -272,7 +272,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_neo4j.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -272,7 +272,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_odf.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -272,7 +272,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/guides/tutorial_rdbms.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -28,7 +28,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jdo-tutorial-*").
                 </p>
                 <br/>
             </subsection>
@@ -275,7 +275,7 @@
     tx.begin();
     Inventory inv = new Inventory("My Inventory");
     Product product = new Product("Sony Discman", "A standard discman from Sony", 49.99);
-    inv.getProducts().add(inv);
+    inv.getProducts().add(product);
     pm.makePersistent(inv);
     tx.commit();
 }

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_excel.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_hbase.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_mongodb.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_neo4j.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_odf.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml	2012-09-16 08:48:22 UTC (rev 15517)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/guides/tutorial_rdbms.xml	2012-09-17 15:14:30 UTC (rev 15518)
@@ -29,7 +29,7 @@
                 <p>
                     The tutorial guides you through this. You can obtain the code referenced in this tutorial from
                     <a href="https://sourceforge.net/projects/datanucleus/files/datanucleus-samples/" 
-                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-tutorial-*").
+                    target="_blank">SourceForge</a> (one of the files entitled "datanucleus-samples-jpa-tutorial-*").
                 </p>
                 <br/>
             </subsection>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15646
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15646&view=rev
Author:   andy_jefferson
Date:     2012-10-06 07:55:26 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
remove enhancer processor from docs; wasn't a good idea IHMO and only leads to problems

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-05 09:05:56 UTC (rev 15645)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-06 07:55:26 UTC (rev 15646)
@@ -28,10 +28,6 @@
                     <li><a href="#runtime">Runtime Enhancement</a></li>
                     <li><a href="#api">Programmatically via an API</a></li>
                 </ul>
-                <li>During compilation</li>
-                <ul>
-                    <li><a href="#javac">Automatic invocation from javac (annotated classes only)</a></li>
-                </ul>
             </ul>
 
 			<a name="manual"/>
@@ -495,51 +491,6 @@
                 </p>
                 <br/>
             </subsection>
-
-			<a name="javac"/>
-            <subsection name="Javac">
-                <p>
-                    DataNucleus provides an Enhancer in <i>datanucleus-core.jar</i>. 
-                    From JDK 1.6 and forward you can automatically enhance your classes when compiling your 
-                    classes, <b>as long as your classes have annotations</b> (since this is an 
-                    <i>AnnotationProcessor</i>). To do this you need to
-                    <ol>
-                        <li>Use JDK1.6+</li>
-                        <li>Add <i>datanucleus-core.jar</i>, 
-                            <i>datanucleus-api-jdo.jar</i>/<i>datanucleus-api-jpa.jar</i> (depends if using JDO or JPA)
-                            <i>jdo-api.jar</i> and <i>asm.jar</i> to the compiler classpath</li>
-                        <li>Set the <b>processor</b> compiler argument to 
-                            <i>org.datanucleus.enhancer.EnhancerProcessor</i>. In Maven you would add the following
-                            to your POM
-                            <source><![CDATA[
-<plugin>
-    <artifactId>maven-compiler-plugin</artifactId>
-    <configuration>
-        <source>1.6</source>
-        <target>1.6</target>
-        <compilerArguments>
-            <processor>org.datanucleus.enhancer.EnhancerProcessor</processor>
-        </compilerArguments>
-    </configuration>
-</plugin>]]></source>
-                        </li>
-                        <li>Classes will be enhanced when you compile</li>
-                    </ol>
-                    <b>Note that this works by waiting a period of time until all classes will have been compiled before
-                    invoking the enhancement step. We advise against using it, and better to use post-compile directly</b>
-                </p>
-                <p>
-                    If using Eclipse you would need to use an Ant <i>build.xml</i> because the Eclipse compiler 
-                    doesn't support specification of the <b>processor</b> compiler argument. 
-                    However with Eclipse you can always just use the 
-                    <a href="guides/eclipse/index.html">DataNucleus Eclipse plugin!</a>
-                </p>
-                <p>
-                    To enhance classes for JPA (rather than JDO) using this method you need to specify 
-                    <i>-AenhanceAPI=JPA</i> as a compiler argument.
-                </p>
-                <br/>
-            </subsection>
         </section>
 
         <section name="Class enhancement">

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml	2012-10-05 09:05:56 UTC (rev 15645)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml	2012-10-06 07:55:26 UTC (rev 15646)
@@ -7,10 +7,10 @@
     <body>
         <section name="AccessPlatform : Migration between versions">
             <p>
-                This version of DataNucleus AccessPlatform builds on the 3.1 releases. As this is a minor 
-                release cycle some internal APIs are changed from 3.1.
-                All releases are checked regularly against the JDO/JPA TCKs, meaning that DataNucleus is always
-                stable in terms of functionality.
+                This version of DataNucleus AccessPlatform builds on the 3.1 releases. 
+                As this is a minor release cycle some internal APIs are changed from 3.1.
+                All releases are checked regularly against the JDO/JPA TCKs, meaning that DataNucleus is 
+                always stable in terms of functionality.
                 Occasionally, due to unknown bugs, or due to new functionality being introduced we need to 
                 change some aspects of DataNucleus. As a result sometimes users will have to make some 
                 changes to move between versions of DataNucleus. We aim to keep this to a minimum.
@@ -22,11 +22,20 @@
                     Migrating from AccessPlatform 3.1 to 3.2.0.M1 will require the following changes.
                 </p>
                 <ul>
-                    <li>The Enhancer plugin is now merged into "datanucleus-core"</li>
+                    <li>The Enhancer plugin is now merged into "datanucleus-core".
+                        Note also that the "pre-compilation" enhancement process is now discontinued.</li>
                 </ul>
                 <br/>
             </subsection>
 
+            <a name="3_1_2_FROM_3_1_1"/>
+            <subsection name="Migration from 3.1.1 to 3.1.2">
+                <p>
+                    Migrating from AccessPlatform 3.1.1 to 3.1.2 will require no changes.
+                </p>
+                <br/>
+            </subsection>
+
             <a name="3_1_1_FROM_3_1_0_REL"/>
             <subsection name="Migration from 3.1.0.RELEASE to 3.1.1">
                 <p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15669
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15669&view=rev
Author:   andy_jefferson
Date:     2012-10-08 18:39:33 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
remove db4o

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/development_process.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/constraints.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/inheritance.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/constraints.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/development_process.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/development_process.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/development_process.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -27,7 +27,6 @@
                 <area href="enhancer.html" shape="RECT" coords="21,233,110,295"/>
                 <area href="schematool.html" shape="RECT" coords="118,233,206,295"/>
                 <area href="rdbms/support.html" shape="RECT" coords="229,385,283,420"/>
-                <area href="db4o/support.html" shape="RECT" coords="230,420,284,453"/>
                 <area href="excel/support.html" shape="RECT" coords="404,385,465,420"/>
                 <area href="odf/support.html" shape="RECT" coords="404,418,465,454"/>
                 <area href="xml/support.html" shape="RECT" coords="291,385,342,420"/>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/constraints.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/constraints.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/constraints.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -22,7 +22,7 @@
 
             <a name="index"/>
             <subsection name="Indexes">
-                <table><tr><td>Applicable to RDBMS, db4o, NeoDatis, MongoDB.</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, NeoDatis, MongoDB.</td></tr></table>
                 <p>
                     Many datastores provide the ability to have indexes defined to give performance benefits.
                     With RDBMS the indexes are specified on the table and the indexes to the rows are stored separately.
@@ -81,7 +81,7 @@
 
             <a name="unique"/>
             <subsection name="Unique constraints">
-                <table><tr><td>Applicable to RDBMS, db4o, NeoDatis, MongoDB.</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, NeoDatis, MongoDB.</td></tr></table>
                 <p>
                     Some datastores provide the ability to have unique constraints defined on tables to give 
                     extra control over data integrity. JDO provides a mechanism for defining such unique constraints. 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/inheritance.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/inheritance.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/orm/inheritance.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -382,7 +382,7 @@
     
             <a name="completetable"/>
             <subsection name="Complete table">
-                <table><tr><td>Applicable to RDBMS, db4o, NeoDatis, Excel, OOXML, ODF, HBase, JSON, AmazonS3, 
+                <table><tr><td>Applicable to RDBMS, Neo4j, NeoDatis, Excel, OOXML, ODF, HBase, JSON, AmazonS3, 
                     GoogleStorage, MongoDB, LDAP</td></tr></table>
                 <p>
                     With "complete-table" we define the strategy on the root class of the inheritance tree and it applies

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/value_generation.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -92,7 +92,6 @@
                     <li>HSQLDB</li>
                     <li>H2</li>
                     <li>Derby (from v10.6)</li>
-                    <li>DB4O</li>
                 </ul>
                 <p>
                     To configure a class to use either of these generation methods with <u>datastore identity</u> you simply

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/constraints.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/constraints.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/orm/constraints.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -22,7 +22,7 @@
 
             <a name="unique"/>
             <subsection name="Unique constraints">
-                <table><tr><td>Applicable to RDBMS, db4o, NeoDatis, MongoDB</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, NeoDatis, MongoDB</td></tr></table>
                 <p>
                     Some datastores provide the ability to have unique constraints defined on tables to give 
                     extra control over data integrity. JPA1 provides a mechanism for defining such unique constraints.
@@ -90,7 +90,7 @@
 
             <a name="index"/>
             <subsection name="Indexes">
-                <table><tr><td>Applicable to RDBMS, db4o, NeoDatis, MongoDB</td></tr></table>
+                <table><tr><td>Applicable to RDBMS, NeoDatis, MongoDB</td></tr></table>
                 <img src="../../images/nucleus_extension.gif" alt=""/>
                 <p>
                     Many datastores provide the ability to have indexes defined to give performance benefits.

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-10-08 16:17:10 UTC (rev 15668)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/value_generation.xml	2012-10-08 18:39:33 UTC (rev 15669)
@@ -76,7 +76,6 @@
                     <li>HSQLDB</li>
                     <li>H2</li>
                     <li>Derby (from v10.6)</li>
-                    <li>DB4O</li>
                 </ul>
                 <p>
                     To configure a class to use either of these generation methods using <u>application identity</u> 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15679
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15679&view=rev
Author:   andy_jefferson
Date:     2012-10-09 13:33:13 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
move enhancerTask

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/guides/ant/enhancingwithant.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-09 13:24:28 UTC (rev 15678)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-09 13:33:13 UTC (rev 15679)
@@ -371,7 +371,7 @@
                 <source><![CDATA[
 <target name="enhance" description="DataNucleus enhancement">
     <taskdef name="datanucleusenhancer" classpathref="enhancer.classpath" 
-                classname="org.datanucleus.enhancer.tools.EnhancerTask" />
+                classname="org.datanucleus.enhancer.EnhancerTask" />
 
     <datanucleusenhancer classpathref="enhancer.classpath"
         dir="${jdo.file.dir}" failonerror="true" verbose="true">
@@ -385,7 +385,7 @@
                 <source><![CDATA[
 <target name="enhance" description="DataNucleus enhancement">
     <taskdef name="datanucleusenhancer" classpathref="enhancer.classpath" 
-                classname="org.datanucleus.enhancer.tools.EnhancerTask" />
+                classname="org.datanucleus.enhancer.EnhancerTask" />
 
     <datanucleusenhancer
         dir="${jdo.file.dir}" failonerror="true" verbose="true">
@@ -405,7 +405,7 @@
                 <source><![CDATA[
 <target name="enhance" description="DataNucleus enhancement">
     <taskdef name="datanucleusenhancer" classpathref="enhancer.classpath" 
-                classname="org.datanucleus.enhancer.tools.EnhancerTask" if="aPropertyName"/>
+                classname="org.datanucleus.enhancer.EnhancerTask" if="aPropertyName"/>
 
     <datanucleusenhancer classpathref="enhancer.classpath"
         dir="${jdo.file.dir}" failonerror="true" verbose="true">

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/guides/ant/enhancingwithant.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/guides/ant/enhancingwithant.xml	2012-10-09 13:24:28 UTC (rev 15678)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/guides/ant/enhancingwithant.xml	2012-10-09 13:33:13 UTC (rev 15679)
@@ -53,7 +53,7 @@
 <!-- define the task enhancer -->
 <taskdef name="nucleusenhancer"
     classpathref="module.enhancer.classpath" 
-    classname="org.datanucleus.enhancer.tools.EnhancerTask" />                           
+    classname="org.datanucleus.enhancer.EnhancerTask" />                           
 ]]></source>
                 <p>
                     With the DataNucleus Enhancer task defined, we are now able to use it. It's important to correctly 
@@ -284,7 +284,7 @@
         <!-- define the task enhancer -->
         <taskdef name="nucleusenhancer"
                  classpathref="module.enhancer.classpath"
-                 classname="org.datanucleus.enhancer.tools.EnhancerTask" />
+                 classname="org.datanucleus.enhancer.EnhancerTask" />
 
         <!-- enhance -->
         <nucleusenhancer classpathref="module.enhancer.classpath"/>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml	2012-10-09 13:24:28 UTC (rev 15678)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/migration.xml	2012-10-09 13:33:13 UTC (rev 15679)
@@ -24,6 +24,7 @@
                 <ul>
                     <li>The Enhancer plugin is now merged into "datanucleus-core".
                         Note also that the "pre-compilation" enhancement process is now discontinued.</li>
+                    <li>The Enhancer Ant task is now moved to <i>org.datanucleus.enhancer.EnhancerTask</i></li>
                 </ul>
                 <br/>
             </subsection>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15751
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15751&view=rev
Author:   andy_jefferson
Date:     2012-10-15 07:46:12 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
fork comments

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/schematool.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-15 07:17:59 UTC (rev 15750)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/enhancer.xml	2012-10-15 07:46:12 UTC (rev 15751)
@@ -200,7 +200,10 @@
                     <tr>
                         <td>fork</td>
                         <td>true</td>
-                        <td>Whether to fork the enhancer process</td>
+                        <td>Whether to fork the enhancer process.
+                            <b>Note that if you are running on Windows and have a large number of classes/mapping-files
+                            then this will result in a large command line, so set this option to false to avoid hitting
+                            Windows limit on command line length</b></td>
                     </tr>
                     <tr>
                         <td>generatePK</td>

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/schematool.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/schematool.xml	2012-10-15 07:17:59 UTC (rev 15750)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/schematool.xml	2012-10-15 07:46:12 UTC (rev 15751)
@@ -225,7 +225,7 @@
                     <tr>
                         <td>fork</td>
                         <td>true</td>
-                        <td>Whether to fork the SchemaTool process <i>(from M2 plugin v3.0.1)</i>.
+                        <td>Whether to fork the SchemaTool process.
                             Note that if you don't fork the process, DataNucleus will likely struggle to determine class 
                             names from the input filenames, so you need to use a persistence.xml file defining the class
                             names directly.</td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15776
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15776&view=rev
Author:   andy_jefferson
Date:     2012-10-19 07:43:13 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
latest updates to connection usage for Neo4j/Mongodb

Modified Paths:
--------------
    documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml
    documentation/accessplatform.datanucleus.org/trunk/docs/jpa/datastore_connection.xml

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml	2012-10-18 14:04:10 UTC (rev 15775)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jdo/datastore_connection.xml	2012-10-19 07:43:13 UTC (rev 15776)
@@ -37,23 +37,25 @@
 
             <subsection name="Transactional Context">
                 <p>
-                    For pessimistic/datastore transactions when <i>begin()</i> is called on the transaction,
-                    a connection will be obtained to the datastore. This datastore connection will be held <b>for the
+                    For pessimistic/datastore transactions a connection will be obtained from the datastore when the
+                    first persistence operation is initiated. This datastore connection will be held <b>for the
                     duration of the transaction</b> until such time as either <i>commit()</i> or <i>rollback()</i> are
                     called.
                 </p>
                 <p>
-                    For optimistic transactions things are a little more complicated. The call to <i>begin()</i> 
-                    has no effect with respect to datastore connections. All updates to the datastore are delayed until
-                    flush() or commit() and so no connection is obtained until that time. When flush() is called, or
-                    the transaction committed a datastore connection is finally obtained and it is held open until 
-                    commit/rollback completes. when a datastore operation is required. The connection is typically
-                    released after performing that operation. So datastore connections, in general, are held for much 
-                    smaller periods of time. 
+                    For optimistic transactions the connection is only obtained when flush()/commit() is called. 
+                    When flush() is called, or the transaction committed a datastore connection is finally obtained 
+                    and it is held open until commit/rollback completes. when a datastore operation is required. 
+                    The connection is typically released after performing that operation. So datastore connections, 
+                    in general, are held for much smaller periods of time. 
                     This is complicated slightly by use of the persistence property <b>java.jdo.option.IgnoreCache</b>. 
                     When this is set to <i>false</i>, the connection, once obtained, is not released until the call to 
                     commit()/rollback().
                 </p>
+                <p>
+                    Note that for Neo4j/MongoDB a single connection is used for the duration of the PM for all
+                    transactional and nontransactional operations.
+                </p>
                 <br/>
             </subsection>
 
@@ -64,6 +66,10 @@
                     ready for the next operation to save the time needed to obtain it; this is enabled by setting the
                     persistence property <b>datanucleus.connection.nontx.releaseAfterUse</b> to <i>false</i>.
                 </p>
+                <p>
+                    Note that for Neo4j/MongoDB a single connection is used for the duration of the PM for all
+                    transactional and nontransactional operations.
+                </p>
                 <br/>
             </subsection>
 

Modified: documentation/accessplatform.datanucleus.org/trunk/docs/jpa/datastore_connection.xml
===================================================================
--- documentation/accessplatform.datanucleus.org/trunk/docs/jpa/datastore_connection.xml	2012-10-18 14:04:10 UTC (rev 15775)
+++ documentation/accessplatform.datanucleus.org/trunk/docs/jpa/datastore_connection.xml	2012-10-19 07:43:13 UTC (rev 15776)
@@ -37,23 +37,25 @@
 
             <subsection name="Transactional Context">
                 <p>
-                    For pessimistic/datastore transactions when <i>begin()</i> is called on the transaction,
-                    a connection will be obtained to the datastore. This datastore connection will be held <b>for the
+                    For pessimistic/datastore transactions a connection will be obtained from the datastore when the
+                    first persistence operation is initiated. This datastore connection will be held <b>for the
                     duration of the transaction</b> until such time as either <i>commit()</i> or <i>rollback()</i> are
                     called.
                 </p>
                 <p>
-                    For optimistic transactions things are a little more complicated. The call to <i>begin()</i> 
-                    has no effect with respect to datastore connections. All updates to the datastore are delayed until
-                    flush() or commit() and so no connection is obtained until that time. When flush() is called, or
-                    the transaction committed a datastore connection is finally obtained and it is held open until 
-                    commit/rollback completes. when a datastore operation is required. The connection is typically
-                    released after performing that operation. So datastore connections, in general, are held for much 
-                    smaller periods of time. 
+                    For optimistic transactions the connection is only obtained when flush()/commit() is called. 
+                    When flush() is called, or the transaction committed a datastore connection is finally obtained 
+                    and it is held open until commit/rollback completes. when a datastore operation is required. 
+                    The connection is typically released after performing that operation. So datastore connections, 
+                    in general, are held for much smaller periods of time. 
                     This is complicated slightly by use of the persistence property <b>datanucleus.IgnoreCache</b>. 
                     When this is set to <i>false</i>, the connection, once obtained, is not released until the call to 
                     commit()/rollback().
                 </p>
+                <p>
+                    Note that for Neo4j/MongoDB a single connection is used for the duration of the EM for all
+                    transactional and nontransactional operations.
+                </p>
                 <br/>
             </subsection>
 
@@ -64,6 +66,10 @@
                     ready for the next operation to save the time needed to obtain it; this is enabled by setting the
                     persistence property <b>datanucleus.connection.nontx.releaseAfterUse</b> to <i>false</i>.
                 </p>
+                <p>
+                    Note that for Neo4j/MongoDB a single connection is used for the duration of the EM for all
+                    transactional and nontransactional operations.
+                </p>
                 <br/>
             </subsection>
         </section>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.