Author: mrdon Date: Sat Jan 6 22:16:04 2007 New Revision: 493661 URL: http://svn.apache.org/viewvc?view=rev&rev=493661 Log: Added bean tag to taglib WW-1392
Added: struts/struts2/trunk/core/src/site/resources/tags/bean.html Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java struts/struts2/trunk/core/src/main/resources/META-INF/struts-tags.tld struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java?view=diff&rev=493661&r1=493660&r2=493661 ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Bean.java Sat Jan 6 22:16:04 2007 @@ -24,6 +24,7 @@ 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 com.opensymphony.xwork2.inject.Inject; @@ -91,10 +92,9 @@ * <!-- END SNIPPET: examplesdescription --> * * @see Param - * - * @s.tag name="bean" tld-body-content="JSP" tld-tag-class="org.apache.struts2.views.jsp.BeanTag" - * description="Instantiate a JavaBean and place it in the context." */ [EMAIL PROTECTED](name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag", + description="Instantiate a JavaBean and place it in the context") public class Bean extends Component { protected static Log log = LogFactory.getLog(Bean.class); 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=493661&r1=493660&r2=493661 ============================================================================== --- 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 22:16:04 2007 @@ -116,7 +116,7 @@ <name>doubleListKey</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The key expression to use for second list]]></description> + <description><![CDATA[Set the list key of the second attribute]]></description> </attribute> <attribute> <name>doubleListValue</name> @@ -626,7 +626,7 @@ <name>doubleListKey</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The key expression to use for second list]]></description> + <description><![CDATA[Set the list key of the second attribute]]></description> </attribute> <attribute> <name>doubleListValue</name> @@ -1014,6 +1014,42 @@ </attribute> </tag> <tag> + <name>bean</name> + <tag-class>org.apache.struts2.views.jsp.BeanTag</tag-class> + <body-content>JSP</body-content> + <description><![CDATA[Instantiate a JavaBean and place it in the context]]></description> + <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>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The class name of the bean to be instantiated (must respect JavaBean specification)]]></description> + </attribute> + </tag> + <tag> + <name>text</name> + <tag-class>org.apache.struts2.views.jsp.TextTag</tag-class> + <body-content>JSP</body-content> + <description><![CDATA[Render a I18n text message]]></description> + <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>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[ Name of resource property to fetch]]></description> + </attribute> + </tag> + <tag> <name>label</name> <tag-class>org.apache.struts2.views.jsp.ui.LabelTag</tag-class> <body-content>JSP</body-content> @@ -1224,10 +1260,34 @@ </attribute> </tag> <tag> - <name>text</name> - <tag-class>org.apache.struts2.views.jsp.TextTag</tag-class> + <name>hidden</name> + <tag-class>org.apache.struts2.views.jsp.ui.HiddenTag</tag-class> <body-content>JSP</body-content> - <description><![CDATA[Render a I18n text message]]></description> + <description><![CDATA[Render a hidden input field]]></description> + <attribute> + <name>accesskey</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>cssClass</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The css class to use for element]]></description> + </attribute> + <attribute> + <name>cssStyle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The css style definitions for element ro use]]></description> + </attribute> + <attribute> + <name>disabled</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html disabled attribute on rendered html element]]></description> + </attribute> <attribute> <name>id</name> <required>false</required> @@ -1235,10 +1295,172 @@ <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></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>name</name> - <required>true</required> + <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[ Name of resource property to fetch]]></description> + <description><![CDATA[The name to set for element]]></description> + </attribute> + <attribute> + <name>onblur</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[ Set the html onblur attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onchange</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onchange attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onclick</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onclick attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>ondblclick</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html ondblclick attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onfocus</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onfocus attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onkeydown</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onkeydown attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onkeypress</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onkeypress attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onkeyup</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onkeyup attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onmousedown</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onmousedown attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onmousemove</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onmousemove attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onmouseout</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onmouseout attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onmouseover</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onmouseover attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onmouseup</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onmouseup attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>onselect</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html onselect attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>required</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[If set to true, the rendered element will indicate that input is required]]></description> + </attribute> + <attribute> + <name>requiredposition</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Define required position of required form element (left|right)]]></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>template</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The template (other than default) to use for rendering the element]]></description> + </attribute> + <attribute> + <name>templateDir</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The template directory.]]></description> + </attribute> + <attribute> + <name>theme</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The theme (other than default) to use for rendering the element]]></description> + </attribute> + <attribute> + <name>title</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html title attribute on rendered html element]]></description> + </attribute> + <attribute> + <name>tooltip</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the tooltip of this particular component]]></description> + </attribute> + <attribute> + <name>tooltipConfig</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the tooltip configuration]]></description> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Preset the value of input element.]]></description> </attribute> </tag> <tag> @@ -1596,36 +1818,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>datepicker</name> <tag-class>org.apache.struts2.views.jsp.ui.DatePickerTag</tag-class> <body-content>JSP</body-content> @@ -1878,33 +2070,21 @@ </attribute> </tag> <tag> - <name>hidden</name> - <tag-class>org.apache.struts2.views.jsp.ui.HiddenTag</tag-class> - <body-content>JSP</body-content> - <description><![CDATA[Render a hidden input field]]></description> - <attribute> - <name>accesskey</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html accesskey attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>cssClass</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The css class to use for element]]></description> - </attribute> + <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>cssStyle</name> + <name>default</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The css style definitions for element ro use]]></description> + <description><![CDATA[The default value to be used if <u>value</u> attribute is null]]></description> </attribute> <attribute> - <name>disabled</name> + <name>escape</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html disabled attribute on rendered html element]]></description> + <description><![CDATA[ Whether to escape HTML]]></description> </attribute> <attribute> <name>id</name> @@ -1913,172 +2093,10 @@ <description><![CDATA[id for referencing element. For UI and form tags it will be used as HTML id attribute]]></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>name</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The name to set for element]]></description> - </attribute> - <attribute> - <name>onblur</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[ Set the html onblur attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onchange</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onchange attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onclick</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onclick attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>ondblclick</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html ondblclick attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onfocus</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onfocus attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onkeydown</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onkeydown attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onkeypress</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onkeypress attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onkeyup</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onkeyup attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onmousedown</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onmousedown attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onmousemove</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onmousemove attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onmouseout</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onmouseout attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onmouseover</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onmouseover attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onmouseup</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onmouseup attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>onselect</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html onselect attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>required</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[If set to true, the rendered element will indicate that input is required]]></description> - </attribute> - <attribute> - <name>requiredposition</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Define required position of required form element (left|right)]]></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>template</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The template (other than default) to use for rendering the element]]></description> - </attribute> - <attribute> - <name>templateDir</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The template directory.]]></description> - </attribute> - <attribute> - <name>theme</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The theme (other than default) to use for rendering the element]]></description> - </attribute> - <attribute> - <name>title</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html title attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>tooltip</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the tooltip of this particular component]]></description> - </attribute> - <attribute> - <name>tooltipConfig</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the tooltip configuration]]></description> - </attribute> - <attribute> <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Preset the value of input element.]]></description> + <description><![CDATA[Value to be displayed]]></description> </attribute> </tag> <tag> @@ -4770,63 +4788,33 @@ </attribute> <attribute> <name>theme</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The theme (other than default) to use for rendering the element]]></description> - </attribute> - <attribute> - <name>title</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html title attribute on rendered html element]]></description> - </attribute> - <attribute> - <name>tooltip</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the tooltip of this particular component]]></description> - </attribute> - <attribute> - <name>tooltipConfig</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the tooltip configuration]]></description> - </attribute> - <attribute> - <name>value</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Preset the value of input element.]]></description> - </attribute> - </tag> - <tag> - <name>date</name> - <tag-class>org.apache.struts2.views.jsp.DateTag</tag-class> - <body-content>empty</body-content> - <description><![CDATA[Render a formatted date.]]></description> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The theme (other than default) to use for rendering the element]]></description> + </attribute> <attribute> - <name>format</name> + <name>title</name> <required>false</required> - <rtexprvalue>false</rtexprvalue> - <description><![CDATA[Date or DateTime format pattern]]></description> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Set the html title attribute on rendered html element]]></description> </attribute> <attribute> - <name>id</name> + <name>tooltip</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> + <description><![CDATA[Set the tooltip of this particular component]]></description> </attribute> <attribute> - <name>name</name> - <required>true</required> + <name>tooltipConfig</name> + <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The date value to format]]></description> + <description><![CDATA[Set the tooltip configuration]]></description> </attribute> <attribute> - <name>nice</name> + <name>value</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Whether to print out the date nicely]]></description> + <description><![CDATA[Preset the value of input element.]]></description> </attribute> </tag> <tag> @@ -5058,6 +5046,36 @@ </attribute> </tag> <tag> + <name>date</name> + <tag-class>org.apache.struts2.views.jsp.DateTag</tag-class> + <body-content>empty</body-content> + <description><![CDATA[Render a formatted date.]]></description> + <attribute> + <name>format</name> + <required>false</required> + <rtexprvalue>false</rtexprvalue> + <description><![CDATA[Date or DateTime format pattern]]></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>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[The date value to format]]></description> + </attribute> + <attribute> + <name>nice</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Whether to print out the date nicely]]></description> + </attribute> + </tag> + <tag> <name>action</name> <tag-class>org.apache.struts2.views.jsp.ActionTag</tag-class> <body-content>JSP</body-content> @@ -5100,10 +5118,10 @@ </attribute> </tag> <tag> - <name>checkbox</name> - <tag-class>org.apache.struts2.views.jsp.ui.CheckboxTag</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 checkbox input field]]></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> @@ -5111,6 +5129,24 @@ <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> @@ -5129,10 +5165,22 @@ <description><![CDATA[Set the html disabled attribute on rendered html element]]></description> </attribute> <attribute> - <name>fieldValue</name> + <name>emptyOption</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[The actual HTML value attribute of the checkbox.]]></description> + <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> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <description><![CDATA[Value expression for first item in list]]></description> </attribute> <attribute> <name>id</name> @@ -5159,6 +5207,42 @@ <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> @@ -5261,6 +5345,18 @@ <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> @@ -5310,10 +5406,10 @@ </attribute> </tag> <tag> - <name>updownselect</name> - <tag-class>org.apache.struts2.views.jsp.ui.UpDownSelectTag</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> + <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> @@ -5321,22 +5417,10 @@ <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> + <name>calendarcss</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Whether or not select all button should be displayed]]></description> + <description><![CDATA[The jscalendar css theme to use]]></description> </attribute> <attribute> <name>cssClass</name> @@ -5351,28 +5435,16 @@ <description><![CDATA[The css style definitions for element ro use]]></description> </attribute> <attribute> - <name>disabled</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <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> + <name>debug</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> + <description><![CDATA[Set to true to enable debugging mode for AJAX themes]]></description> </attribute> <attribute> - <name>headerValue</name> + <name>disabled</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Value expression for first item in list]]></description> + <description><![CDATA[Set the html disabled attribute on rendered html element]]></description> </attribute> <attribute> <name>id</name> @@ -5399,42 +5471,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> @@ -5537,18 +5573,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> @@ -5598,10 +5622,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>checkbox</name> + <tag-class>org.apache.struts2.views.jsp.ui.CheckboxTag</tag-class> + <body-content>JSP</body-content> + <description><![CDATA[Render a checkbox input field]]></description> <attribute> <name>accesskey</name> <required>false</required> @@ -5609,12 +5633,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> @@ -5627,16 +5645,16 @@ <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>fieldValue</name> <required>false</required> <rtexprvalue>true</rtexprvalue> - <description><![CDATA[Set the html disabled attribute on rendered html element]]></description> + <description><![CDATA[The actual HTML value attribute of the checkbox.]]></description> </attribute> <attribute> <name>id</name> Added: struts/struts2/trunk/core/src/site/resources/tags/bean.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/bean.html?view=auto&rev=493661 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/bean.html (added) +++ struts/struts2/trunk/core/src/site/resources/tags/bean.html Sat Jan 6 22:16:04 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>bean</title> + </head> + + <body> + <h1>Tag Name: bean</h1> + <h2>Description</h2> + <p> + <!-- START SNIPPET: tagdescription --> + Instantiate a JavaBean and place it in the context + <!-- 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">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">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> + </tr> + <tr> + <td align="left" valign="top">name</td> + <td align="left" valign="top">true</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 class name of the bean to be instantiated (must respect JavaBean specification)</td> + </tr> + </table> + <!-- END SNIPPET: tagattributes --> + </body> +</html> + Modified: struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html?view=diff&rev=493661&r1=493660&r2=493661 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/doubleselect.html Sat Jan 6 22:16:04 2007 @@ -137,7 +137,7 @@ <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 key expression to use for second list</td> + <td align="left" valign="top">Set the list key of the second attribute</td> </tr> <tr> <td align="left" valign="top">doubleListValue</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html?view=diff&rev=493661&r1=493660&r2=493661 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html Sat Jan 6 22:16:04 2007 @@ -241,7 +241,7 @@ <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 key expression to use for second list</td> + <td align="left" valign="top">Set the list key of the second attribute</td> </tr> <tr> <td align="left" valign="top">doubleListValue</td>