This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 094b6c5e3bc08f03447c2734c03d7b1cbfab4fdd
Merge: ab810c2 0ecb482
Author: Aleksandr Mashchenko <aleksandr...@gmail.com>
AuthorDate: Sun Jan 6 22:16:27 2019 +0200
Merge pull request #289 from lukaszlenart/WW-4972
[WW-4972] Switches incompatible_improvements to VERSION_2_3_28
.../template/ajaxErrorContainers/actionerror.ftl | 8 +-
.../template/ajaxErrorContainers/controlfooter.ftl | 2 +-
.../ajaxErrorContainers/controlheader-core.ftl | 8 +-
.../src/main/webapp/WEB-INF/person/list-people.ftl | 6 +-
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 2 +-
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 2 +-
.../non-ui/actionPrefix/redirectActionPrefix.ftl | 2 +-
.../java/org/apache/struts2/components/UIBean.java | 4 +-
.../views/freemarker/FreemarkerManager.java | 7 +-
.../org/apache/struts2/dispatcher/error.ftl | 18 +--
.../main/resources/template/css_xhtml/checkbox.ftl | 10 +-
.../resources/template/css_xhtml/controlfooter.ftl | 2 +-
.../template/css_xhtml/controlheader-core.ftl | 6 +-
.../main/resources/template/css_xhtml/label.ftl | 10 +-
.../src/main/resources/template/simple/a-close.ftl | 12 +-
.../main/resources/template/simple/actionerror.ftl | 8 +-
.../resources/template/simple/actionmessage.ftl | 8 +-
.../main/resources/template/simple/checkbox.ftl | 10 +-
.../resources/template/simple/checkboxlist.ftl | 26 ++--
.../main/resources/template/simple/combobox.ftl | 20 +--
.../template/simple/common-attributes.ftl | 2 +-
core/src/main/resources/template/simple/css.ftl | 10 +-
core/src/main/resources/template/simple/debug.ftl | 10 +-
.../resources/template/simple/doubleselect.ftl | 24 ++--
.../template/simple/dynamic-attributes.ftl | 2 +-
.../main/resources/template/simple/fielderror.ftl | 14 +-
core/src/main/resources/template/simple/file.ftl | 12 +-
.../main/resources/template/simple/form-common.ftl | 24 ++--
core/src/main/resources/template/simple/form.ftl | 2 +-
core/src/main/resources/template/simple/hidden.ftl | 8 +-
.../template/simple/inputtransferselect.ftl | 40 +++---
core/src/main/resources/template/simple/label.ftl | 6 +-
.../main/resources/template/simple/optgroup.ftl | 10 +-
.../template/simple/optiontransferselect.ftl | 144 ++++++++++-----------
.../main/resources/template/simple/password.ftl | 12 +-
.../main/resources/template/simple/radiomap.ftl | 18 +--
core/src/main/resources/template/simple/reset.ftl | 22 ++--
.../resources/template/simple/scripting-events.ftl | 28 ++--
core/src/main/resources/template/simple/select.ftl | 30 ++---
core/src/main/resources/template/simple/submit.ftl | 28 ++--
core/src/main/resources/template/simple/text.ftl | 16 +--
.../main/resources/template/simple/textarea.ftl | 14 +-
core/src/main/resources/template/simple/token.ftl | 4 +-
.../src/main/resources/template/xhtml/checkbox.ftl | 14 +-
core/src/main/resources/template/xhtml/control.ftl | 4 +-
.../resources/template/xhtml/controlfooter.ftl | 2 +-
.../template/xhtml/controlheader-core.ftl | 8 +-
.../resources/template/xhtml/controlheader.ftl | 2 +-
.../main/resources/template/xhtml/form-close.ftl | 2 +-
core/src/main/resources/template/xhtml/form.ftl | 4 +-
core/src/main/resources/template/xhtml/tooltip.ftl | 6 +-
.../views/freemarker/FreemarkerManagerTest.java | 57 ++++++++
.../struts2/views/jsp/ui/ActionErrorTagTest.java | 2 -
.../freemarker/incompatible-improvements.ftl} | 6 +-
.../org/apache/struts2/views/jsp/ui/Radio-6.txt | 12 +-
.../main/resources/config-browser/actionNames.ftl | 2 +-
.../main/resources/config-browser/showConfig.ftl | 4 +-
.../resources/config-browser/validatorDetails.ftl | 2 +-
58 files changed, 419 insertions(+), 359 deletions(-)
