You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/01/07 08:48:33 UTC

svn commit: r493679 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/jsp/iterator/ main/resources/META-INF/ site/resources/tags/

Author: mrdon
Date: Sat Jan  6 23:48:32 2007
New Revision: 493679

URL: http://svn.apache.org/viewvc?view=rev&rev=493679
Log:
Adding taglib annotations to JSP iterator tags
WW-1599

Added:
    struts/struts2/trunk/core/src/site/resources/tags/generator.html
    struts/struts2/trunk/core/src/site/resources/tags/sort.html
    struts/struts2/trunk/core/src/site/resources/tags/subset.html
Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
    struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?view=diff&rev=493679&r1=493678&r2=493679
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java Sat Jan  6 23:48:32 2007
@@ -24,6 +24,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts.annotations.StrutsTag;
+import org.apache.struts.annotations.StrutsTagAttribute;
 import org.apache.struts2.util.IteratorGenerator;
 import org.apache.struts2.util.IteratorGenerator.Converter;
 import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
@@ -121,10 +123,9 @@
  * <!-- END SNIPPET: example -->
  *
  * @see org.apache.struts2.util.IteratorGenerator
- *
- * @s.tag name="generator" tld-body-content="JSP"
- * description="Generate an iterator for a iterable source."
  */
+@StrutsTag(name="generator", tldTagClass="org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag", 
+        description="Generate an iterator for a iterable source.")
 public class IteratorGeneratorTag extends StrutsBodyTagSupport {
 
     private static final long serialVersionUID = 2968037295463973936L;
@@ -140,10 +141,7 @@
 
     IteratorGenerator iteratorGenerator = null;
 
-    /**
-     * @s.tagattribute required="false" type="Integer"
-     * description="the max number entries to be in the iterator"
-     */
+    @StrutsTagAttribute(type="Integer",description="The max number entries to be in the iterator")
     public void setCount(String count) {
         countAttr = count;
     }
@@ -152,6 +150,7 @@
      * @s.tagattribute required="true" type="String"
      * description="the separator to be used in separating the <i>val</i> into entries of the iterator"
      */
+    @StrutsTagAttribute(required=true, description="The separator to be used in separating the <i>val</i> into entries of the iterator")
     public void setSeparator(String separator) {
         separatorAttr = separator;
     }
@@ -160,14 +159,13 @@
      * @s.tagattribute required="true"
      * description="the source to be parsed into an iterator"
      */
+    @StrutsTagAttribute(required=true, description="The source to be parsed into an iterator")
     public void setVal(String val) {
         valueAttr = val;
     }
 
-    /**
-     * @s.tagattribute required="false" type="org.apache.struts2.util.IteratorGenerator.Converter"
-     * description="the converter to convert the String entry parsed from <i>val</i> into an object"
-     */
+    @StrutsTagAttribute(type="org.apache.struts2.util.IteratorGenerator.Converter",
+            description="The converter to convert the String entry parsed from <i>val</i> into an object")
     public void setConverter(String aConverter) {
         converterAttr = aConverter;
     }
@@ -176,6 +174,7 @@
      * @s.tagattribute required="false" type="String"
      * description="the id to store the resultant iterator into page context, if such id is supplied"
      */
+    @StrutsTagAttribute(description="The id to store the resultant iterator into page context, if such id is supplied")
     public void setId(String string) {
         super.setId(string);
     }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java?view=diff&rev=493679&r1=493678&r2=493679
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java Sat Jan  6 23:48:32 2007
@@ -24,6 +24,8 @@
 
 import javax.servlet.jsp.JspException;
 
+import org.apache.struts.annotations.StrutsTag;
+import org.apache.struts.annotations.StrutsTagAttribute;
 import org.apache.struts2.util.MakeIterator;
 import org.apache.struts2.util.SortIteratorFilter;
 import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
@@ -84,6 +86,8 @@
  * @s.tag name="sort" tld-body-content="JSP"
  * description="Sort a List using a Comparator both passed in as the tag attribute."
  */
+@StrutsTag(name="sort", tldTagClass="org.apache.struts2.views.jsp.iterator.SortIteratorTag", 
+        description="Sort a List using a Comparator both passed in as the tag attribute.")
 public class SortIteratorTag extends StrutsBodyTagSupport {
 
     private static final long serialVersionUID = -7835719609764092235L;
@@ -93,18 +97,12 @@
 
     SortIteratorFilter sortIteratorFilter = null;
 
-    /**
-     * @s.tagattribute required="true" type="java.util.Comparator"
-     * description="The comparator to use"
-     */
+    @StrutsTagAttribute(required=true,type="java.util.Comparator", description="The comparator to use")
     public void setComparator(String comparator) {
         comparatorAttr = comparator;
     }
 
-    /**
-     * @s.tagattribute required="false"
-     * description="The iterable source to sort"
-     */
+    @StrutsTagAttribute(description="The iterable source to sort")
     public void setSource(String source) {
         sourceAttr = source;
     }

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java?view=diff&rev=493679&r1=493678&r2=493679
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java Sat Jan  6 23:48:32 2007
@@ -24,6 +24,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.struts.annotations.StrutsTag;
+import org.apache.struts.annotations.StrutsTagAttribute;
 import org.apache.struts2.util.SubsetIteratorFilter;
 import org.apache.struts2.util.SubsetIteratorFilter.Decider;
 import org.apache.struts2.views.jsp.StrutsBodyTagSupport;
@@ -145,6 +147,8 @@
  * @s.tag name="subset" tld-body-content="JSP"
  * description="Takes an iterator and outputs a subset of it"
  */
+@StrutsTag(name="subset", tldTagClass="org.apache.struts2.views.jsp.iterator.SubsetIteratorTag", 
+        description="Takes an iterator and outputs a subset of it.")
 public class SubsetIteratorTag extends StrutsBodyTagSupport {
 
     private static final long serialVersionUID = -6252696081713080102L;
@@ -159,18 +163,12 @@
     SubsetIteratorFilter subsetIteratorFilter = null;
 
 
-    /**
-     * @s.tagattribute required="false" type="Integer"
-     * description="Indicate the number of entries to be in the resulting subset iterator"
-     */
+    @StrutsTagAttribute(type="Integer", description="Indicate the number of entries to be in the resulting subset iterator")
     public void setCount(String count) {
         countAttr = count;
     }
 
-    /**
-     * @s.tagattribute required="false"
-     * description="Indicate the source of which the resulting subset iterator is to be derived base on"
-     */
+    @StrutsTagAttribute(description="Indicate the source of which the resulting subset iterator is to be derived base on")
     public void setSource(String source) {
         sourceAttr = source;
     }
@@ -179,14 +177,14 @@
      * @s.tagattribute required="false" type="Integer"
      * description="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"
      */
+    @StrutsTagAttribute(type="Integer", 
+            description="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")
     public void setStart(String start) {
         startAttr = start;
     }
 
-    /**
-     * @s.tagattribute required="false" type="org.apache.struts2.util.SubsetIteratorFilter.Decider"
-     * description="Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator"
-     */
+    @StrutsTagAttribute(type="org.apache.struts2.util.SubsetIteratorFilter.Decider", 
+            description="Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator")
     public void setDecider(String decider) {
         deciderAttr = decider;
     }

Modified: struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld?view=diff&rev=493679&r1=493678&r2=493679
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld (original)
+++ struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld Sat Jan  6 23:48:32 2007
@@ -12,6 +12,42 @@
                     to ensure that input is correct and output is localized.
                     The Struts Tags can be used with JSP FreeMarker or Velocity."]]></description>
   <tag>
+    <name>generator</name>
+    <tag-class>org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag</tag-class>
+    <body-content>JSP</body-content>
+    <description><![CDATA[Generate an iterator for a iterable source.]]></description>
+    <attribute>
+      <name>converter</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The converter to convert the String entry parsed from <i>val</i> into an object]]></description>
+    </attribute>
+    <attribute>
+      <name>count</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The max number entries to be in the iterator]]></description>
+    </attribute>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The id to store the resultant iterator into page context, if such id is supplied]]></description>
+    </attribute>
+    <attribute>
+      <name>separator</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The separator to be used in separating the <i>val</i> into entries of the iterator]]></description>
+    </attribute>
+    <attribute>
+      <name>val</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The source to be parsed into an iterator]]></description>
+    </attribute>
+  </tag>
+  <tag>
     <name>push</name>
     <tag-class>org.apache.struts2.views.jsp.PushTag</tag-class>
     <body-content>JSP</body-content>
