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

Modified Files:
        jdo_2_0.dtd jdo_xml.package_class_field.xdt 
Added Files:
        jdo_xml.package_class_field_embedded.xdt 
Log Message:
- replaced jdo_2_0.dtd by a newer version (which should be the final one)
- implemented field tag @jdo.embedded

--- NEW FILE: jdo_xml.package_class_field_embedded.xdt ---

           <embedded
            <XDtField:ifHasFieldTag tagName="jdo.embedded" 
paramName="owner-field">
                 owner-field="<XDtField:fieldTagValue tagName="jdo.embedded" 
paramName="owner-field"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.embedded" 
paramName="null-indicator-column">
                 owner-field="<XDtField:fieldTagValue tagName="jdo.embedded" 
paramName="null-indicator-column"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.embedded" 
paramName="null-indicator-value">
                 owner-field="<XDtField:fieldTagValue tagName="jdo.embedded" 
paramName="null-indicator-value"/>"
            </XDtField:ifHasFieldTag>
           >
           </embedded>

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.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** jdo_2_0.dtd 27 Feb 2006 19:25:27 -0000      1.8
--- jdo_2_0.dtd 25 Nov 2006 23:14:36 -0000      1.9
***************
*** 1,269 ****
! <?xml version="1.0" encoding="UTF-8"?>
! 
! <!--
! 
! Copyright 2003 Sun Microsystems, Inc. All rights reserved.
! Use is subject to license terms.
! 
! -->
! <!--
! 
! This is the DTD defining the Java Data Objects 2.0 metadata.
! 
! The metadata must declare all persistence-capable classes. If any 
! field declarations are not provided in the metadata, then field 
! metadata is defaulted for the missing field declarations. 
! Therefore, the JDO implementation is able to determine based on the
! metadata whether a class is persistence-capable or not. 
! Any class not known to be persistence-capable by the JDO 
! specification (for example, java.lang.Integer) and not explicitly 
! named in the metadata is not persistence-capable. 
! 
! The metadata associated with each persistence capable class must 
! be contained within a file, and its format is as defined in the DTD. 
! If the metadata is for only one class, then its file name should be 
! <class-name>.jdo. If the metadata is for a package, then its file name 
! should be <package-name>.jdo. For portability, files should be 
! available via resources loaded by the same class loader as the class. 
! These rules apply both to enhancement and to runtime.
! 
! The metadata is used both at enhancement time and at runtime. 
! Information required at enhancement time is a subset of the information 
! needed at runtime. 
! 
! -->
! 
! <!NOTATION JDO.2_0 PUBLIC
!           "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN">
! <!--
! This is the XML DTD for the JDO 2.0 Metadata.
! All JDO 2.0 metadata descriptors must include a DOCTYPE
! of the following form:
! 
! <!DOCTYPE jdo 
! PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
! "http://java.sun.com/dtd/jdo_2_0.dtd";>
! 
! -->
! 
! <!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 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*, 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'>
! <!ATTLIST class persistence-capable-superclass CDATA #IMPLIED>
! <!ATTLIST class detachable (true|false) 'false'>
! <!ATTLIST class embedded-only (true|false) #IMPLIED>
! <!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*)>
! <!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*, join?, discriminator?, 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>
! 
! <!ELEMENT column (extension*)>
! <!ATTLIST column name CDATA #IMPLIED>
! <!ATTLIST column target CDATA #IMPLIED>
! <!ATTLIST column target-field CDATA #IMPLIED>
! <!ATTLIST column jdbc-type CDATA #IMPLIED>
! <!ATTLIST column sql-type CDATA #IMPLIED>
! <!ATTLIST column length CDATA #IMPLIED>
! <!ATTLIST column scale CDATA #IMPLIED>
! <!ATTLIST column precision CDATA #IMPLIED>
! <!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?, 
!                  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'>
! <!ATTLIST field default-fetch-group (true|false) #IMPLIED>
! <!ATTLIST field embedded (true|false) #IMPLIED>
! <!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 recursion-depth CDATA #IMPLIED>
! <!ATTLIST field mapped-by CDATA #IMPLIED>
! <!ATTLIST field field-type CDATA #IMPLIED>
! 
! <!ELEMENT foreign-key (extension*, (column|field|property)*, extension*)>
! <!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>
! 
! <!ELEMENT collection (extension*)>
! <!ATTLIST collection element-type CDATA #IMPLIED>
! <!ATTLIST collection embedded-element (true|false) #IMPLIED>
! <!ATTLIST collection dependent-element (true|false) #IMPLIED>
! <!ATTLIST collection serialized-element (true|false) #IMPLIED>
! 
! <!ELEMENT map (extension)*>
! <!ATTLIST map key-type CDATA #IMPLIED>
! <!ATTLIST map embedded-key (true|false) #IMPLIED>
! <!ATTLIST map dependent-key (true|false) #IMPLIED>
! <!ATTLIST map serialized-key (true|false) #IMPLIED>
! <!ATTLIST map value-type CDATA #IMPLIED>
! <!ATTLIST map embedded-value (true|false) #IMPLIED>
! <!ATTLIST map dependent-value (true|false) #IMPLIED>
! <!ATTLIST map serialized-value (true|false) #IMPLIED>
! 
! <!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, 
extension*)>
! <!ATTLIST key column CDATA #IMPLIED>
! <!ATTLIST key table CDATA #IMPLIED>
! <!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST key indexed (true|false|unique) #IMPLIED>
! <!ATTLIST key unique (true|false) #IMPLIED>
! <!ATTLIST key mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>
! <!ATTLIST value table CDATA #IMPLIED>
! <!ATTLIST value column CDATA #IMPLIED>
! <!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST value indexed (true|false|unique) #IMPLIED>
! <!ATTLIST value unique (true|false) #IMPLIED>
! <!ATTLIST value mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT array (extension*)>
! <!ATTLIST array element-type CDATA #IMPLIED>
! <!ATTLIST array embedded-element (true|false) #IMPLIED>
! <!ATTLIST array dependent-element (true|false) #IMPLIED>
! <!ATTLIST array serialized-element (true|false) #IMPLIED>
! 
! <!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>
! <!ATTLIST element column CDATA #IMPLIED>
! <!ATTLIST element table CDATA #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>
! 
! <!ELEMENT order (extension*, column*, index?, extension*)>
! <!ATTLIST order column CDATA #IMPLIED>
! <!ATTLIST order indexed (true|false|unique) #IMPLIED>
! <!ATTLIST order mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT fetch-group (fetch-group|field)*>
! <!ATTLIST fetch-group name CDATA #REQUIRED>
! <!ATTLIST fetch-group post-load (true|false) #IMPLIED>
! 
! <!ELEMENT embedded (extension*, field*, extension*)>
! <!ATTLIST embedded owner-field CDATA #IMPLIED>
! <!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
! <!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
! 
! <!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*)>
! <!ATTLIST index name CDATA #IMPLIED>
! <!ATTLIST index table CDATA #IMPLIED>
! <!ATTLIST index unique (true|false) 'false'>
! 
! <!ELEMENT query (#PCDATA | extension)*>
! <!ATTLIST query name CDATA #IMPLIED>
! <!ATTLIST query language CDATA #IMPLIED>
! <!ATTLIST query unmodifiable (true|false) 'false'>
! <!ATTLIST query unique CDATA #IMPLIED>
! <!ATTLIST query result-class CDATA #IMPLIED>
! 
! <!ELEMENT unique (extension*, (column|field|property)*, extension*)>
! <!ATTLIST unique name CDATA #IMPLIED>
! <!ATTLIST unique table CDATA #IMPLIED>
! <!ATTLIST unique deferred (true|false) 'false'>
! 
! <!ELEMENT extension ANY>
! <!ATTLIST extension vendor-name CDATA #REQUIRED>
! <!ATTLIST extension key CDATA #IMPLIED>
! <!ATTLIST extension value CDATA #IMPLIED>
--- 1,226 ----
! <?xml version="1.0" encoding="UTF-8"?>
! <!-- The DOCTYPE should be as follows for metadata documents.
! <!DOCTYPE jdo
!     PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
!     "http://java.sun.com/dtd/jdo_2_0.dtd";>
! -->
! <!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 ''>
! <!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 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'>
! <!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'>
! <!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 field-type CDATA #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 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*)>
! <!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'>
! <!ATTLIST class persistence-capable-superclass CDATA #IMPLIED>
! <!ATTLIST class detachable (true|false) 'false'>
! <!ATTLIST class embedded-only (true|false) #IMPLIED>
! <!ATTLIST class persistence-modifier 
(persistence-capable|persistence-aware|non-persistent) #IMPLIED>
! <!ATTLIST class catalog CDATA #IMPLIED>
! <!ATTLIST class schema CDATA #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*)>
! <!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*, join?, discriminator?, 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>
! 
! <!ELEMENT column (extension*)>
! <!ATTLIST column name CDATA #IMPLIED>
! <!ATTLIST column target CDATA #IMPLIED>
! <!ATTLIST column target-field CDATA #IMPLIED>
! <!ATTLIST column jdbc-type CDATA #IMPLIED>
! <!ATTLIST column sql-type CDATA #IMPLIED>
! <!ATTLIST column length CDATA #IMPLIED>
! <!ATTLIST column scale CDATA #IMPLIED>
! <!ATTLIST column allows-null (true|false) #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?, index?, unique?, 
extension*)>
! <!ATTLIST field name CDATA #REQUIRED>
! <!ATTLIST field persistence-modifier (persistent|transactional|none) #IMPLIED>
! <!ATTLIST field field-type CDATA #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'>
! <!ATTLIST field default-fetch-group (true|false) #IMPLIED>
! <!ATTLIST field embedded (true|false) #IMPLIED>
! <!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 load-fetch-group CDATA #IMPLIED>
! <!ATTLIST field recursion-depth CDATA #IMPLIED>
! <!ATTLIST field mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT foreign-key (extension*, (column* | field* | property*), 
extension*)>
! <!ATTLIST foreign-key table CDATA #IMPLIED>
! <!ATTLIST foreign-key deferred (true|false) #IMPLIED>
! <!ATTLIST foreign-key delete-action (restrict|cascade|null|default|none) 
'restrict'>
! <!ATTLIST foreign-key update-action (restrict|cascade|null|default|none) 
'restrict'>
! <!ATTLIST foreign-key unique (true|false) #IMPLIED>
! <!ATTLIST foreign-key name CDATA #IMPLIED>
! 
! <!ELEMENT collection (extension*)>
! <!ATTLIST collection element-type CDATA #IMPLIED>
! <!ATTLIST collection embedded-element (true|false) #IMPLIED>
! <!ATTLIST collection dependent-element (true|false) #IMPLIED>
! <!ATTLIST collection serialized-element (true|false) #IMPLIED>
! 
! <!ELEMENT map (extension)*>
! <!ATTLIST map key-type CDATA #IMPLIED>
! <!ATTLIST map embedded-key (true|false) #IMPLIED>
! <!ATTLIST map dependent-key (true|false) #IMPLIED>
! <!ATTLIST map serialized-key (true|false) #IMPLIED>
! <!ATTLIST map value-type CDATA #IMPLIED>
! <!ATTLIST map embedded-value (true|false) #IMPLIED>
! <!ATTLIST map dependent-value (true|false) #IMPLIED>
! <!ATTLIST map serialized-value (true|false) #IMPLIED>
! 
! <!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, 
extension*)>
! <!ATTLIST key column CDATA #IMPLIED>
! <!ATTLIST key table CDATA #IMPLIED>
! <!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST key update-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST key indexed (true|false|unique) #IMPLIED>
! <!ATTLIST key unique (true|false) #IMPLIED>
! <!ATTLIST key mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>
! <!ATTLIST value column CDATA #IMPLIED>
! <!ATTLIST value table CDATA #IMPLIED>
! <!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST value update-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST value indexed (true|false|unique) #IMPLIED>
! <!ATTLIST value unique (true|false) #IMPLIED>
! <!ATTLIST value mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT array (extension*)>
! <!ATTLIST array element-type CDATA #IMPLIED>
! <!ATTLIST array embedded-element (true|false) #IMPLIED>
! <!ATTLIST array dependent-element (true|false) #IMPLIED>
! <!ATTLIST array serialized-element (true|false) #IMPLIED>
! 
! <!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, 
unique?, extension*)>
! <!ATTLIST element column CDATA #IMPLIED>
! <!ATTLIST element table CDATA #IMPLIED>
! <!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST element update-action (restrict|cascade|null|default|none) #IMPLIED>
! <!ATTLIST element indexed (true|false|unique) #IMPLIED>
! <!ATTLIST element unique (true|false) #IMPLIED>
! <!ATTLIST element mapped-by CDATA #IMPLIED>
! 
! <!ELEMENT order (extension*, column*, index?, extension*)>
! <!ATTLIST order column CDATA #IMPLIED>
! <!ATTLIST order mapped-by CDATA #IMPLIED>
! 
! <!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|property)*, extension*)>
! <!ATTLIST embedded owner-field CDATA #IMPLIED>
! <!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
! <!ATTLIST embedded null-indicator-value CDATA #IMPLIED>
! 
! <!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*)>
! <!ATTLIST index name CDATA #IMPLIED>
! <!ATTLIST index table CDATA #IMPLIED>
! <!ATTLIST index unique (true|false) 'false'>
! 
! <!ELEMENT query (#PCDATA|extension)*>
! <!ATTLIST query name CDATA #REQUIRED>
! <!ATTLIST query language CDATA #IMPLIED>
! <!ATTLIST query unmodifiable (true|false) 'false'>
! <!ATTLIST query unique (true|false) #IMPLIED>
! <!ATTLIST query result-class CDATA #IMPLIED>
! 
! <!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
! <!ATTLIST unique name CDATA #IMPLIED>
! <!ATTLIST unique table CDATA #IMPLIED>
! <!ATTLIST unique deferred (true|false) 'false'>
! 
! <!ELEMENT extension ANY>
! <!ATTLIST extension vendor-name CDATA #REQUIRED>
! <!ATTLIST extension key CDATA #IMPLIED>
! <!ATTLIST extension value CDATA #IMPLIED>
! 

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.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** jdo_xml.package_class_field.xdt     14 Mar 2006 00:21:32 -0000      1.14
--- jdo_xml.package_class_field.xdt     25 Nov 2006 23:14:37 -0000      1.15
***************
*** 158,161 ****
--- 158,166 ----
  
           <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
+           <XDtField:ifHasFieldTag tagName="jdo.embedded">
+            <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_embedded.xdt">
+            </XDtMerge:merge>
+           </XDtField:ifHasFieldTag>
+ 
            <XDtField:ifHasFieldTag tagName="jdo.join">
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt">
***************
*** 163,167 ****
            </XDtField:ifHasFieldTag>
  
- 
            <XDtField:ifHasFieldTag tagName="jdo.element">
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt">
--- 168,171 ----


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to