This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch
dependabot/maven/org.mockito-mockito-core-5.8.0
in repository https://gitbox.apache.org/repos/asf/struts.git
omit cc2eab79c Bump org.mockito:mockito-core from 4.3.1 to 5.8.0
omit b5e07903f Merge pull request #811 from
apache/feature/WW-5328-removes-deprecated
omit 92227bb51 Merge pull request #814 from assachs/master
omit 3aeff1c69 Merge pull request #817 from
apache/dependabot/github_actions/github/codeql-action-3
omit 545292561 Merge pull request #815 from apache/WW-5364-fix-map-access
omit 517d18bc4 Bump github/codeql-action from 2 to 3
omit 5aeecd2d1 WW-5364 Add missing system allowlist classes
omit 8965c575c Update CspReportAction.java WW-5373
omit 4bc19c773 Merge pull request #813 from
apache/feature/jenkins-pipeline-struts-7
omit 165e464a1 Builds Struts 7 as part of the main pipeline
omit e8881f664 WW-5328 Removes deprecated setters
add 2202e5fbb WW-5141
add 6d2eb2e02 WN-5141
add eac1e0efa WW-5141
add 0c35a6bf8 IPAGE-5141
add 3a73c2ab2 WN-5141
add 7eda1745a WW-5141 remove code for "pell multipart plugin"
add 20eb2ebbf WN-5141
add 6dc2cba32 WN-5141
add 857c36c3c WN-5141
add 08c669320 WN-5141
add a5c139114 WN-5141
add 841313ec1 WN-5141
add 534142474 WN-5141
add 11284a042 WN-5141
add 697e18553 WN-5141
add 2e528eb66 WN-5141
add 09feb9bf0 Revert "WN-5141"
add 42fed67a8 WW-5141 TODO: TEMPORARY comment-out incomaptible
commons-upload old version code
add 8726288bd WN-5141
add 0566cc58c WN-5141
add fed840b6a WN-5141
add 54a9ef85e WN-5141
add 0cee06f5a WN-5141
add 37e179467 WN-5141
add 416dd7e22 WN-5141
add 380b157be WN-5141
add bbdeb2d45 Revert "WN-5141"
add 752597832 WN-5141
add 459fd74dc WN-5141
add 6ad0ad512 WN-5141
add 07792bd0e WN-5141
add 54564c9aa WN-5141
add 2e6d912ac WN-5141
add 14ecd5c7f IPAGE-5141
add a7618112f WN-5141
add 85529bf0a WN-5141
add 0802707a3 WW-5141 fix security test
add 792357e6f WN-5141
add b21be7570 WW-5141 temp IGNORE test require commons-upload upgrade
add 92cc4f859 WN-5141
add 143be3f17 WN-5141
add 8fecaa2c3 WN-5141
add 7dd2e817e WN-5141
add 6c0a97cfa WN-5141
add 63828c0e8 WN-5141
add ec8ac50b6 WN-5141
add dba63742a WN-5141
add 72e1ff74f WN-5141
add 2e0ba0873 WW-5141 conversion to fileupload2
add 06228a729 WN-5141
add bd6f347db WN-5141
add b365b58e3 WN-5141
add b52f18ced Revert "WN-5141"
add 0b9ca66f5 Revert "WN-5141"
add bafcccc3b Revert "WN-5141"
add a9edf7479 Revert "WN-5141"
add ec6c96e16 Revert "WN-5141"
add 730e5829d Revert "WN-5141"
add d36a76c95 WN-5141
add 38c51d255 WN-5141
add 48b8a3b54 WN-5141
add e9c6ce019 WN-5141
add 712fa7fba Revert "WN-5141"
add 72d07f838 WN-5141
add 6e76a3abc WN-5141
add d20972c13 WW-5141 fix formatting problems
add 79138e185 WW-5335 Prepares for Java 17 & Struts 7.x
add b8d07f422 WW-5335 Reverts adding release/struts-7-0-x branch to
scorecards analysis Only the main branch is supported by this action
add 8b501aa21 WN-5141
add baddd368c WN-5141
add df56821ab WN-5141
add 2fe7a91bd WW-5335 Prepares for Java 17 & Struts 7.x
add 8c906f3c8 WW-5335 Reverts adding release/struts-7-0-x branch to
scorecards analysis Only the main branch is supported by this action
add 7d835bfa4 WN-5141
add 519b8bd98 WN-5141
add 1295c5945 WN-5141
add 71c2fe0ef Revert "WN-5141"
add 147f0ca8a Revert "WN-5141"
add 94c166f22 Revert "WN-5141"
add 0e6d31729 WN-5141
add eb4387521 Revert "WN-5141"
add c59ba68e1 WN-5141
add e95a07fcf WN-5141
add 3f2b8c526 WN-5141
add 8cd0dc9cc Revert "WN-5141"
add b372ac9e9 WN-5141
add bed0db347 WN-5141
add 6f35c02fb [WW-5141] Removes deprecated plugins (#798)
add 60794037d WW-5335 Prepares for Java 17 & Struts 7.x
add e6e057799 WW-5335 Reverts adding release/struts-7-0-x branch to
scorecards analysis Only the main branch is supported by this action
add 0fa8cdd3e [WW-5141] Removes deprecated plugins (#798)
add a20d26fc3 Delete unused files missed in previous PR
add 97dbdc1c9 Delete remaining deprecated plugins
add 8b8de96b4 WN-5141 fix whitespace issues
add 6ce1e9ea3 Upgrades Htmlunit to version 3.6.0
add 5e187ad12 WN-5141
add 94a4f559e WW-5371 Implements action based file upload
add 86d4a5201 WW-5371 Uses the new upload mechanism in Showcase app
add 7f4c37b86 WW-5371 Simplifies file upload logic and extracts constants
add 2009e5892 WW-5371 Document how to use the new file upload logic
add e0f77c11b WW-5370 Simplifies error handling logic
add 19642a5e6 WW-5371 Migrates modern upload change to JakartaEE
add 31a582eee WW-5371 Migrates modern upload change to JakartaEE
add 83874c331 WW-5364 fixes automatically populated OGNL allowlist
add b087006a4 WW-5339 Add option to block custom OGNL maps
add 938f8eadb Adds missing import
add 576c06469 Replaces empty file upload test with simple one
add 51a173aa2 Upgrades Maven wrapper
add 660f5376e Fixes pipeline to properly handle transformed artifacts
add cd2bfee2d Merge pull request #809 from apache/fix/after-rebase
add 26bb35e6c Moves JakartaEE related modules into dedicate subdirectory
add daf5b5055 Fixes typo in pom
add 5d414d4a7 Merge pull request #810 from apache/feature/jakarta-modules
add 4364b2e81 WW-5364 Add missing system allowlist classes
add 9f491ea2b Bump github/codeql-action from 2 to 3
add 3e0e5f86d Update CspReportAction.java WW-5373
add d1905a743 WW-5328 Removes deprecated setters
add 49333d92c Bump org.mockito:mockito-core from 4.3.1 to 5.8.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cc2eab79c)
\
N -- N -- N
refs/heads/dependabot/maven/org.mockito-mockito-core-5.8.0 (49333d92c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/codeql.yml | 10 +-
.github/workflows/maven.yml | 3 +-
.github/workflows/scorecards-analysis.yaml | 3 +-
.github/workflows/sonar.yml | 1 +
.mvn/wrapper/maven-wrapper.properties | 2 +-
Jenkinsfile | 155 +-
apps/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 8 +-
.../apache/struts2/rest/example/GetOrdersTest.java | 16 +-
.../struts2/rest/example/ListOrdersTest.java | 15 +-
.../apache/struts2/rest/example/PostOrderTest.java | 28 +-
apps/showcase/pom.xml | 94 +-
.../struts2/showcase/ajax/tree/Category.java | 3 +-
.../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 +-
.../src/main/resources/struts-validation.xml | 7 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 1 -
.../main/webapp/WEB-INF/validation/quiz-dwr.jsp | 92 -
apps/showcase/src/main/webapp/WEB-INF/web.xml | 19 +-
.../struts2/showcase/ActionChainingTest.java | 5 +-
.../struts2/showcase/ActionTagExampleTest.java | 5 +-
.../it/org/apache/struts2/showcase/AsyncTest.java | 13 +-
.../it/org/apache/struts2/showcase/CRUDTest.java | 11 +-
.../struts2/showcase/ComponentTagExampleTest.java | 5 +-
.../apache/struts2/showcase/ConversionTest.java | 9 +-
.../struts2/showcase/DispatcherResultTest.java | 6 +-
.../apache/struts2/showcase/ExecAndWaitTest.java | 11 +-
.../apache/struts2/showcase/FileDownloadTest.java | 5 +-
.../apache/struts2/showcase/FileUploadTest.java | 41 +-
.../org/apache/struts2/showcase/ForwardTest.java | 6 +-
.../struts2/showcase/FreeMarkerManagerTest.java | 11 +-
.../apache/struts2/showcase/StaticContentTest.java | 9 +-
.../apache/struts2/showcase/UITagExampleTest.java | 17 +-
.../apache/struts2/showcase/ValidationTest.java | 9 +-
assembly/pom.xml | 53 +-
assembly/src/main/assembly/all.xml | 60 +-
assembly/src/main/assembly/docs.xml | 20 -
assembly/src/main/assembly/lib.xml | 8 -
assembly/src/main/assembly/min-lib.xml | 2 +-
bom/pom.xml | 29 +-
bundles/admin/pom.xml | 62 -
.../struts2/osgi/admin/actions/BundlesAction.java | 215 -
.../struts2/osgi/admin/actions/ShellAction.java | 144 -
.../admin/src/main/resources/JQUERY-LICENSE.txt | 43 -
bundles/admin/src/main/resources/LICENSE.txt | 174 -
bundles/admin/src/main/resources/NOTICE.txt | 9 -
.../main/resources/osgi/admin/commandResult.ftl | 21 -
.../admin/src/main/resources/osgi/admin/shell.ftl | 60 -
.../src/main/resources/osgi/admin/viewBundle.ftl | 170 -
.../src/main/resources/osgi/admin/viewBundles.ftl | 97 -
.../admin/src/main/resources/static/css/main.css | 103 -
.../redmond/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes
.../redmond/images/ui-bg_flat_55_fbec88_40x100.png | Bin 182 -> 0 bytes
.../redmond/images/ui-bg_glass_75_d0e5f5_1x400.png | Bin 124 -> 0 bytes
.../redmond/images/ui-bg_glass_85_dfeffc_1x400.png | Bin 123 -> 0 bytes
.../redmond/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 0 bytes
.../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin 4033 -> 0 bytes
.../images/ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin 130 -> 0 bytes
.../images/ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin 88 -> 0 bytes
.../css/redmond/images/ui-icons_217bc0_256x240.png | Bin 5399 -> 0 bytes
.../css/redmond/images/ui-icons_2e83ff_256x240.png | Bin 4379 -> 0 bytes
.../css/redmond/images/ui-icons_469bdd_256x240.png | Bin 4379 -> 0 bytes
.../css/redmond/images/ui-icons_6da8d5_256x240.png | Bin 4379 -> 0 bytes
.../css/redmond/images/ui-icons_cd0a0a_256x240.png | Bin 4379 -> 0 bytes
.../css/redmond/images/ui-icons_d8e7f3_256x240.png | Bin 5399 -> 0 bytes
.../css/redmond/images/ui-icons_f9bd01_256x240.png | Bin 5399 -> 0 bytes
.../css/redmond/jquery-ui-1.12.1.redmond.css | 1311 ------
.../admin/src/main/resources/static/css/shell.css | 43 -
.../main/resources/static/js/jquery-1.12.4.min.js | 5 -
.../resources/static/js/jquery-ui-1.12.1.min.js | 13 -
.../admin/src/main/resources/static/js/shell.js | 83 -
bundles/admin/src/main/resources/struts.xml | 50 -
bundles/demo/pom.xml | 78 -
.../src/main/java/actions/osgi/BundlesAction.java | 43 -
.../main/java/actions/osgi/HelloWorldAction.java | 63 -
.../demo/src/main/java/actions/osgi/Message.java | 37 -
.../META-INF/spring/applicationContext.xml | 33 -
.../src/main/resources/content/osgi/bundles.ftl | 38 -
.../resources/content/osgi/hello-convention.ftl | 30 -
.../demo/src/main/resources/content/osgi/hello.ftl | 30 -
.../demo/src/main/resources/content/osgi/hello.vm | 28 -
.../demo/src/main/resources/content/osgi/home.ftl | 34 -
bundles/demo/src/main/resources/struts.xml | 55 -
bundles/pom.xml | 83 -
core/pom.xml | 59 +-
.../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 | 4 +-
.../multipart/JakartaMultiPartRequest.java | 105 +-
.../multipart/JakartaStreamMultiPartRequest.java | 46 +-
.../dispatcher/multipart/MultiPartRequest.java | 11 +-
.../multipart/MultiPartRequestWrapper.java | 32 +-
.../dispatcher/servlet/ServletHostConfig.java | 4 +-
.../struts2/dispatcher/servlet/StrutsServlet.java | 10 +-
.../interceptor/ActionFileUploadInterceptor.java | 9 +-
.../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 | 3 +-
.../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 | 52 +-
.../apache/struts2/struts-messages_da.properties | 4 +-
.../apache/struts2/struts-messages_de.properties | 4 +-
.../apache/struts2/struts-messages_en.properties | 14 +-
.../apache/struts2/struts-messages_pl.properties | 4 +-
.../apache/struts2/struts-messages_pt.properties | 4 +-
.../ConfigurationProviderOgnlAllowlistTest.java | 2 +-
.../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 +-
.../ActionFileUploadInterceptorTest.java | 97 +-
.../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 | 54 +-
.../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 +-
jakarta/freemarker-jakarta/README.md | 4 +
jakarta/freemarker-jakarta/pom.xml | 71 +
{plugins/dwr => jakarta}/pom.xml | 34 +-
jakarta/sitemesh2-jakarta/README.md | 4 +
jakarta/sitemesh2-jakarta/pom.xml | 71 +
jakarta/velocity-tools-jsp-jakarta/README.md | 4 +
jakarta/velocity-tools-jsp-jakarta/pom.xml | 77 +
jakarta/velocity-tools-view-jakarta/README.md | 4 +
jakarta/velocity-tools-view-jakarta/pom.xml | 71 +
plugins/async/pom.xml | 8 +-
.../apache/struts2/async/DefaultAsyncManager.java | 8 +-
plugins/bean-validation/pom.xml | 11 +-
.../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 | 14 +-
.../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 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
.../convention/ConventionUnknownHandler.java | 2 +-
.../convention/DefaultResultMapBuilder.java | 2 +-
.../convention/ConventionUnknownHandlerTest.java | 2 +-
.../convention/DefaultResultMapBuilderTest.java | 2 +-
.../PackageBasedActionConfigBuilderTest.java | 2 +-
plugins/dwr/README.md | 6 -
.../apache/struts2/validators/DWRValidator.java | 123 -
plugins/dwr/src/site/site.xml | 56 -
plugins/embeddedjsp/README.md | 2 -
plugins/embeddedjsp/pom.xml | 102 -
.../java/org/apache/struts2/EmbeddedJSPResult.java | 32 -
.../main/java/org/apache/struts2/JSPLoader.java | 271 --
.../main/java/org/apache/struts2/JSPRuntime.java | 79 -
.../java/org/apache/struts2/JSPServletConfig.java | 53 -
.../main/java/org/apache/struts2/ServletCache.java | 74 -
.../apache/struts2/compiler/MemoryClassLoader.java | 52 -
.../struts2/compiler/MemoryJavaFileObject.java | 59 -
.../apache/struts2/el/ExpressionFactoryImpl.java | 79 -
.../apache/struts2/el/MethodExpressionImpl.java | 315 --
.../apache/struts2/el/MethodExpressionLiteral.java | 96 -
.../org/apache/struts2/el/ValueExpressionImpl.java | 267 --
.../apache/struts2/el/ValueExpressionLiteral.java | 113 -
.../org/apache/struts2/el/lang/ELArithmetic.java | 378 --
.../java/org/apache/struts2/el/lang/ELSupport.java | 474 ---
.../apache/struts2/el/lang/EvaluationContext.java | 82 -
.../apache/struts2/el/lang/ExpressionBuilder.java | 211 -
.../struts2/el/lang/FunctionMapperFactory.java | 60 -
.../apache/struts2/el/lang/FunctionMapperImpl.java | 190 -
.../struts2/el/lang/VariableMapperFactory.java | 54 -
.../apache/struts2/el/lang/VariableMapperImpl.java | 57 -
.../apache/struts2/el/parser/ArithmeticNode.java | 43 -
.../java/org/apache/struts2/el/parser/AstAnd.java | 46 -
.../apache/struts2/el/parser/AstBracketSuffix.java | 39 -
.../org/apache/struts2/el/parser/AstChoice.java | 47 -
.../struts2/el/parser/AstCompositeExpression.java | 55 -
.../struts2/el/parser/AstDeferredExpression.java | 54 -
.../java/org/apache/struts2/el/parser/AstDiv.java | 42 -
.../org/apache/struts2/el/parser/AstDotSuffix.java | 39 -
.../struts2/el/parser/AstDynamicExpression.java | 54 -
.../org/apache/struts2/el/parser/AstEmpty.java | 59 -
.../org/apache/struts2/el/parser/AstEqual.java | 41 -
.../org/apache/struts2/el/parser/AstFalse.java | 39 -
.../apache/struts2/el/parser/AstFloatingPoint.java | 59 -
.../org/apache/struts2/el/parser/AstFunction.java | 134 -
.../apache/struts2/el/parser/AstGreaterThan.java | 47 -
.../struts2/el/parser/AstGreaterThanEqual.java | 47 -
.../apache/struts2/el/parser/AstIdentifier.java | 137 -
.../org/apache/struts2/el/parser/AstInteger.java | 59 -
.../org/apache/struts2/el/parser/AstLessThan.java | 46 -
.../apache/struts2/el/parser/AstLessThanEqual.java | 46 -
.../struts2/el/parser/AstLiteralExpression.java | 63 -
.../org/apache/struts2/el/parser/AstMinus.java | 41 -
.../java/org/apache/struts2/el/parser/AstMod.java | 41 -
.../java/org/apache/struts2/el/parser/AstMult.java | 41 -
.../org/apache/struts2/el/parser/AstNegative.java | 82 -
.../java/org/apache/struts2/el/parser/AstNot.java | 45 -
.../org/apache/struts2/el/parser/AstNotEqual.java | 40 -
.../java/org/apache/struts2/el/parser/AstNull.java | 43 -
.../java/org/apache/struts2/el/parser/AstOr.java | 45 -
.../java/org/apache/struts2/el/parser/AstPlus.java | 41 -
.../org/apache/struts2/el/parser/AstString.java | 74 -
.../java/org/apache/struts2/el/parser/AstTrue.java | 38 -
.../org/apache/struts2/el/parser/AstValue.java | 179 -
.../org/apache/struts2/el/parser/BooleanNode.java | 40 -
.../org/apache/struts2/el/parser/ELParser.html | 223 --
.../org/apache/struts2/el/parser/ELParser.java | 2483 ------------
.../java/org/apache/struts2/el/parser/ELParser.jjt | 470 ---
.../struts2/el/parser/ELParserConstants.java | 206 -
.../struts2/el/parser/ELParserTokenManager.java | 1343 -------
.../struts2/el/parser/ELParserTreeConstants.java | 95 -
.../apache/struts2/el/parser/JJTELParserState.java | 141 -
.../java/org/apache/struts2/el/parser/Node.java | 97 -
.../org/apache/struts2/el/parser/NodeVisitor.java | 27 -
.../apache/struts2/el/parser/ParseException.java | 226 --
.../apache/struts2/el/parser/SimpleCharStream.java | 589 ---
.../org/apache/struts2/el/parser/SimpleNode.java | 159 -
.../java/org/apache/struts2/el/parser/Token.java | 152 -
.../apache/struts2/el/parser/TokenMgrError.java | 175 -
.../apache/struts2/el/util/ConcurrentCache.java | 57 -
.../org/apache/struts2/el/util/MessageFactory.java | 72 -
.../org/apache/struts2/el/util/ReflectionUtil.java | 182 -
.../java/org/apache/struts2/jasper/Constants.java | 208 -
.../org/apache/struts2/jasper/CustomCompiler.java | 35 -
.../struts2/jasper/EmbeddedServletOptions.java | 668 ----
.../org/apache/struts2/jasper/JasperException.java | 52 -
.../main/java/org/apache/struts2/jasper/JspC.java | 1237 ------
.../struts2/jasper/JspCompilationContext.java | 732 ----
.../java/org/apache/struts2/jasper/Options.java | 196 -
.../struts2/jasper/compiler/BeanRepository.java | 79 -
.../apache/struts2/jasper/compiler/Collector.java | 205 -
.../apache/struts2/jasper/compiler/Compiler.java | 569 ---
.../jasper/compiler/DefaultErrorHandler.java | 110 -
.../org/apache/struts2/jasper/compiler/Dumper.java | 200 -
.../struts2/jasper/compiler/ELFunctionMapper.java | 284 --
.../org/apache/struts2/jasper/compiler/ELNode.java | 256 --
.../apache/struts2/jasper/compiler/ELParser.java | 383 --
.../struts2/jasper/compiler/ErrorDispatcher.java | 699 ----
.../struts2/jasper/compiler/ErrorHandler.java | 79 -
.../apache/struts2/jasper/compiler/Generator.java | 4190 --------------------
.../jasper/compiler/ImplicitTagLibraryInfo.java | 219 -
.../struts2/jasper/compiler/JasperTagInfo.java | 59 -
.../struts2/jasper/compiler/JavacErrorDetail.java | 233 --
.../apache/struts2/jasper/compiler/JspConfig.java | 536 ---
.../struts2/jasper/compiler/JspDocumentParser.java | 1455 -------
.../apache/struts2/jasper/compiler/JspReader.java | 656 ---
.../struts2/jasper/compiler/JspRuntimeContext.java | 468 ---
.../apache/struts2/jasper/compiler/JspUtil.java | 1202 ------
.../apache/struts2/jasper/compiler/Localizer.java | 161 -
.../org/apache/struts2/jasper/compiler/Mark.java | 284 --
.../org/apache/struts2/jasper/compiler/Node.java | 2568 ------------
.../struts2/jasper/compiler/PageDataImpl.java | 713 ----
.../apache/struts2/jasper/compiler/PageInfo.java | 713 ----
.../org/apache/struts2/jasper/compiler/Parser.java | 1792 ---------
.../struts2/jasper/compiler/ParserController.java | 636 ---
.../jasper/compiler/ScriptingVariabler.java | 149 -
.../struts2/jasper/compiler/ServletWriter.java | 204 -
.../struts2/jasper/compiler/SmapGenerator.java | 172 -
.../struts2/jasper/compiler/SmapStratum.java | 333 --
.../apache/struts2/jasper/compiler/SmapUtil.java | 723 ----
.../struts2/jasper/compiler/TagConstants.java | 117 -
.../struts2/jasper/compiler/TagFileProcessor.java | 726 ----
.../jasper/compiler/TagLibraryInfoImpl.java | 769 ----
.../struts2/jasper/compiler/TagPluginManager.java | 241 --
.../struts2/jasper/compiler/TextOptimizer.java | 117 -
.../struts2/jasper/compiler/TldLocationsCache.java | 580 ---
.../apache/struts2/jasper/compiler/Validator.java | 1804 ---------
.../jasper/compiler/tagplugin/TagPlugin.java | 38 -
.../compiler/tagplugin/TagPluginContext.java | 133 -
.../apache/struts2/jasper/el/ELContextImpl.java | 101 -
.../apache/struts2/jasper/el/ELContextWrapper.java | 80 -
.../apache/struts2/jasper/el/ELResolverImpl.java | 147 -
.../struts2/jasper/el/ExpressionEvaluatorImpl.java | 59 -
.../apache/struts2/jasper/el/ExpressionImpl.java | 40 -
.../struts2/jasper/el/FunctionMapperImpl.java | 37 -
.../apache/struts2/jasper/el/JspELException.java | 28 -
.../struts2/jasper/el/JspMethodExpression.java | 110 -
.../jasper/el/JspMethodNotFoundException.java | 28 -
.../jasper/el/JspPropertyNotFoundException.java | 30 -
.../jasper/el/JspPropertyNotWritableException.java | 29 -
.../struts2/jasper/el/JspValueExpression.java | 139 -
.../struts2/jasper/el/VariableResolverImpl.java | 37 -
.../struts2/jasper/runtime/BodyContentImpl.java | 632 ---
.../apache/struts2/jasper/runtime/HttpJspBase.java | 89 -
.../struts2/jasper/runtime/InstanceHelper.java | 191 -
.../jasper/runtime/JspApplicationContextImpl.java | 140 -
.../struts2/jasper/runtime/JspContextWrapper.java | 463 ---
.../struts2/jasper/runtime/JspFactoryImpl.java | 211 -
.../struts2/jasper/runtime/JspFragmentHelper.java | 66 -
.../struts2/jasper/runtime/JspRuntimeLibrary.java | 1059 -----
.../struts2/jasper/runtime/JspSourceDependent.java | 40 -
.../struts2/jasper/runtime/JspWriterImpl.java | 662 ----
.../struts2/jasper/runtime/PageContextImpl.java | 957 -----
.../jasper/runtime/PerThreadTagHandlerPool.java | 135 -
.../jasper/runtime/ProtectedFunctionMapper.java | 200 -
.../runtime/ServletResponseWrapperInclude.java | 77 -
.../struts2/jasper/runtime/TagHandlerPool.java | 193 -
.../struts2/jasper/security/SecurityClassLoad.java | 111 -
.../struts2/jasper/security/SecurityUtil.java | 84 -
.../struts2/jasper/servlet/JasperLoader.java | 173 -
.../struts2/jasper/servlet/JspCServletContext.java | 567 ---
.../apache/struts2/jasper/servlet/JspServlet.java | 347 --
.../struts2/jasper/servlet/JspServletWrapper.java | 528 ---
.../struts2/jasper/tagplugins/jstl/Util.java | 371 --
.../struts2/jasper/tagplugins/jstl/core/Catch.java | 72 -
.../jasper/tagplugins/jstl/core/Choose.java | 34 -
.../jasper/tagplugins/jstl/core/ForEach.java | 344 --
.../jasper/tagplugins/jstl/core/ForTokens.java | 119 -
.../struts2/jasper/tagplugins/jstl/core/If.java | 50 -
.../jasper/tagplugins/jstl/core/Import.java | 382 --
.../jasper/tagplugins/jstl/core/Otherwise.java | 32 -
.../struts2/jasper/tagplugins/jstl/core/Out.java | 90 -
.../struts2/jasper/tagplugins/jstl/core/Param.java | 77 -
.../jasper/tagplugins/jstl/core/Redirect.java | 83 -
.../jasper/tagplugins/jstl/core/Remove.java | 45 -
.../struts2/jasper/tagplugins/jstl/core/Set.java | 167 -
.../struts2/jasper/tagplugins/jstl/core/Url.java | 101 -
.../struts2/jasper/tagplugins/jstl/core/When.java | 50 -
.../org/apache/struts2/jasper/util/Enumerator.java | 174 -
.../struts2/jasper/xmlparser/ASCIIReader.java | 205 -
.../struts2/jasper/xmlparser/EncodingMap.java | 1015 -----
.../struts2/jasper/xmlparser/ParserUtils.java | 240 --
.../struts2/jasper/xmlparser/SymbolTable.java | 312 --
.../apache/struts2/jasper/xmlparser/TreeNode.java | 364 --
.../apache/struts2/jasper/xmlparser/UCSReader.java | 302 --
.../struts2/jasper/xmlparser/UTF8Reader.java | 636 ---
.../apache/struts2/jasper/xmlparser/XMLChar.java | 1031 -----
.../jasper/xmlparser/XMLEncodingDetector.java | 1651 --------
.../apache/struts2/jasper/xmlparser/XMLString.java | 197 -
.../struts2/jasper/xmlparser/XMLStringBuffer.java | 194 -
plugins/embeddedjsp/src/main/resources/LICENSE.txt | 174 -
.../org/apache/struts2/el/Messages.properties | 66 -
.../org/apache/struts2/el/Messages_es.properties | 45 -
.../jasper/resources/LocalStrings.properties | 431 --
.../jasper/resources/LocalStrings_es.properties | 421 --
.../jasper/resources/LocalStrings_fr.properties | 318 --
.../jasper/resources/LocalStrings_ja.properties | 424 --
.../struts2/jasper/servlet/mbeans-descriptors.xml | 40 -
.../struts2/jasper/tagplugins/jstl/tagPlugins.xml | 67 -
.../src/main/resources/struts-plugin.xml | 32 -
plugins/embeddedjsp/src/site/site.xml | 56 -
.../org/apache/struts2/EmbeddedJSPResultTest.java | 456 ---
.../src/test/java/org/apache/struts2/SoyBean.java | 33 -
plugins/embeddedjsp/src/test/resources/jsps.jar | Bin 557 -> 0 bytes
.../test/resources/org/apache/struts2/beans.jsp | 22 -
.../test/resources/org/apache/struts2/broken0.jsp | 22 -
.../test/resources/org/apache/struts2/complex0.jsp | 219 -
.../test/resources/org/apache/struts2/dont-use.jsp | 21 -
.../src/test/resources/org/apache/struts2/el.jsp | 21 -
.../resources/org/apache/struts2/includes0.jsp | 22 -
.../resources/org/apache/struts2/includes1.jsp | 22 -
.../resources/org/apache/struts2/includes2.jsp | 24 -
.../resources/org/apache/struts2/includes3.jsp | 22 -
.../src/test/resources/org/apache/struts2/jstl.jsp | 29 -
.../resources/org/apache/struts2/printParam.jsp | 21 -
.../resources/org/apache/struts2/scriptlet.jsp | 24 -
.../test/resources/org/apache/struts2/simple0.jsp | 21 -
.../resources/org/apache/struts2/sub/simple0.jsp | 21 -
.../src/test/resources/org/apache/struts2/tag0.jsp | 25 -
plugins/gxp/README.md | 2 -
plugins/gxp/pom.xml | 50 -
.../org/apache/struts2/views/gxp/AbstractGxp.java | 363 --
.../struts2/views/gxp/AbstractGxpResult.java | 132 -
.../java/org/apache/struts2/views/gxp/Gxp.java | 88 -
.../org/apache/struts2/views/gxp/GxpInstance.java | 146 -
.../org/apache/struts2/views/gxp/GxpResult.java | 153 -
.../java/org/apache/struts2/views/gxp/Param.java | 94 -
plugins/gxp/src/main/resources/struts-plugin.xml | 33 -
plugins/gxp/src/site/site.xml | 56 -
plugins/jasperreports/README.md | 2 +-
plugins/jasperreports/pom.xml | 2 +-
.../views/jasperreports/JasperReportsResult.java | 8 +-
.../jasperreports/JasperReportsResultTest.java | 2 +-
plugins/javatemplates/pom.xml | 2 +-
.../struts2/views/java/simple/AbstractTest.java | 4 +-
plugins/jfreechart/pom.xml | 2 +-
.../org/apache/struts2/dispatcher/ChartResult.java | 2 +-
.../apache/struts2/dispatcher/ChartResultTest.java | 6 +-
plugins/json/pom.xml | 14 +-
.../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 +-
plugins/junit/pom.xml | 2 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 8 +-
.../apache/struts2/junit/StrutsRestTestCase.java | 4 +-
.../org/apache/struts2/junit/StrutsTestCase.java | 7 +-
.../org/apache/struts2/junit/XWorkTestCase.java | 22 -
.../junit/StrutsSpringJUnit4TestCaseTest.java | 2 +-
.../apache/struts2/junit/StrutsTestCaseTest.java | 2 +-
plugins/osgi/README.md | 2 -
plugins/osgi/pom.xml | 107 -
.../org/apache/struts2/osgi/BundleAccessor.java | 60 -
.../struts2/osgi/BundleClassLoaderInterface.java | 65 -
.../struts2/osgi/BundleFreemarkerManager.java | 83 -
.../apache/struts2/osgi/BundlePackageLoader.java | 191 -
.../apache/struts2/osgi/DefaultBundleAccessor.java | 236 --
.../struts2/osgi/DelegatingObjectFactory.java | 151 -
.../struts2/osgi/OsgiConfigurationProvider.java | 347 --
.../org/apache/struts2/osgi/OsgiHostFactory.java | 52 -
.../java/org/apache/struts2/osgi/OsgiUtil.java | 174 -
.../org/apache/struts2/osgi/PackageLoader.java | 74 -
.../struts2/osgi/SpringOsgiObjectFactory.java | 111 -
.../apache/struts2/osgi/StrutsOsgiListener.java | 85 -
.../struts2/osgi/action/BundleContextAware.java | 31 -
.../apache/struts2/osgi/action/ServiceAware.java | 34 -
.../org/apache/struts2/osgi/host/BaseOsgiHost.java | 524 ---
.../apache/struts2/osgi/host/FelixOsgiHost.java | 608 ---
.../struts2/osgi/host/GlassfishOSGiHost.java | 178 -
.../org/apache/struts2/osgi/host/OsgiHost.java | 40 -
.../osgi/interceptor/BundleContextAware.java | 38 -
.../struts2/osgi/interceptor/OsgiInterceptor.java | 152 -
.../struts2/osgi/interceptor/ServiceAware.java | 38 -
.../loaders/FreeMarkerBundleResourceLoader.java | 37 -
.../loaders/StaticContentBundleResourceLoader.java | 46 -
.../osgi/loaders/VelocityBundleResourceLoader.java | 71 -
plugins/osgi/src/main/resources/beanRefContext.xml | 31 -
.../osgi/src/main/resources/struts-osgi.properties | 26 -
plugins/osgi/src/main/resources/struts-plugin.xml | 54 -
plugins/osgi/src/site/site.xml | 56 -
.../java/org/apache/struts2/osgi/OsgiUtilTest.java | 158 -
.../apache/struts2/osgi/action/ServiceAction.java | 34 -
.../struts2/osgi/host/FelixOsgiHostTest.java | 216 -
.../osgi/interceptor/OsgiInterceptorTest.java | 174 -
.../struts2/osgi/interceptor/SomeAction.java | 34 -
plugins/osgi/src/test/resources/default.properties | 787 ----
.../osgi/src/test/resources/struts-osgi.properties | 26 -
plugins/oval/README.md | 2 -
plugins/oval/pom.xml | 75 -
.../apache/struts2/oval/annotation/Profiles.java | 33 -
.../interceptor/DefaultOValValidationManager.java | 193 -
.../interceptor/OValValidationInterceptor.java | 363 --
.../oval/interceptor/OValValidationManager.java | 67 -
plugins/oval/src/main/resources/LICENSE.txt | 174 -
plugins/oval/src/main/resources/NOTICE.txt | 9 -
plugins/oval/src/main/resources/OVAL-LICENSE.txt | 88 -
.../oval/src/main/resources/XSTREAM-LICENSE.txt | 26 -
plugins/oval/src/main/resources/struts-plugin.xml | 65 -
plugins/oval/src/site/site.xml | 56 -
.../DummyDefaultOValValidationManager.java | 33 -
.../oval/interceptor/FieldsWithProfiles.java | 68 -
.../struts2/oval/interceptor/MemberObject.java | 36 -
.../oval/interceptor/ModelDrivenAction.java | 37 -
.../interceptor/OValValidationInterceptorTest.java | 322 --
.../struts2/oval/interceptor/SimpleField.java | 57 -
.../struts2/oval/interceptor/SimpleFieldI18n.java | 37 -
.../interceptor/SimpleFieldI18nDefaultKey.java | 37 -
.../interceptor/SimpleFieldJPAAnnotations.java | 36 -
.../interceptor/SimpleFieldOGNLExpression.java | 36 -
.../struts2/oval/interceptor/SimpleFieldsXML.java | 46 -
.../oval/interceptor/SimpleFieldsXMLChild.java | 31 -
.../struts2/oval/interceptor/SimpleMethod.java | 39 -
.../oval/interceptor/ValidationInMethods.java | 50 -
.../struts2/oval/interceptor/VoidResult.java | 27 -
.../struts2/oval/interceptor/domain/Address.java | 36 -
.../struts2/oval/interceptor/domain/Person.java | 61 -
.../oval/interceptor/SimpleFieldI18n.properties | 20 -
.../interceptor/SimpleFieldsXML-validation.xml | 30 -
.../SimpleFieldsXMLChild-validation.xml | 30 -
plugins/oval/src/test/resources/oval-test.xml | 124 -
plugins/pell-multipart/README.md | 2 -
plugins/pell-multipart/pom.xml | 45 -
.../dispatcher/multipart/PellMultiPartRequest.java | 164 -
.../pell-multipart/src/main/resources/LICENSE.txt | 174 -
.../pell-multipart/src/main/resources/NOTICE.txt | 5 -
.../src/main/resources/struts-plugin.xml | 28 -
plugins/pell-multipart/src/site/site.xml | 56 -
plugins/plexus/README.md | 2 -
plugins/plexus/pom.xml | 44 -
.../org/apache/struts2/plexus/PlexusFilter.java | 116 -
.../struts2/plexus/PlexusLifecycleListener.java | 114 -
.../apache/struts2/plexus/PlexusObjectFactory.java | 311 --
.../apache/struts2/plexus/PlexusThreadLocal.java | 42 -
.../org/apache/struts2/plexus/PlexusUtils.java | 54 -
.../src/main/resources/CLASSWORLDS-LICENSE.txt | 47 -
plugins/plexus/src/main/resources/LICENSE.txt | 174 -
plugins/plexus/src/main/resources/NOTICE.txt | 9 -
.../plexus/src/main/resources/struts-plugin.xml | 31 -
plugins/plexus/src/site/site.xml | 56 -
plugins/pom.xml | 21 +-
plugins/portlet-junit/README.md | 2 -
plugins/portlet-junit/pom.xml | 58 -
.../struts2/junit/StrutsPortletTestCase.java | 107 -
plugins/portlet-junit/src/site/site.xml | 56 -
.../struts2/junit/StrutsPortletTestCaseTest.java | 64 -
.../portlet-junit/src/test/resources/struts.xml | 34 -
plugins/portlet-mocks/README.md | 2 -
plugins/portlet-mocks/pom.xml | 56 -
.../mock/web/portlet/MockActionRequest.java | 86 -
.../mock/web/portlet/MockActionResponse.java | 132 -
.../struts2/mock/web/portlet/MockBaseURL.java | 161 -
.../struts2/mock/web/portlet/MockCacheControl.java | 78 -
.../mock/web/portlet/MockClientDataRequest.java | 135 -
.../apache/struts2/mock/web/portlet/MockEvent.java | 91 -
.../struts2/mock/web/portlet/MockEventRequest.java | 90 -
.../mock/web/portlet/MockEventResponse.java | 35 -
.../struts2/mock/web/portlet/MockMimeResponse.java | 259 --
.../web/portlet/MockMultipartActionRequest.java | 101 -
.../mock/web/portlet/MockPortalContext.java | 106 -
.../mock/web/portlet/MockPortletConfig.java | 194 -
.../mock/web/portlet/MockPortletContext.java | 285 --
.../mock/web/portlet/MockPortletPreferences.java | 123 -
.../mock/web/portlet/MockPortletRequest.java | 565 ---
.../web/portlet/MockPortletRequestDispatcher.java | 87 -
.../mock/web/portlet/MockPortletResponse.java | 202 -
.../mock/web/portlet/MockPortletSession.java | 250 --
.../struts2/mock/web/portlet/MockPortletURL.java | 121 -
.../mock/web/portlet/MockRenderRequest.java | 94 -
.../mock/web/portlet/MockRenderResponse.java | 90 -
.../mock/web/portlet/MockResourceRequest.java | 132 -
.../mock/web/portlet/MockResourceResponse.java | 41 -
.../struts2/mock/web/portlet/MockResourceURL.java | 73 -
.../mock/web/portlet/MockStateAwareResponse.java | 165 -
.../web/portlet/ServletWrappingPortletContext.java | 161 -
.../portlet/multipart/MultipartActionRequest.java | 41 -
.../mock/web/portlet/multipart/package-info.java | 38 -
.../struts2/mock/web/portlet/package-info.java | 35 -
plugins/portlet-mocks/src/site/site.xml | 56 -
.../StrutsSpringPortletMockObjectsTest.java | 1604 --------
.../src/test/resources/applicationContext.xml | 36 -
plugins/portlet-tiles/README.md | 2 -
plugins/portlet-tiles/pom.xml | 57 -
.../struts2/views/tiles/PortletTilesResult.java | 111 -
.../tiles/request/portlet/PortletRequest.java | 344 --
.../request/portlet/RenderPortletRequest.java | 47 -
.../portlet/delegate/MimeResponseDelegate.java | 72 -
.../portlet/delegate/PortletRequestDelegate.java | 79 -
.../request/portlet/delegate/RequestDelegate.java | 43 -
.../request/portlet/delegate/ResponseDelegate.java | 70 -
.../request/portlet/delegate/package-info.java | 24 -
.../extractor/ApplicationScopeExtractor.java | 66 -
.../request/portlet/extractor/HeaderExtractor.java | 74 -
.../portlet/extractor/InitParameterExtractor.java | 57 -
.../portlet/extractor/ParameterExtractor.java | 56 -
.../portlet/extractor/RequestScopeExtractor.java | 66 -
.../portlet/extractor/SessionScopeExtractor.java | 88 -
.../extractor/StateAwareParameterExtractor.java | 53 -
.../request/portlet/extractor/package-info.java | 24 -
.../apache/tiles/request/portlet/package-info.java | 24 -
.../portlet-tiles/src/main/resources/LICENSE.txt | 174 -
.../portlet-tiles/src/main/resources/NOTICE.txt | 5 -
.../src/main/resources/struts-plugin.xml | 40 -
plugins/portlet-tiles/src/site/site.xml | 56 -
.../tiles/request/portlet/PortletRequestTest.java | 424 --
.../request/portlet/RenderPortletRequestTest.java | 69 -
.../portlet/delegate/MimeResponseDelegateTest.java | 132 -
.../delegate/PortletRequestDelegateTest.java | 83 -
.../extractor/ApplicationScopeExtractorTest.java | 106 -
.../portlet/extractor/HeaderExtractorTest.java | 117 -
.../extractor/InitParameterExtractorTest.java | 83 -
.../portlet/extractor/ParameterExtractorTest.java | 83 -
.../extractor/RequestScopeExtractorTest.java | 107 -
.../extractor/SessionScopeExtractorTest.java | 154 -
.../StateAwareParameterExtractorTest.java | 50 -
plugins/portlet/README.md | 2 -
plugins/portlet/pom.xml | 101 -
.../struts2/components/PortletUrlRenderer.java | 211 -
.../struts2/portlet/PortletApplicationMap.java | 208 -
.../apache/struts2/portlet/PortletConstants.java | 133 -
.../org/apache/struts2/portlet/PortletPhase.java | 64 -
.../apache/struts2/portlet/PortletRequestMap.java | 158 -
.../apache/struts2/portlet/PortletSessionMap.java | 154 -
.../portlet/action/PortletContextAware.java | 30 -
.../portlet/action/PortletPreferencesAware.java | 39 -
.../portlet/action/PortletRequestAware.java | 30 -
.../portlet/action/PortletResponseAware.java | 30 -
.../portlet/context/PortletActionContext.java | 233 --
.../dispatcher/DirectRenderFromEventAction.java | 75 -
.../portlet/dispatcher/DispatcherServlet.java | 53 -
.../portlet/dispatcher/Jsr168Dispatcher.java | 674 ----
.../portlet/dispatcher/Jsr286Dispatcher.java | 90 -
.../interceptor/PortletAwareInterceptor.java | 89 -
.../portlet/interceptor/PortletPrincipalProxy.java | 80 -
.../interceptor/PortletStateInterceptor.java | 95 -
.../interceptor/ServletPortletPreferences.java | 93 -
.../result/PortletActionRedirectResult.java | 263 --
.../struts2/portlet/result/PortletResult.java | 263 --
.../portlet/result/PortletResultHelper.java | 64 -
.../portlet/result/PortletResultHelperJSR168.java | 72 -
.../portlet/result/PortletResultHelperJSR286.java | 70 -
.../portlet/result/PortletVelocityResult.java | 270 --
.../portlet/servlet/PortletHttpSession.java | 212 -
.../portlet/servlet/PortletServletConfig.java | 79 -
.../portlet/servlet/PortletServletContext.java | 385 --
.../portlet/servlet/PortletServletInputStream.java | 134 -
.../servlet/PortletServletOutputStream.java | 97 -
.../portlet/servlet/PortletServletRequest.java | 767 ----
.../servlet/PortletServletRequestDispatcher.java | 68 -
.../portlet/servlet/PortletServletResponse.java | 257 --
.../servlet/PortletServletResponseJSR286.java | 182 -
.../apache/struts2/portlet/servlet/package.html | 25 -
.../struts2/portlet/util/PortletUrlHelper.java | 346 --
.../portlet/util/PortletUrlHelperJSR286.java | 73 -
.../views/freemarker/PortletFreemarkerResult.java | 326 --
plugins/portlet/src/main/resources/LICENSE.txt | 174 -
plugins/portlet/src/main/resources/NOTICE.txt | 5 -
.../portlet/src/main/resources/struts-plugin.xml | 76 -
plugins/portlet/src/site/site.xml | 56 -
.../apache/struts2/StrutsTestCasePortletTests.java | 224 --
.../apache/struts2/components/PortletAction.java | 29 -
.../struts2/components/PortletUrlRendererTest.java | 79 -
.../struts2/portlet/PortletApplicationMapTest.java | 179 -
.../struts2/portlet/PortletRequestMapTest.java | 107 -
.../struts2/portlet/PortletSessionMapTest.java | 122 -
.../portlet/context/PortletActionContextTest.java | 207 -
.../portlet/dispatcher/Jsr168DispatcherTest.java | 286 --
.../portlet/dispatcher/Jsr286DispatcherTest.java | 339 --
.../interceptor/PortletAwareInterceptorTest.java | 86 -
.../interceptor/PortletStateInterceptorTest.java | 159 -
.../struts2/portlet/result/PortletResultTest.java | 250 --
.../struts2/portlet/util/PortletUrlHelperTest.java | 202 -
.../struts2/views/jsp/PortletUrlTagTest.java | 469 ---
plugins/portlet/src/test/resources/log4j2.xml | 33 -
plugins/portlet/src/test/resources/struts.xml | 36 -
plugins/rest/pom.xml | 8 +-
.../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 | 7 +-
.../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 +-
plugins/spring/pom.xml | 2 +-
.../ClassReloadingXMLWebApplicationContext.java | 2 +-
.../struts2/spring/StrutsSpringObjectFactory.java | 2 +-
.../spring/StrutsSpringObjectFactoryTest.java | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 15 +-
.../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 | 10 +-
.../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 +-
plugins/xslt/pom.xml | 2 +-
.../struts2/result/xslt/ServletURIResolver.java | 2 +-
.../org/apache/struts2/result/xslt/XSLTResult.java | 2 +-
pom.xml | 267 +-
src/etc/project-suppression.xml | 30 -
1077 files changed, 2703 insertions(+), 93906 deletions(-)
delete mode 100644
apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
delete mode 100644 bundles/admin/pom.xml
delete mode 100644
bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/BundlesAction.java
delete mode 100644
bundles/admin/src/main/java/org/apache/struts2/osgi/admin/actions/ShellAction.java
delete mode 100644 bundles/admin/src/main/resources/JQUERY-LICENSE.txt
delete mode 100644 bundles/admin/src/main/resources/LICENSE.txt
delete mode 100644 bundles/admin/src/main/resources/NOTICE.txt
delete mode 100644
bundles/admin/src/main/resources/osgi/admin/commandResult.ftl
delete mode 100644 bundles/admin/src/main/resources/osgi/admin/shell.ftl
delete mode 100644 bundles/admin/src/main/resources/osgi/admin/viewBundle.ftl
delete mode 100644 bundles/admin/src/main/resources/osgi/admin/viewBundles.ftl
delete mode 100644 bundles/admin/src/main/resources/static/css/main.css
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_217bc0_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_2e83ff_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_469bdd_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_6da8d5_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_cd0a0a_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_d8e7f3_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/images/ui-icons_f9bd01_256x240.png
delete mode 100644
bundles/admin/src/main/resources/static/css/redmond/jquery-ui-1.12.1.redmond.css
delete mode 100644 bundles/admin/src/main/resources/static/css/shell.css
delete mode 100644
bundles/admin/src/main/resources/static/js/jquery-1.12.4.min.js
delete mode 100644
bundles/admin/src/main/resources/static/js/jquery-ui-1.12.1.min.js
delete mode 100644 bundles/admin/src/main/resources/static/js/shell.js
delete mode 100644 bundles/admin/src/main/resources/struts.xml
delete mode 100644 bundles/demo/pom.xml
delete mode 100644 bundles/demo/src/main/java/actions/osgi/BundlesAction.java
delete mode 100644
bundles/demo/src/main/java/actions/osgi/HelloWorldAction.java
delete mode 100644 bundles/demo/src/main/java/actions/osgi/Message.java
delete mode 100644
bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml
delete mode 100644 bundles/demo/src/main/resources/content/osgi/bundles.ftl
delete mode 100644
bundles/demo/src/main/resources/content/osgi/hello-convention.ftl
delete mode 100644 bundles/demo/src/main/resources/content/osgi/hello.ftl
delete mode 100644 bundles/demo/src/main/resources/content/osgi/hello.vm
delete mode 100644 bundles/demo/src/main/resources/content/osgi/home.ftl
delete mode 100644 bundles/demo/src/main/resources/struts.xml
delete mode 100755 bundles/pom.xml
create mode 100644 jakarta/freemarker-jakarta/README.md
create mode 100644 jakarta/freemarker-jakarta/pom.xml
rename {plugins/dwr => jakarta}/pom.xml (54%)
create mode 100644 jakarta/sitemesh2-jakarta/README.md
create mode 100644 jakarta/sitemesh2-jakarta/pom.xml
create mode 100644 jakarta/velocity-tools-jsp-jakarta/README.md
create mode 100644 jakarta/velocity-tools-jsp-jakarta/pom.xml
create mode 100644 jakarta/velocity-tools-view-jakarta/README.md
create mode 100644 jakarta/velocity-tools-view-jakarta/pom.xml
delete mode 100644 plugins/dwr/README.md
delete mode 100644
plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
delete mode 100644 plugins/dwr/src/site/site.xml
delete mode 100644 plugins/embeddedjsp/README.md
delete mode 100644 plugins/embeddedjsp/pom.xml
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPLoader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPRuntime.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/JSPServletConfig.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/ServletCache.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/compiler/MemoryClassLoader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/compiler/MemoryJavaFileObject.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ExpressionFactoryImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/MethodExpressionLiteral.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/ValueExpressionLiteral.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELArithmetic.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ELSupport.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/EvaluationContext.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/ExpressionBuilder.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperFactory.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/FunctionMapperImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperFactory.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/lang/VariableMapperImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ArithmeticNode.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstAnd.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstBracketSuffix.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstChoice.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstCompositeExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDeferredExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDiv.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDotSuffix.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstDynamicExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEmpty.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstEqual.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFalse.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFloatingPoint.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstFunction.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThan.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstGreaterThanEqual.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstIdentifier.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstInteger.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThan.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLessThanEqual.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstLiteralExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMinus.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMod.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstMult.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNegative.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNot.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNotEqual.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstNull.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstOr.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstPlus.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstString.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstTrue.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/AstValue.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/BooleanNode.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.html
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParser.jjt
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParserConstants.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParserTokenManager.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ELParserTreeConstants.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/JJTELParserState.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Node.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/NodeVisitor.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/ParseException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleCharStream.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/SimpleNode.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/Token.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/parser/TokenMgrError.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ConcurrentCache.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/MessageFactory.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/el/util/ReflectionUtil.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/Constants.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/CustomCompiler.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/EmbeddedServletOptions.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JasperException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspC.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/JspCompilationContext.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/Options.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/BeanRepository.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Collector.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Compiler.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/DefaultErrorHandler.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Dumper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELFunctionMapper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELNode.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ELParser.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ErrorDispatcher.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ErrorHandler.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Generator.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ImplicitTagLibraryInfo.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JasperTagInfo.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JavacErrorDetail.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspConfig.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspDocumentParser.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspReader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspRuntimeContext.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/JspUtil.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Localizer.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Mark.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Node.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageDataImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/PageInfo.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Parser.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ParserController.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ScriptingVariabler.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/ServletWriter.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/SmapGenerator.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/SmapStratum.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/SmapUtil.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagConstants.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagFileProcessor.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagLibraryInfoImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TagPluginManager.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TextOptimizer.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/TldLocationsCache.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/tagplugin/TagPlugin.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/tagplugin/TagPluginContext.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELContextWrapper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionEvaluatorImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ExpressionImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/FunctionMapperImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspELException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspMethodNotFoundException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotFoundException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspPropertyNotWritableException.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/JspValueExpression.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/VariableResolverImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/BodyContentImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/HttpJspBase.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/InstanceHelper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspApplicationContextImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFactoryImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspFragmentHelper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspRuntimeLibrary.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspSourceDependent.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspWriterImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PerThreadTagHandlerPool.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ProtectedFunctionMapper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/ServletResponseWrapperInclude.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/TagHandlerPool.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/security/SecurityClassLoad.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/security/SecurityUtil.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JasperLoader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspCServletContext.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServlet.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/servlet/JspServletWrapper.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/Util.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Catch.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Choose.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForEach.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/ForTokens.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/If.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Import.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Otherwise.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Out.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Param.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Redirect.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Remove.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Set.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/Url.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/core/When.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/util/Enumerator.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ASCIIReader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/EncodingMap.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/ParserUtils.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/SymbolTable.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/TreeNode.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/UCSReader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/UTF8Reader.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLChar.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLEncodingDetector.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLString.java
delete mode 100644
plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/xmlparser/XMLStringBuffer.java
delete mode 100644 plugins/embeddedjsp/src/main/resources/LICENSE.txt
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/el/Messages.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/el/Messages_es.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/resources/LocalStrings.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/resources/LocalStrings_es.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/resources/LocalStrings_fr.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/resources/LocalStrings_ja.properties
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/servlet/mbeans-descriptors.xml
delete mode 100644
plugins/embeddedjsp/src/main/resources/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml
delete mode 100644 plugins/embeddedjsp/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/embeddedjsp/src/site/site.xml
delete mode 100644
plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
delete mode 100644
plugins/embeddedjsp/src/test/java/org/apache/struts2/SoyBean.java
delete mode 100644 plugins/embeddedjsp/src/test/resources/jsps.jar
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/beans.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/broken0.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/complex0.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/dont-use.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/el.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/includes0.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/includes1.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/includes2.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/includes3.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/jstl.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/printParam.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/scriptlet.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/simple0.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/sub/simple0.jsp
delete mode 100644
plugins/embeddedjsp/src/test/resources/org/apache/struts2/tag0.jsp
delete mode 100644 plugins/gxp/README.md
delete mode 100644 plugins/gxp/pom.xml
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxp.java
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/Gxp.java
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpInstance.java
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java
delete mode 100644
plugins/gxp/src/main/java/org/apache/struts2/views/gxp/Param.java
delete mode 100644 plugins/gxp/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/gxp/src/site/site.xml
delete mode 100644
plugins/junit/src/main/java/org/apache/struts2/junit/XWorkTestCase.java
delete mode 100644 plugins/osgi/README.md
delete mode 100644 plugins/osgi/pom.xml
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleAccessor.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleClassLoaderInterface.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/BundleFreemarkerManager.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiUtil.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/PackageLoader.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/SpringOsgiObjectFactory.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/StrutsOsgiListener.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/action/BundleContextAware.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/action/ServiceAware.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/host/BaseOsgiHost.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/host/FelixOsgiHost.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/host/GlassfishOSGiHost.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/host/OsgiHost.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/BundleContextAware.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/OsgiInterceptor.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/interceptor/ServiceAware.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/FreeMarkerBundleResourceLoader.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/StaticContentBundleResourceLoader.java
delete mode 100644
plugins/osgi/src/main/java/org/apache/struts2/osgi/loaders/VelocityBundleResourceLoader.java
delete mode 100644 plugins/osgi/src/main/resources/beanRefContext.xml
delete mode 100644 plugins/osgi/src/main/resources/struts-osgi.properties
delete mode 100644 plugins/osgi/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/osgi/src/site/site.xml
delete mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/OsgiUtilTest.java
delete mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/action/ServiceAction.java
delete mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/host/FelixOsgiHostTest.java
delete mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/OsgiInterceptorTest.java
delete mode 100644
plugins/osgi/src/test/java/org/apache/struts2/osgi/interceptor/SomeAction.java
delete mode 100644 plugins/osgi/src/test/resources/default.properties
delete mode 100644 plugins/osgi/src/test/resources/struts-osgi.properties
delete mode 100644 plugins/oval/README.md
delete mode 100644 plugins/oval/pom.xml
delete mode 100644
plugins/oval/src/main/java/org/apache/struts2/oval/annotation/Profiles.java
delete mode 100644
plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/DefaultOValValidationManager.java
delete mode 100644
plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationInterceptor.java
delete mode 100644
plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java
delete mode 100644 plugins/oval/src/main/resources/LICENSE.txt
delete mode 100644 plugins/oval/src/main/resources/NOTICE.txt
delete mode 100644 plugins/oval/src/main/resources/OVAL-LICENSE.txt
delete mode 100644 plugins/oval/src/main/resources/XSTREAM-LICENSE.txt
delete mode 100644 plugins/oval/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/oval/src/site/site.xml
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/DummyDefaultOValValidationManager.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/FieldsWithProfiles.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/MemberObject.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ModelDrivenAction.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/OValValidationInterceptorTest.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleField.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18n.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldI18nDefaultKey.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldJPAAnnotations.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldOGNLExpression.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXML.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/SimpleMethod.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/ValidationInMethods.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/VoidResult.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Address.java
delete mode 100644
plugins/oval/src/test/java/org/apache/struts2/oval/interceptor/domain/Person.java
delete mode 100644
plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldI18n.properties
delete mode 100644
plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXML-validation.xml
delete mode 100644
plugins/oval/src/test/resources/org/apache/struts2/oval/interceptor/SimpleFieldsXMLChild-validation.xml
delete mode 100644 plugins/oval/src/test/resources/oval-test.xml
delete mode 100644 plugins/pell-multipart/README.md
delete mode 100644 plugins/pell-multipart/pom.xml
delete mode 100644
plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
delete mode 100644 plugins/pell-multipart/src/main/resources/LICENSE.txt
delete mode 100644 plugins/pell-multipart/src/main/resources/NOTICE.txt
delete mode 100644 plugins/pell-multipart/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/pell-multipart/src/site/site.xml
delete mode 100644 plugins/plexus/README.md
delete mode 100644 plugins/plexus/pom.xml
delete mode 100644
plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusFilter.java
delete mode 100644
plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusLifecycleListener.java
delete mode 100644
plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
delete mode 100644
plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusThreadLocal.java
delete mode 100644
plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusUtils.java
delete mode 100644 plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
delete mode 100644 plugins/plexus/src/main/resources/LICENSE.txt
delete mode 100644 plugins/plexus/src/main/resources/NOTICE.txt
delete mode 100644 plugins/plexus/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/plexus/src/site/site.xml
delete mode 100644 plugins/portlet-junit/README.md
delete mode 100644 plugins/portlet-junit/pom.xml
delete mode 100644
plugins/portlet-junit/src/main/java/org/apache/struts2/junit/StrutsPortletTestCase.java
delete mode 100644 plugins/portlet-junit/src/site/site.xml
delete mode 100644
plugins/portlet-junit/src/test/java/org/apache/struts2/junit/StrutsPortletTestCaseTest.java
delete mode 100644 plugins/portlet-junit/src/test/resources/struts.xml
delete mode 100644 plugins/portlet-mocks/README.md
delete mode 100644 plugins/portlet-mocks/pom.xml
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockActionRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockActionResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockBaseURL.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockCacheControl.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockClientDataRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEvent.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEventRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEventResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockMimeResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockMultipartActionRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortalContext.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletConfig.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletContext.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletPreferences.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequestDispatcher.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletURL.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockRenderRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockRenderResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceURL.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockStateAwareResponse.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/multipart/MultipartActionRequest.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/multipart/package-info.java
delete mode 100644
plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/package-info.java
delete mode 100644 plugins/portlet-mocks/src/site/site.xml
delete mode 100644
plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java
delete mode 100644
plugins/portlet-mocks/src/test/resources/applicationContext.xml
delete mode 100644 plugins/portlet-tiles/README.md
delete mode 100644 plugins/portlet-tiles/pom.xml
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/RenderPortletRequest.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/MimeResponseDelegate.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/PortletRequestDelegate.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/RequestDelegate.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/ResponseDelegate.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/package-info.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/ApplicationScopeExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/HeaderExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/InitParameterExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/ParameterExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/RequestScopeExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/SessionScopeExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/StateAwareParameterExtractor.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/package-info.java
delete mode 100644
plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/package-info.java
delete mode 100644 plugins/portlet-tiles/src/main/resources/LICENSE.txt
delete mode 100644 plugins/portlet-tiles/src/main/resources/NOTICE.txt
delete mode 100644 plugins/portlet-tiles/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/portlet-tiles/src/site/site.xml
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/RenderPortletRequestTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/delegate/MimeResponseDelegateTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/delegate/PortletRequestDelegateTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/ApplicationScopeExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/HeaderExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/InitParameterExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/ParameterExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/RequestScopeExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/SessionScopeExtractorTest.java
delete mode 100644
plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/StateAwareParameterExtractorTest.java
delete mode 100644 plugins/portlet/README.md
delete mode 100644 plugins/portlet/pom.xml
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletApplicationMap.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletConstants.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletPhase.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletRequestMap.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/PortletSessionMap.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletPreferencesAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletRequestAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletResponseAware.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/package.html
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java
delete mode 100644
plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
delete mode 100644 plugins/portlet/src/main/resources/LICENSE.txt
delete mode 100644 plugins/portlet/src/main/resources/NOTICE.txt
delete mode 100644 plugins/portlet/src/main/resources/struts-plugin.xml
delete mode 100644 plugins/portlet/src/site/site.xml
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/components/PortletAction.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/components/PortletUrlRendererTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletApplicationMapTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletRequestMapTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/PortletSessionMapTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/context/PortletActionContextTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr286DispatcherTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
delete mode 100644
plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
delete mode 100644 plugins/portlet/src/test/resources/log4j2.xml
delete mode 100644 plugins/portlet/src/test/resources/struts.xml
