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-serv24903/plugin-web/src/main/java/org/xdoclet/plugin/web
Modified Files:
WebPlugin.java WebPlugin.jelly WebUtils.java
Log Message:
XDP-132 : renaming servletVersion attribute to servletversion (lowercase) to
satisfy ant's way of handling bean properties
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.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WebUtils.java 27 Dec 2003 23:10:02 -0000 1.6
--- WebUtils.java 1 Dec 2005 00:45:21 -0000 1.7
***************
*** 25,35 ****
private String servletVersion;
! public WebUtils(String servletVersion) throws ClassNotFoundException {
// Try to load one of the javax.servlet classes so the user can
// get an early warning if she has forgotten to stick it on the
classpath
try {
getClass().getClassLoader().loadClass("javax.servlet.Servlet");
! } catch (ClassNotFoundException ex) {
! throw new ClassNotFoundException("The servlet api jar must be in
the classpath (" + ex.getMessage() + ")");
}
this.servletVersion = servletVersion;
--- 25,35 ----
private String servletVersion;
! public WebUtils(String servletVersion) {
// Try to load one of the javax.servlet classes so the user can
// get an early warning if she has forgotten to stick it on the
classpath
try {
getClass().getClassLoader().loadClass("javax.servlet.Servlet");
! } catch (ClassNotFoundException e) {
! throw new RuntimeException(new ClassNotFoundException("The
servlet api jar must be in the classpath (" + e.getMessage() + ")"));
}
this.servletVersion = servletVersion;
***************
*** 79,83 ****
* @see WebUtils SERVLET_* constants for currently supported version
numbers.
* @param minimalVersion
- * @return
*/
public boolean isMinimumServletVersion(String minimalVersion) {
--- 79,82 ----
Index: WebPlugin.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-web/src/main/java/org/xdoclet/plugin/web/WebPlugin.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** WebPlugin.java 31 May 2005 11:26:42 -0000 1.20
--- WebPlugin.java 1 Dec 2005 00:45:21 -0000 1.21
***************
*** 59,63 ****
private WebUtils webUtils;
! private String servletVersion = WebUtils.SERVLET_23;
protected String mergedir;
--- 59,63 ----
private WebUtils webUtils;
! private String servletversion = WebUtils.SERVLET_23;
protected String mergedir;
***************
*** 77,92 ****
//== plugin attributes ==
! public String getServletVersion() {
! return servletVersion;
}
! public void setServletVersion(String servletVersion) {
! this.servletVersion = servletVersion;
}
//== util methods used by jelly script ==
! public WebUtils getWebUtils() throws ClassNotFoundException {
if (webUtils == null) {
! webUtils = new WebUtils(servletVersion);
}
return webUtils;
--- 77,92 ----
//== plugin attributes ==
! public String getServletversion() {
! return servletversion;
}
! public void setServletversion(String servletversion) {
! this.servletversion = servletversion;
}
//== util methods used by jelly script ==
! public WebUtils getWebUtils() {
if (webUtils == null) {
! webUtils = new WebUtils(servletversion);
}
return webUtils;
***************
*** 109,113 ****
// filter out non-filter classes
ArrayList filters = new ArrayList();
! String[] interfaces = (String[]) filterInterface.get(servletVersion);
if (interfaces != null) {
Predicate predicate = new ClassTagPredicate(interfaces,
"web.filter");
--- 109,113 ----
// filter out non-filter classes
ArrayList filters = new ArrayList();
! String[] interfaces = (String[]) filterInterface.get(servletversion);
if (interfaces != null) {
Predicate predicate = new ClassTagPredicate(interfaces,
"web.filter");
***************
*** 133,137 ****
/**
* TODO : cache the result of this? (maybe it's one of the reasons the
plugin is slow??)
- * @return
*/
public Collection getAllWebClasses() {
--- 133,136 ----
***************
*** 147,151 ****
public boolean needsServletRunAs(DocletTag tag) {
return (tag.getNamedParameter("run-as") != null)
! && (servletVersion.compareTo(WebUtils.SERVLET_23)>=0);
}
--- 146,150 ----
public boolean needsServletRunAs(DocletTag tag) {
return (tag.getNamedParameter("run-as") != null)
! && (servletversion.compareTo(WebUtils.SERVLET_23)>=0);
}
-------------------------------------------------------
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
