You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/04/23 05:22:23 UTC
(struts) 05/06: Merge remote-tracking branch 'origin/master' into fork/6.4
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch m02
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 0a3eef56229850616220586518a0e6c0763a470e
Merge: 6b79f3d40 3c21e8229
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Sat Apr 20 20:14:58 2024 +1000
Merge remote-tracking branch 'origin/master' into fork/6.4
core/pom.xml | 9 +
.../com/opensymphony/xwork2/XWorkTestCase.java | 35 ++-
.../xwork2/config/entities/PackageConfig.java | 13 ++
.../xwork2/config/impl/DefaultConfiguration.java | 18 +-
.../providers/XmlDocConfigurationProvider.java | 25 ++-
.../xwork2/ognl/DefaultOgnlCacheFactory.java | 8 +-
.../xwork2/ognl/SecurityMemberAccess.java | 36 ++--
.../com/opensymphony/xwork2/util/ProxyUtil.java | 59 ++++-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../config/StrutsXmlConfigurationProvider.java | 1 +
.../struts2/config/entities/ConstantConfig.java | 20 ++
.../org/apache/struts2/dispatcher/Dispatcher.java | 36 ++++
.../apache/struts2/dispatcher/InitOperations.java | 25 +--
.../struts2/dispatcher/PrepareOperations.java | 18 +-
.../filter/StrutsPrepareAndExecuteFilter.java | 10 +-
.../dispatcher/filter/StrutsPrepareFilter.java | 10 +-
.../org/apache/struts2/default.properties | 3 +
core/src/main/resources/struts-6.5.dtd | 158 ++++++++++++++
.../src/main/resources/struts-excluded-classes.xml | 2 +
.../xwork2/config/ConfigurationTest.java | 36 ++++
.../XmlConfigurationProviderPackagesTest.java | 68 ++++--
.../xwork2/ognl/OgnlValueStackTest.java | 8 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 2 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 26 +++
.../struts2/dispatcher/InitOperationsTest.java | 86 --------
...rutsPrepareAndExecuteFilterIntegrationTest.java | 13 +-
.../struts2/ognl/OgnlSetPossiblePropertyTest.java | 240 +++++++++++++++++++++
.../apache/struts2/views/jsp/ui/DebugTagTest.java | 22 +-
.../providers/xwork-test-package-extends-final.xml | 37 ++++
.../config/providers/xwork-test-package-final.xml | 37 ++++
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 54 +++--
pom.xml | 2 +-
32 files changed, 892 insertions(+), 228 deletions(-)