This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03-v2
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 3a27b2a0059bc475082d7feef042d7068e6fb491
Merge: b0f2f0a8b b835e8978
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Nov 3 12:04:25 2024 +1100
Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into
7.0.x/merge-master-2024-11-03-v2
.../apache/struts2/showcase/action/JSPEvalAction.java | 2 +-
.../apache/struts2/showcase/ajax/AjaxTestAction.java | 2 +-
.../showcase/chat/ChatAuthenticationInterceptor.java | 2 +-
.../apache/struts2/showcase/chat/ChatInterceptor.java | 2 +-
.../showcase/filedownload/FileDownloadAction.java | 2 +-
.../main/java/org/apache/struts2/ActionContext.java | 1 +
.../main/java/org/apache/struts2/ActionInvocation.java | 2 ++
.../main/java/org/apache/struts2/ActionSupport.java | 1 +
.../org/apache/struts2/DefaultActionInvocation.java | 2 ++
.../java/org/apache/struts2/{ => action}/Action.java | 2 +-
.../config/providers/XmlDocConfigurationProvider.java | 2 +-
.../struts2/interceptor/ChainingInterceptor.java | 2 +-
.../interceptor/DefaultWorkflowInterceptor.java | 2 +-
.../struts2/interceptor/ExecuteAndWaitInterceptor.java | 3 +--
.../org/apache/struts2/interceptor/Interceptor.java | 5 +++--
.../apache/struts2/interceptor/PreResultListener.java | 4 ++--
.../struts2/interceptor/annotations/InputConfig.java | 2 +-
.../struts2/interceptor/parameter/StrutsParameter.java | 4 +++-
.../apache/struts2/{ => result}/ActionChainResult.java | 12 ++++++++----
.../main/java/org/apache/struts2/result/Result.java | 2 +-
.../org/apache/struts2/util/AppendIteratorFilter.java | 2 +-
.../org/apache/struts2/util/IteratorGenerator.java | 2 +-
.../org/apache/struts2/util/MergeIteratorFilter.java | 2 +-
.../org/apache/struts2/util/SortIteratorFilter.java | 2 +-
.../org/apache/struts2/util/SubsetIteratorFilter.java | 2 +-
core/src/main/resources/struts-default.xml | 2 +-
core/src/main/resources/xwork-default.xml | 2 +-
.../java/org/apache/struts2/ActionChainResultTest.java | 1 +
.../java/org/apache/struts2/ActionNestingTest.java | 1 +
.../java/org/apache/struts2/ActionSupportTest.java | 1 +
.../test/java/org/apache/struts2/ChainResultTest.java | 2 +-
.../apache/struts2/DefaultActionInvocationTest.java | 1 +
.../org/apache/struts2/ExternalReferenceAction.java | 2 ++
.../src/test/java/org/apache/struts2/NestedAction.java | 1 +
.../test/java/org/apache/struts2/SimpleFooAction.java | 2 ++
core/src/test/java/org/apache/struts2/TestAction.java | 3 +--
.../org/apache/struts2/TestConfigurationProvider.java | 5 +----
.../java/org/apache/struts2/components/FormTest.java | 2 +-
.../java/org/apache/struts2/config/SettingsTest.java | 2 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 10 +++++-----
.../config/providers/MockConfigurationProvider.java | 4 ++--
.../config/providers/NoNoArgsConstructorAction.java | 2 +-
.../config/providers/PrivateConstructorAction.java | 2 +-
.../XmlConfigurationProviderExceptionMappingsTest.java | 2 +-
.../XmlConfigurationProviderMultilevelTest.java | 2 +-
.../providers/XmlConfigurationProviderResultsTest.java | 4 ++--
.../XmlConfigurationProviderWildCardIncludeTest.java | 4 ++--
.../struts2/conversion/ConversionTestAction.java | 2 +-
.../struts2/interceptor/AliasInterceptorTest.java | 2 +-
.../struts2/interceptor/ChainingInterceptorTest.java | 4 ++--
.../interceptor/ChainingInterceptorWithConfigTest.java | 4 ++--
.../interceptor/ConversionErrorInterceptorTest.java | 2 +-
.../struts2/interceptor/CookieInterceptorTest.java | 2 +-
.../interceptor/DefaultWorkflowInterceptorTest.java | 2 +-
.../interceptor/ExceptionMappingInterceptorTest.java | 2 +-
.../struts2/interceptor/ExecuteAndWaitDelayAction.java | 2 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +-
.../struts2/interceptor/I18nInterceptorTest.java | 2 +-
.../interceptor/MessageStoreInterceptorTest.java | 3 +--
.../interceptor/MessageStorePreResultListenerTest.java | 2 +-
.../interceptor/ModelDrivenInterceptorTest.java | 2 +-
.../struts2/interceptor/PreResultListenerTest.java | 2 +-
.../struts2/interceptor/PrepareInterceptorTest.java | 2 +-
.../interceptor/ScopedModelDrivenInterceptorTest.java | 2 +-
.../interceptor/ServletConfigInterceptorTest.java | 2 +-
.../StrutsConversionErrorInterceptorTest.java | 2 +-
.../struts2/interceptor/TokenInterceptorTest.java | 2 +-
.../interceptor/TokenSessionStoreInterceptorTest.java | 2 +-
.../struts2/interceptor/ValidationErrorAwareTest.java | 2 +-
...alidationInterceptorPrefixMethodInvocationTest.java | 2 +-
.../interceptor/annotations/AnnotatedAction.java | 2 +-
.../annotations/AnnotationWorkflowInterceptorTest.java | 2 +-
.../interceptor/annotations/ShortcircuitedAction.java | 2 +-
.../parameter/ParametersInterceptorTest.java | 2 +-
.../org/apache/struts2/result/StreamResultTest.java | 2 +-
.../java/org/apache/struts2/util/MyBeanAction.java | 2 +-
.../struts2/util/StrutsLocalizedTextProviderTest.java | 2 +-
.../AnnotationActionValidatorManagerTest.java | 2 +-
.../struts2/validator/ExpressionValidatorTest.java | 2 +-
.../struts2/validator/ModelDrivenValidationTest.java | 2 +-
.../apache/struts2/validator/StringValidatorTest.java | 2 +-
.../validator/VisitorFieldValidatorModelTest.java | 2 +-
.../struts2/validator/VisitorFieldValidatorTest.java | 2 +-
.../org/apache/struts2/views/jsp/AbstractTagTest.java | 2 +-
.../org/apache/struts2/views/jsp/ActionTagTest.java | 2 +-
.../struts2/views/jsp/AppendIteratorTagTest.java | 2 +-
.../struts2/views/jsp/IteratorGeneratorTagTest.java | 2 +-
.../apache/struts2/views/jsp/MergeIteratorTagTest.java | 2 +-
.../apache/struts2/views/jsp/SortIteratorTagTest.java | 2 +-
.../struts2/views/jsp/SubsetIteratorTagTest.java | 2 +-
.../java/org/apache/struts2/views/jsp/TextTagTest.java | 2 +-
.../struts2/views/jsp/ui/ActionErrorTagTest.java | 2 +-
.../struts2/views/jsp/ui/ActionMessageTagTest.java | 2 +-
.../apache/struts2/views/jsp/ui/FieldErrorTagTest.java | 2 +-
.../org/apache/struts2/views/jsp/ui/FormTagTest.java | 2 +-
.../apache/struts2/views/jsp/ui/LocaleTestAction.java | 2 +-
.../struts2/views/jsp/ui/UpDownSelectTagTest.java | 2 +-
.../apache/struts2/config/providers/xwork- test.xml | 2 +-
.../struts2/config/providers/xwork-include-parent.xml | 2 +-
.../xwork-test-actions-packagedefaultclassref.xml | 2 +-
.../struts2/config/providers/xwork-test-actions.xml | 2 +-
.../config/providers/xwork-test-allowlist-2.xml | 2 +-
.../config/providers/xwork-test-exception-mappings.xml | 2 +-
.../struts2/config/providers/xwork-test-multilevel.xml | 2 +-
.../config/providers/xwork-test-result-inheritance.xml | 2 +-
.../config/providers/xwork-test-result-names.xml | 2 +-
.../struts2/config/providers/xwork-test-results.xml | 2 +-
core/src/test/resources/struts.properties | 2 +-
core/src/test/resources/xwork - jar.jar | Bin 2042 -> 902 bytes
core/src/test/resources/xwork - zip.zip | Bin 2653 -> 664 bytes
core/src/test/resources/xwork-jar.jar | Bin 2026 -> 898 bytes
core/src/test/resources/xwork-proxyinvoke.xml | 2 +-
core/src/test/resources/xwork-test-default.xml | 2 +-
core/src/test/resources/xwork-test-validation.xml | 2 +-
core/src/test/resources/xwork-zip.zip | Bin 2645 -> 660 bytes
.../struts2/convention/ConventionUnknownHandler.java | 2 +-
.../struts2/convention/DefaultResultMapBuilder.java | 2 +-
.../convention/PackageBasedActionConfigBuilder.java | 4 ++--
.../apache/struts2/convention/annotation/Result.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 2 +-
.../org/apache/struts2/convention/actions/Skip.java | 2 +-
.../defaultinterceptor/SingleActionNameAction2.java | 2 +-
.../apache/struts2/convention/actions/idx/Index.java | 2 +-
.../struts2/convention/actions/idx/idx2/Index.java | 2 +-
.../apache/struts2/convention/actions/skip/Index.java | 2 +-
.../java/org/apache/struts2/json/JSONInterceptor.java | 2 +-
.../apache/struts2/json/JSONValidationInterceptor.java | 2 +-
.../struts2/json/JSONValidationInterceptorTest.java | 2 +-
.../test/java/org/apache/struts2/json/TestAction.java | 2 +-
.../struts2/junit/StrutsSpringJUnit4TestCaseTest.java | 2 +-
.../org/apache/struts2/junit/StrutsTestCaseTest.java | 2 +-
.../org/apache/struts2/rest/RestActionInvocation.java | 2 +-
.../apache/struts2/rest/RestWorkflowInterceptor.java | 2 +-
.../struts2/rest/ContentTypeInterceptorTest.java | 2 +-
.../apache/struts2/spring/ActionsFromSpringTest.java | 2 +-
.../org/apache/struts2/spring/ExecuteInterceptor.java | 2 +-
.../apache/struts2/spring/SpringObjectFactoryTest.java | 4 ++--
.../org/apache/struts2/spring/actionContext-xwork.xml | 2 +-
.../org/apache/struts2/result/xslt/XSLTResultTest.java | 2 +-
139 files changed, 162 insertions(+), 146 deletions(-)
