resources jdo_2_0.dtd,1.3,1.4 jdo_xml.package_class_field.xdt,1.3,1.4

Marco Schulze Mon, 21 Feb 2005 07:58:05 -0800

Update of /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13785/modules/jdo/src/xdoclet/modules/jdo/resources


Modified Files:
        jdo_2_0.dtd jdo_xml.package_class_field.xdt 
Log Message:
- Updated jdo_2_0.dtd by the most current one from the JPOX project.
- Added/replaced some parameters of @jdo.field to match the current spec draft.
- Added docu (at least a stub) for each @jdo.field param.

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.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** jdo_2_0.dtd 6 Jan 2005 16:21:07 -0000       1.3
--- jdo_2_0.dtd 21 Feb 2005 15:56:32 -0000      1.4
***************
*** 47,51 ****
  -->

  

! <!ELEMENT jdo ((package)+, (query)*, (extension)*)>

  

  <!ELEMENT package (extension*, (interface|class|sequence)*, (extension)*)>

--- 47,51 ----
  -->

  

! <!ELEMENT jdo (extension*, (package|query)+, (extension)*)>

  

  <!ELEMENT package (extension*, (interface|class|sequence)*, (extension)*)>

***************
*** 61,65 ****
  

  <!ELEMENT class (extension*, implements*, datastore-identity?, inheritance?, 
version?, join*, 

!                  foreign-key*, index*, unique*, field*, query*, fetch-group*, 
extension*)>

  <!ATTLIST class name CDATA #REQUIRED>

  <!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>

--- 61,65 ----
  

  <!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>

***************
*** 72,79 ****
  <!ATTLIST class persistence-modifier 
(persistence-capable|persistence-aware|non-persistent) #IMPLIED>

  

! <!ELEMENT version (extension*, column*, extension*)>

! <!ATTLIST version strategy CDATA #IMPLIED>

! <!ATTLIST version column CDATA #IMPLIED>

! <!ATTLIST version indexed (true|false|unique) #IMPLIED>

  

  <!ELEMENT join (column*, index?, foreign-key?, extension*)>

--- 72,77 ----
  <!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*)>

***************
*** 83,98 ****
  <!ATTLIST join foreign-key CDATA #IMPLIED>

  

! <!ELEMENT datastore-identity ((column)*, (extension)*)>

  <!ATTLIST datastore-identity column CDATA #IMPLIED>

! <!ATTLIST datastore-identity strategy CDATA #IMPLIED>

  <!ATTLIST datastore-identity sequence CDATA #IMPLIED>

  

! <!ELEMENT implements ((property-field)+, (extension)*)>

  <!ATTLIST implements name CDATA #REQUIRED>

  

! <!ELEMENT inheritance (discriminator?, join?, extension*)>

  <!ATTLIST inheritance strategy CDATA #REQUIRED>

  

! <!ELEMENT discriminator (extension*, column?, extension*)>

  <!ATTLIST discriminator column CDATA #IMPLIED>

  <!ATTLIST discriminator value CDATA #IMPLIED>

--- 81,101 ----
  <!ATTLIST join foreign-key CDATA #IMPLIED>

  

! <!ELEMENT version (extension*, column*, index?, extension*)>

! <!ATTLIST version strategy CDATA #IMPLIED>

! <!ATTLIST version column CDATA #IMPLIED>

! <!ATTLIST version indexed (true|false|unique) #IMPLIED>

! 

! <!ELEMENT datastore-identity (extension*, column*, extension*)>

  <!ATTLIST datastore-identity column CDATA #IMPLIED>

! <!ATTLIST datastore-identity strategy CDATA 'native'>

  <!ATTLIST datastore-identity sequence CDATA #IMPLIED>

  

! <!ELEMENT implements (extension*, property*, extension*)>

  <!ATTLIST implements name CDATA #REQUIRED>

  

! <!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>

***************
*** 112,124 ****
  <!ATTLIST column default-value CDATA #IMPLIED>

  

! <!ELEMENT property-field (extension*)>

! <!ATTLIST property-field name CDATA #REQUIRED>

! <!ATTLIST property-field field-name CDATA #REQUIRED>

! 

! <!ELEMENT field ((collection|map|array|(column*))?, join?, element?, key?, 
value?, fetch-group*, order?, embedded?, index?, foreign-key?, 

!                  delete-action?, extension*)?>

  <!ATTLIST field name CDATA #REQUIRED>

  <!ATTLIST field persistence-modifier (persistent|transactional|none) #IMPLIED>

  <!ATTLIST field table CDATA #IMPLIED>

  <!ATTLIST field primary-key (true|false) 'false'>

  <!ATTLIST field null-value (exception|default|none) 'none'>

--- 115,124 ----
  <!ATTLIST column default-value CDATA #IMPLIED>

  

