You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/02/16 03:16:15 UTC
svn commit: r378143 - in /db/jdo/trunk/api20/src: dtd/javax/jdo/jdo.dtd
dtd/javax/jdo/jdo.xsd java/javax/jdo/FetchPlan.java
Author: clr
Date: Wed Feb 15 18:16:13 2006
New Revision: 378143
URL: http://svn.apache.org/viewcvs?rev=378143&view=rev
Log:
JDO-288 update dtd, xsd, FetchPlan for spec changes
Modified:
db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
db/jdo/trunk/api20/src/java/javax/jdo/FetchPlan.java
Modified: db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd?rev=378143&r1=378142&r2=378143&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd (original)
+++ db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd Wed Feb 15 18:16:13 2006
@@ -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*)>
Modified: db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd?rev=378143&r1=378142&r2=378143&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd (original)
+++ db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd Wed Feb 15 18:16:13 2006
@@ -85,6 +85,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="embedded-only">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
<xs:attribute name="catalog"/>
<xs:attribute name="schema"/>
</xs:attributeGroup>
@@ -198,7 +206,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 +576,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">
Modified: db/jdo/trunk/api20/src/java/javax/jdo/FetchPlan.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/java/javax/jdo/FetchPlan.java?rev=378143&r1=378142&r2=378143&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/java/javax/jdo/FetchPlan.java (original)
+++ db/jdo/trunk/api20/src/java/javax/jdo/FetchPlan.java Wed Feb 15 18:16:13 2006
@@ -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,17 +201,17 @@
* @since 2.0
*/
int getFetchSize();
-
+
/**
* Set options to be used during detachment. Options are {@link
* #DETACH_LOAD_FIELDS} and {@link #DETACH_UNLOAD_FIELDS}.
*/
FetchPlan setDetachmentOptions(int options);
-
+
/**
* Get options used during detachment.
*/
int getDetachmentOptions();
-
+
}