@@ -1260,36 +1296,6 @@
     </attribute>
   </tag>
   <tag>
-    <name>property</name>
-    <tag-class>org.apache.struts2.views.jsp.PropertyTag</tag-class>
-    <body-content>empty</body-content>
-    <description><![CDATA[Print out expression which evaluates against the stack]]></description>
-    <attribute>
-      <name>default</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The default value to be used if <u>value</u> attribute is null]]></description>
-    </attribute>
-    <attribute>
-      <name>escape</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[ Whether to escape HTML]]></description>
-    </attribute>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
-    </attribute>
-    <attribute>
-      <name>value</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Value to be displayed]]></description>
-    </attribute>
-  </tag>
-  <tag>
     <name>hidden</name>
     <tag-class>org.apache.struts2.views.jsp.ui.HiddenTag</tag-class>
     <body-content>JSP</body-content>
@@ -1494,10 +1500,10 @@
     </attribute>
   </tag>
   <tag>
-    <name>datepicker</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.DatePickerTag</tag-class>
+    <name>autocompleter</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.AutocompleterTag</tag-class>
     <body-content>JSP</body-content>
-    <description><![CDATA[Render datepicker]]></description>
+    <description><![CDATA[Renders a combobox with autocomplete and AJAX capabilities]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -1505,10 +1511,10 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>adjustWeeks</name>
+      <name>autoComplete</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[If true, weekly size of calendar changes to acomodate the month if false, 42 day format is used]]></description>
+      <description><![CDATA[Whether autocompleter should make suggestion on the textbox]]></description>
     </attribute>
     <attribute>
       <name>cssClass</name>
@@ -1523,28 +1529,70 @@
       <description><![CDATA[The css style definitions for element ro use]]></description>
     </attribute>
     <attribute>
-      <name>dayWidth</name>
+      <name>delay</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[How to render the names of the days in the header(narrow, abbr or wide)]]></description>
+      <description><![CDATA[Delay before making the search]]></description>
     </attribute>
     <attribute>
       <name>disabled</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
