Update of /cvsroot/xdoclet/xdoclet/modules/caucho/src/xdoclet/modules/caucho/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv9375

Modified Files:
        resin-web-xml.xdt 
Log Message:
Applied Alon Salant's patch to fix useStandardMergeFiles attribute (XDT-571).
The patch also fixes a badly formed role-link element.

Index: resin-web-xml.xdt
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/caucho/src/xdoclet/modules/caucho/resources/resin-web-xml.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** resin-web-xml.xdt   15 Aug 2002 17:41:07 -0000      1.3
--- resin-web-xml.xdt   26 Jul 2003 10:54:55 -0000      1.4
***************
*** 74,78 ****
  
  <XDtConfig:ifConfigParamEquals paramName="useStandardMergeFiles" value="true">
!       <XDtMerge:merge file="com/caucho/xdoclet/resin-web-mergefiles.xdt">
        </XDtMerge:merge>
  </XDtConfig:ifConfigParamEquals>
--- 74,78 ----
  
  <XDtConfig:ifConfigParamEquals paramName="useStandardMergeFiles" value="true">
!       <XDtMerge:merge 
file="xdoclet/modules/caucho/resources/resin-web-mergefiles.xdt">
        </XDtMerge:merge>
  </XDtConfig:ifConfigParamEquals>
***************
*** 201,205 ****
                                        </XDtClass:ifHasClassTag>
                        <role-name><XDtClass:classTagValue 
tagName="web:security-role-ref" paramName="role-name"/></role-name>
!                       <role-link><XDtClass:classTagValue 
tagName="web:security-role-ref" paramName="role-link"/></role-value>
                </security-role-ref>
                                </XDtClass:forAllClassTags>
--- 201,205 ----
                                        </XDtClass:ifHasClassTag>
                        <role-name><XDtClass:classTagValue 
tagName="web:security-role-ref" paramName="role-name"/></role-name>
!                       <role-link><XDtClass:classTagValue 
tagName="web:security-role-ref" paramName="role-link"/></role-link>
                </security-role-ref>
                                </XDtClass:forAllClassTags>



-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to