This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch temp/6.3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit de28971f79ce461638a3731072a537a6cbfd873a
Merge: a11678060 3d25caa0a
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Fri Jan 5 13:09:29 2024 +1100
Merge remote-tracking branch 'origin/WW-5382-stale-config' into fork/6.3
.../opensymphony/xwork2/XWorkJUnit4TestCase.java | 4 -
.../com/opensymphony/xwork2/XWorkTestCase.java | 4 -
.../xwork2/config/impl/DefaultConfiguration.java | 8 +-
.../apache/struts2/dispatcher/ContainerHolder.java | 12 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 159 ++-
.../struts2/dispatcher/ExecuteOperations.java | 4 +-
.../apache/struts2/dispatcher/InitOperations.java | 2 +-
.../apache/struts2/dispatcher/MockDispatcher.java | 42 -
.../struts2/dispatcher/PrepareOperations.java | 8 +-
.../apache/struts2/util/StrutsTestCaseHelper.java | 26 +-
.../org/apache/struts2/StrutsInternalTestCase.java | 28 +-
.../struts2/StrutsJUnit4InternalTestCase.java | 61 +-
.../org/apache/struts2/config/SettingsTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 482 ++++---
.../apache/struts2/views/jsp/AbstractTagTest.java | 6 +-
core/src/test/resources/struts.properties | 2 +-
.../apache/struts2/validators/DWRValidator.java | 33 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 10 +-
.../org/apache/struts2/junit/StrutsTestCase.java | 11 +-
.../portlet/dispatcher/Jsr168Dispatcher.java | 1348 ++++++++++----------
.../apache/struts2/StrutsTestCasePortletTests.java | 24 +-
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 403 +++---
.../org/apache/struts2/testng/StrutsTestCase.java | 12 +-
23 files changed, 1309 insertions(+), 1382 deletions(-)
