CVS: xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources jdo_xml.package_class_field.xdt,1.7,1.8

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

Modified Files:
	jdo_xml.package_class_field.xdt 
Log Message:
enhanced @jdo.key + @jdo.key-column handling: It is NOT necessary anymore to specify @jdo.key. If it is missing, an empty <key> XML tag is auto-generated if @jdo.key-column is specified.

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.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** jdo_xml.package_class_field.xdt	25 Aug 2005 02:02:10 -0000	1.7
--- jdo_xml.package_class_field.xdt	25 Aug 2005 17:52:57 -0000	1.8
***************
*** 139,143 ****
            </array>
           </XDtField:ifFieldTagValueEquals>
!          
           <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
            <XDtField:ifHasFieldTag tagName="jdo.join">
--- 139,143 ----
            </array>
           </XDtField:ifFieldTagValueEquals>
! 
           <XDtConfig:ifConfigParamEquals paramName="jdospec" value="2.0">
            <XDtField:ifHasFieldTag tagName="jdo.join">
***************
*** 155,163 ****
  
           <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">
--- 155,175 ----
  
           <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>
  
+ <XDtComment:comment> If there is no @jdo.key, there might still be a @jdo.key-column. </XDtComment:comment>
+           <XDtField:ifDoesntHaveFieldTag tagName="jdo.key" superclasses="false">
+            <XDtField:ifHasFieldTag tagName="jdo.key-column">
+             <key>
+              <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>
+            </XDtField:ifHasFieldTag>
+           </XDtField:ifDoesntHaveFieldTag>
+ 
            <XDtField:forAllFieldTags tagName="jdo.value-column" superclasses="false">  
             <XDtMerge:merge file="xdoclet/modules/jdo/resources/jdo_xml.package_class_field_value_column.xdt">



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