+      <description><![CDATA[Enable or disable autocompleter]]></description>
     </attribute>
     <attribute>
-      <name>displayWeeks</name>
+      <name>dropdownHeight</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Total weeks to display]]></description>
+      <description><![CDATA[Dropdown's height in pixels]]></description>
     </attribute>
     <attribute>
-      <name>endDate</name>
+      <name>dropdownWidth</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Last available date in the calendar set]]></description>
+      <description><![CDATA[Dropdown's width]]></description>
+    </attribute>
+    <attribute>
+      <name>emptyOption</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Decide if an empty option is to be inserted. Default false.]]></description>
+    </attribute>
+    <attribute>
+      <name>forceValidOption</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Force selection to be one of the options]]></description>
+    </attribute>
+    <attribute>
+      <name>formFilter</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Function name used to filter the fields of the form]]></description>
+    </attribute>
+    <attribute>
+      <name>formId</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Form id whose fields will be serialized and passed as parameters]]></description>
+    </attribute>
+    <attribute>
+      <name>headerKey</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Set the header key for the header option.]]></description>
+    </attribute>
+    <attribute>
+      <name>headerValue</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Set the header value for the header option.]]></description>
+    </attribute>
+    <attribute>
+      <name>href</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The URL used to load the options]]></description>
     </attribute>
     <attribute>
       <name>id</name>
@@ -1553,6 +1601,12 @@
       <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
     </attribute>
     <attribute>
+      <name>indicator</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Id of element that will be shown while request is made]]></description>
+    </attribute>
+    <attribute>
       <name>key</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -1571,10 +1625,52 @@
       <description><![CDATA[Define label position of form element (top/left)]]></description>
     </attribute>
     <attribute>
-      <name>language</name>
+      <name>list</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Iteratable source to populate from. If this is missing, the select widget is simply not displayed.]]></description>
+    </attribute>
+    <attribute>
+      <name>listKey</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Language to display this widget in]]></description>
+      <description><![CDATA[Set the key used to retrive the option key.]]></description>
+    </attribute>
+    <attribute>
+      <name>listValue</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Set the value used to retrive the option value.]]></description>
+    </attribute>
+    <attribute>
+      <name>listenTopics</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Topic that will trigger a reload]]></description>
+    </attribute>
+    <attribute>
+      <name>loadMinimumCount</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Minimum number of characters that will force the content to be loaded]]></description>
+    </attribute>
+    <attribute>
+      <name>loadOnTextChange</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Options will be reloaded everytime a character is typed on the textbox]]></description>
+    </attribute>
+    <attribute>
+      <name>maxLength</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Deprecated. Use maxlength instead.]]></description>
+    </attribute>
+    <attribute>
+      <name>maxlength</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[HTML maxlength attribute]]></description>
     </attribute>
     <attribute>
       <name>name</name>
@@ -1583,6 +1679,12 @@
       <description><![CDATA[The name to set for element]]></description>
     </attribute>
     <attribute>
+      <name>notifyTopics</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Topics that will be published when content is reloaded]]></description>
+    </attribute>
+    <attribute>
       <name>onblur</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -1667,6 +1769,12 @@
       <description><![CDATA[Set the html onselect attribute on rendered html element]]></description>
     </attribute>
     <attribute>
+      <name>readonly</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Whether the input is readonly]]></description>
+    </attribute>
+    <attribute>
       <name>required</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -1679,16 +1787,22 @@
       <description><![CDATA[Define required position of required form element (left|right)]]></description>
     </attribute>
     <attribute>
-      <name>startDate</name>
+      <name>searchType</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[First available date in the calendar set]]></description>
+      <description><![CDATA[how the search must be performed, options are: 'startstring', 'startword' and 'substring']]></description>
     </attribute>
     <attribute>
-      <name>staticDisplay</name>
+      <name>showDownArrow</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Disable all incremental controls, must pick a date in the current display]]></description>
+      <description><![CDATA[Show or hide the down arrow button]]></description>
+    </attribute>
+    <attribute>
+      <name>size</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[HTML size attribute]]></description>
     </attribute>
     <attribute>
       <name>tabindex</name>
@@ -1738,18 +1852,12 @@
       <rtexprvalue>true</rtexprvalue>
       <description><![CDATA[Preset the value of input element.]]></description>
     </attribute>
-    <attribute>
-      <name>weekStartsOn</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Adjusts the first day of the week 0==Sunday..6==Saturday]]></description>
-    </attribute>
   </tag>
   <tag>
-    <name>autocompleter</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.AutocompleterTag</tag-class>
+    <name>datepicker</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.DatePickerTag</tag-class>
     <body-content>JSP</body-content>
-    <description><![CDATA[Renders a combobox with autocomplete and AJAX capabilities]]></description>
+    <description><![CDATA[Render datepicker]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -1757,10 +1865,10 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>autoComplete</name>
+      <name>adjustWeeks</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether autocompleter should make suggestion on the textbox]]></description>
+      <description><![CDATA[If true, weekly size of calendar changes to acomodate the month if false, 42 day format is used]]></description>
     </attribute>
     <attribute>
       <name>cssClass</name>
@@ -1775,166 +1883,70 @@
       <description><![CDATA[The css style definitions for element ro use]]></description>
     </attribute>
     <attribute>
