Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19168/xdoclet/modules/web/src/xdoclet/modules/web/resources
Modified Files:
taglib_tld.xdt
Log Message:
Added not yet present changes from XDT-580.
Patch by Andy Jaschke.
Index: taglib_tld.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources/taglib_tld.xdt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** taglib_tld.xdt 16 Jan 2005 11:41:55 -0000 1.11
--- taglib_tld.xdt 16 Jan 2005 12:13:48 -0000 1.12
***************
*** 17,24 ****
<shortname><XDtConfig:configParameterValue
paramName="Shortname"/></shortname>
</XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
<tlib-version><XDtConfig:configParameterValue
paramName="Taglibversion"/></tlib-version>
<jsp-version><XDtConfig:configParameterValue
paramName="Jspversion"/></jsp-version>
<short-name><XDtConfig:configParameterValue
paramName="Shortname"/></short-name>
</XDtConfig:ifConfigParamGreaterOrEquals>
--- 17,28 ----
<shortname><XDtConfig:configParameterValue
paramName="Shortname"/></shortname>
</XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.2">
<tlib-version><XDtConfig:configParameterValue
paramName="Taglibversion"/></tlib-version>
<jsp-version><XDtConfig:configParameterValue
paramName="Jspversion"/></jsp-version>
<short-name><XDtConfig:configParameterValue
paramName="Shortname"/></short-name>
+ </XDtConfig:ifConfigParamEquals>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="2.0">
+ <tlib-version><XDtConfig:configParameterValue
paramName="Taglibversion"/></tlib-version>
+ <short-name><XDtConfig:configParameterValue
paramName="Shortname"/></short-name>
</XDtConfig:ifConfigParamGreaterOrEquals>
***************
*** 70,74 ****
<XDtMerge:merge file="taglib-functions.ent">
</XDtMerge:merge>
! <XDtConfig:ifConfigParamGreaterOrEquals>
<XDtClass:forAllClasses
type="javax.servlet.http.HttpSessionActivationListener,javax.servlet.http.HttpSessionAttributeListener,javax.servlet.http.HttpSessionBindingListener,javax.servlet.http.HttpSessionListener,javax.servlet.ServletContextAttributeListener,javax.servlet.ServletContextListener"
abstract="false">
--- 74,78 ----
<XDtMerge:merge file="taglib-functions.ent">
</XDtMerge:merge>
! </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtClass:forAllClasses
type="javax.servlet.http.HttpSessionActivationListener,javax.servlet.http.HttpSessionAttributeListener,javax.servlet.http.HttpSessionBindingListener,javax.servlet.http.HttpSessionListener,javax.servlet.ServletContextAttributeListener,javax.servlet.ServletContextListener"
abstract="false">
***************
*** 82,91 ****
</XDtConfig:ifConfigParamGreaterOrEquals>
! <XDtClass:forAllClasses
type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.TagSupport"
abstract="false">
<XDtClass:ifHasClassTag tagName="jsp:tag">
<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">
--- 86,95 ----
</XDtConfig:ifConfigParamGreaterOrEquals>
! <XDtClass:forAllClasses
type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.TagSupport,javax.servlet.jsp.tagext.SimpleTagSupport"
abstract="false">
<XDtClass:ifHasClassTag tagName="jsp:tag">
<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">
***************
*** 99,103 ****
</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">
--- 103,108 ----
</XDtClass:ifHasClassTag>
</XDtConfig:ifConfigParamEquals>
! <XDtConfig:ifConfigParamEquals 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">
***************
*** 119,127 ****
--- 124,163 ----
<description><![CDATA[<XDtClass:classTagValue tagName="jsp:tag"
paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamEquals>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="2.0">
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="description">
+ <description><XDtClass:classTagValue tagName="jsp:tag"
paramName="description"/></description>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="display-name">
+ <display-name><XDtClass:classTagValue tagName="jsp:tag"
paramName="display-name"/></display-name>
+ </XDtClass:ifHasClassTag>
+ <icon>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="small-icon">
+ <small-icon><XDtClass:classTagValue tagName="jsp:tag"
paramName="small-icon"/></small-icon>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="large-icon">
+ <large-icon><XDtClass:classTagValue tagName="jsp:tag"
paramName="large-icon"/></large-icon>
+ </XDtClass:ifHasClassTag>
+ </icon>
+ <name><XDtClass:classTagValue tagName="jsp:tag"
paramName="name"/></name>
+ <tag-class><XDtClass:fullClassName/></tag-class>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
+ <tei-class><XDtClass:classTagValue tagName="jsp:tag"
paramName="tei-class"/></tei-class>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="body-content"
values="JSP,empty,tagdependent" error="ERROR: Paramete 'body-content' is
mandatory">
+ <body-content><XDtClass:classTagValue tagName="jsp:tag"
paramName="body-content"/></body-content>
+ </XDtClass:ifHasClassTag>
</XDtConfig:ifConfigParamGreaterOrEquals>
+
+
<XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="1.2">
<XDtClass:forAllClassTags tagName="jsp:variable">
<variable>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="2.0">
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="description">
+ <description><XDtClass:classTagValue tagName="jsp:tag"
paramName="description"/></description>
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtClass:ifHasClassTag tagName="jsp:variable" paramName="name-given">
<name-given><XDtClass:classTagValue tagName="jsp:variable"
paramName="name-given"/></name-given>
***************
*** 141,147 ****
--- 177,185 ----
<scope><XDtClass:classTagValue tagName="jsp:variable"
paramName="scope" values="NESTED,AT_BEGIN,AT_END"/></scope>
</XDtClass:ifHasClassTag>
+ <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.2">
<XDtClass:ifHasClassTag tagName="jsp:variable"
paramName="description">
<description><![CDATA[<XDtClass:classTagValue tagName="jsp:variable"
paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamEquals>
</variable>
</XDtClass:forAllClassTags>
***************
*** 151,163 ****
<XDtMethod:ifHasMethodTag tagName="jsp:attribute">
<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>
</XDtMethod:ifHasMethodTag>
! <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="1.2">
<XDtMethod:ifHasMethodTag tagName="jsp:attribute" paramName="type">
<type><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="type"/></type>
--- 189,208 ----
<XDtMethod:ifHasMethodTag tagName="jsp:attribute">
<attribute>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="2.0">
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="description">
+ <description><XDtClass:classTagValue tagName="jsp:tag"
paramName="description"/></description>
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<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>
+ <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="Jspversion"
value="2.0">
<XDtMethod:ifHasMethodTag tagName="jsp:attribute"
paramName="rtexprvalue">
<rtexprvalue><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="rtexprvalue" values="true,false,yes,no"/></rtexprvalue>
</XDtMethod:ifHasMethodTag>
+ </XDtConfig:ifConfigParamNotGreaterOrEquals>
! <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.2">
<XDtMethod:ifHasMethodTag tagName="jsp:attribute" paramName="type">
<type><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="type"/></type>
***************
*** 166,169 ****
--- 211,228 ----
<description><![CDATA[<XDtMethod:methodTagValue
tagName="jsp:attribute" paramName="description"/>]]></description>
</XDtMethod:ifHasMethodTag>
+ </XDtConfig:ifConfigParamEquals>
+
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="2.0">
+ <XDtMethod:ifDoesntHaveMethodTag tagName="jsp:attribute"
paramName="fragment">
+ <XDtMethod:ifHasMethodTag tagName="jsp:attribute"
paramName="rtexprvalue">
+ <rtexprvalue><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="rtexprvalue" values="true,false,yes,no"/></rtexprvalue>
+ </XDtMethod:ifHasMethodTag>
+ <XDtMethod:ifHasMethodTag tagName="jsp:attribute" paramName="type">
+ <type><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="type"/></type>
+ </XDtMethod:ifHasMethodTag>
+ </XDtMethod:ifDoesntHaveMethodTag>
+ <XDtMethod:ifHasMethodTag tagName="jsp:attribute"
paramName="fragment">
+ <rtexprvalue><XDtMethod:methodTagValue tagName="jsp:attribute"
paramName="fragment" values="true,false,yes,no"/></rtexprvalue>
+ </XDtMethod:ifHasMethodTag>
</XDtConfig:ifConfigParamGreaterOrEquals>
***************
*** 171,174 ****
--- 230,246 ----
</XDtMethod:ifHasMethodTag>
</XDtMethod:forAllMethods>
+
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion"
value="2.0">
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="dynamic-attributes">
+ <dynamic-attributes><XDtClass:classTagValue tagName="jsp:tag"
paramName="dynamic-attributes" values="true,false,yes,no"/></dynamic-attributes>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="example">
+ <example><XDtClass:classTagValue tagName="jsp:tag"
paramName="example"/></example>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tag-extension">
+ <!-- Sorry! This template does not support the 'tag-extension' element
at the moment -->
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
+
</tag>
</XDtClass:ifHasClassTag>
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
