Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28577
Modified Files:
taglib_tld.xdt
Log Message:
Applied (slightly modified) patch from XDT-742, so that valid 1.1 TLDs can still be
generated if 1.2-specific tags etc. are present. Thanks to Howard M. Lewis Ship for
the patch.
Index: taglib_tld.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources/taglib_tld.xdt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** taglib_tld.xdt 28 Jul 2004 22:19:10 -0000 1.9
--- taglib_tld.xdt 1 Aug 2004 13:18:54 -0000 1.10
***************
*** 20,23 ****
--- 20,28 ----
</XDtConfig:ifConfigParamNotEquals>
+ <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.1">
+ <XDtConfig:ifConfigParamNotEquals paramName="Description" value="">
+ <info><![CDATA[<XDtConfig:configParameterValue paramName="Description"/>]]></info>
+ </XDtConfig:ifConfigParamNotEquals>
+ </XDtConfig:ifConfigParamEquals>
<XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
<XDtConfig:ifConfigParamNotEquals paramName="Displayname" value="">
***************
*** 36,39 ****
--- 41,46 ----
</XDtMerge:merge>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
+ <XDtMerge:merge file="taglib-validator.xml">
<XDtClass:forAllClasses type="javax.servlet.jsp.tagext.TagLibraryValidator"
abstract="false">
<validator>
***************
*** 51,56 ****
</validator>
</XDtClass:forAllClasses>
-
- <XDtMerge:merge file="taglib-validator.xml">
</XDtMerge:merge>
--- 58,61 ----
***************
*** 63,66 ****
--- 68,72 ----
<XDtMerge:merge file="taglib-listener.xml">
</XDtMerge:merge>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtClass:forAllClasses
type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.TagSupport"
abstract="false">
***************
*** 68,73 ****
<tag>
- <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.1">
<name><XDtClass:classTagValue tagName="jsp:tag" paramName="name"/></name>
<tagclass><XDtClass:fullClassName/></tagclass>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
--- 74,79 ----
<tag>
<name><XDtClass:classTagValue tagName="jsp:tag" paramName="name"/></name>
+ <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.1">
<tagclass><XDtClass:fullClassName/></tagclass>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
***************
*** 77,84 ****
<bodycontent><XDtClass:classTagValue tagName="jsp:tag"
paramName="body-content"/></bodycontent>
</XDtClass:ifHasClassTag>
</XDtConfig:ifConfigParamEquals>
-
<XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
- <name><XDtClass:classTagValue tagName="jsp:tag" paramName="name"/></name>
<tag-class><XDtClass:fullClassName/></tag-class>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
--- 83,91 ----
<bodycontent><XDtClass:classTagValue tagName="jsp:tag"
paramName="body-content"/></bodycontent>
</XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="description">
+ <info><![CDATA[<XDtClass:classTagValue tagName="jsp:tag"
paramName="description"/>]]></info>
+ </XDtClass:ifHasClassTag>
</XDtConfig:ifConfigParamEquals>
<XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
<tag-class><XDtClass:fullClassName/></tag-class>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
***************
*** 88,92 ****
<body-content><XDtClass:classTagValue tagName="jsp:tag"
paramName="body-content"/></body-content>
</XDtClass:ifHasClassTag>
-
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="display-name">
<display-name><XDtClass:classTagValue tagName="jsp:tag"
paramName="display-name"/></display-name>
--- 95,98 ----
***************
*** 103,106 ****
--- 109,113 ----
</XDtConfig:ifConfigParamGreaterOrEquals>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
<XDtClass:forAllClassTags tagName="jsp:variable">
<variable>
***************
*** 127,130 ****
--- 134,138 ----
</variable>
</XDtClass:forAllClassTags>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtMethod:forAllMethods>
***************
*** 132,140 ****
<attribute>
<name><XDtMethod:propertyName/></name>
-
<XDtMethod:ifHasMethodTag tagName="jsp:attribute" paramName="required">
<required><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="required" values="true,false,yes,no"/></required>
</XDtMethod:ifHasMethodTag>
-
<XDtMethod:ifHasMethodTag tagName="jsp:attribute" paramName="rtexprvalue">
<rtexprvalue><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="rtexprvalue" values="true,false,yes,no"/></rtexprvalue>
--- 140,146 ----
***************
*** 161,163 ****
</taglib>
-
--- 167,168 ----
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