-      <name>delay</name>
+      <name>dayWidth</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Delay before making the search]]></description>
+      <description><![CDATA[How to render the names of the days in the header(narrow, abbr or wide)]]></description>
     </attribute>
     <attribute>
       <name>disabled</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Enable or disable autocompleter]]></description>
+      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>dropdownHeight</name>
+      <name>displayWeeks</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Dropdown's height in pixels]]></description>
+      <description><![CDATA[Total weeks to display]]></description>
     </attribute>
     <attribute>
-      <name>dropdownWidth</name>
+      <name>endDate</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Dropdown's width]]></description>
+      <description><![CDATA[Last available date in the calendar set]]></description>
     </attribute>
     <attribute>
-      <name>emptyOption</name>
+      <name>id</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Decide if an empty option is to be inserted. Default false.]]></description>
+      <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
     </attribute>
     <attribute>
-      <name>forceValidOption</name>
+      <name>key</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Force selection to be one of the options]]></description>
+      <description><![CDATA[Set the key (name, value, label) for this particular component]]></description>
     </attribute>
     <attribute>
-      <name>formFilter</name>
+      <name>label</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Function name used to filter the fields of the form]]></description>
+      <description><![CDATA[Label expression used for rendering a element specific label]]></description>
     </attribute>
     <attribute>
-      <name>formId</name>
+      <name>labelposition</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Form id whose fields will be serialized and passed as parameters]]></description>
+      <description><![CDATA[Define label position of form element (top/left)]]></description>
     </attribute>
     <attribute>
-      <name>headerKey</name>
+      <name>language</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the header key for the header option.]]></description>
+      <description><![CDATA[Language to display this widget in]]></description>
     </attribute>
     <attribute>
-      <name>headerValue</name>
+      <name>name</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the header value for the header option.]]></description>
+      <description><![CDATA[The name to set for element]]></description>
     </attribute>
     <attribute>
-      <name>href</name>
+      <name>onblur</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The URL used to load the options]]></description>
-    </attribute>
-    <attribute>
-      <name>id</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
-    </attribute>
-    <attribute>
-      <name>indicator</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Id of element that will be shown while request is made]]></description>
-    </attribute>
-    <attribute>
-      <name>key</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the key (name, value, label) for this particular component]]></description>
-    </attribute>
-    <attribute>
-      <name>label</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Label expression used for rendering a element specific label]]></description>
-    </attribute>
-    <attribute>
-      <name>labelposition</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Define label position of form element (top/left)]]></description>
-    </attribute>
-    <attribute>
-      <name>list</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Iteratable source to populate from. If this is missing, the select widget is simply not displayed.]]></description>
-    </attribute>
-    <attribute>
-      <name>listKey</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the key used to retrive the option key.]]></description>
-    </attribute>
-    <attribute>
-      <name>listValue</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the value used to retrive the option value.]]></description>
-    </attribute>
-    <attribute>
-      <name>listenTopics</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Topic that will trigger a reload]]></description>
-    </attribute>
-    <attribute>
-      <name>loadMinimumCount</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Minimum number of characters that will force the content to be loaded]]></description>
-    </attribute>
-    <attribute>
-      <name>loadOnTextChange</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Options will be reloaded everytime a character is typed on the textbox]]></description>
-    </attribute>
-    <attribute>
-      <name>maxLength</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Deprecated. Use maxlength instead.]]></description>
-    </attribute>
-    <attribute>
-      <name>maxlength</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[HTML maxlength attribute]]></description>
-    </attribute>
-    <attribute>
-      <name>name</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The name to set for element]]></description>
-    </attribute>
-    <attribute>
-      <name>notifyTopics</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Topics that will be published when content is reloaded]]></description>
-    </attribute>
-    <attribute>
-      <name>onblur</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[ Set the html onblur attribute on rendered html element]]></description>
+      <description><![CDATA[ Set the html onblur attribute on rendered html element]]></description>
     </attribute>
     <attribute>
       <name>onchange</name>
@@ -2015,12 +2027,6 @@
       <description><![CDATA[Set the html onselect attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>readonly</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether the input is readonly]]></description>
-    </attribute>
-    <attribute>
       <name>required</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -2033,22 +2039,16 @@
       <description><![CDATA[Define required position of required form element (left|right)]]></description>
     </attribute>
     <attribute>
-      <name>searchType</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[how the search must be performed, options are: 'startstring', 'startword' and 'substring']]></description>
-    </attribute>
-    <attribute>
-      <name>showDownArrow</name>
+      <name>startDate</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Show or hide the down arrow button]]></description>
+      <description><![CDATA[First available date in the calendar set]]></description>
     </attribute>
     <attribute>
-      <name>size</name>
+      <name>staticDisplay</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[HTML size attribute]]></description>
+      <description><![CDATA[Disable all incremental controls, must pick a date in the current display]]></description>
     </attribute>
     <attribute>
       <name>tabindex</name>
@@ -2098,6 +2098,42 @@
       <rtexprvalue>true</rtexprvalue>
       <description><![CDATA[Preset the value of input element.]]></description>
     </attribute>
