Update of /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18081/modules/jdo/src/xdoclet/modules/jdo/resources
Modified Files:
jdo_2_0.dtd
Log Message:
new JDO 2.0 DTD
Index: jdo_2_0.dtd
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_2_0.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** jdo_2_0.dtd 21 Feb 2005 15:56:32 -0000 1.4
--- jdo_2_0.dtd 14 Jul 2005 16:55:59 -0000 1.5
***************
*** 48,68 ****
<!ELEMENT jdo (extension*, (package|query)+, (extension)*)>
<!ELEMENT package (extension*, (interface|class|sequence)*, (extension)*)>
<!ATTLIST package name CDATA #REQUIRED>
! <!ELEMENT interface ((property)*, (extension*))>
<!ATTLIST interface name CDATA #REQUIRED>
<!ATTLIST interface requires-extent (true|false) 'true'>
! <!ELEMENT property ((join?, element?, key?, value?, order?, column)? ,
extension*)>
<!ATTLIST property name CDATA #REQUIRED>
<!ATTLIST property column CDATA #IMPLIED>
! <!ELEMENT class (extension*, implements*, datastore-identity?, inheritance?,
version?, join*,
! foreign-key*, index*, unique*, field*, unmapped?, query*,
fetch-group*, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
<!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>
<!ATTLIST class objectid-class CDATA #IMPLIED>
<!ATTLIST class table CDATA #IMPLIED>
<!ATTLIST class requires-extent (true|false) 'true'>
--- 48,99 ----
<!ELEMENT jdo (extension*, (package|query)+, (extension)*)>
+ <!ATTLIST jdo catalog CDATA #IMPLIED>
+ <!ATTLIST jdo schema CDATA #IMPLIED>
<!ELEMENT package (extension*, (interface|class|sequence)*, (extension)*)>
<!ATTLIST package name CDATA #REQUIRED>
+ <!ATTLIST package catalog CDATA #IMPLIED>
+ <!ATTLIST package schema CDATA #IMPLIED>
! <!ELEMENT interface (extension*, datastore-identity?, primary-key?,
inheritance?, version?, join*, foreign-key*, index*,
! unique*, property*, query*, fetch-group*, extension*)>
<!ATTLIST interface name CDATA #REQUIRED>
+ <!ATTLIST interface catalog CDATA #IMPLIED>
+ <!ATTLIST interface schema CDATA #IMPLIED>
+ <!ATTLIST interface table CDATA #IMPLIED>
+ <!ATTLIST interface identity-type (datastore|application|nondurable) #IMPLIED>
+ <!ATTLIST interface objectid-class CDATA #IMPLIED>
<!ATTLIST interface requires-extent (true|false) 'true'>
+ <!ATTLIST interface detachable (true|false) 'false'>
! <!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 default-fetch-group (true|false) #IMPLIED>
+ <!ATTLIST property load-fetch-group CDATA #IMPLIED>
+ <!ATTLIST property null-value (default|exception|none) 'none'>
+ <!ATTLIST property dependent (true|false) #IMPLIED>
+ <!ATTLIST property embedded (true|false) #IMPLIED>
+ <!ATTLIST property primary-key (true|false) 'false'>
+ <!ATTLIST property value-strategy CDATA #IMPLIED>
+ <!ATTLIST property sequence CDATA #IMPLIED>
+ <!ATTLIST property serialized (true|false) #IMPLIED>
+ <!ATTLIST property table CDATA #IMPLIED>
<!ATTLIST property column CDATA #IMPLIED>
+ <!ATTLIST property delete-action (restrict|cascade|null|default|none)
#IMPLIED>
+ <!ATTLIST property indexed (true|false|unique) #IMPLIED>
+ <!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 field-name CDATA #IMPLIED>
! <!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?,
inheritance?, version?, join*,
! foreign-key*, index*, unique*, field*, column*, query*,
fetch-group*, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
<!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>
<!ATTLIST class objectid-class CDATA #IMPLIED>
+ <!ATTLIST class catalog CDATA #IMPLIED>
+ <!ATTLIST class schema CDATA #IMPLIED>
<!ATTLIST class table CDATA #IMPLIED>
<!ATTLIST class requires-extent (true|false) 'true'>
***************
*** 72,83 ****
<!ATTLIST class persistence-modifier
(persistence-capable|persistence-aware|non-persistent) #IMPLIED>
! <!ELEMENT unmapped (extension*, column*, extension*)>
! <!ATTLIST unmapped column CDATA #IMPLIED>
! <!ELEMENT join (column*, index?, foreign-key?, extension*)>
<!ATTLIST join table CDATA #IMPLIED>
<!ATTLIST join column CDATA #IMPLIED>
<!ATTLIST join outer (true|false) 'false'>
! <!ATTLIST join foreign-key CDATA #IMPLIED>
<!ELEMENT version (extension*, column*, index?, extension*)>
--- 103,117 ----
<!ATTLIST class persistence-modifier
(persistence-capable|persistence-aware|non-persistent) #IMPLIED>
! <!ELEMENT primary-key (extension*, column*, extension*)>
! <!ATTLIST primary-key name CDATA #IMPLIED>
! <!ATTLIST primary-key column CDATA #IMPLIED>
! <!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?,
unique?, extension*)>
<!ATTLIST join table CDATA #IMPLIED>
<!ATTLIST join column CDATA #IMPLIED>
<!ATTLIST join outer (true|false) 'false'>
! <!ATTLIST join delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST join indexed (true|false|unique) #IMPLIED>
! <!ATTLIST join unique (true|false) #IMPLIED>
<!ELEMENT version (extension*, column*, index?, extension*)>
***************
*** 95,104 ****
<!ELEMENT inheritance (extension*, discriminator?, join?, extension*)>
! <!ATTLIST inheritance strategy CDATA #REQUIRED>
<!ELEMENT discriminator (extension*, column*, index?, extension*)>
<!ATTLIST discriminator column CDATA #IMPLIED>
<!ATTLIST discriminator value CDATA #IMPLIED>
! <!ATTLIST discriminator strategy (value-map|class-name|none) #IMPLIED>
<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
--- 129,138 ----
<!ELEMENT inheritance (extension*, discriminator?, join?, extension*)>
! <!ATTLIST inheritance strategy CDATA #IMPLIED>
<!ELEMENT discriminator (extension*, column*, index?, extension*)>
<!ATTLIST discriminator column CDATA #IMPLIED>
<!ATTLIST discriminator value CDATA #IMPLIED>
! <!ATTLIST discriminator strategy CDATA #IMPLIED>
<!ATTLIST discriminator indexed (true|false|unique) #IMPLIED>
***************
*** 114,117 ****
--- 148,152 ----
<!ATTLIST column allows-null CDATA #IMPLIED>
<!ATTLIST column default-value CDATA #IMPLIED>
+ <!ATTLIST column insert-value CDATA #IMPLIED>
<!ELEMENT field (extension*, (array|collection|map)?, join?, embedded?,
element?, key?, value?, order?, column*, foreign-key?,
***************
*** 140,145 ****
<!ATTLIST foreign-key table CDATA #IMPLIED>
<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
! <!ATTLIST foreign-key delete-action (cascade|restrict|null|default) #IMPLIED>
! <!ATTLIST foreign-key update-action (cascade|restrict|default) #IMPLIED>
<!ATTLIST foreign-key unique (true|false) #IMPLIED>
<!ATTLIST foreign-key name CDATA #IMPLIED>
--- 175,180 ----
<!ATTLIST foreign-key table CDATA #IMPLIED>
<!ATTLIST foreign-key deferred (true|false) #IMPLIED>
! <!ATTLIST foreign-key delete-action (cascade|restrict|null|default)
'restrict'>
! <!ATTLIST foreign-key update-action (cascade|restrict|null|default)
'restrict'>
<!ATTLIST foreign-key unique (true|false) #IMPLIED>
<!ATTLIST foreign-key name CDATA #IMPLIED>
***************
*** 199,204 ****
<!ELEMENT sequence (extension*)>
<!ATTLIST sequence name CDATA #REQUIRED>
! <!ATTLIST sequence sequence-name CDATA #REQUIRED>
! <!ATTLIST sequence strategy
(non-transactional|transactional-contiguous|transactional-holes-allowed)
#REQUIRED>
<!ELEMENT index (extension*, (column|field|property)*, extension*)>
--- 234,240 ----
<!ELEMENT sequence (extension*)>
<!ATTLIST sequence name CDATA #REQUIRED>
! <!ATTLIST sequence datastore-sequence CDATA #IMPLIED>
! <!ATTLIST sequence factory-class CDATA #IMPLIED>
! <!ATTLIST sequence strategy (nontransactional|contiguous|noncontiguous)
#REQUIRED>
<!ELEMENT index (extension*, (column|field|property)*, extension*)>
***************
*** 215,218 ****
--- 251,257 ----
<!ATTLIST query name CDATA #IMPLIED>
<!ATTLIST query language CDATA #IMPLIED>
+ <!ATTLIST query result-class CDATA #IMPLIED>
+ <!ATTLIST query unique CDATA #IMPLIED>
+ <!ATTLIST query unmodifiable (true|false) 'false'>
<!ELEMENT extension ANY>
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