! <!ELEMENT field (extension*, (array|collection|map)?, join?, embedded?, 
element?, key?, value?, order?, column*, foreign-key?, 

!                  index?, unique?, extension*)>

  <!ATTLIST field name CDATA #REQUIRED>

  <!ATTLIST field persistence-modifier (persistent|transactional|none) #IMPLIED>

  <!ATTLIST field table CDATA #IMPLIED>

+ <!ATTLIST field column CDATA #IMPLIED>

  <!ATTLIST field primary-key (true|false) 'false'>

  <!ATTLIST field null-value (exception|default|none) 'none'>

***************
*** 127,141 ****
  <!ATTLIST field serialized (true|false) #IMPLIED>

  <!ATTLIST field dependent (true|false) #IMPLIED>

! <!ATTLIST field value-factory CDATA #IMPLIED>

  <!ATTLIST field indexed (true|false|unique) #IMPLIED>

  <!ATTLIST field foreign-key CDATA #IMPLIED>

  <!ATTLIST field load-fetch-group CDATA #IMPLIED>

  <!ATTLIST field fetch-depth CDATA #IMPLIED>

- <!ATTLIST field column CDATA #IMPLIED>

  <!ATTLIST field mapped-by CDATA #IMPLIED>

- <!ATTLIST field value-strategy CDATA #IMPLIED>

  

! <!ELEMENT foreign-key (column*, extension*)>

! <!ATTLIST foreign-key column CDATA #IMPLIED>

  <!ATTLIST foreign-key deferred (true|false) #IMPLIED>

  <!ATTLIST foreign-key delete-action (cascade|restrict|null|default) #IMPLIED>

--- 127,142 ----
  <!ATTLIST field serialized (true|false) #IMPLIED>

  <!ATTLIST field dependent (true|false) #IMPLIED>

! <!ATTLIST field value-strategy CDATA #IMPLIED>

! <!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>

  <!ATTLIST field indexed (true|false|unique) #IMPLIED>

+ <!ATTLIST field unique (true|false) #IMPLIED>

+ <!ATTLIST field sequence CDATA #IMPLIED>

  <!ATTLIST field foreign-key CDATA #IMPLIED>

  <!ATTLIST field load-fetch-group CDATA #IMPLIED>

  <!ATTLIST field fetch-depth CDATA #IMPLIED>

  <!ATTLIST field mapped-by CDATA #IMPLIED>

  

! <!ELEMENT foreign-key (extension*, column*, extension*)>

! <!ATTLIST foreign-key table CDATA #IMPLIED>

  <!ATTLIST foreign-key deferred (true|false) #IMPLIED>

  <!ATTLIST foreign-key delete-action (cascade|restrict|null|default) #IMPLIED>

***************
*** 144,148 ****
  <!ATTLIST foreign-key name CDATA #IMPLIED>

  

! <!ELEMENT collection (order?, extension*)>

  <!ATTLIST collection element-type CDATA #IMPLIED>

  <!ATTLIST collection embedded-element (true|false) #IMPLIED>

--- 145,149 ----
  <!ATTLIST foreign-key name CDATA #IMPLIED>

  

! <!ELEMENT collection (extension*)>

  <!ATTLIST collection element-type CDATA #IMPLIED>

  <!ATTLIST collection embedded-element (true|false) #IMPLIED>

***************
*** 160,179 ****
  <!ATTLIST key column CDATA #IMPLIED>

  <!ATTLIST key serialized (true|false) #IMPLIED>

! <!ATTLIST key foreign-key CDATA #IMPLIED>

  <!ATTLIST key indexed (true|false|unique) #IMPLIED>

  <!ATTLIST key unique (true|false) #IMPLIED>

  

  <!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>

- <!ATTLIST value serialized (true|false) #IMPLIED>

- <!ATTLIST value foreign-key CDATA #IMPLIED>

  <!ATTLIST value column CDATA #IMPLIED>

  <!ATTLIST value indexed (true|false|unique) #IMPLIED>

  <!ATTLIST value unique (true|false) #IMPLIED>

  

! 

! <!ELEMENT array (column*, embedded?, foreign-key?, extension*)>

! <!ATTLIST array column (true|false) #IMPLIED>

! <!ATTLIST array serialized (true|false) #IMPLIED>

! <!ATTLIST array foreign-key CDATA #IMPLIED>

  <!ATTLIST array embedded-element (true|false) #IMPLIED>

  <!ATTLIST array dependent-element (true|false) #IMPLIED>

--- 161,176 ----
  <!ATTLIST key column CDATA #IMPLIED>

  <!ATTLIST key serialized (true|false) #IMPLIED>

! <!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>

  <!ATTLIST key indexed (true|false|unique) #IMPLIED>

  <!ATTLIST key unique (true|false) #IMPLIED>

  

  <!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>

  <!ATTLIST value column CDATA #IMPLIED>

