This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git.
from cf1c674 WW-5172 Upgrades Freemarker to version 2.3.31
add 8d6e26e fix double evaluations
add e647e5c Merge branch 'struts-2-5-x' into fix/double_evaluations_2_5
add 4e05233 reorder to pass tests after merge
add 8a46e93 keep dynamic attributes order
add 88f04fa Revert "keep dynamic attributes order"
add bb6c186 fix test for jdk8+
add e7834d4 Revert "keep dynamic attributes order"
new e1209fd Merge pull request #496 from apache/fix/double_evaluations_2_5
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../providers/XWorkConfigurationProvider.java | 4 +
.../xwork2/interceptor/AliasInterceptor.java | 85 ++++++-
.../com/opensymphony/xwork2/mock/MockResult.java | 7 +-
.../xwork2/security/AcceptedPatternsChecker.java | 2 +-
.../DefaultNotExcludedAcceptedPatternsChecker.java | 105 +++++++++
.../NotExcludedAcceptedPatternsChecker.java | 70 ++++++
.../java/org/apache/struts2/StrutsConstants.java | 1 +
.../org/apache/struts2/components/Component.java | 42 +++-
.../org/apache/struts2/components/FormButton.java | 1 +
.../java/org/apache/struts2/components/Param.java | 29 ++-
.../struts2/components/ServletUrlRenderer.java | 8 +-
.../java/org/apache/struts2/components/UIBean.java | 117 +++++-----
.../config/DefaultBeanSelectionProvider.java | 3 +
.../org/apache/struts2/result/StreamResult.java | 51 ++++-
.../java/org/apache/struts2/util/StrutsUtil.java | 4 +-
core/src/main/resources/struts-default.xml | 1 +
.../resources/template/css_xhtml/form-validate.ftl | 4 +-
.../main/resources/template/simple/combobox.ftl | 4 +-
.../resources/template/simple/doubleselect.ftl | 44 ++--
.../main/resources/template/simple/form-close.ftl | 24 +-
.../template/xhtml/form-close-validate.ftl | 10 +-
.../main/resources/template/xhtml/form-close.ftl | 2 +-
.../resources/template/xhtml/form-validate.ftl | 4 +-
.../com/opensymphony/xwork2/ChainResultTest.java | 14 +-
.../xwork2/interceptor/AliasInterceptorTest.java | 90 ++++++++
.../DefaultAcceptedPatternsCheckerTest.java | 28 +++
.../DefaultExcludedPatternsCheckerTest.java | 29 +++
...aultNotExcludedAcceptedPatternsCheckerTest.java | 91 ++++++++
.../apache/struts2/TestConfigurationProvider.java | 12 +-
.../org/apache/struts2/components/UIBeanTest.java | 94 ++++++--
.../apache/struts2/result/PostbackResultTest.java | 135 +++++++++++
.../result/ServletActionRedirectResultTest.java | 135 +++++++++++
.../apache/struts2/result/StreamResultTest.java | 42 +++-
.../org/apache/struts2/util/StrutsUtilTest.java | 55 +++--
.../freemarker/FreemarkerResultMockedTest.java | 65 +++++-
.../struts2/views/jsp/AbstractUITagTest.java | 42 ++--
.../org/apache/struts2/views/jsp/BeanTagTest.java | 61 +++++
.../apache/struts2/views/jsp/ui/ComboBoxTest.java | 2 +-
.../apache/struts2/views/jsp/ui/TextfieldTest.java | 8 +-
.../apache/struts2/views/freemarker/iterator.ftl | 9 +-
.../org/apache/struts2/views/jsp/ui/ComboBox-4.txt | 8 +-
.../org/apache/struts2/views/jsp/ui/Radio-6.txt | 12 +-
.../apache/struts2/views/jsp/ui/Textfield-5.txt | 2 +-
.../ui/{Textfield-5.txt => Textfield-5jdk8.txt} | 2 +-
core/src/test/resources/struts.xml | 5 +
core/src/test/resources/xwork-sample.xml | 24 +-
.../views/jasperreports/JasperReportsResult.java | 59 ++++-
.../jasperreports/JasperReportsResultTest.java | 251 +++++++++++++++++++--
.../apache/struts2/views/jasperreports/empty.jrxml | 23 --
.../struts2/views/jasperreports/simple.jrxml | 45 ++++
.../struts2/views/java/simple/AnchorTest.java | 2 +
.../struts2/views/java/simple/CheckboxTest.java | 2 +
.../struts2/components/PortletUrlRenderer.java | 4 +-
53 files changed, 1682 insertions(+), 291 deletions(-)
create mode 100644
core/src/main/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsChecker.java
create mode 100644
core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java
create mode 100644
core/src/test/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsCheckerTest.java
create mode 100644
core/src/test/java/org/apache/struts2/result/PostbackResultTest.java
copy
apps/showcase/src/main/resources/myTemplateDir/myTheme/myAnotherTemplate.ftl =>
core/src/test/resources/org/apache/struts2/views/freemarker/iterator.ftl (83%)
copy core/src/test/resources/org/apache/struts2/views/jsp/ui/{Textfield-5.txt
=> Textfield-5jdk8.txt} (64%)
delete mode 100644
plugins/jasperreports/src/test/resources/org/apache/struts2/views/jasperreports/empty.jrxml
create mode 100644
plugins/jasperreports/src/test/resources/org/apache/struts2/views/jasperreports/simple.jrxml
