You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2024/05/06 16:21:03 UTC

(struts) branch master updated (c0d1217d7 -> 49b8eedf1)

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


    from c0d1217d7 Merge pull request #924 from apache/feature/WW-5420-text
     add a88cb741d WW-5419 Fixes support for loading Tiles definitions
     add 49b8eedf1 Merge pull request #920 from apache/fix/WW-5419-tiles

No new revisions were added by this update.

Summary of changes:
 plugins/tiles/pom.xml                              | 10 +++
 .../struts2/tiles/StrutsTilesContainerFactory.java | 16 ++---
 .../StrutsWildcardServletApplicationContext.java   |  9 ++-
 .../tiles/StrutsTilesContainerFactoryTest.java     |  9 ++-
 ...trutsWildcardServletApplicationContextTest.java | 79 ++++++++++++++++++++++
 .../tiles-defs-2.1_it.xml => WEB-INF/tiles.xml}    | 22 +++---
 .../core/config/{defs1.xml => tiles_defs1.xml}     |  0
 7 files changed, 116 insertions(+), 29 deletions(-)
 create mode 100644 plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContextTest.java
 copy plugins/tiles/src/test/resources/{org/apache/tiles/core/config/tiles-defs-2.1_it.xml => WEB-INF/tiles.xml} (56%)
 copy plugins/tiles/src/test/resources/org/apache/tiles/core/config/{defs1.xml => tiles_defs1.xml} (100%)