CVS: xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources jdo_xml.package_class_field.xdt,1.11,1.12 jdo_xml.package_class_fetch-group.xdt,1.2,1.3

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

Modified Files:
	jdo_xml.package_class_field.xdt 
	jdo_xml.package_class_fetch-group.xdt 
Log Message:
- removed the project's default-fetch-depth again (not necessary, because the fetch-depth applies only to a few special situations)
- added the possibility to declare the fetch-depth (in square brackets) for each field within a fetch-group (e.g.: jdo.fetch-group name="myFetchGroup" field-names="name, parent[2], children[5]")

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.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** jdo_xml.package_class_field.xdt	18 Sep 2005 23:14:41 -0000	1.11
--- jdo_xml.package_class_field.xdt	18 Sep 2005 23:37:51 -0000	1.12
***************
*** 52,65 ****
                 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:ifDoesntHaveFieldTag tagName="jdo.field" paramName="fetch-depth">
-            <XDtConfig:ifConfigParamNotEquals paramName="fetchDepth" value="-1">
-             <XDtJdo:ifCurrentFieldIsInFetchGroup>
-                fetch-depth="<XDtConfig:configParameterValue paramName="fetchDepth"/>"
-             </XDtJdo:ifCurrentFieldIsInFetchGroup>
-            </XDtConfig:ifConfigParamNotEquals>
-           </XDtField:ifDoesntHaveFieldTag>
            <XDtField:ifHasFieldTag tagName="jdo.field" paramName="mapped-by">
                 mapped-by="<XDtField:fieldTagValue tagName="jdo.field" paramName="mapped-by"/>"
--- 52,55 ----

Index: jdo_xml.package_class_fetch-group.xdt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/modules/jdo/src/xdoclet/modules/jdo/resources/jdo_xml.package_class_fetch-group.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** jdo_xml.package_class_fetch-group.xdt	27 Aug 2005 16:13:59 -0000	1.2
--- jdo_xml.package_class_fetch-group.xdt	18 Sep 2005 23:37:51 -0000	1.3
***************
*** 8,16 ****
         </XDtClass:ifHasClassTag>
        >
!        <XDtClass:ifHasClassTag tagName="jdo.fetch-group" paramName="field-names">
!         <XDtClass:forAllClassTagTokens tagName="jdo.fetch-group" paramName="field-names" delimiter=", ">
!          <field name="<XDtClass:currentToken/>"/>
!         </XDtClass:forAllClassTagTokens>
!        </XDtClass:ifHasClassTag>
         <XDtClass:ifHasClassTag tagName="jdo.fetch-group" paramName="fetch-group-names">
          <XDtClass:forAllClassTagTokens tagName="jdo.fetch-group" paramName="fetch-group-names" delimiter=", ">
--- 8,18 ----
         </XDtClass:ifHasClassTag>
        >
!        <XDtJdo:forAllFetchGroupFieldNames>
!          <field name="<XDtJdo:currentFetchGroupFieldName/>"
!           <XDtJdo:ifCurrentFetchGroupFieldHasFetchDepth>
!                 fetch-depth="<XDtJdo:currentFetchGroupFieldFetchDepth/>"
!           </XDtJdo:ifCurrentFetchGroupFieldHasFetchDepth>
!          />
!        </XDtJdo:forAllFetchGroupFieldNames>
         <XDtClass:ifHasClassTag tagName="jdo.fetch-group" paramName="fetch-group-names">
          <XDtClass:forAllClassTagTokens tagName="jdo.fetch-group" paramName="fetch-group-names" delimiter=", ">



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php