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 0c4d66430 Merge pull request #994 from
apache/dependabot/maven/maven-surefire-plugin.version-3.3.1
add 56c1291d2 WW-5440 Deprecate AnnotationParameterFilterInterceptor
add 10edbce8d WW-5440 Fix MultipleFileUploadUsingArrayAction
add f9953938f WW-5440 Add missing annotations
add 8b4c188d0 WW-5440 Fix Showcase App allowlist configuration
add cb62cb4e9 WW-5440 Fix OGNL allowlist compat with Convention plugin
add 27e4d0d47 WW-5440 Fix inconsistent indenting
add cec46792c Merge branch 'master' into WW-5440-convention
new 9195990b5 Merge pull request #986 from apache/WW-5440-convention
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/demo/rest/example/OrdersController.java | 24 ++---
.../java/org/demo/rest/example/OrdersService.java | 7 +-
apps/showcase/pom.xml | 6 ++
.../struts2/showcase/DynamicTreeSelectAction.java | 3 +-
.../showcase/LotsOfOptiontransferselectAction.java | 17 +++-
.../showcase/LotsOfRichtexteditorAction.java | 7 +-
.../apache/struts2/showcase/MoreSelectsAction.java | 10 +-
.../showcase/ShowAjaxDynamicTreeAction.java | 2 +
.../org/apache/struts2/showcase/UITagExample.java | 8 ++
.../showcase/action/AbstractCRUDAction.java | 101 +++++++++++----------
.../struts2/showcase/action/EmployeeAction.java | 5 +-
.../struts2/showcase/action/ExampleAction.java | 10 +-
.../struts2/showcase/action/JSPEvalAction.java | 8 +-
.../struts2/showcase/action/SkillAction.java | 2 +
.../showcase/actionchaining/ActionChain1.java | 3 +
.../showcase/actionchaining/ActionChain2.java | 5 +-
.../showcase/actionchaining/ActionChain3.java | 8 +-
.../struts2/showcase/ajax/AjaxTestAction.java | 3 +-
.../showcase/ajax/AutocompleterExampleAction.java | 5 +-
.../showcase/ajax/Example4ShowPanelAction.java | 3 +
.../struts2/showcase/ajax/Example5Action.java | 3 +
.../struts2/showcase/ajax/tree/GetCategory.java | 3 +
.../apache/struts2/showcase/ajax/tree/Toggle.java | 2 +
.../struts2/showcase/async/ChatRoomAction.java | 13 +--
.../struts2/showcase/chat/ChatLoginAction.java | 5 +-
.../struts2/showcase/chat/CrudRoomAction.java | 3 +
.../struts2/showcase/chat/EnterRoomAction.java | 5 +-
.../struts2/showcase/chat/ExitRoomAction.java | 5 +-
.../chat/MessagesAvailableInRoomAction.java | 6 +-
.../showcase/chat/SendMessageToRoomAction.java | 10 +-
.../showcase/chat/UsersAvailableInRoomAction.java | 7 +-
.../showcase/conversion/OperationsEnumAction.java | 3 +-
.../MultipleFileUploadUsingArrayAction.java | 6 +-
.../showcase/freemarker/StandardTagsAction.java | 6 +-
.../showcase/hangman/GuessCharacterAction.java | 6 +-
.../showcase/modelDriven/ModelDrivenAction.java | 4 +
.../showcase/modelDriven/{ => model}/Gangster.java | 2 +-
.../struts2/showcase/person/EditPersonAction.java | 6 +-
.../struts2/showcase/person/ListPeopleAction.java | 3 +-
.../struts2/showcase/person/NewPersonAction.java | 3 +
.../struts2/showcase/source/ViewSourceAction.java | 12 ++-
.../tag/nonui/actionPrefix/SubmitAction.java | 3 +
.../tag/nonui/debugtag/DebugTagAction.java | 3 +-
.../nonui/iteratortag/AppendIteratorTagDemo.java | 7 +-
.../iteratortag/IteratorGeneratorTagDemo.java | 9 +-
.../nonui/iteratortag/MergeIteratorTagDemo.java | 9 +-
.../nonui/iteratortag/SubsetIteratorTagDemo.java | 13 ++-
.../apache/struts2/showcase/token/TokenAction.java | 2 +
.../AbstractValidationActionSupport.java | 1 +
.../showcase/validation/AjaxFormSubmitAction.java | 31 ++++---
.../validation/BeanValidationExampleAction.java | 13 ++-
.../NonFieldValidatorsExampleAction.java | 5 +
.../struts2/showcase/validation/QuizAction.java | 4 +
.../showcase/validation/SubmitApplication.java | 3 +
.../validation/VisitorValidatorsExampleAction.java | 3 +
.../apache/struts2/showcase/xslt/JVMAction.java | 6 +-
.../src/main/resources/struts-fileupload.xml | 4 +-
apps/showcase/src/main/resources/struts.xml | 9 ++
.../apache/struts2/showcase/ConventionTest.java | 88 ++++++++++++++++++
.../struts2/osgi/admin/actions/BundlesAction.java | 9 +-
.../struts2/osgi/admin/actions/ShellAction.java | 15 +--
.../src/main/java/actions/osgi/BundlesAction.java | 1 +
.../main/java/actions/osgi/HelloWorldAction.java | 4 +-
.../xwork2/ValidationAwareSupport.java | 15 ++-
.../xwork2/config/ConfigurationUtil.java | 13 ++-
.../providers/XmlDocConfigurationProvider.java | 5 +-
.../xwork2/interceptor/annotations/Allowed.java | 2 +
.../AnnotationParameterFilterInterceptor.java | 7 +-
.../interceptor/annotations/BlockByDefault.java | 2 +
.../xwork2/interceptor/annotations/Blocked.java | 2 +
.../struts2/dispatcher/DefaultActionSupport.java | 10 +-
.../org/apache/struts2/ognl/ProviderAllowlist.java | 35 +++++--
.../com/opensymphony/xwork2/ActionSupportTest.java | 7 +-
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
.../xwork2/ModelDrivenAnnotationAction.java | 8 +-
.../opensymphony/xwork2/ProxyInvocationAction.java | 2 +
.../java/com/opensymphony/xwork2/SimpleAction.java | 26 +++---
.../xwork2/SimpleAnnotationAction.java | 32 +++++--
.../opensymphony/xwork2/ValidationOrderAction.java | 36 ++++----
.../interceptor/ModelDrivenInterceptorTest.java | 8 +-
.../ScopedModelDrivenInterceptorTest.java | 10 ++
.../annotations/AllowingByDefaultAction.java | 9 +-
.../annotations/BlockingByDefaultAction.java | 9 +-
.../xwork2/test/ModelDrivenAction2.java | 4 +-
.../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +-
.../opensymphony/xwork2/test/SimpleAction2.java | 3 +-
.../opensymphony/xwork2/test/SimpleAction3.java | 8 +-
.../xwork2/test/SimpleAnnotationAction2.java | 2 +
.../xwork2/test/SimpleAnnotationAction3.java | 8 +-
.../ValidateAnnotatedMethodOnlyAction.java | 3 +
.../java/com/opensymphony/xwork2/util/Bar.java | 5 +-
.../util/StrutsLocalizedTextProviderTest.java | 10 +-
.../validator/ActionValidatorManagerTest.java | 5 +-
.../validator/AnnotationValidationAction.java | 1 +
.../validator/AnnotationValidationExpAction.java | 1 +
.../validator/StringLengthFieldValidatorTest.java | 7 ++
.../validator/VisitorValidatorModelAction.java | 3 +
.../validator/VisitorValidatorTestAction.java | 7 +-
.../apache/struts2/ExecutionCountTestAction.java | 3 +-
.../org/apache/struts2/HttpMethodsTestAction.java | 2 +
.../test/java/org/apache/struts2/TestAction.java | 1 +
.../struts2/interceptor/CookieInterceptorTest.java | 9 ++
.../interceptor/FileUploadInterceptorTest.java | 4 +-
.../apache/struts2/ognl/ProviderAllowlistTest.java | 27 +++---
.../views/jsp/IteratorGeneratorTagTest.java | 13 +--
.../struts2/views/jsp/SortIteratorTagTest.java | 22 ++---
.../struts2/views/jsp/SubsetIteratorTagTest.java | 29 +++---
.../views/jsp/ui/DoubleValidationAction.java | 2 +
.../struts2/views/jsp/ui/FieldErrorTagTest.java | 13 ++-
.../struts2/views/jsp/ui/IntValidationAction.java | 2 +
.../struts/beanvalidation/actions/FieldAction.java | 2 +
.../beanvalidation/actions/FieldMatchAction.java | 5 +
.../beanvalidation/actions/ModelDrivenAction.java | 5 +-
.../actions/ValidateGroupAction.java | 7 +-
.../struts2/config_browser/ActionNamesAction.java | 5 +-
.../config_browser/ListValidatorsAction.java | 8 +-
.../struts2/config_browser/ShowBeansAction.java | 2 +
.../struts2/config_browser/ShowConfigAction.java | 25 +++--
.../config_browser/ShowValidatorAction.java | 24 +++--
.../convention/ClasspathConfigurationProvider.java | 11 ++-
.../convention/ClasspathPackageProvider.java | 11 ++-
.../PackageBasedActionConfigBuilder.java | 61 +++++++++----
.../src/test/java/actions/MessageAction.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 52 +++++++++--
.../json/JSONValidationInterceptorTest.java | 5 +
.../org/apache/struts2/junit/JUnitTestAction.java | 2 +
.../struts2/junit/session/SessionGetAction.java | 1 +
.../struts2/junit/session/SessionSetAction.java | 1 +
.../oval/interceptor/FieldsWithProfiles.java | 4 +
.../struts2/oval/interceptor/MemberObject.java | 8 +-
.../oval/interceptor/ModelDrivenAction.java | 11 ++-
.../struts2/oval/interceptor/SimpleField.java | 5 +-
.../struts2/oval/interceptor/SimpleFieldI18n.java | 2 +
.../interceptor/SimpleFieldI18nDefaultKey.java | 4 +-
.../interceptor/SimpleFieldJPAAnnotations.java | 2 +
.../interceptor/SimpleFieldOGNLExpression.java | 4 +-
.../struts2/oval/interceptor/SimpleFieldsXML.java | 4 +-
.../oval/interceptor/SimpleFieldsXMLChild.java | 3 +
.../struts2/oval/interceptor/SimpleMethod.java | 4 +-
.../struts2/rest/RestActionInvocationTest.java | 65 ++++++-------
.../com/opensymphony/xwork2/ModelDrivenAction.java | 8 +-
141 files changed, 969 insertions(+), 420 deletions(-)
rename apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/{
=> model}/Gangster.java (96%)
create mode 100644
apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConventionTest.java