+ <!ATTLIST value serialized (true|false) #IMPLIED>

+ <!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>

  <!ATTLIST value indexed (true|false|unique) #IMPLIED>

  <!ATTLIST value unique (true|false) #IMPLIED>

  

! <!ELEMENT array (extension*)>

  <!ATTLIST array embedded-element (true|false) #IMPLIED>

  <!ATTLIST array dependent-element (true|false) #IMPLIED>

***************
*** 181,186 ****
  <!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>

  <!ATTLIST element column CDATA #IMPLIED>

- <!ATTLIST element foreign-key CDATA #IMPLIED>

  <!ATTLIST element serialized (true|false) #IMPLIED>

  <!ATTLIST element indexed (true|false|unique) #IMPLIED>

  <!ATTLIST element unique (true|false) #IMPLIED>

--- 178,184 ----
  <!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>

  <!ATTLIST element column CDATA #IMPLIED>

  <!ATTLIST element serialized (true|false) #IMPLIED>

+ <!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>

+ <!ATTLIST element update-action CDATA #IMPLIED>

  <!ATTLIST element indexed (true|false|unique) #IMPLIED>

  <!ATTLIST element unique (true|false) #IMPLIED>

***************
*** 199,204 ****
  <!ATTLIST embedded null-indicator-value CDATA #IMPLIED>

  

- <!ELEMENT owner (extension*, field?, extension*)>

- 

  <!ELEMENT sequence (extension*)>

  <!ATTLIST sequence name CDATA #REQUIRED>

--- 197,200 ----
***************
*** 208,212 ****
  <!ELEMENT index (extension*, (column|field|property)*, extension*)>

  <!ATTLIST index name CDATA #IMPLIED>

! <!ATTLIST index column CDATA #IMPLIED>

  <!ATTLIST index unique (true|false) 'false'>

  

--- 204,208 ----
  <!ELEMENT index (extension*, (column|field|property)*, extension*)>

  <!ATTLIST index name CDATA #IMPLIED>

! <!ATTLIST index table CDATA #IMPLIED>

  <!ATTLIST index unique (true|false) 'false'>

  


Index: jdo_xml.package_class_field.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** jdo_xml.package_class_field.xdt     6 Jan 2005 16:21:07 -0000       1.3
--- jdo_xml.package_class_field.xdt     21 Feb 2005 15:56:42 -0000      1.4
***************
*** 26,44 ****
                 dependent="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="dependent" values="true,false"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" 
paramName="value-factory">
!                value-factory="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="value-factory"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.field" paramName="foreign-key">
                 foreign-key="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="foreign-key"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="fetch-group">
!                fetch-group="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="fetch-group"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="depth">
!                depth="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="depth"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.field" paramName="mapped-by">
                 mapped-by="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="mapped-by"/>"
                </XDtField:ifHasFieldTag>
               </XDtConfig:ifConfigParamEquals>
          > <XDtComment:comment> --- end tag *field* --- </XDtComment:comment>
--- 26,59 ----
                 dependent="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="dependent" values="true,false"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" 
paramName="value-strategy">
!                value-strategy="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="value-strategy"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.field" paramName="foreign-key">
                 foreign-key="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="foreign-key"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" 
paramName="load-fetch-group">
!                load-fetch-group="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="load-fetch-group"/>"
            </XDtField:ifHasFieldTag>
!           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="fetch-depth">
!                fetch-depth="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="fetch-depth"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.field" paramName="mapped-by">
                 mapped-by="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="mapped-by"/>"
                </XDtField:ifHasFieldTag>
+               <XDtField:ifHasFieldTag tagName="jdo.field" paramName="column">
+                column="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="column"/>"
+           </XDtField:ifHasFieldTag>
+           <XDtField:ifHasFieldTag tagName="jdo.field" 
paramName="delete-action">
+                delete-action="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="delete-action" values="restrict,cascade,null,default,none"/>"
+           </XDtField:ifHasFieldTag>
+           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="indexed">
+                indexed="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="indexed" values="true,false,unique"/>"
+           </XDtField:ifHasFieldTag>
+           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="unique">
+                unique="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="unique" values="true,false"/>"
+           </XDtField:ifHasFieldTag>
+           <XDtField:ifHasFieldTag tagName="jdo.field" paramName="sequence">
+                sequence="<XDtField:fieldTagValue tagName="jdo.field" 
paramName="sequence"/>"
+               </XDtField:ifHasFieldTag>
               </XDtConfig:ifConfigParamEquals>
          > <XDtComment:comment> --- end tag *field* --- </XDtComment:comment>



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

[Xdoclet-devel] CVS: xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources jdo_2_0.dtd,1.3,1.4 jdo_xml.package_class_field.xdt,1.3,1.4

Reply via email to