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 2005/12/08 00:31:29 UTC
svn commit: r354904 - in /incubator/jdo/trunk/api20/src/dtd/javax/jdo:
jdo.dtd orm.dtd
Author: clr
Date: Wed Dec 7 15:31:23 2005
New Revision: 354904
URL: http://svn.apache.org/viewcvs?rev=354904&view=rev
Log:
JDO-212 Add persistent property support to jdo.dtd and orm.dtd
Modified:
incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd
Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd?rev=354904&r1=354903&r2=354904&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd Wed Dec 7 15:31:23 2005
@@ -18,11 +18,13 @@
<!ATTLIST interface objectid-class CDATA #IMPLIED>
<!ATTLIST interface requires-extent (true|false) 'true'>
<!ATTLIST interface detachable (true|false) 'false'>
+<!ATTLIST interface embedded-only (true|false) #IMPLIED>
<!ATTLIST interface catalog CDATA #IMPLIED>
<!ATTLIST interface schema CDATA #IMPLIED>
<!ELEMENT property (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST property name CDATA #REQUIRED>
+<!ATTLIST property persistence-modifier (persistent|transactional|none) #IMPLIED>
<!ATTLIST property default-fetch-group (true|false) #IMPLIED>
<!ATTLIST property load-fetch-group CDATA #IMPLIED>
<!ATTLIST property null-value (default|exception|none) 'none'>
@@ -180,11 +182,11 @@
<!ATTLIST order indexed (true|false|unique) #IMPLIED>
<!ATTLIST order mapped-by CDATA #IMPLIED>
-<!ELEMENT fetch-group (fetch-group|field)*>
+<!ELEMENT fetch-group (extension*, (fetch-group|field|property)*, extension*)>
<!ATTLIST fetch-group name CDATA #REQUIRED>
<!ATTLIST fetch-group post-load (true|false) #IMPLIED>
-<!ELEMENT embedded (extension*, field*, extension*)>
+<!ELEMENT embedded (extension*, (field|property)*, extension*)>
<!ATTLIST embedded owner-field CDATA #IMPLIED>
<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd?rev=354904&r1=354903&r2=354904&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd Wed Dec 7 15:31:23 2005
@@ -134,7 +134,7 @@
<!ATTLIST order indexed (true|false|unique) #IMPLIED>
<!ATTLIST order mapped-by CDATA #IMPLIED>
-<!ELEMENT embedded (extension*, field*, extension*)>
+<!ELEMENT embedded (extension*, (field|property)*, extension*)>
<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
<!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
<!ATTLIST embedded owner-field CDATA #IMPLIED>