This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
from cde3c4f12 Merge pull request #803 from apache/feature/update-htmlunit
new 86c72097c WN-5141
new 9ea5ffc5c Merge remote-tracking branch 'origin/master' into
feature/WN-5141
new c4cc465e1 WN-5141
new 81a765cde WN-5141
new af70ececd IPAGE-5141
new 307829c5f WN-5141
new 666e17845 WN-5141
new a900d7b7d WN-5141
new e00457ee4 WN-5141
new 0295f0728 WN-5141
new 33c1afad0 WN-5141
new 20f8a0096 WN-5141
new b10b49160 WN-5141
new 6f609dea6 WN-5141
new d132c4386 WN-5141
new 5ccaf2449 WN-5141
new b8b9f8aa3 WN-5141
new 625a81e59 Revert "WN-5141"
new 3a4c1dd6f WN-5141
new def5254a5 WN-5141
new 1fc70af56 WN-5141
new 1c66e692c WN-5141
new 8d3880a67 WN-5141
new d5e766e43 WN-5141
new cdb0820e6 WN-5141
new 5d1aa6edc WN-5141
new 57032d9d1 WN-5141
new 9d873e506 Revert "WN-5141"
new eb16ed49a WN-5141
new 861e8f98b WN-5141
new ba75db010 WN-5141
new 261cfe549 WN-5141
new c322f7f4a WN-5141
new 27a2a4390 WN-5141
new 73b6a5831 IPAGE-5141
new 8d465c66a WN-5141
new 1c43fd1dc WN-5141
new ea722cb35 WN-5141
new e4fa6e40e WN-5141
new f0df35f2e WN-5141
new 4e8dbe0c9 WN-5141
new 46a0037a3 WN-5141
new cb476c8a9 WN-5141
new 908d06483 WN-5141
new f2459c07c WN-5141
new 7f12f15d9 WN-5141
new 3383ff552 WN-5141
new f4bd1462e WN-5141
new 315eb49f0 WN-5141
new 74cf21a4f Merge remote-tracking branch 'origin' into feature/WN-5141
new 334c4090c conversion to fileupload2
new 1aa997474 Merge pull request #1 from tyme-dev/feature/WN-5141
new 98665848c WN-5141
new f17124c23 WN-5141
new 77df10b9a Merge branch 'master' into feature/WN-5141
new 8cd3245cf WN-5141
new 24519a97d Revert "WN-5141"
new 62c63a676 Revert "WN-5141"
new c990edad1 Revert "WN-5141"
new 010192a1e Revert "WN-5141"
new 99a482d0f Revert "WN-5141"
new 7c81d066e Revert "WN-5141"
new bbc4d1dbb WN-5141
new 107eeb199 WN-5141
new 818ca1f26 WN-5141
new deebfc346 WN-5141
new e3f463548 Revert "WN-5141"
new 6140e5d73 WN-5141
new 89717a58c WN-5141
new 5a34bc8e0 WN-5141
new 0845c6af6 WW-5335 Prepares for Java 17 & Struts 7.x
new 0af312f0f WW-5335 Reverts adding release/struts-7-0-x branch to
scorecards analysis Only the main branch is supported by this action
new 4aa8ccacf WN-5141
new bde4eb37c WN-5141
new e87806436 WN-5141
new dc13abaf8 WW-5335 Prepares for Java 17 & Struts 7.x
new 321cf4634 Merge pull request #785 from apache/feature/prepares-for-7
new 55a304bf0 WW-5335 Reverts adding release/struts-7-0-x branch to
scorecards analysis Only the main branch is supported by this action
new ed04c009c Merge pull request #794 from apache/fix/WW-5335-scorecards
new 7ae89828b Merge branch 'release/struts-7-0-x' into feature/WN-5141
new d6d0c5111 WN-5141
new 334ed173c WN-5141
new 9439e675c WN-5141
new aea173c89 Revert "WN-5141"
new 6b38a1e91 Revert "WN-5141"
new bb4237155 Revert "WN-5141"
new c66f2a2a9 WN-5141
new 5d19c7335 Revert "WN-5141"
new 1080579db WN-5141
new 4f9febb54 WN-5141
new 0c5e9c34d WN-5141
new 646ad0f54 Revert "WN-5141"
new 3651f62f5 WN-5141
new 50f724e66 WN-5141
new 219049773 Merge remote-tracking branch 'origin/master' into
merge-forward-master
new 0321d2777 Merge pull request #797 from apache/merge-forward-master
new dd45eb9f6 Merge branch 'release/struts-7-0-x' into feature/WN-5141
new bf2d85ebe [WW-5141] Removes deprecated plugins (#798)
new 84ab6e966 Merge branch 'release/struts-7-0-x' into feature/WN-5141
new fde15d3b8 Merge branch 'release/struts-7-0-x' into feature/WN-5141
new 4e22a87b1 WN-5141
new 397c5491b Merge branch 'release/struts-7-0-x' into feature/WN-5141
new ba45c36a9 WN-5141
new c1054ada2 Merge pull request #778 from jdyer1/feature/WN-5141
The 7019 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:
apps/rest-showcase/pom.xml | 2 +-
apps/showcase/pom.xml | 67 +++-
.../apache/struts2/showcase/async/AsyncFilter.java | 14 +-
.../struts2/showcase/chat/ChatSessionListener.java | 6 +-
.../freemarker/CustomFreemarkerManager.java | 4 +-
.../struts2/showcase/servlet/TestServlet.java | 8 +-
.../struts2/showcase/source/ViewSourceAction.java | 2 +-
.../validation/BeanValidationExampleAction.java | 14 +-
.../apache/struts2/showcase/xslt/JVMAction.java | 2 +-
apps/showcase/src/main/webapp/WEB-INF/web.xml | 2 +-
.../apache/struts2/showcase/FileUploadTest.java | 3 +
assembly/src/main/assembly/docs.xml | 12 -
assembly/src/main/assembly/min-lib.xml | 2 +-
bom/pom.xml | 5 -
core/pom.xml | 53 +---
.../com/opensymphony/xwork2/ActionContext.java | 8 +-
.../ServletContextAwareConfigurationProvider.java | 2 +-
.../xwork2/interceptor/Interceptor.java | 2 +-
.../main/java/org/apache/struts2/RequestUtils.java | 4 +-
.../org/apache/struts2/ServletActionContext.java | 8 +-
.../java/org/apache/struts2/StrutsStatics.java | 13 +-
.../org/apache/struts2/action/CspReportAction.java | 4 +-
.../apache/struts2/action/ServletContextAware.java | 2 +-
.../apache/struts2/action/ServletRequestAware.java | 2 +-
.../struts2/action/ServletResponseAware.java | 2 +-
.../apache/struts2/components/ActionComponent.java | 6 +-
.../org/apache/struts2/components/ActionError.java | 4 +-
.../apache/struts2/components/ActionMessage.java | 4 +-
.../java/org/apache/struts2/components/Anchor.java | 4 +-
.../org/apache/struts2/components/Checkbox.java | 4 +-
.../apache/struts2/components/CheckboxList.java | 4 +-
.../apache/struts2/components/ClosingUIBean.java | 4 +-
.../org/apache/struts2/components/ComboBox.java | 4 +-
.../org/apache/struts2/components/Component.java | 4 +-
.../struts2/components/ComponentUrlProvider.java | 4 +-
.../apache/struts2/components/DateTextField.java | 4 +-
.../java/org/apache/struts2/components/Debug.java | 4 +-
.../struts2/components/DoubleListUIBean.java | 4 +-
.../apache/struts2/components/DoubleSelect.java | 4 +-
.../org/apache/struts2/components/FieldError.java | 4 +-
.../java/org/apache/struts2/components/File.java | 4 +-
.../java/org/apache/struts2/components/Form.java | 4 +-
.../org/apache/struts2/components/FormButton.java | 4 +-
.../apache/struts2/components/GenericUIBean.java | 4 +-
.../java/org/apache/struts2/components/Head.java | 4 +-
.../java/org/apache/struts2/components/Hidden.java | 4 +-
.../org/apache/struts2/components/Include.java | 20 +-
.../struts2/components/InputTransferSelect.java | 4 +-
.../java/org/apache/struts2/components/Label.java | 4 +-
.../java/org/apache/struts2/components/Link.java | 4 +-
.../org/apache/struts2/components/ListUIBean.java | 4 +-
.../org/apache/struts2/components/OptGroup.java | 4 +-
.../struts2/components/OptionTransferSelect.java | 4 +-
.../org/apache/struts2/components/Password.java | 4 +-
.../java/org/apache/struts2/components/Radio.java | 4 +-
.../java/org/apache/struts2/components/Reset.java | 4 +-
.../java/org/apache/struts2/components/Script.java | 4 +-
.../java/org/apache/struts2/components/Select.java | 4 +-
.../struts2/components/ServletUrlRenderer.java | 2 +-
.../java/org/apache/struts2/components/Submit.java | 4 +-
.../org/apache/struts2/components/TextArea.java | 4 +-
.../org/apache/struts2/components/TextField.java | 4 +-
.../java/org/apache/struts2/components/Token.java | 4 +-
.../java/org/apache/struts2/components/UIBean.java | 4 +-
.../java/org/apache/struts2/components/URL.java | 4 +-
.../apache/struts2/components/UpDownSelect.java | 4 +-
.../org/apache/struts2/components/UrlProvider.java | 4 +-
.../org/apache/struts2/components/UrlRenderer.java | 2 +-
.../components/template/BaseTemplateEngine.java | 2 +-
.../template/FreemarkerTemplateEngine.java | 8 +-
.../components/template/JspTemplateEngine.java | 4 +-
.../config/StrutsXmlConfigurationProvider.java | 2 +-
.../apache/struts2/dispatcher/ApplicationMap.java | 4 +-
.../apache/struts2/dispatcher/AttributeMap.java | 2 +-
.../struts2/dispatcher/DefaultActionSupport.java | 2 +-
.../dispatcher/DefaultDispatcherErrorHandler.java | 12 +-
.../dispatcher/DefaultStaticContentLoader.java | 10 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 14 +-
.../struts2/dispatcher/DispatcherErrorHandler.java | 14 +-
.../struts2/dispatcher/ExecuteOperations.java | 6 +-
.../org/apache/struts2/dispatcher/HostConfig.java | 2 +-
.../apache/struts2/dispatcher/MockDispatcher.java | 2 +-
.../struts2/dispatcher/PrepareOperations.java | 8 +-
.../org/apache/struts2/dispatcher/RequestMap.java | 2 +-
.../org/apache/struts2/dispatcher/SessionMap.java | 4 +-
.../struts2/dispatcher/StaticContentLoader.java | 4 +-
.../struts2/dispatcher/StrutsRequestWrapper.java | 8 +-
.../dispatcher/filter/FilterHostConfig.java | 4 +-
.../dispatcher/filter/StrutsExecuteFilter.java | 16 +-
.../filter/StrutsPrepareAndExecuteFilter.java | 16 +-
.../dispatcher/filter/StrutsPrepareFilter.java | 16 +-
.../dispatcher/listener/ListenerHostConfig.java | 2 +-
.../dispatcher/listener/StrutsListener.java | 4 +-
.../struts2/dispatcher/mapper/ActionMapper.java | 2 +-
.../dispatcher/mapper/CompositeActionMapper.java | 2 +-
.../dispatcher/mapper/DefaultActionMapper.java | 4 +-
.../dispatcher/mapper/PrefixBasedActionMapper.java | 2 +-
.../dispatcher/mapper/Restful2ActionMapper.java | 30 +-
.../dispatcher/mapper/RestfulActionMapper.java | 4 +-
.../multipart/AbstractMultiPartRequest.java | 2 +-
.../multipart/JakartaMultiPartRequest.java | 94 +++---
.../multipart/JakartaStreamMultiPartRequest.java | 39 ++-
.../dispatcher/multipart/MultiPartRequest.java | 11 +-
.../multipart/MultiPartRequestWrapper.java | 12 +-
.../dispatcher/servlet/ServletHostConfig.java | 4 +-
.../struts2/dispatcher/servlet/StrutsServlet.java | 10 +-
.../struts2/interceptor/CoepInterceptor.java | 4 +-
.../struts2/interceptor/CookieInterceptor.java | 2 +-
.../apache/struts2/interceptor/CookieProvider.java | 2 +-
.../interceptor/CookieProviderInterceptor.java | 4 +-
.../struts2/interceptor/CoopInterceptor.java | 4 +-
.../interceptor/CreateSessionInterceptor.java | 4 +-
.../interceptor/ExecuteAndWaitInterceptor.java | 2 +-
.../interceptor/FetchMetadataInterceptor.java | 4 +-
.../struts2/interceptor/FileUploadInterceptor.java | 2 +-
.../struts2/interceptor/I18nInterceptor.java | 6 +-
.../apache/struts2/interceptor/PrincipalProxy.java | 2 +-
.../interceptor/ResourceIsolationPolicy.java | 2 +-
.../struts2/interceptor/RolesInterceptor.java | 4 +-
.../interceptor/ServletConfigInterceptor.java | 6 +-
.../interceptor/StrutsResourceIsolationPolicy.java | 2 +-
.../struts2/interceptor/TokenInterceptor.java | 2 +-
.../interceptor/TokenSessionStoreInterceptor.java | 6 +-
.../struts2/interceptor/csp/CspInterceptor.java | 4 +-
.../struts2/interceptor/csp/CspSettings.java | 4 +-
.../interceptor/csp/DefaultCspSettings.java | 4 +-
.../debugging/DebuggingInterceptor.java | 2 +-
.../interceptor/httpmethod/HttpMethodAware.java | 2 +-
.../httpmethod/HttpMethodInterceptor.java | 2 +-
.../interceptor/servlet/ServletPrincipalProxy.java | 2 +-
.../apache/struts2/result/HttpHeaderResult.java | 8 +-
.../org/apache/struts2/result/PlainResult.java | 4 +-
.../org/apache/struts2/result/PlainTextResult.java | 4 +-
.../org/apache/struts2/result/PostbackResult.java | 4 +-
.../struts2/result/ServletDispatcherResult.java | 18 +-
.../struts2/result/ServletRedirectResult.java | 6 +-
.../org/apache/struts2/result/StreamResult.java | 2 +-
.../apache/struts2/result/plain/HttpCookies.java | 2 +-
.../struts2/result/plain/ResponseBuilder.java | 2 +-
.../struts2/util/FastByteArrayOutputStream.java | 2 +-
.../apache/struts2/util/StrutsTestCaseHelper.java | 6 +-
.../java/org/apache/struts2/util/StrutsUtil.java | 12 +-
.../main/java/org/apache/struts2/util/URLBean.java | 4 +-
.../apache/struts2/views/DefaultTagLibrary.java | 4 +-
.../apache/struts2/views/JspSupportServlet.java | 6 +-
.../struts2/views/TagLibraryDirectiveProvider.java | 4 +-
.../struts2/views/TagLibraryModelProvider.java | 4 +-
.../views/freemarker/FreemarkerManager.java | 14 +-
.../struts2/views/freemarker/FreemarkerResult.java | 6 +-
.../struts2/views/freemarker/ScopesHashModel.java | 6 +-
.../views/freemarker/tags/ActionErrorModel.java | 4 +-
.../views/freemarker/tags/ActionMessageModel.java | 4 +-
.../struts2/views/freemarker/tags/ActionModel.java | 4 +-
.../struts2/views/freemarker/tags/AnchorModel.java | 4 +-
.../struts2/views/freemarker/tags/BeanModel.java | 4 +-
.../views/freemarker/tags/CheckboxListModel.java | 4 +-
.../views/freemarker/tags/CheckboxModel.java | 4 +-
.../views/freemarker/tags/ComboBoxModel.java | 4 +-
.../views/freemarker/tags/ComponentModel.java | 4 +-
.../struts2/views/freemarker/tags/DateModel.java | 4 +-
.../views/freemarker/tags/DoubleSelectModel.java | 4 +-
.../struts2/views/freemarker/tags/ElseIfModel.java | 4 +-
.../struts2/views/freemarker/tags/ElseModel.java | 4 +-
.../views/freemarker/tags/FieldErrorModel.java | 4 +-
.../struts2/views/freemarker/tags/FileModel.java | 4 +-
.../struts2/views/freemarker/tags/FormModel.java | 4 +-
.../struts2/views/freemarker/tags/HeadModel.java | 4 +-
.../struts2/views/freemarker/tags/HiddenModel.java | 4 +-
.../struts2/views/freemarker/tags/I18nModel.java | 4 +-
.../struts2/views/freemarker/tags/IfModel.java | 4 +-
.../views/freemarker/tags/IncludeModel.java | 4 +-
.../freemarker/tags/InputTransferSelectModel.java | 4 +-
.../views/freemarker/tags/IteratorModel.java | 4 +-
.../struts2/views/freemarker/tags/LabelModel.java | 4 +-
.../struts2/views/freemarker/tags/LinkModel.java | 4 +-
.../views/freemarker/tags/OptGroupModel.java | 4 +-
.../freemarker/tags/OptionTransferSelectModel.java | 4 +-
.../struts2/views/freemarker/tags/ParamModel.java | 4 +-
.../views/freemarker/tags/PasswordModel.java | 4 +-
.../views/freemarker/tags/PropertyModel.java | 4 +-
.../struts2/views/freemarker/tags/PushModel.java | 4 +-
.../struts2/views/freemarker/tags/RadioModel.java | 4 +-
.../struts2/views/freemarker/tags/ResetModel.java | 4 +-
.../struts2/views/freemarker/tags/ScriptModel.java | 4 +-
.../struts2/views/freemarker/tags/SelectModel.java | 4 +-
.../struts2/views/freemarker/tags/SetModel.java | 4 +-
.../views/freemarker/tags/StrutsModels.java | 4 +-
.../struts2/views/freemarker/tags/SubmitModel.java | 4 +-
.../struts2/views/freemarker/tags/TagModel.java | 4 +-
.../views/freemarker/tags/TextAreaModel.java | 4 +-
.../views/freemarker/tags/TextFieldModel.java | 4 +-
.../struts2/views/freemarker/tags/TextModel.java | 4 +-
.../struts2/views/freemarker/tags/TokenModel.java | 4 +-
.../struts2/views/freemarker/tags/URLModel.java | 4 +-
.../views/freemarker/tags/UpDownSelectModel.java | 4 +-
.../org/apache/struts2/views/jsp/ActionTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/BeanTag.java | 4 +-
.../struts2/views/jsp/ComponentTagSupport.java | 6 +-
.../java/org/apache/struts2/views/jsp/DateTag.java | 4 +-
.../org/apache/struts2/views/jsp/ElseIfTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/ElseTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/I18nTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/IfTag.java | 4 +-
.../org/apache/struts2/views/jsp/IncludeTag.java | 4 +-
.../org/apache/struts2/views/jsp/IteratorTag.java | 6 +-
.../org/apache/struts2/views/jsp/NumberTag.java | 4 +-
.../org/apache/struts2/views/jsp/ParamTag.java | 4 +-
.../org/apache/struts2/views/jsp/PropertyTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/PushTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/SetTag.java | 4 +-
.../struts2/views/jsp/StrutsBodyTagSupport.java | 4 +-
.../org/apache/struts2/views/jsp/TagUtils.java | 4 +-
.../java/org/apache/struts2/views/jsp/TextTag.java | 4 +-
.../java/org/apache/struts2/views/jsp/URLTag.java | 4 +-
.../views/jsp/iterator/AppendIteratorTag.java | 4 +-
.../views/jsp/iterator/IteratorGeneratorTag.java | 2 +-
.../views/jsp/iterator/MergeIteratorTag.java | 4 +-
.../views/jsp/iterator/SortIteratorTag.java | 2 +-
.../views/jsp/iterator/SubsetIteratorTag.java | 2 +-
.../apache/struts2/views/jsp/ui/AbstractUITag.java | 4 +-
.../struts2/views/jsp/ui/ActionErrorTag.java | 4 +-
.../struts2/views/jsp/ui/ActionMessageTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/AnchorTag.java | 4 +-
.../struts2/views/jsp/ui/CheckboxListTag.java | 4 +-
.../apache/struts2/views/jsp/ui/CheckboxTag.java | 4 +-
.../apache/struts2/views/jsp/ui/ComboBoxTag.java | 4 +-
.../apache/struts2/views/jsp/ui/ComponentTag.java | 4 +-
.../struts2/views/jsp/ui/DateTextFieldTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/DebugTag.java | 4 +-
.../struts2/views/jsp/ui/DoubleSelectTag.java | 4 +-
.../apache/struts2/views/jsp/ui/FieldErrorTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/FileTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/FormTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/HeadTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/HiddenTag.java | 4 +-
.../views/jsp/ui/InputTransferSelectTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/LabelTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/LinkTag.java | 4 +-
.../apache/struts2/views/jsp/ui/OptGroupTag.java | 4 +-
.../views/jsp/ui/OptionTransferSelectTag.java | 4 +-
.../apache/struts2/views/jsp/ui/PasswordTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/RadioTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/ResetTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/ScriptTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/SelectTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/SubmitTag.java | 4 +-
.../apache/struts2/views/jsp/ui/TextFieldTag.java | 4 +-
.../apache/struts2/views/jsp/ui/TextareaTag.java | 4 +-
.../org/apache/struts2/views/jsp/ui/TokenTag.java | 4 +-
.../struts2/views/jsp/ui/UpDownSelectTag.java | 4 +-
.../org/apache/struts2/views/util/ContextUtil.java | 4 +-
.../struts2/views/util/DefaultUrlHelper.java | 8 +-
.../apache/struts2/views/util/ResourceUtil.java | 2 +-
.../org/apache/struts2/views/util/UrlHelper.java | 4 +-
.../org/apache/struts2/default.properties | 3 +-
.../org/apache/struts2/struts-messages.properties | 8 +-
.../apache/struts2/struts-messages_da.properties | 4 +-
.../apache/struts2/struts-messages_de.properties | 4 +-
.../apache/struts2/struts-messages_en.properties | 4 +-
.../apache/struts2/struts-messages_pl.properties | 4 +-
.../apache/struts2/struts-messages_pt.properties | 4 +-
.../java/org/apache/struts2/RequestUtilsTest.java | 2 +-
.../apache/struts2/ServletActionContextTest.java | 18 +-
.../components/AnotherActionComponentTest.java | 4 +-
.../apache/struts2/components/ComponentTest.java | 4 +-
.../apache/struts2/components/UIComponentTest.java | 2 +-
.../struts2/dispatcher/ApplicationMapTest.java | 2 +-
.../struts2/dispatcher/AttributeMapTest.java | 31 +-
.../DefaultDispatcherErrorHandlerTest.java | 12 +-
.../dispatcher/DefaultStaticContentLoaderTest.java | 4 +-
.../apache/struts2/dispatcher/DispatcherTest.java | 4 +-
.../struts2/dispatcher/NullActionMapper.java | 2 +-
.../struts2/dispatcher/PrepareOperationsTest.java | 4 +-
.../apache/struts2/dispatcher/RequestMapTest.java | 2 +-
.../apache/struts2/dispatcher/SessionMapTest.java | 4 +-
.../dispatcher/StaticContentLoaderTest.java | 2 +-
...rutsPrepareAndExecuteFilterIntegrationTest.java | 8 +-
.../dispatcher/TwoFilterIntegrationTest.java | 12 +-
.../mapper/CompositeActionMapperTest.java | 2 +-
.../dispatcher/mapper/DefaultActionMapperTest.java | 168 +++++-----
.../mapper/Restful2ActionMapperTest.java | 105 +++----
.../dispatcher/mapper/RestfulActionMapperTest.java | 8 +-
.../JakartaStreamMultiPartRequestTest.java | 15 +-
.../struts2/interceptor/CookieInterceptorTest.java | 10 +-
.../interceptor/CookieProviderInterceptorTest.java | 4 +-
.../interceptor/CreateSessionInterceptorTest.java | 2 +-
.../struts2/interceptor/CspInterceptorTest.java | 2 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +-
.../interceptor/FetchMetadataInterceptorTest.java | 2 +-
.../interceptor/FileUploadInterceptorTest.java | 46 +--
.../struts2/interceptor/I18nInterceptorTest.java | 4 +-
.../interceptor/MessageStoreInterceptorTest.java | 6 +-
.../MessageStorePreResultListenerTest.java | 6 +-
.../struts2/interceptor/RolesInterceptorTest.java | 8 +-
.../struts2/interceptor/TokenInterceptorTest.java | 4 +-
.../exec/StrutsBackgroundProcessTest.java | 13 +-
.../struts2/result/HttpHeaderResultTest.java | 2 +-
.../apache/struts2/result/PlainTextResultTest.java | 17 +-
.../result/ServletDispatcherResultTest.java | 10 +-
.../struts2/result/ServletRedirectResultTest.java | 6 +-
.../struts2/util/InvocationSessionStoreTest.java | 17 +-
.../util/SecurityMemberAccessInServletsTest.java | 10 +-
.../org/apache/struts2/util/StrutsUtilTest.java | 6 +-
.../views/freemarker/FreemarkerManagerTest.java | 2 +-
.../freemarker/FreemarkerResultMockedTest.java | 2 +-
.../apache/struts2/views/jsp/AbstractTagTest.java | 15 +-
.../apache/struts2/views/jsp/ActionTagTest.java | 12 +-
.../apache/struts2/views/jsp/AnchorTagTest.java | 4 +-
.../org/apache/struts2/views/jsp/BeanTagTest.java | 9 +-
.../apache/struts2/views/jsp/DynAttribsTest.java | 4 +-
.../apache/struts2/views/jsp/ElseIfTagTest.java | 20 +-
.../org/apache/struts2/views/jsp/ElseTagTest.java | 21 +-
.../org/apache/struts2/views/jsp/I18nTagTest.java | 22 +-
.../org/apache/struts2/views/jsp/IfTagTest.java | 17 +-
.../apache/struts2/views/jsp/IncludeTagTest.java | 21 +-
.../apache/struts2/views/jsp/IteratorTagTest.java | 22 +-
.../apache/struts2/views/jsp/PropertyTagTest.java | 347 +++++++++++----------
.../org/apache/struts2/views/jsp/PushTagTest.java | 2 +-
.../org/apache/struts2/views/jsp/SetTagTest.java | 23 +-
.../struts2/views/jsp/SortIteratorTagTest.java | 2 +-
.../struts2/views/jsp/StrutsMockBodyContent.java | 4 +-
.../views/jsp/StrutsMockHttpServletRequest.java | 18 +-
.../views/jsp/StrutsMockHttpServletResponse.java | 6 +-
.../struts2/views/jsp/StrutsMockHttpSession.java | 2 +-
.../struts2/views/jsp/StrutsMockJspWriter.java | 2 +-
.../struts2/views/jsp/StrutsMockPageContext.java | 40 ++-
.../views/jsp/StrutsMockServletContext.java | 56 +++-
.../org/apache/struts2/views/jsp/TextTagTest.java | 33 +-
.../org/apache/struts2/views/jsp/URLTagTest.java | 78 ++---
.../apache/struts2/views/jsp/ui/CheckboxTest.java | 2 +-
.../apache/struts2/views/jsp/ui/DateTagTest.java | 2 +-
.../apache/struts2/views/jsp/ui/FormTagTest.java | 32 +-
.../struts2/views/jsp/ui/JspTemplateTest.java | 10 +-
.../apache/struts2/views/jsp/ui/LinkTagTest.java | 2 +-
.../org/apache/struts2/views/jsp/ui/MockTag.java | 2 +-
.../apache/struts2/views/jsp/ui/ScriptTagTest.java | 2 +-
.../struts2/views/jsp/ui/StrutsBodyContent.java | 4 +-
.../apache/struts2/views/jsp/ui/TokenTagTest.java | 2 +-
.../apache/struts2/views/jsp/ui/TooltipTest.java | 12 +-
.../struts2/views/util/DefaultUrlHelperTest.java | 24 +-
.../struts2/views/util/ResourceUtilTest.java | 2 +-
freemarker-jakarta/README.md | 3 +
freemarker-jakarta/pom.xml | 71 +++++
plugins/async/pom.xml | 6 -
.../apache/struts2/async/DefaultAsyncManager.java | 8 +-
plugins/bean-validation/pom.xml | 9 +-
.../beanvalidation/constraints/FieldMatch.java | 4 +-
.../constraints/ValidationGroup.java | 2 +-
.../constraints/impl/FieldMatchValidator.java | 4 +-
.../interceptor/BeanValidationInterceptor.java | 6 +-
.../interceptor/BeanValidationManager.java | 2 +-
.../interceptor/DefaultBeanValidationManager.java | 8 +-
.../beanvalidation/actions/ModelDrivenAction.java | 2 +-
.../actions/ValidateGroupAction.java | 2 +-
.../constraints/impl/FieldMatchValidatorTest.java | 2 +-
.../struts/beanvalidation/models/Address.java | 6 +-
.../struts/beanvalidation/models/Person.java | 8 +-
plugins/cdi/pom.xml | 12 +-
.../org/apache/struts2/cdi/CdiObjectFactory.java | 8 +-
.../apache/struts2/cdi/CdiObjectFactoryTest.java | 2 +-
.../java/org/apache/struts2/cdi/FooConsumer.java | 2 +-
plugins/cdi/src/test/resources/META-INF/beans.xml | 7 +-
.../convention/ConventionUnknownHandler.java | 2 +-
.../convention/DefaultResultMapBuilder.java | 2 +-
.../convention/ConventionUnknownHandlerTest.java | 2 +-
.../convention/DefaultResultMapBuilderTest.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 2 +-
plugins/jasperreports/README.md | 2 +-
.../views/jasperreports/JasperReportsResult.java | 8 +-
.../jasperreports/JasperReportsResultTest.java | 2 +-
.../struts2/views/java/simple/AbstractTest.java | 4 +-
.../org/apache/struts2/dispatcher/ChartResult.java | 2 +-
.../apache/struts2/dispatcher/ChartResultTest.java | 6 +-
plugins/json/pom.xml | 12 -
.../struts2/json/JSONActionRedirectResult.java | 4 +-
.../org/apache/struts2/json/JSONInterceptor.java | 4 +-
.../java/org/apache/struts2/json/JSONResult.java | 4 +-
.../java/org/apache/struts2/json/JSONUtil.java | 4 +-
.../struts2/json/JSONValidationInterceptor.java | 4 +-
.../apache/struts2/json/SerializationParams.java | 2 +-
.../org/apache/struts2/json/smd/SMDGenerator.java | 2 +-
.../org/apache/struts2/json/JSONResultTest.java | 2 +-
.../json/JSONValidationInterceptorTest.java | 2 +-
.../struts2/json/StrutsMockHttpServletRequest.java | 6 +-
.../json/StrutsMockHttpServletResponse.java | 6 +-
.../apache/struts2/json/StrutsMockHttpSession.java | 2 +-
.../struts2/json/StrutsMockServletContext.java | 40 ++-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 8 +-
.../apache/struts2/junit/StrutsRestTestCase.java | 4 +-
.../org/apache/struts2/junit/StrutsTestCase.java | 6 +-
.../junit/StrutsSpringJUnit4TestCaseTest.java | 2 +-
.../apache/struts2/junit/StrutsTestCaseTest.java | 2 +-
plugins/pom.xml | 8 +-
plugins/rest/pom.xml | 6 +-
.../struts2/rest/ContentTypeHandlerManager.java | 4 +-
.../struts2/rest/ContentTypeInterceptor.java | 2 +-
.../rest/DefaultContentTypeHandlerManager.java | 4 +-
.../apache/struts2/rest/DefaultHttpHeaders.java | 8 +-
.../java/org/apache/struts2/rest/HttpHeaders.java | 4 +-
.../apache/struts2/rest/RestActionInvocation.java | 4 +-
.../org/apache/struts2/rest/RestActionMapper.java | 2 +-
.../org/apache/struts2/rest/RestActionSupport.java | 4 +-
.../struts2/rest/RestWorkflowInterceptor.java | 2 +-
.../rest/ContentTypeHandlerManagerTest.java | 4 +-
.../struts2/rest/DefaultHttpHeadersTest.java | 2 +-
.../struts2/rest/RestActionInvocationTest.java | 4 +-
plugins/sitemesh/pom.xml | 5 +-
.../sitemesh/FreemarkerDecoratorServlet.java | 10 +-
.../FreemarkerMapper2DecoratorSelector.java | 2 +-
.../struts2/sitemesh/FreemarkerPageFilter.java | 4 +-
.../struts2/sitemesh/NoneDecoratorMapper.java | 2 +-
.../sitemesh/OldDecorator2NewStrutsDecorator.java | 8 +-
.../OldDecorator2NewStrutsFreemarkerDecorator.java | 8 +-
.../OldDecorator2NewStrutsVelocityDecorator.java | 8 +-
.../struts2/sitemesh/VelocityDecoratorServlet.java | 8 +-
.../sitemesh/VelocityMapper2DecoratorSelector.java | 2 +-
.../struts2/sitemesh/VelocityPageFilter.java | 2 +-
.../ClassReloadingXMLWebApplicationContext.java | 2 +-
.../struts2/spring/StrutsSpringObjectFactory.java | 2 +-
.../spring/StrutsSpringObjectFactoryTest.java | 2 +-
plugins/tiles/pom.xml | 13 +-
.../struts2/tiles/I18NAttributeEvaluator.java | 2 +-
.../struts2/tiles/StrutsAttributeEvaluator.java | 2 +-
.../tiles/StrutsFreeMarkerAttributeRenderer.java | 4 +-
.../struts2/tiles/StrutsTilesContainerFactory.java | 16 +-
.../struts2/tiles/StrutsTilesInitializer.java | 2 +-
.../struts2/tiles/StrutsTilesLocaleResolver.java | 2 +-
.../StrutsWildcardServletApplicationContext.java | 2 +-
.../apache/struts2/views/tiles/TilesResult.java | 6 +-
.../org/apache/tiles/el/ELAttributeEvaluator.java | 6 +-
.../java/org/apache/tiles/el/ELContextImpl.java | 10 +-
.../apache/tiles/el/ExpressionFactoryFactory.java | 2 +-
.../tiles/el/JspExpressionFactoryFactory.java | 6 +-
.../java/org/apache/tiles/el/ScopeELResolver.java | 4 +-
.../tiles/el/TilesContextBeanELResolver.java | 4 +-
.../apache/tiles/el/TilesContextELResolver.java | 4 +-
.../request/freemarker/FreemarkerRequest.java | 4 +-
.../servlet/WebappClassTemplateLoader.java | 2 +-
.../tiles/request/jsp/JspPrintWriterAdapter.java | 2 +-
.../org/apache/tiles/request/jsp/JspRequest.java | 8 +-
.../java/org/apache/tiles/request/jsp/JspUtil.java | 4 +-
.../request/jsp/autotag/JspAutotagRuntime.java | 6 +-
.../tiles/request/jsp/autotag/JspModelBody.java | 6 +-
.../request/jsp/extractor/ScopeExtractor.java | 2 +-
.../jsp/extractor/SessionScopeExtractor.java | 2 +-
.../tiles/request/jsp/extractor/package-info.java | 2 +-
.../servlet/ExternalWriterHttpServletResponse.java | 4 +-
.../request/servlet/ServletApplicationContext.java | 2 +-
.../tiles/request/servlet/ServletRequest.java | 8 +-
.../apache/tiles/request/servlet/ServletUtil.java | 4 +-
.../extractor/ApplicationScopeExtractor.java | 2 +-
.../request/servlet/extractor/HeaderExtractor.java | 4 +-
.../servlet/extractor/InitParameterExtractor.java | 2 +-
.../servlet/extractor/ParameterExtractor.java | 2 +-
.../servlet/extractor/RequestScopeExtractor.java | 2 +-
.../servlet/extractor/SessionScopeExtractor.java | 4 +-
.../tiles/request/velocity/VelocityRequest.java | 8 +-
.../velocity/autotag/VelocityAutotagRuntime.java | 6 +-
.../render/ApplicationContextJeeConfig.java | 2 +-
.../AbstractDefaultToStringRenderable.java | 4 +-
.../tiles/velocity/template/ContextHolder.java | 6 +-
.../velocity/template/VelocityStyleTilesTool.java | 2 +-
.../tiles/web/jsp/taglib/AddAttributeTag.java | 4 +-
.../tiles/web/jsp/taglib/AddListAttributeTag.java | 4 +-
.../apache/tiles/web/jsp/taglib/DefinitionTag.java | 4 +-
.../tiles/web/jsp/taglib/GetAsStringTag.java | 4 +-
.../tiles/web/jsp/taglib/ImportAttributeTag.java | 4 +-
.../tiles/web/jsp/taglib/InsertAttributeTag.java | 4 +-
.../tiles/web/jsp/taglib/InsertDefinitionTag.java | 4 +-
.../tiles/web/jsp/taglib/InsertTemplateTag.java | 4 +-
.../tiles/web/jsp/taglib/PutAttributeTag.java | 4 +-
.../tiles/web/jsp/taglib/PutListAttributeTag.java | 4 +-
.../web/jsp/taglib/SetCurrentContainerTag.java | 4 +-
.../tiles/web/jsp/taglib/UseAttributeTag.java | 10 +-
.../tiles/web/startup/AbstractTilesListener.java | 6 +-
.../tiles/web/util/AttributeContextMutator.java | 2 +-
.../tiles/web/util/TilesDispatchServlet.java | 12 +-
.../org/apache/tiles/autotag/jsp/bodyTag.vm | 4 +-
.../apache/tiles/el/ELAttributeEvaluatorTest.java | 14 +-
.../org/apache/tiles/el/ELContextImplTest.java | 8 +-
.../tiles/el/JspExpressionFactoryFactoryTest.java | 8 +-
.../org/apache/tiles/el/ScopeELResolverTest.java | 2 +-
.../tiles/el/TilesContextBeanELResolverTest.java | 2 +-
.../tiles/el/TilesContextELResolverTest.java | 4 +-
.../tiles/web/jsp/taglib/UseAttributeTagTest.java | 16 +-
.../web/startup/AbstractTilesListenerTest.java | 4 +-
.../tiles/autotag/jsp/test/DoStuffNoBodyTag.java | 4 +-
.../apache/tiles/autotag/jsp/test/DoStuffTag.java | 4 +-
plugins/velocity/pom.xml | 8 +-
.../struts2/views/velocity/VelocityManager.java | 6 +-
.../struts2/views/velocity/VelocityStrutsUtil.java | 4 +-
.../velocity/components/AbstractDirective.java | 4 +-
.../views/velocity/components/ActionDirective.java | 4 +-
.../velocity/components/ActionErrorDirective.java | 4 +-
.../components/ActionMessageDirective.java | 4 +-
.../views/velocity/components/AnchorDirective.java | 4 +-
.../views/velocity/components/BeanDirective.java | 4 +-
.../velocity/components/CheckBoxDirective.java | 4 +-
.../velocity/components/CheckBoxListDirective.java | 4 +-
.../velocity/components/ComboBoxDirective.java | 4 +-
.../velocity/components/ComponentDirective.java | 4 +-
.../views/velocity/components/DateDirective.java | 4 +-
.../velocity/components/DoubleSelectDirective.java | 4 +-
.../velocity/components/FieldErrorDirective.java | 4 +-
.../views/velocity/components/FileDirective.java | 4 +-
.../views/velocity/components/FormDirective.java | 4 +-
.../views/velocity/components/HeadDirective.java | 4 +-
.../views/velocity/components/HiddenDirective.java | 4 +-
.../views/velocity/components/I18nDirective.java | 4 +-
.../velocity/components/IncludeDirective.java | 4 +-
.../components/InputTransferSelectDirective.java | 4 +-
.../views/velocity/components/LabelDirective.java | 4 +-
.../velocity/components/OptGroupDirective.java | 4 +-
.../components/OptionTransferSelectDirective.java | 4 +-
.../views/velocity/components/ParamDirective.java | 4 +-
.../velocity/components/PasswordDirective.java | 4 +-
.../velocity/components/PropertyDirective.java | 4 +-
.../views/velocity/components/PushDirective.java | 4 +-
.../views/velocity/components/RadioDirective.java | 4 +-
.../views/velocity/components/ResetDirective.java | 4 +-
.../views/velocity/components/SelectDirective.java | 4 +-
.../views/velocity/components/SetDirective.java | 4 +-
.../views/velocity/components/SubmitDirective.java | 4 +-
.../velocity/components/TextAreaDirective.java | 4 +-
.../views/velocity/components/TextDirective.java | 4 +-
.../velocity/components/TextFieldDirective.java | 4 +-
.../views/velocity/components/TokenDirective.java | 4 +-
.../views/velocity/components/URLDirective.java | 4 +-
.../velocity/components/UpDownSelectDirective.java | 4 +-
.../views/velocity/result/VelocityResult.java | 12 +-
.../velocity/template/VelocityTemplateEngine.java | 6 +-
.../views/velocity/VelocityManagerTest.java | 4 +-
.../struts2/result/xslt/ServletURIResolver.java | 2 +-
.../org/apache/struts2/result/xslt/XSLTResult.java | 2 +-
pom.xml | 159 +++++-----
sitemesh2-jakarta/README.md | 3 +
sitemesh2-jakarta/pom.xml | 71 +++++
velocity-tools-jsp-jakarta/README.md | 3 +
velocity-tools-jsp-jakarta/pom.xml | 77 +++++
velocity-tools-view-jakarta/README.md | 3 +
velocity-tools-view-jakarta/pom.xml | 71 +++++
541 files changed, 2333 insertions(+), 1954 deletions(-)
create mode 100644 freemarker-jakarta/README.md
create mode 100644 freemarker-jakarta/pom.xml
create mode 100644 sitemesh2-jakarta/README.md
create mode 100644 sitemesh2-jakarta/pom.xml
create mode 100644 velocity-tools-jsp-jakarta/README.md
create mode 100644 velocity-tools-jsp-jakarta/pom.xml
create mode 100644 velocity-tools-view-jakarta/README.md
create mode 100644 velocity-tools-view-jakarta/pom.xml