This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from 5132f09bb Merge pull request #1078 from
apache/fix/WW-5473-multipart-wraper
add 00f979e9c WW-5465 Renames tag parameters to attributes
add b17d7f6ff WW-5465 Short-circuits attributes processing if not found in
ValueStack
add 3a08c1094 Merge pull request #1067 from
apache/feature/WW-5465-attributes
No new revisions were added by this update.
Summary of changes:
.../myTemplateDir/myTheme/myAnotherTemplate.ftl | 2 +-
.../template/ajaxErrorContainers/actionerror.ftl | 16 +-
.../template/ajaxErrorContainers/controlfooter.ftl | 10 +-
.../ajaxErrorContainers/controlheader-core.ftl | 34 +--
.../webapp/WEB-INF/tags/ui/componentTagExample.jsp | 110 ++++----
.../customTheme/ftlCustomTemplate.ftl | 2 +-
.../customTheme/jspCustomTemplate.jsp | 4 +-
.../src/main/webapp/template/xhtml/mytemplate.jsp | 2 +-
.../apache/struts2/components/ActionComponent.java | 10 +-
.../java/org/apache/struts2/components/Anchor.java | 12 +-
.../apache/struts2/components/AppendIterator.java | 44 ++-
.../org/apache/struts2/components/Component.java | 36 +--
.../struts2/components/DoubleListUIBean.java | 4 +-
.../apache/struts2/components/DoubleSelect.java | 2 +-
.../java/org/apache/struts2/components/File.java | 4 +-
.../java/org/apache/struts2/components/Form.java | 10 +-
.../org/apache/struts2/components/FormButton.java | 6 +-
.../apache/struts2/components/GenericUIBean.java | 12 +-
.../org/apache/struts2/components/Include.java | 8 +-
.../struts2/components/InputTransferSelect.java | 8 +-
.../java/org/apache/struts2/components/Label.java | 2 +-
.../org/apache/struts2/components/ListUIBean.java | 2 +-
.../apache/struts2/components/MergeIterator.java | 49 ++--
.../org/apache/struts2/components/OptGroup.java | 2 +-
.../struts2/components/OptionTransferSelect.java | 16 +-
.../struts2/components/ServletUrlRenderer.java | 2 +-
.../java/org/apache/struts2/components/Token.java | 2 +-
.../java/org/apache/struts2/components/UIBean.java | 26 +-
.../java/org/apache/struts2/components/URL.java | 2 +-
.../apache/struts2/components/UpDownSelect.java | 6 +-
.../apache/struts2/util/AppendIteratorFilter.java | 18 +-
.../struts2/views/freemarker/ScopesHashModel.java | 11 +-
.../struts2/views/freemarker/tags/TagModel.java | 2 +-
.../struts2/views/jsp/ComponentTagSupport.java | 13 +-
.../main/resources/template/css_xhtml/checkbox.ftl | 46 ++--
.../resources/template/css_xhtml/controlfooter.ftl | 22 +-
.../template/css_xhtml/controlheader-core.ftl | 36 +--
.../resources/template/css_xhtml/controlheader.ftl | 12 +-
.../resources/template/css_xhtml/form-validate.ftl | 10 +-
.../src/main/resources/template/css_xhtml/head.ftl | 4 +-
.../main/resources/template/css_xhtml/hidden.ftl | 2 +-
.../main/resources/template/css_xhtml/label.ftl | 30 +-
.../main/resources/template/css_xhtml/reset.ftl | 14 +-
.../resources/template/css_xhtml/submit-close.ftl | 10 +-
.../main/resources/template/css_xhtml/submit.ftl | 14 +-
.../src/main/resources/template/simple/a-close.ftl | 34 +--
.../main/resources/template/simple/actionerror.ftl | 16 +-
.../resources/template/simple/actionmessage.ftl | 16 +-
.../main/resources/template/simple/checkbox.ftl | 32 +--
.../resources/template/simple/checkboxlist.ftl | 78 +++---
.../main/resources/template/simple/combobox.ftl | 56 ++--
.../template/simple/common-attributes.ftl | 4 +-
core/src/main/resources/template/simple/css.ftl | 22 +-
core/src/main/resources/template/simple/debug.ftl | 6 +-
.../resources/template/simple/doubleselect.ftl | 206 +++++++-------
.../template/simple/dynamic-attributes.ftl | 6 +-
.../main/resources/template/simple/fielderror.ftl | 24 +-
core/src/main/resources/template/simple/file.ftl | 32 +--
.../template/simple/form-close-tooltips.ftl | 6 +-
.../main/resources/template/simple/form-close.ftl | 44 +--
.../main/resources/template/simple/form-common.ftl | 56 ++--
core/src/main/resources/template/simple/form.ftl | 6 +-
core/src/main/resources/template/simple/head.ftl | 2 +-
core/src/main/resources/template/simple/hidden.ftl | 22 +-
.../template/simple/inputtransferselect.ftl | 102 +++----
core/src/main/resources/template/simple/label.ftl | 22 +-
core/src/main/resources/template/simple/link.ftl | 56 ++--
core/src/main/resources/template/simple/nonce.ftl | 4 +-
.../main/resources/template/simple/optgroup.ftl | 32 +--
.../template/simple/optiontransferselect.ftl | 306 ++++++++++-----------
.../main/resources/template/simple/password.ftl | 38 +--
.../simple/prefixed-dynamic-attributes.ftl | 6 +-
.../main/resources/template/simple/radiomap.ftl | 64 ++---
core/src/main/resources/template/simple/reset.ftl | 74 ++---
core/src/main/resources/template/simple/script.ftl | 36 +--
.../resources/template/simple/scripting-events.ftl | 56 ++--
core/src/main/resources/template/simple/select.ftl | 102 +++----
.../resources/template/simple/submit-close.ftl | 6 +-
core/src/main/resources/template/simple/submit.ftl | 84 +++---
core/src/main/resources/template/simple/text.ftl | 40 +--
.../main/resources/template/simple/textarea.ftl | 50 ++--
core/src/main/resources/template/simple/token.ftl | 4 +-
.../resources/template/simple/updownselect.ftl | 32 +--
.../src/main/resources/template/xhtml/checkbox.ftl | 68 ++---
.../main/resources/template/xhtml/checkboxlist.ftl | 6 +-
.../src/main/resources/template/xhtml/combobox.ftl | 6 +-
core/src/main/resources/template/xhtml/control.ftl | 4 +-
.../resources/template/xhtml/controlfooter.ftl | 10 +-
.../template/xhtml/controlheader-core.ftl | 32 +--
.../resources/template/xhtml/controlheader.ftl | 10 +-
.../resources/template/xhtml/datetextfield.ftl | 6 +-
.../main/resources/template/xhtml/doubleselect.ftl | 6 +-
core/src/main/resources/template/xhtml/file.ftl | 6 +-
.../template/xhtml/form-close-validate.ftl | 8 +-
.../main/resources/template/xhtml/form-close.ftl | 10 +-
.../resources/template/xhtml/form-validate.ftl | 10 +-
core/src/main/resources/template/xhtml/form.ftl | 14 +-
core/src/main/resources/template/xhtml/head.ftl | 4 +-
core/src/main/resources/template/xhtml/hidden.ftl | 2 +-
.../template/xhtml/inputtransferselect.ftl | 6 +-
core/src/main/resources/template/xhtml/label.ftl | 6 +-
.../template/xhtml/optiontransferselect.ftl | 6 +-
.../src/main/resources/template/xhtml/password.ftl | 6 +-
.../src/main/resources/template/xhtml/radiomap.ftl | 6 +-
core/src/main/resources/template/xhtml/reset.ftl | 4 +-
core/src/main/resources/template/xhtml/select.ftl | 6 +-
.../main/resources/template/xhtml/submit-close.ftl | 4 +-
core/src/main/resources/template/xhtml/submit.ftl | 2 +-
core/src/main/resources/template/xhtml/text.ftl | 6 +-
.../src/main/resources/template/xhtml/textarea.ftl | 6 +-
core/src/main/resources/template/xhtml/tooltip.ftl | 22 +-
.../main/resources/template/xhtml/updownselect.ftl | 6 +-
.../apache/struts2/components/ComponentTest.java | 4 +-
.../apache/struts2/components/FormButtonTest.java | 22 +-
.../org/apache/struts2/components/FormTest.java | 6 +-
.../org/apache/struts2/components/UIBeanTest.java | 46 ++--
.../org/apache/struts2/views/jsp/URLTagTest.java | 12 +-
.../apache/struts2/views/jsp/ui/FormTagTest.java | 8 +-
.../src/test/resources/template/test/Component.ftl | 10 +-
core/src/test/resources/template/test/text.ftl | 2 +-
.../struts2/views/java/simple/SelectHandler.java | 8 +-
.../java/simple/AbstractCommonAttributesTest.java | 6 +-
.../struts2/views/java/simple/ActionErrorTest.java | 6 +-
.../views/java/simple/ActionMessageTest.java | 6 +-
.../struts2/views/java/simple/AnchorTest.java | 8 +-
.../struts2/views/java/simple/CheckboxTest.java | 6 +-
.../views/java/simple/DateTextFieldTest.java | 6 +-
.../struts2/views/java/simple/FieldErrorTest.java | 10 +-
.../apache/struts2/views/java/simple/FileTest.java | 2 +-
.../apache/struts2/views/java/simple/FormTest.java | 4 +-
.../apache/struts2/views/java/simple/HeadTest.java | 2 +-
.../struts2/views/java/simple/HiddenTest.java | 2 +-
.../struts2/views/java/simple/LabelTest.java | 2 +-
.../apache/struts2/views/java/simple/LinkTest.java | 4 +-
.../struts2/views/java/simple/PasswordTest.java | 4 +-
.../struts2/views/java/simple/ResetTest.java | 4 +-
.../struts2/views/java/simple/ScriptTest.java | 2 +-
.../struts2/views/java/simple/SelectTest.java | 10 +-
.../struts2/views/java/simple/SubmitTest.java | 16 +-
.../struts2/views/java/simple/TextAreaTest.java | 4 +-
.../struts2/views/java/simple/TextFieldTest.java | 2 +-
.../struts2/views/java/simple/TokenTest.java | 2 +-
.../velocity/components/AbstractDirective.java | 3 +-
143 files changed, 1491 insertions(+), 1497 deletions(-)
