This is an automated email from the ASF dual-hosted git repository. yasserzamani pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
from dc4e403d3 Merge pull request #570 from apache/WW-5187-velocity add 3825229f4 WW-5185 Reintroduces proper implementation of Tiles resource to support wildcard matching of Tiles definitions It was broken after refactoring related to WW-5011 add 9a2996f9b Uses proper Servlet API 3.1 headers new 64d054221 Merge pull request #566 from apache/WW-5185-struts-resource 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: apps/rest-showcase/src/main/webapp/WEB-INF/web.xml | 7 +- apps/showcase/src/main/webapp/WEB-INF/web.xml | 46 ++++++------ .../struts2/tiles/StrutsApplicationResource.java | 82 ++++++++++++++++++++++ .../StrutsWildcardServletApplicationContext.java | 5 +- 4 files changed, 109 insertions(+), 31 deletions(-) create mode 100644 plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java