+    <attribute>
+      <name>weekStartsOn</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Adjusts the first day of the week 0==Sunday..6==Saturday]]></description>
+    </attribute>
+  </tag>
+  <tag>
+    <name>property</name>
+    <tag-class>org.apache.struts2.views.jsp.PropertyTag</tag-class>
+    <body-content>empty</body-content>
+    <description><![CDATA[Print out expression which evaluates against the stack]]></description>
+    <attribute>
+      <name>default</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The default value to be used if <u>value</u> attribute is null]]></description>
+    </attribute>
+    <attribute>
+      <name>escape</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[ Whether to escape HTML]]></description>
+    </attribute>
+    <attribute>
+      <name>id</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
+    </attribute>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Value to be displayed]]></description>
+    </attribute>
   </tag>
   <tag>
     <name>optgroup</name>
@@ -3540,6 +3576,36 @@
     </attribute>
   </tag>
   <tag>
+    <name>subset</name>
+    <tag-class>org.apache.struts2.views.jsp.iterator.SubsetIteratorTag</tag-class>
+    <body-content>JSP</body-content>
+    <description><![CDATA[Takes an iterator and outputs a subset of it.]]></description>
+    <attribute>
+      <name>count</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Indicate the number of entries to be in the resulting subset iterator]]></description>
+    </attribute>
+    <attribute>
+      <name>decider</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator]]></description>
+    </attribute>
+    <attribute>
+      <name>source</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Indicate the source of which the resulting subset iterator is to be derived base on]]></description>
+    </attribute>
+    <attribute>
+      <name>start</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[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]]></description>
+    </attribute>
+  </tag>
+  <tag>
     <name>elseif</name>
     <tag-class>org.apache.struts2.views.jsp.ElseIfTag</tag-class>
     <body-content>JSP</body-content>
@@ -5118,10 +5184,28 @@
     </attribute>
   </tag>
   <tag>
-    <name>checkbox</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.CheckboxTag</tag-class>
+    <name>sort</name>
+    <tag-class>org.apache.struts2.views.jsp.iterator.SortIteratorTag</tag-class>
     <body-content>JSP</body-content>
-    <description><![CDATA[Render a checkbox input field]]></description>
+    <description><![CDATA[Sort a List using a Comparator both passed in as the tag attribute.]]></description>
+    <attribute>
+      <name>comparator</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The comparator to use]]></description>
+    </attribute>
+    <attribute>
+      <name>source</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The iterable source to sort]]></description>
+    </attribute>
+  </tag>
+  <tag>
+    <name>head</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.HeadTag</tag-class>
+    <body-content>empty</body-content>
+    <description><![CDATA[Render a chunk of HEAD for your HTML file]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -5129,6 +5213,12 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
+      <name>calendarcss</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The jscalendar css theme to use]]></description>
+    </attribute>
+    <attribute>
       <name>cssClass</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5141,16 +5231,16 @@
       <description><![CDATA[The css style definitions for element ro use]]></description>
     </attribute>
     <attribute>
-      <name>disabled</name>
+      <name>debug</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
+      <description><![CDATA[Set to true to enable debugging mode for AJAX themes]]></description>
     </attribute>
     <attribute>
-      <name>fieldValue</name>
+      <name>disabled</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The actual HTML value attribute of the checkbox.]]></description>
+      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
     </attribute>
     <attribute>
       <name>id</name>
@@ -5328,10 +5418,10 @@
     </attribute>
   </tag>
   <tag>
-    <name>updownselect</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.UpDownSelectTag</tag-class>
+    <name>checkbox</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.CheckboxTag</tag-class>
     <body-content>JSP</body-content>
-    <description><![CDATA[Create a Select component with buttons to move the elements in the select component up and down]]></description>
+    <description><![CDATA[Render a checkbox input field]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -5339,24 +5429,6 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>allowMoveDown</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether move down button should be displayed]]></description>
-    </attribute>
-    <attribute>
-      <name>allowMoveUp</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether move up button should be displayed]]></description>
-    </attribute>
-    <attribute>
-      <name>allowSelectAll</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether or not select all button should be displayed]]></description>
-    </attribute>
-    <attribute>
       <name>cssClass</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5375,22 +5447,10 @@
       <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>emptyOption</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Whether or not to add an empty (--) option after the header option]]></description>
-    </attribute>
-    <attribute>
-      <name>headerKey</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[ Key for first item in list. Must not be empty! '-1' and '' is correct, '' is bad.]]></description>
-    </attribute>
-    <attribute>
-      <name>headerValue</name>
+      <name>fieldValue</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Value expression for first item in list]]></description>
+      <description><![CDATA[The actual HTML value attribute of the checkbox.]]></description>
     </attribute>
     <attribute>
       <name>id</name>
@@ -5417,42 +5477,6 @@
       <description><![CDATA[Define label position of form element (top/left)]]></description>
     </attribute>
     <attribute>
