This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
from 266cd1333 Merge pull request #1082 from apache/kusal-depr-apis-4
add 8ba8ee5fe WW-3714 Deprecate and migrate ValueStack
add 111bc2565 WW-3714 Deprecate and migrate assorted marker interfaces
add dfd07190b WW-3714 Update new ActionContext with new ValueStack
add 7ce8f484e WW-3714 Shortcut adapters
add ebedd7391 WW-3714 Marker interface migration follow-up
add 2757c2357 WW-3714 Fix replacement ValidationAware marker not recognised
add 5b81ec085 Merge pull request #1083 from apache/kusal-depr-apis-5
No new revisions were added by this update.
Summary of changes:
.../com/opensymphony/xwork2/ActionContext.java | 13 +-
.../opensymphony/xwork2/ActionEventListener.java | 17 ++
.../com/opensymphony/xwork2/ActionInvocation.java | 8 +-
.../java/com/opensymphony/xwork2/ActionProxy.java | 3 +
.../java/com/opensymphony/xwork2/ModelDriven.java | 16 +-
.../java/com/opensymphony/xwork2/Preparable.java | 17 +-
.../main/java/com/opensymphony/xwork2/Result.java | 3 +
.../java/com/opensymphony/xwork2/Unchainable.java | 7 +-
.../java/com/opensymphony/xwork2/Validateable.java | 15 +-
.../xwork2/interceptor/AliasInterceptor.java | 9 +-
.../xwork2/interceptor/ChainingInterceptor.java | 15 +-
.../interceptor/ConversionErrorInterceptor.java | 1 +
.../interceptor/DefaultWorkflowInterceptor.java | 3 +
.../xwork2/interceptor/ModelDrivenInterceptor.java | 2 +-
.../xwork2/interceptor/PreResultListener.java | 3 +
.../xwork2/interceptor/PrepareInterceptor.java | 4 +-
.../xwork2/interceptor/ScopedModelDriven.java | 21 +-
.../interceptor/ScopedModelDrivenInterceptor.java | 1 +
.../interceptor/StaticParametersInterceptor.java | 3 +-
.../xwork2/interceptor/ValidationAware.java | 179 ++++++--------
.../xwork2/interceptor/ValidationErrorAware.java | 20 +-
.../interceptor/ValidationWorkflowAware.java | 10 +-
.../com/opensymphony/xwork2/util/DebugUtils.java | 2 +-
.../xwork2/util/StrutsLocalizedTextProvider.java | 6 +-
.../com/opensymphony/xwork2/util/ValueStack.java | 257 ++++++++++-----------
.../validator/DelegatingValidatorContext.java | 18 +-
.../xwork2/validator/ValidationInterceptor.java | 52 ++---
.../java/org/apache/struts2/ActionContext.java | 2 +-
.../org/apache/struts2/ActionEventListener.java | 2 +-
.../java/org/apache/struts2/ActionInvocation.java | 2 +-
.../xwork2 => org/apache/struts2}/ModelDriven.java | 2 +-
.../xwork2 => org/apache/struts2}/Preparable.java | 4 +-
.../xwork2 => org/apache/struts2}/Unchainable.java | 2 +-
.../apache/struts2}/Validateable.java | 4 +-
.../interceptor/AbstractFileUploadInterceptor.java | 1 -
.../interceptor/ActionFileUploadInterceptor.java | 1 -
.../interceptor/MessageStoreInterceptor.java | 5 +-
.../interceptor/MessageStorePreResultListener.java | 1 -
.../struts2}/interceptor/ScopedModelDriven.java | 8 +-
.../struts2/interceptor/TokenInterceptor.java | 1 -
.../struts2}/interceptor/ValidationAware.java | 2 +-
.../struts2}/interceptor/ValidationErrorAware.java | 2 +-
.../interceptor/ValidationWorkflowAware.java | 2 +-
.../apache/struts2}/util/ValueStack.java | 7 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 12 +-
.../interceptor/BeanValidationInterceptor.java | 2 +-
.../apache/struts2/validators/DWRValidator.java | 2 +-
.../java/org/apache/struts2/json/JSONResult.java | 2 +-
.../struts2/json/JSONValidationInterceptor.java | 8 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 2 +-
.../interceptor/OValValidationInterceptor.java | 3 +-
.../struts2/rest/ContentTypeInterceptor.java | 2 +-
.../apache/struts2/rest/RestActionInvocation.java | 12 +-
.../struts2/rest/RestWorkflowInterceptor.java | 2 +-
.../struts2/rest/handler/XStreamHandler.java | 2 +-
55 files changed, 379 insertions(+), 423 deletions(-)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/ModelDriven.java (97%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Preparable.java (97%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Unchainable.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/Validateable.java (93%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ScopedModelDriven.java (92%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationAware.java (98%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationErrorAware.java (97%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/interceptor/ValidationWorkflowAware.java (96%)
copy core/src/main/java/{com/opensymphony/xwork2 =>
org/apache/struts2}/util/ValueStack.java (97%)
