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

Modified Files:
        jdo_2_0.dtd jdo_xml.package_class_field_key_column.xdt 
        jdo_xml.package_class_field.xdt 
Added Files:
        jdo_xml.package_class_field_key.xdt 
Log Message:
- replaced jdo_2_0.dtd by a newer version
- added @jdo.key (warning: @jdo.key-column works now only if @jdo.key is 
present)

--- NEW FILE: jdo_xml.package_class_field_key.xdt ---

           <key
            <XDtField:ifHasFieldTag tagName="jdo.key" paramName="column">
                column="<XDtField:fieldTagValue tagName="jdo.key" 
paramName="column"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.key" paramName="delete-action">
                delete-action="<XDtField:fieldTagValue tagName="jdo.key" 
paramName="delete-action" values="restrict,cascade,null,default,none"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.key" paramName="indexed">
                indexed="<XDtField:fieldTagValue tagName="jdo.key" 
paramName="indexed" values="true,false,unique"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.key" paramName="unique">
                unique="<XDtField:fieldTagValue tagName="jdo.key" 
paramName="unique" values="true,false"/>"
            </XDtField:ifHasFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.key" paramName="mapped-by">
                mapped-by="<XDtField:fieldTagValue tagName="jdo.key" 
paramName="mapped-by"/>"
            </XDtField:ifHasFieldTag>
           > <XDtComment:comment> end tag *key* </XDtComment:comment>
            <XDtField:forAllFieldTags tagName="jdo.key-column" 
superclasses="false">  
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key_column.xdt">
             </XDtMerge:merge>
            </XDtField:forAllFieldTags>
           </key>
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.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** jdo_2_0.dtd 14 Jul 2005 16:55:59 -0000      1.5
--- jdo_2_0.dtd 25 Aug 2005 02:02:10 -0000      1.6
***************
*** 199,202 ****
--- 199,203 ----
  <!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*)>
***************
*** 206,209 ****
--- 207,211 ----
  <!ATTLIST value indexed (true|false|unique) #IMPLIED>
  <!ATTLIST value unique (true|false) #IMPLIED>
+ <!ATTLIST value mapped-by CDATA #IMPLIED>
  
  <!ELEMENT array (extension*)>
***************
*** 222,225 ****
--- 224,228 ----
  <!ATTLIST order column CDATA #IMPLIED>
  <!ATTLIST order indexed (true|false|unique) #IMPLIED>
+ <!ATTLIST order mapped-by CDATA #IMPLIED>
  
  <!ELEMENT fetch-group (fetch-group|field)*>

Index: jdo_xml.package_class_field_key_column.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key_column.xdt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jdo_xml.package_class_field_key_column.xdt  14 Jul 2005 18:40:51 -0000      
1.1
--- jdo_xml.package_class_field_key_column.xdt  25 Aug 2005 02:02:10 -0000      
1.2
***************
*** 1,4 ****
  
-            <key>
              <column
               <XDtField:ifHasFieldTag tagName="jdo.key-column" 
paramName="name">
--- 1,3 ----
***************
*** 48,51 ****
                <XDtJdo:vendorExtension/>
               </XDtJdo:forAllVendorExtensions>
!             </column>
!            </key>
\ No newline at end of file
--- 47,49 ----
                <XDtJdo:vendorExtension/>
               </XDtJdo:forAllVendorExtensions>
!             </column>
\ No newline at end of file

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.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** jdo_xml.package_class_field.xdt     18 Jul 2005 22:09:37 -0000      1.6
--- jdo_xml.package_class_field.xdt     25 Aug 2005 02:02:10 -0000      1.7
***************
*** 144,168 ****
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt">
             </XDtMerge:merge>
!               </XDtField:ifHasFieldTag>
!              </XDtConfig:ifConfigParamEquals>
  
!              <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
            <XDtField:ifHasFieldTag tagName="jdo.element">
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt">
             </XDtMerge:merge>
!               </XDtField:ifHasFieldTag>
!              </XDtConfig:ifConfigParamEquals>
  
!              <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
!           <XDtField:forAllFieldTags tagName="jdo.key-column" 
superclasses="false">  
!            <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key_column.xdt">
             </XDtMerge:merge>
!               </XDtField:forAllFieldTags>
  
!               <XDtField:forAllFieldTags tagName="jdo.value-column" 
superclasses="false">  
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">
             </XDtMerge:merge>
!               </XDtField:forAllFieldTags>
!              </XDtConfig:ifConfigParamEquals>
  
           <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
--- 144,168 ----
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_join.xdt">
             </XDtMerge:merge>
!           </XDtField:ifHasFieldTag>
!          </XDtConfig:ifConfigParamEquals>
  
!          <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
            <XDtField:ifHasFieldTag tagName="jdo.element">
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_element.xdt">
             </XDtMerge:merge>
!           </XDtField:ifHasFieldTag>
!          </XDtConfig:ifConfigParamEquals>
  
!          <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
!           <XDtField:forAllFieldTags tagName="jdo.key" superclasses="false">  
!            <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_key.xdt">
             </XDtMerge:merge>
!           </XDtField:forAllFieldTags>
  
!           <XDtField:forAllFieldTags tagName="jdo.value-column" 
superclasses="false">  
             <XDtMerge:merge 
file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">
             </XDtMerge:merge>
!           </XDtField:forAllFieldTags>
!          </XDtConfig:ifConfigParamEquals>
  
           <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to