This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 1e32510ea659344f36fefe2944ba7432b3e50f41
Merge: e59abe4 61e6d34
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Jan 23 13:02:48 2022 +0100
Merge pull request #523 from apache/WW-5022-escape-false
[WW-5022] Sets escapeHtmlBody to false by default and defines a new flag
.../src/main/webapp/WEB-INF/decorators/main.jsp | 4 +-
.../src/main/webapp/WEB-INF/filedownload/index.jsp | 4 +-
.../main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 4 +-
.../src/main/webapp/WEB-INF/person/new-person.ftl | 2 +-
.../tags/non-ui/actionPrefix/actionPrefix.ftl | 2 +-
.../non-ui/actionPrefix/actionPrefixExample.ftl | 8 +-
.../tags/non-ui/actionPrefix/methodPrefix.ftl | 4 +-
.../tags/non-ui/actionPrefix/normalSubmit.ftl | 4 +-
.../non-ui/actionPrefix/redirectActionPrefix.ftl | 4 +-
.../iteratorTag/appendIteratorTagDemoResult.jsp | 2 +-
.../iteratorTag/iteratorGeneratorTagDemoResult.jsp | 2 +-
.../iteratorTag/mergeIteratorTagDemoResult.jsp | 2 +-
.../iteratorTag/subsetIteratorTagDemoResult.jsp | 2 +-
.../src/main/webapp/WEB-INF/token/example4.ftl | 2 +-
core/pom.xml | 2 +-
.../java/org/apache/struts2/StrutsConstants.java | 4 +
.../java/org/apache/struts2/components/Anchor.java | 20 +---
.../org/apache/struts2/components/Component.java | 22 ++--
.../java/org/apache/struts2/components/Submit.java | 25 ++--
.../org/apache/struts2/views/jsp/ui/AnchorTag.java | 18 +--
.../org/apache/struts2/views/jsp/ui/SubmitTag.java | 8 +-
.../org/apache/struts2/default.properties | 7 +-
core/src/site/resources/tags/a-attributes.html | 2 +-
.../src/site/resources/tags/submit-attributes.html | 2 +-
.../apache/struts2/components/ComponentTest.java | 133 ++++++++-------------
.../apache/struts2/views/jsp/ui/AnchorTest.java | 71 ++++++++---
.../apache/struts2/views/jsp/ui/CheckboxTest.java | 4 +-
.../org/apache/struts2/views/jsp/ui/FileTest.java | 4 +-
.../apache/struts2/views/jsp/ui/SubmitTest.java | 9 +-
.../apache/struts2/views/jsp/ui/TextareaTest.java | 4 +-
.../src/test/resources/struts-escape-body.xml | 33 ++---
.../views/java/DefaultTagHandlerFactory.java | 13 +-
.../struts2/views/java/simple/AnchorHandler.java | 6 +-
.../struts2/views/java/simple/SimpleTheme.java | 6 +-
.../struts2/views/java/simple/SubmitHandler.java | 14 ++-
.../struts2/views/java/simple/AnchorTest.java | 36 ++++++
36 files changed, 262 insertions(+), 227 deletions(-)