Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8688/plugin-web/src/main/java/org/xdoclet/plugin/web
Modified Files:
WebPlugin.jelly WebUtils.java
Log Message:
XDP-93 generated document now validates at generation-time, but tests still
don't pass.. still this grammar not found issue :/
Index: WebUtils.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WebUtils.java 2 Dec 2005 20:32:35 -0000 1.8
--- WebUtils.java 4 Dec 2005 15:10:48 -0000 1.9
***************
*** 74,85 ****
/**
! * Checks if the currently selected servlet api version is at least the
one
! * passed as parameter. Currently does a lexicographic comparison between
! * string version numbers.
* @see WebUtils SERVLET_* constants for currently supported version
numbers.
- * @param minimalVersion
*/
public boolean isMinimumServletVersion(String minimalVersion) {
return servletVersion.compareTo(minimalVersion)>=0;
}
}
--- 74,87 ----
/**
! * Checks if the currently selected servlet api version is at least the
given one.
! * Does a lexicographic comparison between String version numbers.
* @see WebUtils SERVLET_* constants for currently supported version
numbers.
*/
public boolean isMinimumServletVersion(String minimalVersion) {
return servletVersion.compareTo(minimalVersion)>=0;
}
+
+ public boolean isMaximumServletVersion(String maximalVersion) {
+ return servletVersion.compareTo(maximalVersion)<=0;
+ }
}
Index: WebPlugin.jelly
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** WebPlugin.jelly 2 Dec 2005 20:32:35 -0000 1.16
--- WebPlugin.jelly 4 Dec 2005 15:10:48 -0000 1.17
***************
*** 7,14 ****
<d:script var="init_param">
<init-param>
<param-name>${param.getNamedParameter("name")}</param-name>
<param-value>${param.getNamedParameter("value")}</param-value>
! <j:if test="${param.getNamedParameter('description') != null}">
!
<description>${param.getNamedParameter('description')}</description>
</j:if>
</init-param>
--- 7,17 ----
<d:script var="init_param">
<init-param>
+ <j:if test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
+ <x:condelement tag="description" doclettag="${param}"
property="description"/>
+ </j:if>
<param-name>${param.getNamedParameter("name")}</param-name>
<param-value>${param.getNamedParameter("value")}</param-value>
! <j:if test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
! <x:condelement tag="description" doclettag="${param}"
property="description"/>
</j:if>
</init-param>
***************
*** 43,46 ****
--- 46,53 ----
<filter>
<j:set var="item"
value="${filter.getTagByName('web.filter')}"/>
+ <j:if
test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
+ <x:condelement tag="description" doclettag="${item}"
property="description"/>
+ <x:condelement tag="display-name" doclettag="${item}"
property="display-name"/>
+ </j:if>
<j:if test="${item.getNamedParameter('icon') != null}">
<icon>
***************
*** 49,54 ****
</j:if>
<filter-name>${item.getNamedParameter('name')}</filter-name>
! <x:condelement tag="display-name" doclettag="${item}"
property="display-name"/>
! <x:condelement tag="description" doclettag="${item}"
property="description"/>
<filter-class>${filter.fullyQualifiedName}</filter-class>
<j:forEach var="param"
items="${filter.getTagsByName('web.filter-init-param')}">
--- 56,63 ----
</j:if>
<filter-name>${item.getNamedParameter('name')}</filter-name>
! <j:if
test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
! <x:condelement tag="display-name" doclettag="${item}"
property="display-name"/>
! <x:condelement tag="description" doclettag="${item}"
property="description"/>
! </j:if>
<filter-class>${filter.fullyQualifiedName}</filter-class>
<j:forEach var="param"
items="${filter.getTagsByName('web.filter-init-param')}">
***************
*** 83,88 ****
--- 92,99 ----
<servlet>
<servlet-name>${servlet.getNamedParameter("web.servlet","name")}</servlet-name>
+ <j:if
test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
<x:condelement tag="display-name" doclettag="${item}"
property="display-name"/>
<x:condelement tag="description" doclettag="${item}"
property="description"/>
+ </j:if>
<servlet-class>${servlet.fullyQualifiedName}</servlet-class>
<j:forEach var="param"
items="${servlet.getTagsByName('web.servlet-init-param')}">
***************
*** 165,170 ****
--- 176,186 ----
<x:condelement tag="description" doclettag="${item}"
property="description"/>
<env-entry-name>${item.getNamedParameter('name')}</env-entry-name>
+ <j:if
test="${plugin.webUtils.isMaximumServletVersion('2.3')}">
<env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
+ </j:if>
<env-entry-type>${item.getNamedParameter('type')}</env-entry-type>
+ <j:if
test="${plugin.webUtils.isMinimumServletVersion('2.4')}">
+
<env-entry-value>${item.getNamedParameter('value')}</env-entry-value>
+ </j:if>
</env-entry>
</j:forEach>
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
