This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from c5dfe61ec [maven-release-plugin] prepare for next development iteration
add 5919178ce WW-5411 Delete deprecated code part 1
add 36176b665 WW-5411 Delete deprecated code part 2
add 6c6ef447c WW-5411 Delete deprecated code part 3
add e411f9c17 WW-5411 Delete deprecated code part 4
add 4e4cf468a WW-5411 Delete deprecated code part 5
add aec78dd16 WW-5411 Misc code cleanup
add fe49781a3 Merge pull request #1002 from
apache/7.0.x/WW-5411-delete-deprecated
No new revisions were added by this update.
Summary of changes:
.../showcase/application/TestDataProvider.java | 23 +-
.../apache/struts2/showcase/hangman/Hangman.java | 29 +--
.../org/apache/struts2/showcase/hangman/Vocab.java | 31 +--
.../com/opensymphony/xwork2/ActionSupport.java | 8 +-
.../opensymphony/xwork2/DefaultTextProvider.java | 4 +-
.../xwork2/config/impl/AbstractMatcher.java | 84 +------
.../xwork2/conversion/TypeConverter.java | 3 -
.../conversion/impl/InstantiatingNullHandler.java | 18 +-
.../opensymphony/xwork2/inject/ContainerImpl.java | 2 +-
.../opensymphony/xwork2/inject/util/Strings.java | 57 -----
.../xwork2/interceptor/AliasInterceptor.java | 10 +-
.../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +-
.../xwork2/interceptor/NoParameters.java | 37 ----
.../interceptor/ParameterFilterInterceptor.java | 241 ---------------------
.../xwork2/interceptor/ParameterNameAware.java | 26 ---
.../xwork2/interceptor/ParameterValueAware.java | 26 ---
.../xwork2/interceptor/ParametersInterceptor.java | 25 ---
.../interceptor/StaticParametersInterceptor.java | 6 +-
.../xwork2/interceptor/annotations/Allowed.java | 38 ----
.../AnnotationParameterFilterInterceptor.java | 115 ----------
.../interceptor/annotations/BlockByDefault.java | 41 ----
.../xwork2/interceptor/annotations/Blocked.java | 38 ----
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 2 +
.../xwork2/ognl/SecurityMemberAccess.java | 43 +---
.../xwork2/util/AbstractLocalizedTextProvider.java | 32 +--
.../xwork2/util/NamedVariablePatternMatcher.java | 2 +-
.../opensymphony/xwork2/util/PatternMatcher.java | 14 +-
.../xwork2/util/StrutsLocalizedTextProvider.java | 70 +-----
.../xwork2/util/fs/DefaultFileManager.java | 9 +-
.../util/reflection/ReflectionProviderFactory.java | 32 ---
.../validator/DelegatingValidatorContext.java | 78 +++++--
.../org/apache/struts2/ServletActionContext.java | 13 +-
.../java/org/apache/struts2/StrutsConstants.java | 19 --
.../config/StrutsXmlConfigurationProvider.java | 10 -
.../apache/struts2/dispatcher/HttpParameters.java | 55 +----
.../dispatcher/multipart/StrutsUploadedFile.java | 13 --
.../factory/PrefixBasedActionProxyFactory.java | 12 +-
.../ActionMappingParametersInterceptor.java | 7 +-
.../struts2/interceptor/csp/CspSettings.java | 6 -
.../interceptor/csp/DefaultCspSettings.java | 9 +-
.../debugging/DebuggingInterceptor.java | 11 +-
.../parameter/ParametersInterceptor.java | 9 -
.../org/apache/struts2/ognl/ProviderAllowlist.java | 18 --
.../result/ServletActionRedirectResult.java | 3 +-
.../struts2/result/ServletRedirectResult.java | 7 +-
.../org/apache/struts2/url/QueryStringParser.java | 6 -
.../struts2/url/StrutsQueryStringParser.java | 8 +-
.../java/org/apache/struts2/util/MakeIterator.java | 4 +-
.../apache/struts2/util/ServletContextAware.java | 32 ---
.../views/freemarker/FreemarkerManager.java | 33 +--
.../apache/struts2/views/jsp/ui/AbstractUITag.java | 12 +-
core/src/main/resources/struts-beans.xml | 15 --
core/src/main/resources/struts-default.xml | 4 +-
core/src/main/resources/xwork-default.xml | 4 +-
.../providers/MockConfigurationProvider.java | 38 ++--
.../XmlConfigurationProviderMultilevelTest.java | 2 +-
.../ParameterFilterInterceptorTest.java | 127 -----------
.../annotations/AllowingByDefaultAction.java | 44 ----
.../annotations/AllowingByDefaultModel.java | 41 ----
.../AnnotationParameterFilterInterceptorTest.java | 199 -----------------
.../annotations/BlockingByDefaultAction.java | 45 ----
.../annotations/BlockingByDefaultModel.java | 40 ----
.../xwork2/ognl/OgnlValueStackTest.java | 9 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 10 +-
.../xwork2/ognl/SetPropertiesTest.java | 8 +-
.../util/StrutsLocalizedTextProviderTest.java | 16 +-
.../com/test/ExternalSecurityMemberAccess.java | 6 +-
.../com/test/ExternalSecurityMemberAccessTest.java | 4 +-
.../apache/struts2/TestConfigurationProvider.java | 6 +-
.../struts2/interceptor/CspInterceptorTest.java | 6 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 4 +-
.../parameter/ParametersInterceptorTest.java | 2 +-
.../util/SecurityMemberAccessInServletsTest.java | 4 +-
.../config/providers/xwork-include-parent.xml | 2 +-
.../config/providers/xwork-test-multilevel.xml | 2 +-
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 +-
.../convention/DefaultResultMapBuilder.java | 13 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 10 +-
.../portlet/interceptor/PortletContextAware.java | 32 ---
.../interceptor/PortletPreferencesAware.java | 32 ---
.../portlet/interceptor/PortletRequestAware.java | 32 ---
.../portlet/interceptor/PortletResponseAware.java | 32 ---
.../struts2/rest/ContentTypeHandlerManager.java | 22 +-
.../rest/DefaultContentTypeHandlerManager.java | 18 +-
.../rest/handler/AbstractContentTypeHandler.java | 20 --
.../struts2/rest/handler/ContentTypeHandler.java | 31 +--
.../rest/handler/FormUrlEncodedHandler.java | 8 +-
.../apache/struts2/rest/handler/HtmlHandler.java | 6 +-
.../struts2/rest/handler/JacksonJsonHandler.java | 6 +-
.../struts2/rest/handler/JacksonXmlHandler.java | 8 +-
.../struts2/rest/handler/JuneauXmlHandler.java | 6 +-
.../rest/handler/MultipartFormDataHandler.java | 10 +-
.../struts2/rest/handler/XStreamHandler.java | 6 +-
.../rest/ContentTypeHandlerManagerTest.java | 4 +-
.../rest/DefaultContentTypeHandlerManagerTest.java | 3 +-
.../xwork2/spring/actionContext-xwork.xml | 6 +-
.../struts2/tiles/StrutsTilesContainerFactory.java | 24 +-
.../views/velocity/StrutsVelocityContext.java | 18 --
.../struts2/views/velocity/VelocityTagLibrary.java | 8 -
101 files changed, 355 insertions(+), 2080 deletions(-)
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterValueAware.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
delete mode 100644
core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
delete mode 100644
core/src/main/java/org/apache/struts2/util/ServletContextAware.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptorTest.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java
delete mode 100644
core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
