This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5190-match-action-proxy
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d639b59f6df0d621197f7f8a17158910c3a66722
Merge: 8e468a368 64d054221
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Jun 18 09:45:20 2022 +0200
Merge branch 'master' into WW-5190-match-action-proxy
apps/rest-showcase/src/main/webapp/WEB-INF/web.xml | 7 +-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 42 +++++------
.../apache/struts2/views/jsp/ui/TextareaTag.java | 4 +-
.../main/resources/template/simple/textarea.ftl | 14 ++--
.../apache/struts2/views/jsp/ui/TextareaTest.java | 4 ++
.../org/apache/struts2/views/jsp/ui/Textarea-1.txt | 2 +-
.../struts2/sitemesh/VelocityPageFilter.java | 2 +-
.../sitemesh/src/main/resources/struts-plugin.xml | 5 +-
.../struts2/tiles/StrutsApplicationResource.java | 82 ++++++++++++++++++++++
.../StrutsWildcardServletApplicationContext.java | 5 +-
10 files changed, 126 insertions(+), 41 deletions(-)
