diff --git a/core/pom.xml b/core/pom.xml index ab89dc2e4..098cd4200 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -11,7 +11,7 @@ struts2-core jar Struts 2 Core - + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/ scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/ @@ -79,7 +79,7 @@ - + @@ -109,16 +109,16 @@ - + - j4 @@ -173,7 +173,7 @@ - + alljars @@ -246,8 +246,8 @@ - - + + opensymphony @@ -260,7 +260,7 @@ struts2-api ${pom.version} - + freemarker freemarker @@ -286,7 +286,7 @@ ognl 2.6.9 - + commons-logging commons-logging @@ -411,7 +411,7 @@ - + jmock jmock-cglib diff --git a/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java b/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java index e42be0a5f..96339e482 100644 --- a/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java @@ -20,7 +20,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index bcdd9fd90..710beeee2 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -32,8 +32,8 @@ import javax.servlet.jsp.PageContext; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.Dispatcher; diff --git a/core/src/main/java/org/apache/struts2/components/ActionError.java b/core/src/main/java/org/apache/struts2/components/ActionError.java index a40087408..de34caffb 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionError.java +++ b/core/src/main/java/org/apache/struts2/components/ActionError.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ActionMessage.java b/core/src/main/java/org/apache/struts2/components/ActionMessage.java index 4a0f3ab96..26978b521 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionMessage.java +++ b/core/src/main/java/org/apache/struts2/components/ActionMessage.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index 142acb738..1020d133b 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/AppendIterator.java b/core/src/main/java/org/apache/struts2/components/AppendIterator.java index 11318ec17..15815e51d 100644 --- a/core/src/main/java/org/apache/struts2/components/AppendIterator.java +++ b/core/src/main/java/org/apache/struts2/components/AppendIterator.java @@ -27,8 +27,8 @@ import java.util.List; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.AppendIteratorFilter; import org.apache.struts2.util.MakeIterator; diff --git a/core/src/main/java/org/apache/struts2/components/Autocompleter.java b/core/src/main/java/org/apache/struts2/components/Autocompleter.java index 4098b7a7d..6cb4dfe4e 100644 --- a/core/src/main/java/org/apache/struts2/components/Autocompleter.java +++ b/core/src/main/java/org/apache/struts2/components/Autocompleter.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index 49cddf20c..1a35c396f 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -24,8 +24,8 @@ import java.io.Writer; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ClassLoaderUtil; @@ -93,7 +93,7 @@ import com.opensymphony.xwork2.util.ValueStack; * * @see Param */ -@StrutsTag(name="bean", tldTagClass="org.apache.struts2.views.jsp.BeanTag", +@StrutsTag(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); diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java index f99adc64f..269d4471d 100644 --- a/core/src/main/java/org/apache/struts2/components/Checkbox.java +++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java index 92c04e99e..3638f9cef 100644 --- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java +++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java index 0152ea710..86a92abf4 100644 --- a/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ClosingUIBean.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ComboBox.java b/core/src/main/java/org/apache/struts2/components/ComboBox.java index c9d11c8c5..1c05fc68b 100644 --- a/core/src/main/java/org/apache/struts2/components/ComboBox.java +++ b/core/src/main/java/org/apache/struts2/components/ComboBox.java @@ -27,8 +27,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.MakeIterator; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index 92c87c4b5..cf5430015 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -31,7 +31,7 @@ import java.util.Stack; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -40,9 +40,6 @@ import org.apache.struts2.views.jsp.TagUtils; import org.apache.struts2.views.util.ContextUtil; import org.apache.struts2.views.util.UrlHelper; -import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.config.Configuration; -import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextParseUtil; diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index 7eb861561..f6dba3c63 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -30,8 +30,8 @@ import java.util.List; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.TextProvider; diff --git a/core/src/main/java/org/apache/struts2/components/DateTimePicker.java b/core/src/main/java/org/apache/struts2/components/DateTimePicker.java index 74f423661..f4c7bd657 100644 --- a/core/src/main/java/org/apache/struts2/components/DateTimePicker.java +++ b/core/src/main/java/org/apache/struts2/components/DateTimePicker.java @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java index 39da72c07..99492df39 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -31,10 +31,10 @@ import java.util.Map; import java.util.ArrayList; import java.util.List; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.StrutsException; -@StrutsTag(name="debug", tldTagClass="org.apache.struts2.views.jsp.ui.DebugTag", +@StrutsTag(name="debug", tldTagClass="org.apache.struts2.views.jsp.ui.DebugTag", description="Prints debugging information") public class Debug extends UIBean { public static final String TEMPLATE = "debug"; diff --git a/core/src/main/java/org/apache/struts2/components/Div.java b/core/src/main/java/org/apache/struts2/components/Div.java index dc1d9b594..a779fc615 100644 --- a/core/src/main/java/org/apache/struts2/components/Div.java +++ b/core/src/main/java/org/apache/struts2/components/Div.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 522bdc993..9f3027bb3 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -25,7 +25,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java index df143de0f..29193938b 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleSelect.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleSelect.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Else.java b/core/src/main/java/org/apache/struts2/components/Else.java index eca11c464..6824a3f4d 100644 --- a/core/src/main/java/org/apache/struts2/components/Else.java +++ b/core/src/main/java/org/apache/struts2/components/Else.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import java.io.Writer; import java.util.Map; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java index 418adeab6..2c9995ef4 100644 --- a/core/src/main/java/org/apache/struts2/components/ElseIf.java +++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java @@ -22,8 +22,8 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/FieldError.java b/core/src/main/java/org/apache/struts2/components/FieldError.java index 87de6a2b3..d272a3618 100644 --- a/core/src/main/java/org/apache/struts2/components/FieldError.java +++ b/core/src/main/java/org/apache/struts2/components/FieldError.java @@ -26,7 +26,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.components.Param.UnnamedParametric; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 477e5221d..0b020cf52 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java index c8742397d..64f31aef6 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -29,11 +29,10 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.Dispatcher; -import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.struts2.portlet.util.PortletUrlHelper; diff --git a/core/src/main/java/org/apache/struts2/components/FormButton.java b/core/src/main/java/org/apache/struts2/components/FormButton.java index 0896fcdc9..865ec230a 100644 --- a/core/src/main/java/org/apache/struts2/components/FormButton.java +++ b/core/src/main/java/org/apache/struts2/components/FormButton.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java index d56a52148..a1d631fb9 100644 --- a/core/src/main/java/org/apache/struts2/components/GenericUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/GenericUIBean.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.ContainUtil; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Head.java b/core/src/main/java/org/apache/struts2/components/Head.java index 98ba765c1..830481c6f 100644 --- a/core/src/main/java/org/apache/struts2/components/Head.java +++ b/core/src/main/java/org/apache/struts2/components/Head.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsConstants; import com.opensymphony.xwork2.inject.Inject; diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java index 48999461f..092f5e32d 100644 --- a/core/src/main/java/org/apache/struts2/components/Hidden.java +++ b/core/src/main/java/org/apache/struts2/components/Hidden.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java index 65b830773..e7ee754b3 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -24,8 +24,8 @@ import java.io.Writer; import java.util.Locale; import java.util.ResourceBundle; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.ActionContext; diff --git a/core/src/main/java/org/apache/struts2/components/If.java b/core/src/main/java/org/apache/struts2/components/If.java index a383996ae..4c3cfc43d 100644 --- a/core/src/main/java/org/apache/struts2/components/If.java +++ b/core/src/main/java/org/apache/struts2/components/If.java @@ -22,8 +22,8 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index 8557347c3..bcb6a2231 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -42,8 +42,8 @@ import javax.servlet.http.HttpServletResponseWrapper; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.RequestUtils; import org.apache.struts2.StrutsConstants; import org.apache.struts2.util.FastByteArrayOutputStream; diff --git a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java index 6542af4bb..ccad62b1c 100644 --- a/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/InputTransferSelect.java @@ -20,8 +20,8 @@ */ package org.apache.struts2.components; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java index 2506a62c2..24d1d3eb4 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import java.io.Writer; import java.util.Iterator; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.jsp.IteratorStatus; diff --git a/core/src/main/java/org/apache/struts2/components/Label.java b/core/src/main/java/org/apache/struts2/components/Label.java index 1a42ef6d0..db8d06340 100644 --- a/core/src/main/java/org/apache/struts2/components/Label.java +++ b/core/src/main/java/org/apache/struts2/components/Label.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index c802695b1..d6ce92366 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -27,7 +27,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.ContainUtil; import org.apache.struts2.util.MakeIterator; diff --git a/core/src/main/java/org/apache/struts2/components/MergeIterator.java b/core/src/main/java/org/apache/struts2/components/MergeIterator.java index ec81f970e..1d8ff3d8b 100644 --- a/core/src/main/java/org/apache/struts2/components/MergeIterator.java +++ b/core/src/main/java/org/apache/struts2/components/MergeIterator.java @@ -27,8 +27,8 @@ import java.util.List; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.components.Param.UnnamedParametric; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.util.MergeIteratorFilter; diff --git a/core/src/main/java/org/apache/struts2/components/OptGroup.java b/core/src/main/java/org/apache/struts2/components/OptGroup.java index 94521ebab..126828a2b 100644 --- a/core/src/main/java/org/apache/struts2/components/OptGroup.java +++ b/core/src/main/java/org/apache/struts2/components/OptGroup.java @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java index e7b2fead8..058699b41 100644 --- a/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java +++ b/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java @@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Param.java b/core/src/main/java/org/apache/struts2/components/Param.java index e642b5a58..2aee7073a 100644 --- a/core/src/main/java/org/apache/struts2/components/Param.java +++ b/core/src/main/java/org/apache/struts2/components/Param.java @@ -22,8 +22,8 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Password.java b/core/src/main/java/org/apache/struts2/components/Password.java index 310d6384a..81819bf0b 100644 --- a/core/src/main/java/org/apache/struts2/components/Password.java +++ b/core/src/main/java/org/apache/struts2/components/Password.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Property.java b/core/src/main/java/org/apache/struts2/components/Property.java index 9905d929d..24b479d5d 100644 --- a/core/src/main/java/org/apache/struts2/components/Property.java +++ b/core/src/main/java/org/apache/struts2/components/Property.java @@ -25,8 +25,8 @@ import java.io.Writer; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextUtils; diff --git a/core/src/main/java/org/apache/struts2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java index e865ee01e..3429139e8 100644 --- a/core/src/main/java/org/apache/struts2/components/Push.java +++ b/core/src/main/java/org/apache/struts2/components/Push.java @@ -22,8 +22,8 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java index 77849f2ab..dd825fab1 100644 --- a/core/src/main/java/org/apache/struts2/components/Radio.java +++ b/core/src/main/java/org/apache/struts2/components/Radio.java @@ -23,7 +23,7 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Reset.java b/core/src/main/java/org/apache/struts2/components/Reset.java index 096149049..eb970a42b 100644 --- a/core/src/main/java/org/apache/struts2/components/Reset.java +++ b/core/src/main/java/org/apache/struts2/components/Reset.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Select.java b/core/src/main/java/org/apache/struts2/components/Select.java index f60e56d8b..55f090e64 100644 --- a/core/src/main/java/org/apache/struts2/components/Select.java +++ b/core/src/main/java/org/apache/struts2/components/Select.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index af9eebd79..b70cbb0e7 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -22,8 +22,8 @@ package org.apache.struts2.components; import java.io.Writer; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index eef01fd3a..ef8e72974 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -23,9 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; -import org.apache.struts2.views.util.UrlHelper; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java index cf3ddf58b..faec38445 100644 --- a/core/src/main/java/org/apache/struts2/components/TabbedPanel.java +++ b/core/src/main/java/org/apache/struts2/components/TabbedPanel.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java index 7680717d5..b78e76e00 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -29,8 +29,8 @@ import java.util.List; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java index ecec58ce5..55a62347d 100644 --- a/core/src/main/java/org/apache/struts2/components/TextArea.java +++ b/core/src/main/java/org/apache/struts2/components/TextArea.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/TextField.java b/core/src/main/java/org/apache/struts2/components/TextField.java index 5232833b0..cf4d4929f 100644 --- a/core/src/main/java/org/apache/struts2/components/TextField.java +++ b/core/src/main/java/org/apache/struts2/components/TextField.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Token.java b/core/src/main/java/org/apache/struts2/components/Token.java index fee7cf71b..9fd151b8a 100644 --- a/core/src/main/java/org/apache/struts2/components/Token.java +++ b/core/src/main/java/org/apache/struts2/components/Token.java @@ -25,7 +25,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTag; import org.apache.struts2.util.TokenHelper; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/Tree.java b/core/src/main/java/org/apache/struts2/components/Tree.java index 6e44ee645..3e60a31e0 100644 --- a/core/src/main/java/org/apache/struts2/components/Tree.java +++ b/core/src/main/java/org/apache/struts2/components/Tree.java @@ -25,8 +25,8 @@ import java.io.Writer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/TreeNode.java b/core/src/main/java/org/apache/struts2/components/TreeNode.java index 5d9c254dd..b00da63dd 100644 --- a/core/src/main/java/org/apache/struts2/components/TreeNode.java +++ b/core/src/main/java/org/apache/struts2/components/TreeNode.java @@ -23,8 +23,8 @@ package org.apache.struts2.components; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index 425a7f375..e7a12d9c8 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsConstants; import org.apache.struts2.components.template.Template; import org.apache.struts2.components.template.TemplateEngine; diff --git a/core/src/main/java/org/apache/struts2/components/URL.java b/core/src/main/java/org/apache/struts2/components/URL.java index 58acf4bba..8ecef36ef 100644 --- a/core/src/main/java/org/apache/struts2/components/URL.java +++ b/core/src/main/java/org/apache/struts2/components/URL.java @@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import org.apache.struts2.StrutsConstants; import org.apache.struts2.dispatcher.Dispatcher; @@ -41,7 +41,6 @@ import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.struts2.portlet.util.PortletUrlHelper; import org.apache.struts2.views.util.UrlHelper; -import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; 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 b51367fca..fc0e8337f 100644 --- a/core/src/main/java/org/apache/struts2/components/UpDownSelect.java +++ b/core/src/main/java/org/apache/struts2/components/UpDownSelect.java @@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletResponse; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import com.opensymphony.xwork2.util.ValueStack; diff --git a/core/src/main/java/org/apache/struts2/components/table/WebTable.java b/core/src/main/java/org/apache/struts2/components/table/WebTable.java index 9921ff07f..88d9fa352 100644 --- a/core/src/main/java/org/apache/struts2/components/table/WebTable.java +++ b/core/src/main/java/org/apache/struts2/components/table/WebTable.java @@ -31,8 +31,8 @@ import javax.swing.table.TableModel; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.StrutsException; import org.apache.struts2.components.GenericUIBean; import org.apache.struts2.components.table.renderer.CellRenderer; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java index 2467a51bf..a4dafc773 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java @@ -24,8 +24,8 @@ import javax.servlet.jsp.JspException; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.IteratorGenerator; import org.apache.struts2.util.IteratorGenerator.Converter; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java index 23c9a960f..604052245 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SortIteratorTag.java @@ -24,8 +24,8 @@ import java.util.Comparator; import javax.servlet.jsp.JspException; -import org.apache.struts.annotations.StrutsTag; -import org.apache.struts.annotations.StrutsTagAttribute; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.util.SortIteratorFilter; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java index cc27ef833..7df704f1c 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java @@ -24,8 +24,8 @@ import javax.servlet.jsp.JspException; 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.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.util.SubsetIteratorFilter; import org.apache.struts2.util.SubsetIteratorFilter.Decider; import org.apache.struts2.views.jsp.StrutsBodyTagSupport; @@ -147,7 +147,7 @@ import org.apache.struts2.views.jsp.StrutsBodyTagSupport; * @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", +@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 { diff --git a/core/src/main/resources/META-INF/struts-tags.tld b/core/src/main/resources/META-INF/struts-tags.tld deleted file mode 100644 index cb18fd5fd..000000000 --- a/core/src/main/resources/META-INF/struts-tags.tld +++ /dev/null @@ -1,9158 +0,0 @@ - - - - 2.2.3 - 1.2 - s - /struts-tags - "Struts Tags" - - - action - org.apache.struts2.views.jsp.ActionTag - JSP - - - executeResult - false - true - - - - flush - false - true - - - - id - false - true - - - - ignoreContextParams - false - true - - - - name - true - true - - - - namespace - false - true - - - - - actionerror - org.apache.struts2.views.jsp.ui.ActionErrorTag - empty - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - actionmessage - org.apache.struts2.views.jsp.ui.ActionMessageTag - empty - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - a - org.apache.struts2.views.jsp.ui.AnchorTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onLoadJS - 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 - - - - openTemplate - false - true - - - - preInvokeJS - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - tabindex - false - true - - - - targets - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - value - false - true - - - - - append - org.apache.struts2.views.jsp.iterator.AppendIteratorTag - JSP - - - id - false - true - - - - - autocompleter - org.apache.struts2.views.jsp.ui.AutocompleterTag - JSP - - - accesskey - false - true - - - - autoComplete - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - delay - false - true - - - - disabled - false - true - - - - dropdownHeight - false - true - - - - dropdownWidth - false - true - - - - emptyOption - false - true - - - - forceValidOption - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - false - true - - - - listKey - false - true - - - - listValue - false - true - - - - listenTopics - false - true - - - - loadMinimumCount - false - true - - - - loadOnTextChange - false - true - - - - maxLength - false - true - - - - maxlength - false - true - - - - name - false - true - - - - notifyTopics - 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 - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - searchType - false - true - - - - showDownArrow - 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 - - - - - bean - org.apache.struts2.views.jsp.BeanTag - JSP - - - id - false - true - - - - name - true - true - - - - - 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 - - - - - checkboxlist - org.apache.struts2.views.jsp.ui.CheckboxListTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - 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 - - - - - combobox - org.apache.struts2.views.jsp.ui.ComboBoxTag - JSP - - - accesskey - 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 - - - - maxLength - false - true - - - - maxlength - 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 - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - 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 - - - - - date - org.apache.struts2.views.jsp.DateTag - empty - - - format - false - false - - - - id - false - true - - - - name - true - true - - - - nice - false - true - - - - - datetimepicker - org.apache.struts2.views.jsp.ui.DateTimePickerTag - JSP - - - accesskey - false - true - - - - adjustWeeks - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - dayWidth - false - true - - - - disabled - false - true - - - - displayFormat - false - true - - - - displayWeeks - false - true - - - - endDate - false - true - - - - formatLength - false - true - - - - iconPath - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - language - 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 - - - - startDate - false - true - - - - staticDisplay - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - toggleDuration - false - true - - - - toggleType - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - type - false - true - - - - value - false - true - - - - weekStartsOn - false - true - - - - - debug - org.apache.struts2.views.jsp.ui.DebugTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - div - org.apache.struts2.views.jsp.ui.DivTag - JSP - - - accesskey - false - true - - - - afterLoading - false - true - - - - autoStart - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - delay - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - name - false - true - - - - notifyTopics - 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 - - - - openTemplate - false - true - - - - refreshOnShow - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - startTimerListenTopics - false - true - - - - stopTimerListenTopics - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - updateFreq - false - true - - - - value - false - true - - - - - doubleselect - org.apache.struts2.views.jsp.ui.DoubleSelectTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doubleAccesskey - false - true - - - - doubleCssClass - false - true - - - - doubleCssStyle - false - true - - - - doubleDisabled - false - true - - - - doubleEmptyOption - false - true - - - - doubleHeaderKey - false - true - - - - doubleHeaderValue - false - true - - - - doubleId - false - true - - - - doubleList - true - true - - - - doubleListKey - false - true - - - - doubleListValue - false - true - - - - doubleMultiple - false - true - - - - doubleName - true - true - - - - doubleOnblur - false - true - - - - doubleOnchange - false - true - - - - doubleOnclick - false - true - - - - doubleOndblclick - false - true - - - - doubleOnfocus - false - true - - - - doubleOnkeydown - false - true - - - - doubleOnkeypress - false - true - - - - doubleOnkeyup - false - true - - - - doubleOnmousedown - false - true - - - - doubleOnmousemove - false - true - - - - doubleOnmouseout - false - true - - - - doubleOnmouseover - false - true - - - - doubleOnmouseup - false - true - - - - doubleOnselect - false - true - - - - doubleSize - false - true - - - - doubleValue - false - true - - - - emptyOption - false - true - - - - formName - 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 - - - - 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 - - - - 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 - - - - - else - org.apache.struts2.views.jsp.ElseTag - JSP - - - id - false - true - - - - - elseif - org.apache.struts2.views.jsp.ElseIfTag - JSP - - - id - false - true - - - - test - true - true - - - - - fielderror - org.apache.struts2.views.jsp.ui.FieldErrorTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - file - org.apache.struts2.views.jsp.ui.FileTag - JSP - - - accept - false - true - - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - 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 - - - - - form - org.apache.struts2.views.jsp.ui.FormTag - JSP - - - acceptcharset - false - true - - - - accesskey - false - true - - - - action - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - enctype - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - method - false - true - - - - name - false - true - - - - namespace - 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 - - - - onsubmit - false - true - - - - openTemplate - false - true - - - - portletMode - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - tabindex - false - true - - - - target - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - validate - false - true - - - - value - false - true - - - - windowState - false - true - - - - - component - org.apache.struts2.views.jsp.ui.ComponentTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - head - org.apache.struts2.views.jsp.ui.HeadTag - empty - - - accesskey - false - true - - - - calendarcss - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - debug - false - true - - - - disabled - 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 - - - - - hidden - org.apache.struts2.views.jsp.ui.HiddenTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - i18n - org.apache.struts2.views.jsp.I18nTag - JSP - - - id - false - true - - - - name - true - true - - - - - if - org.apache.struts2.views.jsp.IfTag - JSP - - - id - false - true - - - - test - true - true - - - - - include - org.apache.struts2.views.jsp.IncludeTag - JSP - - - id - false - true - - - - value - true - true - - - - - inputtransferselect - org.apache.struts2.views.jsp.ui.InputTransferSelectTag - JSP - - - accesskey - false - true - - - - addLabel - false - true - - - - allowRemoveAll - false - true - - - - allowUpDown - false - true - - - - buttonCssClass - false - true - - - - buttonCssStyle - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - downLabel - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - leftTitle - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - 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 - - - - removeAllLabel - false - true - - - - removeLabel - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rightTitle - 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 - - - - upLabel - false - true - - - - value - false - true - - - - - iterator - org.apache.struts2.views.jsp.IteratorTag - JSP - - - id - false - true - - - - status - false - true - - - - value - false - true - - - - - label - org.apache.struts2.views.jsp.ui.LabelTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - for - 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 - - - - - merge - org.apache.struts2.views.jsp.iterator.MergeIteratorTag - JSP - - - id - false - true - - - - - optgroup - org.apache.struts2.views.jsp.ui.OptGroupTag - JSP - - - disabled - false - true - - - - id - false - true - - - - label - false - true - - - - list - false - true - - - - listKey - false - true - - - - listValue - false - true - - - - - optiontransferselect - org.apache.struts2.views.jsp.ui.OptionTransferSelectTag - JSP - - - accesskey - false - true - - - - addAllToLeftLabel - false - true - - - - addAllToRightLabel - false - true - - - - addToLeftLabel - false - true - - - - addToRightLabel - false - true - - - - allowAddAllToLeft - false - true - - - - allowAddAllToRight - false - true - - - - allowAddToLeft - false - true - - - - allowAddToRight - false - true - - - - allowSelectAll - false - true - - - - allowUpDownOnLeft - false - true - - - - allowUpDownOnRight - false - true - - - - buttonCssClass - false - true - - - - buttonCssStyle - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doubleAccesskey - false - true - - - - doubleCssClass - false - true - - - - doubleCssStyle - false - true - - - - doubleDisabled - false - true - - - - doubleEmptyOption - false - true - - - - doubleHeaderKey - false - true - - - - doubleHeaderValue - false - true - - - - doubleId - false - true - - - - doubleList - true - true - - - - doubleListKey - false - true - - - - doubleListValue - false - true - - - - doubleMultiple - false - true - - - - doubleName - true - true - - - - doubleOnblur - false - true - - - - doubleOnchange - false - true - - - - doubleOnclick - false - true - - - - doubleOndblclick - false - true - - - - doubleOnfocus - false - true - - - - doubleOnkeydown - false - true - - - - doubleOnkeypress - false - true - - - - doubleOnkeyup - false - true - - - - doubleOnmousedown - false - true - - - - doubleOnmousemove - false - true - - - - doubleOnmouseout - false - true - - - - doubleOnmouseover - false - true - - - - doubleOnmouseup - false - true - - - - doubleOnselect - false - true - - - - doubleSize - false - true - - - - doubleValue - false - true - - - - emptyOption - false - true - - - - formName - false - true - - - - headerKey - false - true - - - - headerValue - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - leftDownLabel - false - true - - - - leftTitle - false - true - - - - leftUpLabel - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - 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 - - - - rightDownLabel - false - true - - - - rightTitle - false - true - - - - rightUpLabel - 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 - - - - - param - org.apache.struts2.views.jsp.ParamTag - JSP - - - id - false - true - - - - name - false - true - - - - value - false - true - - - - - password - org.apache.struts2.views.jsp.ui.PasswordTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - maxLength - false - true - - - - maxlength - 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 - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showPassword - 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 - - - - - property - org.apache.struts2.views.jsp.PropertyTag - empty - - - default - false - true - value attribute is null]]> - - - escape - false - true - - - - id - false - true - - - - value - false - true - - - - - push - org.apache.struts2.views.jsp.PushTag - JSP - - - id - false - true - - - - value - true - true - - - - - radio - org.apache.struts2.views.jsp.ui.RadioTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - list - true - true - - - - listKey - false - true - - - - listValue - 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 - - - - - reset - org.apache.struts2.views.jsp.ui.ResetTag - JSP - - - accesskey - false - true - - - - action - false - true - - - - align - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - input type reset, since button text will always be the value parameter.]]> - - - labelposition - false - true - - - - method - 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 - - - - type - false - true - input, button and image.]]> - - - value - false - true - - - - - select - org.apache.struts2.views.jsp.ui.SelectTag - JSP - - - accesskey - 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 - - - - 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 - - - - 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 - - - - - set - org.apache.struts2.views.jsp.SetTag - empty - - - id - false - true - - - - name - true - true - value]]> - - - scope - false - true - application, session, request, page, or action.]]> - - - value - false - true - name]]> - - - - submit - org.apache.struts2.views.jsp.ui.SubmitTag - JSP - - - accesskey - false - true - - - - action - false - true - - - - align - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - errorText - false - true - - - - executeScripts - false - true - - - - formFilter - false - true - - - - formId - false - true - - - - handler - false - true - - - - href - false - true - - - - id - false - true - - - - indicator - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - listenTopics - false - true - - - - loadingText - false - true - - - - method - false - true - - - - name - false - true - - - - notifyTopics - false - true - - - - onLoadJS - 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 - - - - preInvokeJS - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - showErrorTransportText - false - true - - - - src - false - true - image type submit button. Will have no effect for types input and button.]]> - - - tabindex - false - true - - - - targets - false - true - - - - template - false - true - - - - templateDir - false - true - - - - theme - false - true - This tag will usually use the ajax theme.]]> - - - title - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - type - false - true - input, button and image.]]> - - - value - false - true - - - - - tabbedPanel - org.apache.struts2.views.jsp.ui.TabbedPanelTag - JSP - - - accesskey - false - true - - - - closeButton - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - doLayout - false - true - - - - id - true - 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 - - - - openTemplate - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - selectedTab - 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 - - - - - text - org.apache.struts2.views.jsp.TextTag - JSP - - - id - false - true - - - - name - true - true - - - - - textarea - org.apache.struts2.views.jsp.ui.TextareaTag - JSP - - - accesskey - false - true - - - - cols - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rows - 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 - - - - wrap - false - true - - - - - textfield - org.apache.struts2.views.jsp.ui.TextFieldTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - maxLength - false - true - - - - maxlength - 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 - - - - readonly - false - true - - - - required - false - true - - - - requiredposition - 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 - - - - - token - org.apache.struts2.views.jsp.ui.TokenTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - - tree - org.apache.struts2.views.jsp.ui.TreeTag - JSP - - - accesskey - false - true - - - - blankIconSrc - false - true - - - - childCollectionProperty - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - expandIconSrcMinus - false - true - - - - expandIconSrcPlus - false - true - - - - gridIconSrcC - false - true - - - - gridIconSrcL - false - true - - - - gridIconSrcP - false - true - - - - gridIconSrcV - false - true - - - - gridIconSrcX - false - true - - - - gridIconSrcY - false - true - - - - iconHeight - false - true - - - - iconWidth - false - true - - - - id - false - true - - - - key - false - true - - - - label - false - true - - - - labelposition - false - true - - - - name - false - true - - - - nodeIdProperty - false - true - - - - nodeTitleProperty - 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 - - - - openTemplate - false - true - - - - required - false - true - - - - requiredposition - false - true - - - - rootNode - false - true - - - - showGrid - false - true - - - - showRootGrid - false - true - - - - tabindex - false - true - - - - template - false - true - - - - templateCssPath - false - true - - - - templateDir - false - true - - - - theme - false - true - - - - title - false - true - - - - toggle - false - true - - - - toggleDuration - false - true - - - - tooltip - false - true - - - - tooltipConfig - false - true - - - - treeCollapsedTopic - false - true - - - - treeExpandedTopic - false - true - - - - treeSelectedTopic - false - true - - - - value - false - true - - - - - treenode - org.apache.struts2.views.jsp.ui.TreeNodeTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - false - true - - - - id - false - true - - - - key - false - true - - - - label - true - 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 - - - - openTemplate - 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 - - - - - url - org.apache.struts2.views.jsp.URLTag - JSP - - - action - false - true - - - - anchor - false - true - - - - encode - false - true - - - - id - false - true - - - - includeContext - false - true - - - - includeParams - false - true - - - - method - false - true - - - - namespace - false - true - - - - portletMode - false - true - - - - portletUrlType - false - true - - - - scheme - false - true - - - - value - false - true - - - - windowState - 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 - - - - - table - org.apache.struts2.views.jsp.ui.table.WebTableTag - JSP - - - accesskey - false - true - - - - cssClass - false - true - - - - cssStyle - false - true - - - - disabled - 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 - - - - sortColumn - false - true - - - - sortOrder - false - true - - - - sortable - 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 - - - - - generator - org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag - JSP - - - converter - false - true - val into an object]]> - - - count - false - true - - - - id - false - true - - - - separator - true - true - val into entries of the iterator]]> - - - val - true - true - - - - - sort - org.apache.struts2.views.jsp.iterator.SortIteratorTag - JSP - - - comparator - true - true - - - - source - false - true - - - - - subset - org.apache.struts2.views.jsp.iterator.SubsetIteratorTag - JSP - - - count - false - true - - - - decider - false - true - - - - source - false - true - - - - start - false - true - - - - diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html index 807e6bf59..3c156d9e7 100644 --- a/core/src/site/resources/tags/doubleselect.html +++ b/core/src/site/resources/tags/doubleselect.html @@ -137,7 +137,7 @@ Please do not edit it directly. true String - Set the list key of the second attribute + The key expression to use for second list doubleListValue diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html index 5dfa2ea31..c9a9221b9 100644 --- a/core/src/site/resources/tags/optiontransferselect.html +++ b/core/src/site/resources/tags/optiontransferselect.html @@ -241,7 +241,7 @@ Please do not edit it directly. true String - Set the list key of the second attribute + The key expression to use for second list doubleListValue