-      <name>list</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Iterable source to populate from. If the list is a Map (key, value), the Map key will become the option 'value' parameter and the Map value will become the option body.]]></description>
-    </attribute>
-    <attribute>
-      <name>listKey</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[ Property of list objects to get field value from]]></description>
-    </attribute>
-    <attribute>
-      <name>listValue</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Property of list objects to get field content from]]></description>
-    </attribute>
-    <attribute>
-      <name>moveDownLabel</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Text to display on the move down button]]></description>
-    </attribute>
-    <attribute>
-      <name>moveUpLabel</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Text to display on the move up button]]></description>
-    </attribute>
-    <attribute>
-      <name>multiple</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[ Creates a multiple select. The tag will pre-select multiple values if the values are passed as an Array (of appropriate types) via the value attribute. Passing a Collection may work too? Haven't tested this.]]></description>
-    </attribute>
-    <attribute>
       <name>name</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5555,18 +5579,6 @@
       <description><![CDATA[Define required position of required form element (left|right)]]></description>
     </attribute>
     <attribute>
-      <name>selectAllLabel</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Text to display on the select all button]]></description>
-    </attribute>
-    <attribute>
-      <name>size</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Size of the element box (# of elements to show)]]></description>
-    </attribute>
-    <attribute>
       <name>tabindex</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5616,10 +5628,10 @@
     </attribute>
   </tag>
   <tag>
-    <name>head</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.HeadTag</tag-class>
-    <body-content>empty</body-content>
-    <description><![CDATA[Render a chunk of HEAD for your HTML file]]></description>
+    <name>a</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.AnchorTag</tag-class>
+    <body-content>JSP</body-content>
+    <description><![CDATA[Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -5627,12 +5639,6 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>calendarcss</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The jscalendar css theme to use]]></description>
-    </attribute>
-    <attribute>
       <name>cssClass</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5645,16 +5651,46 @@
       <description><![CDATA[The css style definitions for element ro use]]></description>
     </attribute>
     <attribute>
-      <name>debug</name>
+      <name>disabled</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set to true to enable debugging mode for AJAX themes]]></description>
+      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>disabled</name>
+      <name>errorText</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
+      <description><![CDATA[The text to display to the user if the is an error fetching the content]]></description>
+    </attribute>
+    <attribute>
+      <name>executeScripts</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Javascript code in the fetched content will be executed]]></description>
+    </attribute>
+    <attribute>
+      <name>formFilter</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Function name used to filter the fields of the form.]]></description>
+    </attribute>
+    <attribute>
+      <name>formId</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Form id whose fields will be serialized and passed as parameters]]></description>
+    </attribute>
+    <attribute>
+      <name>handler</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Javascript function name that will make the request]]></description>
+    </attribute>
+    <attribute>
+      <name>href</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The URL to call to obtain the content. Note: If used with ajax context, the value must be set as an url tag value.]]></description>
     </attribute>
     <attribute>
       <name>id</name>
@@ -5663,6 +5699,12 @@
       <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
     </attribute>
     <attribute>
+      <name>indicator</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Id of element that will be shown while making request]]></description>
+    </attribute>
+    <attribute>
       <name>key</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5681,12 +5723,36 @@
       <description><![CDATA[Define label position of form element (top/left)]]></description>
     </attribute>
     <attribute>
+      <name>listenTopics</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Topic that will trigger the remote call]]></description>
+    </attribute>
+    <attribute>
+      <name>loadingText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Text to be shown while content is being fetched]]></description>
+    </attribute>
+    <attribute>
       <name>name</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
       <description><![CDATA[The name to set for element]]></description>
     </attribute>
     <attribute>
+      <name>notifyTopics</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Topics that will published when the remote call completes]]></description>
+    </attribute>
+    <attribute>
+      <name>onLoadJS</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Deprecated. Use 'notifyTopics'. Javascript code execute after reload]]></description>
+    </attribute>
+    <attribute>
       <name>onblur</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5771,6 +5837,18 @@
       <description><![CDATA[Set the html onselect attribute on rendered html element]]></description>
     </attribute>
     <attribute>
+      <name>openTemplate</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Set template to use for opening the rendered html.]]></description>
+    </attribute>
+    <attribute>
+      <name>preInvokeJS</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Deprecated. Use 'notifyTopics'. Javascript code execute before reload]]></description>
+    </attribute>
+    <attribute>
       <name>required</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5783,12 +5861,24 @@
       <description><![CDATA[Define required position of required form element (left|right)]]></description>
     </attribute>
     <attribute>
+      <name>showErrorTransportText</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Set whether errors will be shown or not]]></description>
+    </attribute>
+    <attribute>
       <name>tabindex</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
       <description><![CDATA[Set the html tabindex attribute on rendered html element]]></description>
     </attribute>
     <attribute>
+      <name>targets</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Comma delimited list of ids of the elements whose content will be updated]]></description>
+    </attribute>
+    <attribute>
       <name>template</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5832,10 +5922,10 @@
     </attribute>
   </tag>
   <tag>
-    <name>a</name>
-    <tag-class>org.apache.struts2.views.jsp.ui.AnchorTag</tag-class>
+    <name>updownselect</name>
+    <tag-class>org.apache.struts2.views.jsp.ui.UpDownSelectTag</tag-class>
     <body-content>JSP</body-content>
-    <description><![CDATA[Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets]]></description>
+    <description><![CDATA[Create a Select component with buttons to move the elements in the select component up and down]]></description>
     <attribute>
       <name>accesskey</name>
       <required>false</required>
@@ -5843,58 +5933,58 @@
       <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>cssClass</name>
+      <name>allowMoveDown</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The css class to use for element]]></description>
+      <description><![CDATA[Whether move down button should be displayed]]></description>
     </attribute>
     <attribute>
-      <name>cssStyle</name>
+      <name>allowMoveUp</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The css style definitions for element ro use]]></description>
+      <description><![CDATA[Whether move up button should be displayed]]></description>
     </attribute>
     <attribute>
