Update of /cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10253/modules/web/src/xdoclet/modules/web/resources
Modified Files:
web_xml.xdt
Log Message:
Fixed sub-element order of <servlet> for servletSpec 2.4 (XDT-1286). Thanks to
Scott England-Sullivan for the patch
Index: web_xml.xdt
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/resources/web_xml.xdt,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** web_xml.xdt 17 Jan 2005 00:34:30 -0000 1.26
--- web_xml.xdt 2 Mar 2005 19:29:36 -0000 1.27
***************
*** 130,135 ****
<XDtClass:forAllClassTags tagName="web:servlet" superclasses="false">
<servlet>
<XDtClass:ifHasClassTag tagName="web:servlet" paramName="icon">
! <icon><XDtClass:classTagValue tagName="web:servlet"
paramName="icon"/></icon>
</XDtClass:ifHasClassTag>
<servlet-name><XDtClass:classTagValue tagName="web:servlet"
paramName="name"/></servlet-name>
--- 130,161 ----
<XDtClass:forAllClassTags tagName="web:servlet" superclasses="false">
<servlet>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="ServletSpec"
value="2.4">
+ <XDtClass:ifHasClassTag tagName="web:servlet" paramName="description">
+ <description><![CDATA[<XDtClass:classTagValue tagName="web:servlet"
paramName="description"/>]]></description>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="web:servlet" paramName="display-name">
+ <display-name><XDtClass:classTagValue tagName="web:servlet"
paramName="display-name"/></display-name>
+ </XDtClass:ifHasClassTag>
<XDtClass:ifHasClassTag tagName="web:servlet" paramName="icon">
! <icon>
! <small-icon><XDtClass:classTagValue tagName="web:servlet"
paramName="icon"/></small-icon>
! <large-icon><XDtClass:classTagValue tagName="web:servlet"
paramName="icon"/></large-icon>
! </icon>
! </XDtClass:ifHasClassTag>
! <servlet-name><XDtClass:classTagValue tagName="web:servlet"
paramName="name"/></servlet-name>
! <XDtClass:ifDoesntHaveClassTag tagName="web:servlet"
paramName="jsp-file">
! <servlet-class><XDtClass:fullClassName/></servlet-class>
! </XDtClass:ifDoesntHaveClassTag>
! <XDtClass:ifHasClassTag tagName="web:servlet" paramName="jsp-file">
! <jsp-file><XDtClass:classTagValue tagName="web:servlet"
paramName="jsp-file"/></jsp-file>
! </XDtClass:ifHasClassTag>
! </XDtConfig:ifConfigParamGreaterOrEquals>
!
! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="ServletSpec"
value="2.4">
! <XDtClass:ifHasClassTag tagName="web:servlet" paramName="icon">
! <icon>
! <small-icon><XDtClass:classTagValue tagName="web:servlet"
paramName="icon"/></small-icon>
! <large-icon><XDtClass:classTagValue tagName="web:servlet"
paramName="icon"/></large-icon>
! </icon>
</XDtClass:ifHasClassTag>
<servlet-name><XDtClass:classTagValue tagName="web:servlet"
paramName="name"/></servlet-name>
***************
*** 140,157 ****
<description><![CDATA[<XDtClass:classTagValue tagName="web:servlet"
paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="web:servlet" paramName="jsp-file">
! <jsp-file><XDtClass:classTagValue tagName="web:servlet"
paramName="jsp-file"/></jsp-file>
! </XDtClass:ifHasClassTag>
! <XDtClass:ifDoesntHaveClassTag tagName="web:servlet" paramName="jsp-file">
! <servlet-class><XDtClass:fullClassName/></servlet-class>
! </XDtClass:ifDoesntHaveClassTag>
<XDtClass:forAllClassTags tagName="web:servlet-init-param">
<init-param>
<param-name><XDtClass:classTagValue tagName="web:servlet-init-param"
paramName="name"/></param-name>
<param-value><XDtClass:classTagValue
tagName="web:servlet-init-param" paramName="value"/></param-value>
! <XDtClass:ifHasClassTag tagName="web:servlet-init-param"
paramName="description">
<description><![CDATA[<XDtClass:classTagValue
tagName="web:servlet-init-param" paramName="description"/>]]></description>
! </XDtClass:ifHasClassTag>
</init-param>
</XDtClass:forAllClassTags>
--- 166,191 ----
<description><![CDATA[<XDtClass:classTagValue tagName="web:servlet"
paramName="description"/>]]></description>
</XDtClass:ifHasClassTag>
! <XDtClass:ifHasClassTag tagName="web:servlet" paramName="jsp-file">
! <jsp-file><XDtClass:classTagValue tagName="web:servlet"
paramName="jsp-file"/></jsp-file>
! </XDtClass:ifHasClassTag>
! <XDtClass:ifDoesntHaveClassTag tagName="web:servlet"
paramName="jsp-file">
! <servlet-class><XDtClass:fullClassName/></servlet-class>
! </XDtClass:ifDoesntHaveClassTag>
! </XDtConfig:ifConfigParamNotGreaterOrEquals>
<XDtClass:forAllClassTags tagName="web:servlet-init-param">
<init-param>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="ServletSpec"
value="2.4">
+ <XDtClass:ifHasClassTag tagName="web:servlet-init-param"
paramName="description">
+ <description><![CDATA[<XDtClass:classTagValue
tagName="web:servlet-init-param" paramName="description"/>]]></description>
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<param-name><XDtClass:classTagValue tagName="web:servlet-init-param"
paramName="name"/></param-name>
<param-value><XDtClass:classTagValue
tagName="web:servlet-init-param" paramName="value"/></param-value>
! <XDtConfig:ifConfigParamNotGreaterOrEquals paramName="ServletSpec"
value="2.4">
! <XDtClass:ifHasClassTag tagName="web:servlet-init-param"
paramName="description">
<description><![CDATA[<XDtClass:classTagValue
tagName="web:servlet-init-param" paramName="description"/>]]></description>
! </XDtClass:ifHasClassTag>
! </XDtConfig:ifConfigParamNotGreaterOrEquals>
</init-param>
</XDtClass:forAllClassTags>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
xdoclet-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
