diff --git a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
index b13ca0490..b51367fca 100644
--- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
+++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java
@@ -77,6 +77,8 @@ import com.opensymphony.xwork2.util.ValueStack;
* @s.tag name="updownselect" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.ui.UpDownSelectTag"
* description="Render a up down select element"
*/
+@StrutsTag(name="updownselect", tldTagClass="org.apache.struts2.views.jsp.ui.UpDownSelectTag",
+ description="Create a Select component with buttons to move the elements in the select component up and down")
public class UpDownSelect extends Select {
private static final Log _log = LogFactory.getLog(UpDownSelect.class);
diff --git a/core/src/main/resources/META-INF/struts-tags.tld b/core/src/main/resources/META-INF/struts-tags.tld
index 09c51597f..2aeb60fc7 100644
--- a/core/src/main/resources/META-INF/struts-tags.tld
+++ b/core/src/main/resources/META-INF/struts-tags.tld
@@ -1596,33 +1596,21 @@
- hidden
- org.apache.struts2.views.jsp.ui.HiddenTag
- JSP
-
+ property
+ org.apache.struts2.views.jsp.PropertyTag
+ empty
+
- accesskey
+ default
false
true
-
+ value attribute is null]]>
- cssClass
+ escape
false
true
-
-
-
- cssStyle
- false
- true
-
-
-
- disabled
- false
- true
-
+
id
@@ -1630,173 +1618,11 @@
true
-
- key
- false
- true
-
-
-
- label
- false
- true
-
-
-
- labelposition
- false
- true
-
-
-
- name
- false
- true
-
-
-
- onblur
- false
- true
-
-
-
- onchange
- false
- true
-
-
-
- onclick
- false
- true
-
-
-
- ondblclick
- false
- true
-
-
-
- onfocus
- false
- true
-
-
-
- onkeydown
- false
- true
-
-
-
- onkeypress
- false
- true
-
-
-
- onkeyup
- false
- true
-
-
-
- onmousedown
- false
- true
-
-
-
- onmousemove
- false
- true
-
-
-
- onmouseout
- false
- true
-
-
-
- onmouseover
- false
- true
-
-
-
- onmouseup
- false
- true
-
-
-
- onselect
- false
- true
-
-
-
- required
- false
- true
-
-
-
- requiredposition
- false
- true
-
-
-
- tabindex
- false
- true
-
-
-
- template
- false
- true
-
-
-
- templateDir
- false
- true
-
-
-
- theme
- false
- true
-
-
-
- title
- false
- true
-
-
-
- tooltip
- false
- true
-
-
-
- tooltipConfig
- false
- true
-
-
value
false
true
-
+
@@ -2052,21 +1878,33 @@
- property
- org.apache.struts2.views.jsp.PropertyTag
- empty
-
+ hidden
+ org.apache.struts2.views.jsp.ui.HiddenTag
+ JSP
+
- default
+ accesskey
false
true
- value attribute is null]]>
+
- escape
+ cssClass
false
true
-
+
+
+
+ cssStyle
+ false
+ true
+
+
+
+ disabled
+ false
+ true
+
id
@@ -2074,11 +1912,173 @@
true
+
+ key
+ false
+ true
+
+
+
+ label
+ false
+ true
+
+
+
+ labelposition
+ false
+ true
+
+
+
+ name
+ false
+ true
+
+
+
+ onblur
+ false
+ true
+
+
+
+ onchange
+ false
+ true
+
+
+
+ onclick
+ false
+ true
+
+
+
+ ondblclick
+ false
+ true
+
+
+
+ onfocus
+ false
+ true
+
+
+
+ onkeydown
+ false
+ true
+
+
+
+ onkeypress
+ false
+ true
+
+
+
+ onkeyup
+ false
+ true
+
+
+
+ onmousedown
+ false
+ true
+
+
+
+ onmousemove
+ false
+ true
+
+
+
+ onmouseout
+ false
+ true
+
+
+
+ onmouseover
+ false
+ true
+
+
+
+ onmouseup
+ false
+ true
+
+
+
+ onselect
+ false
+ true
+
+
+
+ required
+ false
+ true
+
+
+
+ requiredposition
+ false
+ true
+
+
+
+ tabindex
+ false
+ true
+
+
+
+ template
+ false
+ true
+
+
+
+ templateDir
+ false
+ true
+
+
+
+ theme
+ false
+ true
+
+
+
+ title
+ false
+ true
+
+
+
+ tooltip
+ false
+ true
+
+
+
+ tooltipConfig
+ false
+ true
+
+
value
false
true
-
+
@@ -5099,6 +5099,504 @@
+
+ checkbox
+ org.apache.struts2.views.jsp.ui.CheckboxTag
+ JSP
+
+
+ accesskey
+ false
+ true
+
+
+
+ cssClass
+ false
+ true
+
+
+
+ cssStyle
+ false
+ true
+
+
+
+ disabled
+ false
+ true
+
+
+
+ fieldValue
+ false
+ true
+
+
+
+ id
+ false
+ true
+
+
+
+ key
+ false
+ true
+
+
+
+ label
+ false
+ true
+
+
+
+ labelposition
+ false
+ true
+
+
+
+ name
+ false
+ true
+
+
+
+ onblur
+ false
+ true
+
+
+
+ onchange
+ false
+ true
+
+
+
+ onclick
+ false
+ true
+
+
+
+ ondblclick
+ false
+ true
+
+
+
+ onfocus
+ false
+ true
+
+
+
+ onkeydown
+ false
+ true
+
+
+
+ onkeypress
+ false
+ true
+
+
+
+ onkeyup
+ false
+ true
+
+
+
+ onmousedown
+ false
+ true
+
+
+
+ onmousemove
+ false
+ true
+
+
+
+ onmouseout
+ false
+ true
+
+
+
+ onmouseover
+ false
+ true
+
+
+
+ onmouseup
+ false
+ true
+
+
+
+ onselect
+ false
+ true
+
+
+
+ required
+ false
+ true
+
+
+
+ requiredposition
+ false
+ true
+
+
+
+ tabindex
+ false
+ true
+
+
+
+ template
+ false
+ true
+
+
+
+ templateDir
+ false
+ true
+
+
+
+ theme
+ false
+ true
+
+
+
+ title
+ false
+ true
+
+
+
+ tooltip
+ false
+ true
+
+
+
+ tooltipConfig
+ false
+ true
+
+
+
+ value
+ false
+ true
+
+
+
+
+ updownselect
+ org.apache.struts2.views.jsp.ui.UpDownSelectTag
+ JSP
+
+
+ accesskey
+ false
+ true
+
+
+
+ allowMoveDown
+ false
+ true
+
+
+
+ allowMoveUp
+ false
+ true
+
+
+
+ allowSelectAll
+ false
+ true
+
+
+
+ cssClass
+ false
+ true
+
+
+
+ cssStyle
+ false
+ true
+
+
+
+ disabled
+ false
+ true
+
+
+
+ emptyOption
+ false
+ true
+
+
+
+ headerKey
+ false
+ true
+
+
+
+ headerValue
+ false
+ true
+
+
+
+ id
+ false
+ true
+
+
+
+ key
+ false
+ true
+
+
+
+ label
+ false
+ true
+
+
+
+ labelposition
+ false
+ true
+
+
+
+ list
+ true
+ true
+
+
+
+ listKey
+ false
+ true
+
+
+
+ listValue
+ false
+ true
+
+
+
+ moveDownLabel
+ false
+ true
+
+
+
+ moveUpLabel
+ false
+ true
+
+
+
+ multiple
+ false
+ true
+
+
+
+ name
+ false
+ true
+
+
+
+ onblur
+ false
+ true
+
+
+
+ onchange
+ false
+ true
+
+
+
+ onclick
+ false
+ true
+
+
+
+ ondblclick
+ false
+ true
+
+
+
+ onfocus
+ false
+ true
+
+
+
+ onkeydown
+ false
+ true
+
+
+
+ onkeypress
+ false
+ true
+
+
+
+ onkeyup
+ false
+ true
+
+
+
+ onmousedown
+ false
+ true
+
+
+
+ onmousemove
+ false
+ true
+
+
+
+ onmouseout
+ false
+ true
+
+
+
+ onmouseover
+ false
+ true
+
+
+
+ onmouseup
+ false
+ true
+
+
+
+ onselect
+ false
+ true
+
+
+
+ required
+ false
+ true
+
+
+
+ requiredposition
+ false
+ true
+
+
+
+ selectAllLabel
+ false
+ true
+
+
+
+ size
+ false
+ true
+
+
+
+ tabindex
+ false
+ true
+
+
+
+ template
+ false
+ true
+
+
+
+ templateDir
+ false
+ true
+
+
+
+ theme
+ false
+ true
+
+
+
+ title
+ false
+ true
+
+
+
+ tooltip
+ false
+ true
+
+
+
+ tooltipConfig
+ false
+ true
+
+
+
+ value
+ false
+ true
+
+
+
head
org.apache.struts2.views.jsp.ui.HeadTag
@@ -5609,216 +6107,6 @@
-
- checkbox
- org.apache.struts2.views.jsp.ui.CheckboxTag
- JSP
-
-
- accesskey
- false
- true
-
-
-
- cssClass
- false
- true
-
-
-
- cssStyle
- false
- true
-
-
-
- disabled
- false
- true
-
-
-
- fieldValue
- false
- true
-
-
-
- id
- false
- true
-
-
-
- key
- false
- true
-
-
-
- label
- false
- true
-
-
-
- labelposition
- false
- true
-
-
-
- name
- false
- true
-
-
-
- onblur
- false
- true
-
-
-
- onchange
- false
- true
-
-
-
- onclick
- false
- true
-
-
-
- ondblclick
- false
- true
-
-
-
- onfocus
- false
- true
-
-
-
- onkeydown
- false
- true
-
-
-
- onkeypress
- false
- true
-
-
-
- onkeyup
- false
- true
-
-
-
- onmousedown
- false
- true
-
-
-
- onmousemove
- false
- true
-
-
-
- onmouseout
- false
- true
-
-
-
- onmouseover
- false
- true
-
-
-
- onmouseup
- false
- true
-
-
-
- onselect
- false
- true
-
-
-
- required
- false
- true
-
-
-
- requiredposition
- false
- true
-
-
-
- tabindex
- false
- true
-
-
-
- template
- false
- true
-
-
-
- templateDir
- false
- true
-
-
-
- theme
- false
- true
-
-
-
- title
- false
- true
-
-
-
- tooltip
- false
- true
-
-
-
- tooltipConfig
- false
- true
-
-
-
- value
- false
- true
-
-
-
password
org.apache.struts2.views.jsp.ui.PasswordTag