diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java
index 7dc74163b..a8dd070e9 100644
--- a/core/src/main/java/org/apache/struts2/components/If.java
+++ b/core/src/main/java/org/apache/struts2/components/If.java
@@ -48,8 +48,8 @@ import java.io.Writer;
* </s:if>
* <s:elseif test="%{true}">
* <div>Will Be Executed</div>
- * </s:elseif>
* <s:else>
+ * </s:elseif>
* <div>Will Not Be Executed</div>
* </s:else>
*
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.html b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.html
deleted file mode 100644
index 1c29ed15c..000000000
--- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.html
+++ /dev/null
@@ -1,567 +0,0 @@
-
-
-
-
-
-
-SubsetIteratorTag (Struts 2 API - 2.0-dev)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-org.apache.struts2.views.jsp.iterator
-
-Class SubsetIteratorTag
-
-java.lang.Object
- javax.servlet.jsp.tagext.TagSupport
- javax.servlet.jsp.tagext.BodyTagSupport
- org.apache.struts2.views.jsp.StrutsBodyTagSupport
- org.apache.struts2.views.jsp.iterator.SubsetIteratorTag
-
-
-All Implemented Interfaces: Serializable , javax.servlet.jsp.tagext.BodyTag, javax.servlet.jsp.tagext.IterationTag, javax.servlet.jsp.tagext.JspTag, javax.servlet.jsp.tagext.Tag
-
-
-
-public class SubsetIteratorTag extends StrutsBodyTagSupport
-
-
-
-
- NOTE: JSP-TAG
-
-
A tag that takes an iterator and outputs a subset of it. It delegates to
- SubsetIteratorFilter internally to
- perform the subset functionality.
-
-
-
-
- count (Object) - Indicate the number of entries to be in the resulting subset iterator
- source* (Object) - Indicate the source of which the resulting subset iterator is to be derived base on
- start (Object) - Indicate the starting index (eg. first entry is 0) of entries in the source to be available as the first entry in the resulting subset iterator
- decider (Object) - Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator
- id (String) - Indicate the pageContext attribute id to store the resultant subset iterator in
-
-
-
-
-
-
- public class MySubsetTagAction extends ActionSupport {
- public String execute() throws Exception {
- l = new ArrayList();
- l.add(new Integer(1));
- l.add(new Integer(2));
- l.add(new Integer(3));
- l.add(new Integer(4));
- l.add(new Integer(5));
- return "done";
- }
-
-
- public Integer[] getMyArray() {
- return a;
- }
-
- public List getMyList() {
- return l;
- }
-
- public Decider getMyDecider() {
- return new Decider() {
- public boolean decide(Object element) throws Exception {
- int i = ((Integer)element).intValue();
- return (((i % 2) == 0)?true:false);
- }
- };
- }
- }
-
-
-
-
-
-
- <!-- s: List basic -->
- <s:subset source="myList">
- <s:iterator>
- <s:property />
- </s:iterator>
- </s:subset>
-
-
-
-
-
- <!-- B: List with count -->
- <s:subset source="myList" count="3">
- <s:iterator>
- <s:property />
- </s:iterator>
- </s:subset>
-
-
-
-
-
- <!-- C: List with start -->
- <s:subset source="myList" count="13" start="3">
- <s:iterator>
- <s:property />
- </s:iterator>
- </s:subset>
-
-
-
-
-
- <!-- D: List with id -->
- <s:subset id="mySubset" source="myList" count="13" start="3" />
- <%
- Iterator i = (Iterator) pageContext.getAttribute("mySubset");
- while(i.hasNext()) {
- %>
- <%=i.next() %>
- <% } %>
-
-
-
-
-
- <!-- D: List with Decider -->
- <s:subset source="myList" decider="myDecider">
- <s:iterator>
- <s:property />
- </s:iterator>
- </s:subset>
-
-
-
-
-
-
-See Also: Serialized Form
-
-
-
-
-
-
-
-
-
-
-Fields inherited from class javax.servlet.jsp.tagext.BodyTagSupport
-
-
-bodyContent
-
-
-
-
-
-Fields inherited from class javax.servlet.jsp.tagext.TagSupport
-
-
-id, pageContext
-
-
-
-
-
-Fields inherited from interface javax.servlet.jsp.tagext.BodyTag
-
-
-EVAL_BODY_BUFFERED, EVAL_BODY_TAG
-
-
-
-
-
-Fields inherited from interface javax.servlet.jsp.tagext.IterationTag
-
-
-EVAL_BODY_AGAIN
-
-
-
-
-
-Fields inherited from interface javax.servlet.jsp.tagext.Tag
-
-
-EVAL_BODY_INCLUDE, EVAL_PAGE, SKIP_BODY, SKIP_PAGE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Methods inherited from class javax.servlet.jsp.tagext.BodyTagSupport
-
-
-doAfterBody, doInitBody, getBodyContent, getPreviousOut, release, setBodyContent
-
-
-
-
-
-Methods inherited from class javax.servlet.jsp.tagext.TagSupport
-
-
-findAncestorWithClass, getId, getParent, getValue, getValues, removeValue, setPageContext, setParent, setValue
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-Methods inherited from interface javax.servlet.jsp.tagext.Tag
-
-
-getParent, setPageContext, setParent
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-SubsetIteratorTag
-
-public SubsetIteratorTag ()
-
-
-
-
-
-
-
-
-
-setCount
-
-public void setCount (String count)
-
-
-
-
-
-
-
-
-setSource
-
-public void setSource (String source)
-
-
-
-
-
-
-
-
-setStart
-
-public void setStart (String start)
-
-
-
-
-
-
-
-
-setDecider
-
-public void setDecider (String decider)
-
-
-
-
-
-
-
-
-doStartTag
-
-public int doStartTag ()
- throws javax.servlet.jsp.JspException
-
-
-Specified by: doStartTag in interface javax.servlet.jsp.tagext.TagOverrides: doStartTag in class javax.servlet.jsp.tagext.BodyTagSupport
-
-
-
-Throws:
-javax.servlet.jsp.JspException
-
-
-
-
-
-doEndTag
-
-public int doEndTag ()
- throws javax.servlet.jsp.JspException
-
-
-Specified by: doEndTag in interface javax.servlet.jsp.tagext.TagOverrides: doEndTag in class javax.servlet.jsp.tagext.BodyTagSupport
-
-
-
-Throws:
-javax.servlet.jsp.JspException
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 25f0458ac..c5413cbaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,11 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
+
+ net.sourceforge.maven-taglib
+ maven-taglib-plugin
+ 2.2.1
+
maven-javadoc-plugin
2.0
@@ -307,28 +312,28 @@
http://maven.opensymphony.com
-
- Maven Snapshots
- http://snapshots.maven.codehaus.org/maven2/
-
- true
-
-
- false
-
-
+
+ Maven Snapshots
+ http://snapshots.maven.codehaus.org/maven2/
+
+ true
+
+
+ false
+
+
-
-
- Maven Snapshots
- http://snapshots.maven.codehaus.org/maven2/
-
- true
-
-
- false
-
-
-
+
+
+ Maven Snapshots
+ http://snapshots.maven.codehaus.org/maven2/
+
+ true
+
+
+ false
+
+
+