Index: trunk/api20/src/java/javax/jdo/FetchPlan.java
===================================================================
--- trunk/api20/src/java/javax/jdo/FetchPlan.java	(revision 377957)
+++ trunk/api20/src/java/javax/jdo/FetchPlan.java	(working copy)
@@ -138,6 +138,53 @@
     FetchPlan setGroup(String fetchGroupName);
 
     /**
+     * Set the maximum fetch depth when fetching. 
+     * 0 has no meaning and will throw a JDOUserException.
+     * -1 means that no limit is placed on fetching.
+     * A positive integer will result in that number of references from the
+     * initial object to be fetched.
+     * @param fetchDepth the depth
+     * @return the FetchPlan
+     * @since 2.0
+     */
+    FetchPlan setMaxFetchDepth(int fetchDepth);
+
+    /**
+     * Return the maximum fetch depth used when fetching instances.
+     * @return the maximum fetch depth
+     * @since 2.0
+     */
+    int getMaxFetchDepth(); 
+
+    /**
+     * Set the roots for DetachAllOnCommit.
+     * @param roots Collection of the detachment roots.
+     * @since 2.0
+     */
+    FetchPlan setDetachmentRoots(Collection roots);
+
+    /**
+     * Get the roots for DetachAllOnCommit.
+     * @return Collection of detachment roots.
+     * @since 2.0
+     */
+    Collection getDetachmentRoots();
+
+    /**
+     * Set the root classes for DetachAllOnCommit.
+     * @param rootClasses The root classes.
+     * @since 2.0
+     */
+    FetchPlan setDetachmentRootClasses(Class[] rootClasses);
+
+    /**
+     * Get the root classes for DetachAllOnCommit.
+     * @return The detachment root classes
+     * @since 2.0
+     */
+    Class[] getDetachmentRootClasses();
+
+    /**
      * Set the fetch size for large result set support. Use
      * {@link #FETCH_SIZE_OPTIMAL} to unset, and {@link #FETCH_SIZE_GREEDY}
      * to force loading of everything.
@@ -154,7 +201,7 @@
      * @since 2.0
      */
     int getFetchSize(); 
-    
+
     /**
      * Set options to be used during detachment. Options are {@link
      * #DETACH_LOAD_FIELDS} and {@link #DETACH_UNLOAD_FIELDS}.
Index: trunk/api20/src/dtd/javax/jdo/jdo.dtd
===================================================================
--- trunk/api20/src/dtd/javax/jdo/jdo.dtd	(revision 377957)
+++ trunk/api20/src/dtd/javax/jdo/jdo.dtd	(working copy)
@@ -41,7 +41,7 @@
 <!ATTLIST property unique (true|false) #IMPLIED>
 <!ATTLIST property mapped-by CDATA #IMPLIED>
 <!ATTLIST property fetch-group CDATA #IMPLIED>
-<!ATTLIST property fetch-depth CDATA #IMPLIED>
+<!ATTLIST property recursion-depth CDATA #IMPLIED>
 <!ATTLIST property field-name CDATA #IMPLIED>
 
 <!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, fetch-group*, extension*)>
@@ -120,7 +120,7 @@
 <!ATTLIST field unique (true|false) #IMPLIED>
 <!ATTLIST field sequence CDATA #IMPLIED>
 <!ATTLIST field load-fetch-group CDATA #IMPLIED>
-<!ATTLIST field fetch-depth CDATA #IMPLIED>
+<!ATTLIST field recursion-depth CDATA #IMPLIED>
 <!ATTLIST field mapped-by CDATA #IMPLIED>
 
 <!ELEMENT foreign-key (extension*, (column|field|property)*, extension*)>
Index: trunk/api20/src/dtd/javax/jdo/jdo.xsd
===================================================================
--- trunk/api20/src/dtd/javax/jdo/jdo.xsd	(revision 377957)
+++ trunk/api20/src/dtd/javax/jdo/jdo.xsd	(working copy)
@@ -198,7 +198,7 @@
         </xs:attribute>
         <xs:attribute name="mapped-by"/>
         <xs:attribute name="fetch-group"/>
-        <xs:attribute name="fetch-depth"/>
+        <xs:attribute name="recursion-depth"/>
         <xs:attribute name="field-name"/>
     </xs:attributeGroup>
     <xs:element name="class">
@@ -568,7 +568,7 @@
         <xs:attribute name="sequence"/>
         <xs:attribute name="foreign-key"/>
         <xs:attribute name="load-fetch-group"/>
-        <xs:attribute name="fetch-depth"/>
+        <xs:attribute name="recursion-depth"/>
         <xs:attribute name="mapped-by"/>
     </xs:attributeGroup>
     <xs:element name="foreign-key">