-      <name>disabled</name>
+      <name>allowSelectAll</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
+      <description><![CDATA[Whether or not select all button should be displayed]]></description>
     </attribute>
     <attribute>
-      <name>errorText</name>
+      <name>cssClass</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The text to display to the user if the is an error fetching the content]]></description>
+      <description><![CDATA[The css class to use for element]]></description>
     </attribute>
     <attribute>
-      <name>executeScripts</name>
+      <name>cssStyle</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Javascript code in the fetched content will be executed]]></description>
+      <description><![CDATA[The css style definitions for element ro use]]></description>
     </attribute>
     <attribute>
-      <name>formFilter</name>
+      <name>disabled</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Function name used to filter the fields of the form.]]></description>
+      <description><![CDATA[Set the html disabled attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>formId</name>
+      <name>emptyOption</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Form id whose fields will be serialized and passed as parameters]]></description>
+      <description><![CDATA[Whether or not to add an empty (--) option after the header option]]></description>
     </attribute>
     <attribute>
-      <name>handler</name>
+      <name>headerKey</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Javascript function name that will make the request]]></description>
+      <description><![CDATA[ Key for first item in list. Must not be empty! '-1' and '' is correct, '' is bad.]]></description>
     </attribute>
     <attribute>
-      <name>href</name>
+      <name>headerValue</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The URL to call to obtain the content. Note: If used with ajax context, the value must be set as an url tag value.]]></description>
+      <description><![CDATA[Value expression for first item in list]]></description>
     </attribute>
     <attribute>
       <name>id</name>
@@ -5903,12 +5993,6 @@
       <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></description>
     </attribute>
     <attribute>
-      <name>indicator</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Id of element that will be shown while making request]]></description>
-    </attribute>
-    <attribute>
       <name>key</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -5927,34 +6011,46 @@
       <description><![CDATA[Define label position of form element (top/left)]]></description>
     </attribute>
     <attribute>
-      <name>listenTopics</name>
+      <name>list</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[Iterable source to populate from. If the list is a Map (key, value), the Map key will become the option 'value' parameter and the Map value will become the option body.]]></description>
+    </attribute>
+    <attribute>
+      <name>listKey</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Topic that will trigger the remote call]]></description>
+      <description><![CDATA[ Property of list objects to get field value from]]></description>
     </attribute>
     <attribute>
-      <name>loadingText</name>
+      <name>listValue</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Text to be shown while content is being fetched]]></description>
+      <description><![CDATA[Property of list objects to get field content from]]></description>
     </attribute>
     <attribute>
-      <name>name</name>
+      <name>moveDownLabel</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The name to set for element]]></description>
+      <description><![CDATA[Text to display on the move down button]]></description>
     </attribute>
     <attribute>
-      <name>notifyTopics</name>
+      <name>moveUpLabel</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Topics that will published when the remote call completes]]></description>
+      <description><![CDATA[Text to display on the move up button]]></description>
     </attribute>
     <attribute>
-      <name>onLoadJS</name>
+      <name>multiple</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Deprecated. Use 'notifyTopics'. Javascript code execute after reload]]></description>
+      <description><![CDATA[ Creates a multiple select. The tag will pre-select multiple values if the values are passed as an Array (of appropriate types) via the value attribute. Passing a Collection may work too? Haven't tested this.]]></description>
+    </attribute>
+    <attribute>
+      <name>name</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description><![CDATA[The name to set for element]]></description>
     </attribute>
     <attribute>
       <name>onblur</name>
@@ -6041,18 +6137,6 @@
       <description><![CDATA[Set the html onselect attribute on rendered html element]]></description>
     </attribute>
     <attribute>
-      <name>openTemplate</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set template to use for opening the rendered html.]]></description>
-    </attribute>
-    <attribute>
-      <name>preInvokeJS</name>
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Deprecated. Use 'notifyTopics'. Javascript code execute before reload]]></description>
-    </attribute>
-    <attribute>
       <name>required</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
@@ -6065,22 +6149,22 @@
       <description><![CDATA[Define required position of required form element (left|right)]]></description>
     </attribute>
     <attribute>
-      <name>showErrorTransportText</name>
+      <name>selectAllLabel</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set whether errors will be shown or not]]></description>
+      <description><![CDATA[Text to display on the select all button]]></description>
     </attribute>
     <attribute>
-      <name>tabindex</name>
+      <name>size</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Set the html tabindex attribute on rendered html element]]></description>
+      <description><![CDATA[Size of the element box (# of elements to show)]]></description>
     </attribute>
     <attribute>
-      <name>targets</name>
+      <name>tabindex</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[Comma delimited list of ids of the elements whose content will be updated]]></description>
+      <description><![CDATA[Set the html tabindex attribute on rendered html element]]></description>
     </attribute>
     <attribute>
       <name>template</name>

Added: struts/struts2/trunk/core/src/site/resources/tags/generator.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/generator.html?view=auto&rev=493679
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/generator.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/generator.html Sat Jan  6 23:48:32 2007
@@ -0,0 +1,74 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+    <head>
+		<title>generator</title>
+	</head>
+
+	<body>
+		<h1>Tag Name: generator</h1>
+		<h2>Description</h2>
+		<p>
+		<!-- START SNIPPET: tagdescription -->
+		Generate an iterator for a iterable source.
+		<!-- END SNIPPET: tagdescription -->
+		</p>
+
+		<h2>Attributes</h2>
+		<!-- START SNIPPET: tagattributes -->
+		<table width="100%">
+			<tr>
+				<th align="left" valign="top"><h4>Name</h4></th>
+				<th align="left" valign="top"><h4>Required</h4></th>
+				<th align="left" valign="top"><h4>Default</h4></th>
+				<th align="left" valign="top"><h4>Evaluated</h4></th>
+				<th align="left" valign="top"><h4>Type</h4></th>
+				<th align="left" valign="top"><h4>Description</h4></th>
+			</tr>
+				<tr>
+					<td align="left" valign="top">converter</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">org.apache.struts2.util.IteratorGenerator.Converter</td>
+					<td align="left" valign="top">The converter to convert the String entry parsed from <i>val</i> into an object</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">count</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">Integer</td>
+					<td align="left" valign="top">The max number entries to be in the iterator</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">id</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The id to store the resultant iterator into page context, if such id is supplied</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">separator</td>
+					<td align="left" valign="top"><strong>true</strong></td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The separator to be used in separating the <i>val</i> into entries of the iterator</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">val</td>
+					<td align="left" valign="top"><strong>true</strong></td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The source to be parsed into an iterator</td>
+				</tr>
+		</table>
+		<!-- END SNIPPET: tagattributes -->
+	</body>
+</html>
+

Added: struts/struts2/trunk/core/src/site/resources/tags/sort.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/sort.html?view=auto&rev=493679
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/sort.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/sort.html Sat Jan  6 23:48:32 2007
@@ -0,0 +1,50 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+    <head>
+		<title>sort</title>
+	</head>
+
+	<body>
+		<h1>Tag Name: sort</h1>
+		<h2>Description</h2>
+		<p>
+		<!-- START SNIPPET: tagdescription -->
+		Sort a List using a Comparator both passed in as the tag attribute.
+		<!-- END SNIPPET: tagdescription -->
+		</p>
+
+		<h2>Attributes</h2>
+		<!-- START SNIPPET: tagattributes -->
+		<table width="100%">
+			<tr>
+				<th align="left" valign="top"><h4>Name</h4></th>
+				<th align="left" valign="top"><h4>Required</h4></th>
+				<th align="left" valign="top"><h4>Default</h4></th>
+				<th align="left" valign="top"><h4>Evaluated</h4></th>
+				<th align="left" valign="top"><h4>Type</h4></th>
+				<th align="left" valign="top"><h4>Description</h4></th>
+			</tr>
+				<tr>
+					<td align="left" valign="top">comparator</td>
+					<td align="left" valign="top"><strong>true</strong></td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">java.util.Comparator</td>
+					<td align="left" valign="top">The comparator to use</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">source</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">The iterable source to sort</td>
+				</tr>
+		</table>
+		<!-- END SNIPPET: tagattributes -->
+	</body>
+</html>
+

Added: struts/struts2/trunk/core/src/site/resources/tags/subset.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/subset.html?view=auto&rev=493679
==============================================================================
--- struts/struts2/trunk/core/src/site/resources/tags/subset.html (added)
+++ struts/struts2/trunk/core/src/site/resources/tags/subset.html Sat Jan  6 23:48:32 2007
@@ -0,0 +1,66 @@
+<!--
+This file is generated during the build by processing Component class annotations.
+Please do not edit it directly.
+-->
+<html>
+    <head>
+		<title>subset</title>
+	</head>
+
+	<body>
+		<h1>Tag Name: subset</h1>
+		<h2>Description</h2>
+		<p>
+		<!-- START SNIPPET: tagdescription -->
+		Takes an iterator and outputs a subset of it.
+		<!-- END SNIPPET: tagdescription -->
+		</p>
+
+		<h2>Attributes</h2>
+		<!-- START SNIPPET: tagattributes -->
+		<table width="100%">
+			<tr>
+				<th align="left" valign="top"><h4>Name</h4></th>
+				<th align="left" valign="top"><h4>Required</h4></th>
+				<th align="left" valign="top"><h4>Default</h4></th>
+				<th align="left" valign="top"><h4>Evaluated</h4></th>
+				<th align="left" valign="top"><h4>Type</h4></th>
+				<th align="left" valign="top"><h4>Description</h4></th>
+			</tr>
+				<tr>
+					<td align="left" valign="top">count</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">Integer</td>
+					<td align="left" valign="top">Indicate the number of entries to be in the resulting subset iterator</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">decider</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">org.apache.struts2.util.SubsetIteratorFilter.Decider</td>
+					<td align="left" valign="top">Extension to plug-in a decider to determine if that particular entry is to be included in the resulting subset iterator</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">source</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">String</td>
+					<td align="left" valign="top">Indicate the source of which the resulting subset iterator is to be derived base on</td>
+				</tr>
+				<tr>
+					<td align="left" valign="top">start</td>
+					<td align="left" valign="top">false</td>
+					<td align="left" valign="top"></td>
+					<td align="left" valign="top">true</td>
+					<td align="left" valign="top">Integer</td>
+					<td align="left" valign="top">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</td>
+				</tr>
+		</table>
+		<!-- END SNIPPET: tagattributes -->
+	</body>
+</html>
+