You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by gi...@apache.org on 2024/11/30 07:56:30 UTC

(struts) branch dependabot/github_actions/github/codeql-action-3.27.5 updated (1e3a52f96 -> 723045bab)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-3.27.5
in repository https://gitbox.apache.org/repos/asf/struts.git


 discard 1e3a52f96 Bump github/codeql-action from 3.27.4 to 3.27.5
     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 2246ea06c Upgrades Mockito to ver 5.8.0
     add 91fd7d0f2 Dependency manage byte-buddy
     add 59992ba01 Alphabetise dependency version props
     add 89a4580f8 Upgrade Maven Surefire version
     add 3af581855 Merge pull request #827 from apache/feature/upgrade-mockito
     add d8090ef9d Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-04
     add 273eb1f6a Merge pull request #833 from apache/merge-master-to-7xx-2024-01-04
     add 13bf91bf3 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-01-20
     add 95ba165ff Merge pull request #850 from apache/merge-master-to-7xx-2024-01-20
     add f055f4f67 Fixes wrong version in BOM
     add e7259ba00 Configure assembly plugin to use proper folders
     add bfc5ddba2 Cleans up assembly definitions
     add 7c375cd0b Configures source-release assembly https://maven.apache.org/apache-resource-bundles/source-release/
     add cd3389ab3 [maven-release-plugin] prepare release STRUTS_7_0_0_M1
     add 00533db15 [maven-release-plugin] prepare for next development iteration
     add 54a7c7094 Upgrade maven to 3.9.6 and wrapper to 3.2.0
     add 77acd665e Merge pull request #851 from sepe81/feature/upgrade-maven-to-3.9.6
     add 8c161f431 WW-5388 Uses the latest JakartaEE FileUpload Servlet 6 package Also refactors the Jakarta based parsers as they have a lot in common
     add b68b6ab7c WW-5388 Updates tests to match new logic
     add ac9b9ad89 WW-5388 Simplifies code
     add c37a6edb6 WW-5388 Avoids unconditional invocations of method in logs
     add 3294ed08d WW-5388 Adds tests per each Jakarta parser
     add d07792a40 WW-5388 Drops unused defaultLocale
     add 51bf8de71 WW-5388 Uses temp directory to avoid problems on Jenkins
     add e635b5973 WW-5388 Test multi-files and fields
     add e2215c852 WW-5388 Introduces new constant to allow control max number of files
     add d024ccdd5 WW-5388 Extracts method to read charset
     add e9e3c0a25 WW-5388 Adds dedicated integration test to cover max size upload
     add 84d350dac Merge pull request #861 from apache/feature/WW-5388-upload-servlet6
     add 11d84a26c Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-01
     add 9a30a9f95 Merge pull request #866 from apache/merge-master-to-7xx-2024-02-01
     add 6db4c5150 [maven-release-plugin] prepare release STRUTS_7_0_0_M2
     add 737542a03 [maven-release-plugin] prepare for next development iteration
     add 245eb90aa WW-5390 Fixes generating assemblies during release process
     add f0db577e9 Merge pull request #868 from apache/fix/WW-5390-assembly
     add 9afb24bda Ensures if temp folder is writable
     add e6d1f59de Merge pull request #869 from apache/fix/temp-folder
     add caa34a497 Update log4j2 to 2.21.1
     add ade8af377 [WW-5384] Update log4j2 to 2.22.1
     add f8fcdbde5 [WW-5393] Update caffeine to 3.1.8
     add d1413b01c Override version of error_prone_annotations
     add d384c824b Merge pull request #870 from sepe81/feature/update-log42j-for-java-version-after-8
     add f913c407e WW-5388 Fixes a few issues in Servlet 6 file upload usage - removes duplicated validation messages where both interceptors have been used - defines a proper error message on a general file upload exception - removes generic definition in tests
     add 7edcac886 Merge pull request #873 from apache/fix/WW-5388-fileupload
     add 45b06dd69 Merge remote-tracking branch 'origin/master' into merge-master-to-7xx-2024-02-16
     add c5d760ce5 Merge pull request #877 from apache/merge-master-to-7xx-2024-02-16
     add a35cfebf5 [maven-release-plugin] prepare release STRUTS_7_0_0_M3
     add d3727070b [maven-release-plugin] prepare for next development iteration
     add ca5e82309 Fix file upload to use actual file name rather than uploadxxx.tmp
     add 4939d3cef Merge pull request #893 from gregh3269/fix-STRUTS_7_0_0_M3-upload-file-name
     add e5e6145c3 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-04-07
     add 964590c9a Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07
     add aca2eb07e [maven-release-plugin] prepare release STRUTS_7_0_0_M4
     add 8b9173469 [maven-release-plugin] prepare for next development iteration
     add ce7671568 Fixes after merge assembly issue
     add 4acb0d16d [maven-release-plugin] prepare release STRUTS_7_0_0_M5
     add 549c3bc98 [maven-release-plugin] prepare for next development iteration
     add 0a3b59664 Fixes creating assembly during release process
     add af53f0d93 [maven-release-plugin] prepare release STRUTS_7_0_0_M6
     add 2352c6863 [maven-release-plugin] prepare for next development iteration
     add d0204f315 Merge remote-tracking branch 'origin/master' into merge-master-to-70-2024-04-20
     add 831689b26 Merge pull request #918 from apache/merge-master-to-70-2024-04-20
     add 85cf09b7d WW-5353 Stronger security defaults for 7.0
     add 5d4ad83cc WW-5353 Test fixes
     add baab7dd36 Merge pull request #919 from apache/WW-5353-stronger-security-defaults
     add 5015ea0d9 WW-5423 Fixes returning null instead of empty array in case of non-existing param
     add 62eac8f58 Merge pull request #954 from apache/fix/WW-5423-query-params
     add 28ea6d01c Merge branch 'master' into merge/master-2024-06-10
     add d1d02c150 Merge pull request #963 from apache/merge/master-2024-06-10
     add 1057d4149 [maven-release-plugin] prepare release STRUTS_7_0_0_M7
     add 28a68676e [maven-release-plugin] prepare for next development iteration
     add a7145d695 WW-5430 Uses Freemarker native support for JakartaEE instead of manually transforming the artifacts
     add 6cebeaca9 Merge pull request #970 from apache/feature/WW-5430-freemarker-jakarta
     add e2d5cc2bd Merge branch 'refs/heads/master' into 7.0.x/merge-master-2024-07-08
     add b65005c72 Merge pull request #980 from apache/7.0.x/merge-master-2024-07-08
     add 4944f1838 WW-5411 Delete deprecated methods from OgnlValueStack
     add ead66f2f7 WW-5411 Delete deprecated methods from cache factories and OgnlUtil constructor
     add c801c8a74 WW-5411 Delete deprecated methods from OgnlUtil
     add e3624835f WW-5411 Delete deprecated members from prepare filters
     add 1b8e7ac82 WW-5411 Delete misc deprecated methods from 6.2.0
     add 31bdbfc27 WW-5411 Delete deprecated Velocity injection methods
     add 61d593620 WW-5411 Delete misc deprecated methods from 6.4.0
     add 089f620ea WW-5411 Delete deprecated Aware marker interfaces
     add a3cc0422f WW-5411 Delete more deprecated methods from OgnlUtil
     add 70b5d7c83 Merge pull request #981 from apache/WW-5411-delete-deprecated-1
     add d995b1a85 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-09
     add 713fd3ba2 Merge pull request #983 from apache/7.0.x/merge-master-2024-07-09
     add 8c8bf6bc7 WW-5438 Fixes scope of Weld dependencies
     add b16ae0445 Merge pull request #984 from apache/fic/WW-5438-weld
     add 4f8cb5211 [maven-release-plugin] prepare release STRUTS_7_0_0_M8
     add e40703e8a [maven-release-plugin] prepare for next development iteration
     add b8f7c4b2f Merge commit '54e387dc' into 7.0.x/merge-master-2024-07-20
     add 7b8435768 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20
     add 2f6604503 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-07-20
     add b9991b5cc Merge pull request #996 from apache/7.0.x/merge-master-2024-07-20
     add 571c7eff0 [maven-release-plugin] prepare release STRUTS_7_0_0_M9
     add c5dfe61ec [maven-release-plugin] prepare for next development iteration
     add 5919178ce WW-5411 Delete deprecated code part 1
     add 36176b665 WW-5411 Delete deprecated code part 2
     add 6c6ef447c WW-5411 Delete deprecated code part 3
     add e411f9c17 WW-5411 Delete deprecated code part 4
     add 4e4cf468a WW-5411 Delete deprecated code part 5
     add aec78dd16 WW-5411 Misc code cleanup
     add fe49781a3 Merge pull request #1002 from apache/7.0.x/WW-5411-delete-deprecated
     add 35d9c0b41 WW-5411 General code clean up using modern language features
     add 5cd03aa02 Merge pull request #1003 from apache/7.0.x/WW-5411-delete-deprecated-2
     add d0b53465b WW-5411 Delete deprecated code part 6
     add bf56c59d8 WW-5411 Delete old comment
     add 9d624069a WW-5411 Delete unsupported static field templating
     add 1ecfbae46 WW-5386 Delete deprecated FileUploadInterceptor
     add 6265455d1 Merge pull request #1004 from apache/7.0.x/WW-5411-delete-deprecated-3
     add 015544abd WW-5449 Make Velocity Tools dependency optional for Velocity plugin
     add 902dca06c WW-5449 Minor clean up
     add ac860d3bb WW-5449 Include Velocity Tools dependencies explicitly in Showcase app
     add ca358c57d WW-5449 Increase coverage
     add 817b0cd6e Merge pull request #1005 from apache/7.0.x/WW-5449-remove-vel-tools
     add f41fe80d8 WW-5454 Log warnings on startup for disabled critical security features
     add 3267a1ace Merge pull request #1010 from apache/7.0.x/WW-5454-log-security-warnings
     add 1b540c288 WW-5453 Rename VelocityManager interface and default implementation
     add 46797922e Merge pull request #1009 from apache/7.0.x/WW-5453-rename-velocity
     add 9292dc2d0 WW-5450 Uses existing Jakarta constants instead of free hand strings
     add 7aa491eb4 WW-5450 Avoids accessing parameters via a key
     add b6cffd2ff WW-5450 Uses proper naming when defining a constant
     add f50cb28f8 WW-5450 Simplifies boolean expression
     add e743ddec3 WW-5450 Drops unused import
     add e62ee8fcb Merge pull request #1034 from apache/feature/WW-5450-use-contstants
     add 9fa6dd96f Merge branch 'master' into merge/master-to-7xx-2024-09-01
     add b69e44122 Merge pull request #1039 from apache/merge/master-to-7xx-2024-09-01
     add b237fb6f8 WW-5461 Extends UploadedFile with inputName field
     add 74c01b31d Merge pull request #1041 from apache/fix/WW-5461-input-name-cherry-pick
     add 81a3776a3 WW-5458 Replaces e.printStackTrace() with proper logger
     add 39a561337 Merge pull request #1043 from apache/fix/WW-5458-stack-trace
     add 514c52b51 Merge branch 'master' into merge/master-to-7xx-2024-09-10
     add ddc29445f Merge pull request #1051 from apache/merge/master-to-7xx-2024-09-10
     add 5c5683907 WW-5468 Fixes @StrutsParameter for ModelDriven
     add a57f51cc2 WW-5468 Reworked fix, exempt ModelDriven Action parameters
     add 58e19dde3 WW-5468 Remove unneeded annotations
     add f6c17e9c6 WW-5468 Replace tabs with spaces
     add 762a0e02e Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2
     add 8dc652789 Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-10-15
     add c1b9ff4ed Merge pull request #1076 from apache/merge/master-to-7xx-2024-10-15
     add 15fb28f2d WW-5473 Fixes examining multiple HttpServletWrappers to find MultiPartRequestWrapper
     add 5132f09bb Merge pull request #1078 from apache/fix/WW-5473-multipart-wraper
     add 00f979e9c WW-5465 Renames tag parameters to attributes
     add b17d7f6ff WW-5465 Short-circuits attributes processing if not found in ValueStack
     add 3a08c1094 Merge pull request #1067 from apache/feature/WW-5465-attributes
     add ce71dab1d WW-5472 Removes Struts Sitemesh plugin
     add 954453b66 Merge pull request #1077 from apache/feature/WW-5472-remove-sitemesh
     add ad9224512 WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
     add 3d255ca81 Merge pull request #1089 from apache/feature/WW-5209-bean-validation
     add c3e0b9c90 WW-5427 Upgrades Freemarker incompatible_improvements to version 2.3.33
     add 9130e3165 Merge pull request #1088 from apache/feature/WW-5427-incompatible-improvements
     add 91154f0ec Merge branch 'kusal-depr-apis-3.5' into 7.0.x/merge-master-2024-11-01
     add 56004a10a Merge branch 'kusal-depr-apis-5' into 7.0.x/merge-master-2024-11-01
     add a34bffdf3 Merge branch 'kusal-depr-apis-7' into 7.0.x/merge-master-2024-11-01
     add f55c404d2 Merge branch 'master' into 7.0.x/merge-master-2024-11-01
     add eab6d9ef8 Fix merge errors
     add 08d54d2b6 Merge pull request #1103 from apache/7.0.x/merge-master-2024-11-01
     add 32bc4045b WW-3714 Moves all classes from com.opensymphony.xwork2 into org.apache.struts2
     add 99434d99b Merge pull request #1036 from apache/feature/WW-3714-rename
     add a43f8a523 Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-02
     add ecad4a576 Replace com.opensymphony.xwork2 mentions
     add 0e6008d63 Merge pull request #1106 from apache/7.0.x/merge-master-2024-11-02
     add 0d0560370 WW-5478 Delete deprecated DefaultResultFactory
     add 46251a11f Merge pull request #1107 from apache/7.0.x/WW-5478-delete-result
     add 87df4a229 WW-3714 Move new Result class into result package
     add 3931968b1 Merge pull request #1111 from apache/7.0.x/WW-3714-result-repkg
     add 01d953b1e Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
     add b0f2f0a8b Merge pull request #1110 from apache/7.0.x/merge-master-2024-11-03
     add dd6bb139f WW-5459 Moves Action interface into org.apache.struts2.action package
     add 83cb936c3 WW-5459 Moves ActionChainResult into org.apache.struts2.result package
     add 7e3b3e58c Uses proper default package name
     add f4f828814 WW-5459 Updates content of zipped XMLs
     add b835e8978 Creates temp folder in target folder
     add 957783b8a Merge pull request #1112 from apache/feature/WW-5459-restructure
     add 80dab5294 WW-5481 Moves text related classes into org.apache.struts2.text
     add e6c7ced60 WW-5481 Extracts duplicated code
     add 058a4495b Merge pull request #1113 from apache/feature/WW-5481-text
     add 3a27b2a00 Merge remote-tracking branch 'origin/feature/WW-5459-restructure' into 7.0.x/merge-master-2024-11-03-v2
     add 93e4f2718 Merge remote-tracking branch 'origin/WW-3714-overriding-behaviour' into 7.0.x/merge-master-2024-11-03-v2
     add 7eb198cbe Merge remote-tracking branch 'origin/release/struts-7-0-x' into 7.0.x/merge-master-2024-11-03-v2
     add 2582a783e Merge remote-tracking branch 'origin/master' into 7.0.x/merge-master-2024-11-03-v2
     add 803a85735 Merge pull request #1118 from apache/7.0.x/merge-master-2024-11-03-v2
     add 0c2d275dc WW-5482 Moves locale related code into org.apache.struts2.locale
     add 7fc0c41b1 Merge pull request #1114 from apache/feature/WW-5482-locale
     add 5760d45a3 [maven-release-plugin] prepare release STRUTS_7_0_0_M10
     add 90c9dfa92 [maven-release-plugin] prepare for next development iteration
     add 24e60416f WW-5486 Fixes exposing params added by ServletDispatcherResult
     add cf260074d WW-5486 Simplifies test to avoid using mocks
     add a49b5a361 WW-5486 Removes try-catches
     add 08f664c0e Merge pull request #1123 from apache/fix/WW-5486-request-params
     add 24c0e5f64 WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
     add 9b2d6a23e Merge pull request #1127 from apache/feature/WW-5463-servlet-path
     add 61000681b Merge remote-tracking branch 'origin/master' into merge/master-to-7xx-2024-11-29
     add c16ab0d86 Merge pull request #1134 from apache/merge/master-to-7xx-2024-11-29
     add 5f35af0e1 Merge pull request #792 from apache/release/struts-7-0-x
     add 723045bab Bump github/codeql-action from 3.27.4 to 3.27.5

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   (1e3a52f96)
            \
             N -- N -- N   refs/heads/dependabot/github_actions/github/codeql-action-3.27.5 (723045bab)

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 +
 Jenkinsfile                                        |   89 +-
 apps/pom.xml                                       |    2 +-
 apps/rest-showcase/pom.xml                         |    8 +-
 .../org/demo/rest/example/OrdersController.java    |    6 +-
 apps/rest-showcase/src/main/resources/log4j2.xml   |    1 -
 .../apache/struts2/rest/example/GetOrdersTest.java |   16 +-
 .../struts2/rest/example/ListOrdersTest.java       |   15 +-
 .../apache/struts2/rest/example/PostOrderTest.java |   28 +-
 apps/showcase/pom.xml                              |  107 +-
 .../org/apache/struts2/showcase/DateAction.java    |    2 +-
 .../struts2/showcase/DynamicTreeSelectAction.java  |    2 +-
 .../showcase/LotsOfOptiontransferselectAction.java |    2 +-
 .../showcase/LotsOfRichtexteditorAction.java       |    2 +-
 .../apache/struts2/showcase/MoreSelectsAction.java |    2 +-
 .../showcase/ShowAjaxDynamicTreeAction.java        |    2 +-
 .../struts2/showcase/ShowDynamicTreeAction.java    |    2 +-
 .../org/apache/struts2/showcase/UITagExample.java  |    6 +-
 .../showcase/action/AbstractCRUDAction.java        |    2 +-
 .../struts2/showcase/action/EmployeeAction.java    |    2 +-
 .../struts2/showcase/action/ExampleAction.java     |    2 +-
 .../struts2/showcase/action/JSPEvalAction.java     |    4 +-
 .../showcase/action/ParamsAnnotationAction.java    |    2 +-
 .../struts2/showcase/action/SkillAction.java       |    2 +-
 .../showcase/actionchaining/ActionChain1.java      |    2 +-
 .../showcase/actionchaining/ActionChain2.java      |    2 +-
 .../showcase/actionchaining/ActionChain3.java      |    2 +-
 .../struts2/showcase/ajax/AjaxTestAction.java      |    2 +-
 .../showcase/ajax/AutocompleterExampleAction.java  |    2 +-
 .../showcase/ajax/Example4ShowPanelAction.java     |    2 +-
 .../struts2/showcase/ajax/Example5Action.java      |    2 +-
 .../struts2/showcase/ajax/tree/Category.java       |    3 +-
 .../struts2/showcase/ajax/tree/GetCategory.java    |    2 +-
 .../showcase/application/TestDataProvider.java     |  123 +-
 .../apache/struts2/showcase/async/AsyncFilter.java |   14 +-
 .../struts2/showcase/async/ChatRoomAction.java     |    2 +-
 .../chat/ChatAuthenticationInterceptor.java        |    8 +-
 .../struts2/showcase/chat/ChatInterceptor.java     |    8 +-
 .../struts2/showcase/chat/ChatLoginAction.java     |    2 +-
 .../struts2/showcase/chat/ChatLogoutAction.java    |    2 +-
 .../struts2/showcase/chat/ChatSessionListener.java |    6 +-
 .../struts2/showcase/chat/CrudRoomAction.java      |    2 +-
 .../struts2/showcase/chat/DateConverter.java       |    4 +-
 .../struts2/showcase/chat/EnterRoomAction.java     |    2 +-
 .../struts2/showcase/chat/ExitRoomAction.java      |    2 +-
 .../chat/MessagesAvailableInRoomAction.java        |    2 +-
 .../showcase/chat/RoomsAvailableAction.java        |    2 +-
 .../showcase/chat/SendMessageToRoomAction.java     |    2 +-
 .../showcase/chat/UsersAvailableAction.java        |    2 +-
 .../showcase/chat/UsersAvailableInRoomAction.java  |    2 +-
 .../struts2/showcase/conversion/AddressAction.java |    2 +-
 .../showcase/conversion/OperationsEnumAction.java  |    2 +-
 .../struts2/showcase/conversion/PersonAction.java  |    2 +-
 .../showcase/filedownload/FileDownloadAction.java  |    2 +-
 .../showcase/fileupload/FileUploadAction.java      |    2 +-
 .../MultipleFileUploadUsingArrayAction.java        |    2 +-
 .../MultipleFileUploadUsingListAction.java         |    2 +-
 .../freemarker/CustomFreemarkerManager.java        |    6 +-
 .../showcase/freemarker/StandardTagsAction.java    |    4 +-
 .../showcase/hangman/GetUpdatedHangmanAction.java  |    2 +-
 .../showcase/hangman/GuessCharacterAction.java     |    2 +-
 .../apache/struts2/showcase/hangman/Hangman.java   |   36 +-
 .../showcase/hangman/StartHangmanAction.java       |    2 +-
 .../org/apache/struts2/showcase/hangman/Vocab.java |   31 +-
 .../showcase/modelDriven/ModelDrivenAction.java    |    4 +-
 .../struts2/showcase/person/EditPersonAction.java  |    2 +-
 .../struts2/showcase/person/ListPeopleAction.java  |    2 +-
 .../struts2/showcase/person/NewPersonAction.java   |    2 +-
 .../struts2/showcase/servlet/TestServlet.java      |    8 +-
 .../struts2/showcase/source/ViewSourceAction.java  |    6 +-
 .../tag/nonui/actionPrefix/SubmitAction.java       |    2 +-
 .../tag/nonui/actiontag/ActionTagDemo.java         |    2 +-
 .../tag/nonui/debugtag/DebugTagAction.java         |    2 +-
 .../nonui/iteratortag/AppendIteratorTagDemo.java   |    4 +-
 .../iteratortag/IteratorGeneratorTagDemo.java      |    2 +-
 .../nonui/iteratortag/MergeIteratorTagDemo.java    |    4 +-
 .../nonui/iteratortag/SubsetIteratorTagDemo.java   |    4 +-
 .../showcase/tiles/TilesAnnotationsAction.java     |    2 +-
 .../apache/struts2/showcase/token/TokenAction.java |    4 +-
 .../AbstractValidationActionSupport.java           |    2 +-
 .../showcase/validation/AjaxFormSubmitAction.java  |   18 +-
 .../validation/BeanValidationExampleAction.java    |   16 +-
 .../struts2/showcase/validation/QuizAction.java    |    2 +-
 .../showcase/validation/SubmitApplication.java     |    2 +-
 .../struts2/showcase/wait/LongProcessAction.java   |    2 +-
 .../apache/struts2/showcase/xslt/JVMAction.java    |    6 +-
 apps/showcase/src/main/resources/log4j2.xml        |    1 -
 .../myTemplateDir/myTheme/myAnotherTemplate.ftl    |    2 +-
 .../src/main/resources/struts-fileupload.xml       |    3 +
 .../src/main/resources/struts-validation.xml       |    7 +-
 apps/showcase/src/main/resources/struts.xml        |    1 -
 .../template/ajaxErrorContainers/actionerror.ftl   |   16 +-
 .../template/ajaxErrorContainers/controlfooter.ftl |   10 +-
 .../ajaxErrorContainers/controlheader-core.ftl     |   34 +-
 .../WEB-INF/conversion/AddressAction.java.txt      |   10 +-
 .../conversion/OperationsEnumAction.java.txt       |   14 +-
 .../WEB-INF/conversion/PersonAction.java.txt       |   16 +-
 .../src/main/webapp/WEB-INF/decorators.xml         |   36 -
 .../src/main/webapp/WEB-INF/decorators/main.jsp    |   16 +-
 apps/showcase/src/main/webapp/WEB-INF/dwr.xml      |    6 +-
 .../webapp/WEB-INF/fileupload/upload-success.jsp   |   45 +-
 .../src/main/webapp/WEB-INF/sitemesh-decorator.tld |   99 -
 .../src/main/webapp/WEB-INF/sitemesh-page.tld      |  115 -
 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml |   75 -
 .../showcase/src/main/webapp/WEB-INF/sitemesh3.xml |   30 +
 .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp    |   14 -
 .../webapp/WEB-INF/tags/ui/componentTagExample.jsp |  110 +-
 .../main/webapp/WEB-INF/validation/quiz-dwr.jsp    |   92 -
 apps/showcase/src/main/webapp/WEB-INF/web.xml      |   30 +-
 .../customTheme/ftlCustomTemplate.ftl              |    2 +-
 .../customTheme/jspCustomTemplate.jsp              |    4 +-
 .../src/main/webapp/template/xhtml/mytemplate.jsp  |    2 +-
 .../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/ConventionTest.java    |    8 +-
 .../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    |   71 +-
 .../org/apache/struts2/showcase/ForwardTest.java   |    6 +-
 .../struts2/showcase/FreeMarkerManagerTest.java    |   11 +-
 .../apache/struts2/showcase/StaticContentTest.java |    9 +-
 .../struts2/showcase/StrutsParametersTest.java     |    4 +-
 .../apache/struts2/showcase/UITagExampleTest.java  |   17 +-
 .../apache/struts2/showcase/ValidationTest.java    |    9 +-
 assembly/pom.xml                                   |   63 +-
 assembly/src/main/assembly/all.xml                 |  447 +--
 assembly/src/main/assembly/apps.xml                |   14 -
 assembly/src/main/assembly/docs.xml                |   58 +-
 assembly/src/main/assembly/lib.xml                 |   22 -
 assembly/src/main/assembly/min-lib.xml             |    2 +-
 assembly/src/main/assembly/src.xml                 |   16 -
 bom/pom.xml                                        |   38 +-
 bundles/admin/pom.xml                              |   62 -
 .../struts2/osgi/admin/actions/BundlesAction.java  |  216 -
 .../struts2/osgi/admin/actions/ShellAction.java    |  145 -
 .../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  |   44 -
 .../main/java/actions/osgi/HelloWorldAction.java   |   65 -
 .../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                                       |   96 +-
 .../main/java/com/opensymphony/xwork2/Action.java  |   28 -
 .../com/opensymphony/xwork2/ActionChainResult.java |   38 -
 .../com/opensymphony/xwork2/ActionContext.java     |  276 --
 .../opensymphony/xwork2/ActionEventListener.java   |   70 -
 .../com/opensymphony/xwork2/ActionInvocation.java  |  146 -
 .../java/com/opensymphony/xwork2/ActionProxy.java  |   94 -
 .../opensymphony/xwork2/ActionProxyFactory.java    |   85 -
 .../com/opensymphony/xwork2/ActionSupport.java     |   28 -
 .../java/com/opensymphony/xwork2/AsyncManager.java |   35 -
 .../opensymphony/xwork2/CompositeTextProvider.java |  283 --
 .../xwork2/DefaultActionInvocation.java            |  505 ---
 .../opensymphony/xwork2/DefaultActionProxy.java    |  220 -
 .../xwork2/DefaultActionProxyFactory.java          |   85 -
 .../opensymphony/xwork2/DefaultLocaleProvider.java |   68 -
 .../xwork2/DefaultLocaleProviderFactory.java       |   28 -
 .../opensymphony/xwork2/DefaultTextProvider.java   |  151 -
 .../xwork2/DefaultUnknownHandlerManager.java       |  152 -
 .../java/com/opensymphony/xwork2/FileManager.java  |   93 -
 .../opensymphony/xwork2/FileManagerFactory.java    |   30 -
 .../com/opensymphony/xwork2/LocaleProvider.java    |   77 -
 .../opensymphony/xwork2/LocaleProviderFactory.java |   35 -
 .../opensymphony/xwork2/LocalizedTextProvider.java |   49 -
 .../java/com/opensymphony/xwork2/ModelDriven.java  |   26 -
 .../com/opensymphony/xwork2/ObjectFactory.java     |  264 --
 .../java/com/opensymphony/xwork2/Preparable.java   |   26 -
 .../xwork2/ResourceBundleTextProvider.java         |   51 -
 .../main/java/com/opensymphony/xwork2/Result.java  |   56 -
 .../xwork2/StrutsTextProviderFactory.java          |   85 -
 .../java/com/opensymphony/xwork2/TextProvider.java |  189 -
 .../opensymphony/xwork2/TextProviderFactory.java   |   29 -
 .../opensymphony/xwork2/TextProviderSupport.java   |  339 --
 .../java/com/opensymphony/xwork2/Unchainable.java  |   26 -
 .../com/opensymphony/xwork2/UnknownHandler.java    |   67 -
 .../opensymphony/xwork2/UnknownHandlerManager.java |   50 -
 .../java/com/opensymphony/xwork2/Validateable.java |   26 -
 .../xwork2/ValidationAwareSupport.java             |  183 -
 .../opensymphony/xwork2/XWorkJUnit4TestCase.java   |   86 -
 .../com/opensymphony/xwork2/XWorkTestCase.java     |  143 -
 .../xwork2/config/BeanSelectionProvider.java       |   26 -
 .../opensymphony/xwork2/config/Configuration.java  |   95 -
 .../xwork2/config/ConfigurationException.java      |   98 -
 .../xwork2/config/ConfigurationManager.java        |  232 --
 .../xwork2/config/ConfigurationProvider.java       |   25 -
 .../xwork2/config/ConfigurationUtil.java           |   97 -
 .../xwork2/config/ContainerProvider.java           |   60 -
 .../xwork2/config/FileManagerFactoryProvider.java  |   51 -
 .../xwork2/config/FileManagerProvider.java         |   53 -
 .../xwork2/config/PackageProvider.java             |   49 -
 .../xwork2/config/RuntimeConfiguration.java        |   56 -
 .../ServletContextAwareConfigurationProvider.java  |   35 -
 .../xwork2/config/entities/ActionConfig.java       |  362 --
 .../xwork2/config/entities/AllowedMethods.java     |  220 -
 .../config/entities/ExceptionMappingConfig.java    |  183 -
 .../xwork2/config/entities/InterceptorConfig.java  |  163 -
 .../config/entities/InterceptorListHolder.java     |   34 -
 .../xwork2/config/entities/InterceptorLocator.java |   32 -
 .../xwork2/config/entities/InterceptorMapping.java |   93 -
 .../config/entities/InterceptorStackConfig.java    |  198 -
 .../xwork2/config/entities/PackageConfig.java      |  642 ---
 .../xwork2/config/entities/Parameterizable.java    |   45 -
 .../xwork2/config/entities/ResultConfig.java       |  164 -
 .../xwork2/config/entities/ResultTypeConfig.java   |  159 -
 .../config/entities/UnknownHandlerConfig.java      |   46 -
 .../xwork2/config/impl/AbstractMatcher.java        |  289 --
 .../xwork2/config/impl/ActionConfigMatcher.java    |  152 -
 .../xwork2/config/impl/DefaultConfiguration.java   |  672 ----
 .../config/impl/LocatableConstantFactory.java      |   54 -
 .../xwork2/config/impl/LocatableFactory.java       |   75 -
 .../xwork2/config/impl/MockConfiguration.java      |  125 -
 .../xwork2/config/impl/NamespaceMatch.java         |   50 -
 .../xwork2/config/impl/NamespaceMatcher.java       |   68 -
 .../com/opensymphony/xwork2/config/package.html    |   21 -
 .../xwork2/config/providers/CycleDetector.java     |   77 -
 .../xwork2/config/providers/DirectedGraph.java     |  161 -
 .../config/providers/EnvsValueSubstitutor.java     |   52 -
 .../config/providers/InterceptorBuilder.java       |  218 -
 .../StrutsDefaultConfigurationProvider.java        |  168 -
 .../xwork2/config/providers/ValueSubstitutor.java  |   28 -
 .../config/providers/XmlConfigurationProvider.java |  255 --
 .../providers/XmlDocConfigurationProvider.java     | 1030 -----
 .../xwork2/config/providers/XmlHelper.java         |  144 -
 .../conversion/ConversionAnnotationProcessor.java  |   41 -
 .../xwork2/conversion/ConversionFileProcessor.java |   37 -
 .../conversion/ConversionPropertiesProcessor.java  |   40 -
 .../xwork2/conversion/NullHandler.java             |   57 -
 .../xwork2/conversion/ObjectTypeDeterminer.java    |   40 -
 .../xwork2/conversion/TypeConverter.java           |   54 -
 .../xwork2/conversion/TypeConverterCreator.java    |   44 -
 .../xwork2/conversion/TypeConverterHolder.java     |  100 -
 .../xwork2/conversion/annotations/Conversion.java  |  102 -
 .../conversion/annotations/ConversionRule.java     |   36 -
 .../conversion/annotations/ConversionType.java     |   37 -
 .../conversion/annotations/TypeConversion.java     |  212 -
 .../xwork2/conversion/impl/ArrayConverter.java     |   54 -
 .../conversion/impl/CollectionConverter.java       |  113 -
 .../xwork2/conversion/impl/ConversionData.java     |   46 -
 .../xwork2/conversion/impl/DateConverter.java      |  261 --
 .../impl/DefaultConversionAnnotationProcessor.java |  119 -
 .../impl/DefaultConversionFileProcessor.java       |  116 -
 .../impl/DefaultObjectTypeDeterminer.java          |  297 --
 .../conversion/impl/DefaultTypeConverter.java      |  336 --
 .../conversion/impl/InstantiatingNullHandler.java  |  154 -
 .../xwork2/conversion/impl/NumberConverter.java    |  238 --
 .../xwork2/conversion/impl/StringConverter.java    |  100 -
 .../conversion/impl/XWorkBasicConverter.java       |  222 --
 .../xwork2/conversion/impl/XWorkConverter.java     |  630 ---
 .../xwork2/conversion/impl/XWorkList.java          |  249 --
 .../opensymphony/xwork2/factory/ActionFactory.java |   45 -
 .../xwork2/factory/ConverterFactory.java           |   42 -
 .../xwork2/factory/DefaultActionFactory.java       |   43 -
 .../xwork2/factory/DefaultInterceptorFactory.java  |  105 -
 .../xwork2/factory/DefaultResultFactory.java       |   87 -
 .../factory/DefaultUnknownHandlerFactory.java      |   43 -
 .../xwork2/factory/DefaultValidatorFactory.java    |   52 -
 .../xwork2/factory/InterceptorFactory.java         |   50 -
 .../opensymphony/xwork2/factory/ResultFactory.java |   33 -
 .../xwork2/factory/StrutsConverterFactory.java     |   48 -
 .../xwork2/factory/UnknownHandlerFactory.java      |   42 -
 .../xwork2/factory/ValidatorFactory.java           |   43 -
 .../xwork2/inject/ConstructionContext.java         |  119 -
 .../com/opensymphony/xwork2/inject/Container.java  |  133 -
 .../xwork2/inject/ContainerBuilder.java            |  666 ----
 .../opensymphony/xwork2/inject/ContainerImpl.java  |  607 ---
 .../com/opensymphony/xwork2/inject/Context.java    |   57 -
 .../xwork2/inject/DependencyException.java         |   37 -
 .../xwork2/inject/EarlyInitializable.java          |   22 -
 .../xwork2/inject/ExternalContext.java             |   77 -
 .../com/opensymphony/xwork2/inject/Factory.java    |   41 -
 .../opensymphony/xwork2/inject/Initializable.java  |   34 -
 .../xwork2/inject/InitializableFactory.java        |   56 -
 .../com/opensymphony/xwork2/inject/Inject.java     |   47 -
 .../xwork2/inject/InternalContext.java             |   77 -
 .../xwork2/inject/InternalFactory.java             |   42 -
 .../java/com/opensymphony/xwork2/inject/Key.java   |   81 -
 .../java/com/opensymphony/xwork2/inject/Scope.java |  293 --
 .../com/opensymphony/xwork2/inject/Scoped.java     |   37 -
 .../opensymphony/xwork2/inject/package-info.java   |   30 -
 .../inject/util/FinalizablePhantomReference.java   |   35 -
 .../xwork2/inject/util/FinalizableReference.java   |   32 -
 .../inject/util/FinalizableReferenceQueue.java     |   77 -
 .../inject/util/FinalizableSoftReference.java      |   34 -
 .../inject/util/FinalizableWeakReference.java      |   34 -
 .../opensymphony/xwork2/inject/util/Function.java  |   44 -
 .../xwork2/inject/util/ReferenceCache.java         |  197 -
 .../xwork2/inject/util/ReferenceMap.java           |  609 ---
 .../xwork2/inject/util/ReferenceType.java          |   55 -
 .../opensymphony/xwork2/inject/util/Strings.java   |   57 -
 .../xwork2/interceptor/AbstractInterceptor.java    |   48 -
 .../xwork2/interceptor/AliasInterceptor.java       |  296 --
 .../xwork2/interceptor/ChainingInterceptor.java    |  278 --
 .../xwork2/interceptor/ConditionalInterceptor.java |   59 -
 .../interceptor/ConversionErrorInterceptor.java    |  153 -
 .../interceptor/DefaultWorkflowInterceptor.java    |  251 --
 .../xwork2/interceptor/ExceptionHolder.java        |   80 -
 .../interceptor/ExceptionMappingInterceptor.java   |  326 --
 .../xwork2/interceptor/Interceptor.java            |   75 -
 .../xwork2/interceptor/LoggingInterceptor.java     |   93 -
 .../interceptor/MethodFilterInterceptor.java       |  126 -
 .../interceptor/MethodFilterInterceptorUtil.java   |   26 -
 .../xwork2/interceptor/ModelDrivenInterceptor.java |  150 -
 .../xwork2/interceptor/NoParameters.java           |   37 -
 .../interceptor/ParameterFilterInterceptor.java    |  241 --
 .../xwork2/interceptor/ParameterNameAware.java     |   26 -
 .../interceptor/ParameterRemoverInterceptor.java   |  127 -
 .../xwork2/interceptor/ParameterValueAware.java    |   26 -
 .../xwork2/interceptor/ParametersInterceptor.java  |   25 -
 .../xwork2/interceptor/PreResultListener.java      |   58 -
 .../interceptor/PrefixMethodInvocationUtil.java    |  184 -
 .../xwork2/interceptor/PrepareInterceptor.java     |  179 -
 .../xwork2/interceptor/ScopedModelDriven.java      |   28 -
 .../interceptor/ScopedModelDrivenInterceptor.java  |  169 -
 .../interceptor/StaticParametersInterceptor.java   |  245 --
 .../xwork2/interceptor/ValidationAware.java        |  106 -
 .../xwork2/interceptor/ValidationErrorAware.java   |   26 -
 .../interceptor/ValidationWorkflowAware.java       |   26 -
 .../xwork2/interceptor/WithLazyParams.java         |   84 -
 .../xwork2/interceptor/annotations/After.java      |   84 -
 .../xwork2/interceptor/annotations/Allowed.java    |   38 -
 .../AnnotationParameterFilterInterceptor.java      |  115 -
 .../annotations/AnnotationWorkflowInterceptor.java |  200 -
 .../xwork2/interceptor/annotations/Before.java     |   83 -
 .../interceptor/annotations/BeforeResult.java      |   83 -
 .../interceptor/annotations/BlockByDefault.java    |   41 -
 .../xwork2/interceptor/annotations/Blocked.java    |   38 -
 .../interceptor/annotations/InputConfig.java       |   95 -
 .../xwork2/mock/MockActionInvocation.java          |  127 -
 .../opensymphony/xwork2/mock/MockActionProxy.java  |  129 -
 .../opensymphony/xwork2/mock/MockContainer.java    |   59 -
 .../opensymphony/xwork2/mock/MockInterceptor.java  |  111 -
 .../xwork2/mock/MockObjectTypeDeterminer.java      |  128 -
 .../com/opensymphony/xwork2/mock/MockResult.java   |   61 -
 .../xwork2/ognl/BeanInfoCacheFactory.java          |   23 -
 .../ognl/DefaultOgnlBeanInfoCacheFactory.java      |   45 -
 .../xwork2/ognl/DefaultOgnlCacheFactory.java       |  106 -
 .../ognl/DefaultOgnlExpressionCacheFactory.java    |   45 -
 .../xwork2/ognl/ErrorMessageBuilder.java           |   76 -
 .../xwork2/ognl/ExpressionCacheFactory.java        |   23 -
 .../com/opensymphony/xwork2/ognl/ObjectProxy.java  |   57 -
 .../com/opensymphony/xwork2/ognl/OgnlCache.java    |   41 -
 .../opensymphony/xwork2/ognl/OgnlCacheFactory.java |   70 -
 .../xwork2/ognl/OgnlCaffeineCache.java             |   78 -
 .../opensymphony/xwork2/ognl/OgnlDefaultCache.java |   88 -
 .../com/opensymphony/xwork2/ognl/OgnlLRUCache.java |   89 -
 .../xwork2/ognl/OgnlNullHandlerWrapper.java        |   42 -
 .../xwork2/ognl/OgnlReflectionContextFactory.java  |   32 -
 .../xwork2/ognl/OgnlReflectionProvider.java        |  146 -
 .../xwork2/ognl/OgnlTypeConverterWrapper.java      |   48 -
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java     |  897 -----
 .../opensymphony/xwork2/ognl/OgnlValueStack.java   |  546 ---
 .../xwork2/ognl/OgnlValueStackFactory.java         |  170 -
 .../xwork2/ognl/SecurityMemberAccess.java          |  549 ---
 .../xwork2/ognl/XWorkTypeConverterWrapper.java     |   41 -
 .../xwork2/ognl/accessor/CompoundRootAccessor.java |  366 --
 .../accessor/HttpParametersPropertyAccessor.java   |   40 -
 .../xwork2/ognl/accessor/ObjectAccessor.java       |   44 -
 .../ognl/accessor/ObjectProxyPropertyAccessor.java |   80 -
 .../ognl/accessor/ParameterPropertyAccessor.java   |   48 -
 .../xwork2/ognl/accessor/RootAccessor.java         |   29 -
 .../accessor/XWorkCollectionPropertyAccessor.java  |  312 --
 .../ognl/accessor/XWorkEnumerationAccessor.java    |   39 -
 .../accessor/XWorkIteratorPropertyAccessor.java    |   39 -
 .../ognl/accessor/XWorkListPropertyAccessor.java   |  195 -
 .../ognl/accessor/XWorkMapPropertyAccessor.java    |  162 -
 .../xwork2/ognl/accessor/XWorkMethodAccessor.java  |  138 -
 .../ognl/accessor/XWorkObjectPropertyAccessor.java |   44 -
 .../xwork2/result/ParamNameAwareResult.java        |   28 -
 .../xwork2/security/AcceptedPatternsChecker.java   |  100 -
 .../security/DefaultAcceptedPatternsChecker.java   |  138 -
 .../security/DefaultExcludedPatternsChecker.java   |  121 -
 .../DefaultNotExcludedAcceptedPatternsChecker.java |  105 -
 .../xwork2/security/ExcludedPatternsChecker.java   |  100 -
 .../NotExcludedAcceptedPatternsChecker.java        |   70 -
 .../xwork2/test/StubConfigurationProvider.java     |   54 -
 .../xwork2/util/AbstractLocalizedTextProvider.java |  731 ----
 .../opensymphony/xwork2/util/AnnotationUtils.java  |  211 -
 .../opensymphony/xwork2/util/ClassLoaderUtil.java  |  280 --
 .../opensymphony/xwork2/util/ClassPathFinder.java  |  193 -
 .../xwork2/util/ClearableValueStack.java           |   30 -
 .../com/opensymphony/xwork2/util/CompoundRoot.java |   58 -
 .../opensymphony/xwork2/util/ConfigParseUtil.java  |  105 -
 .../com/opensymphony/xwork2/util/CreateIfNull.java |   77 -
 .../com/opensymphony/xwork2/util/DebugUtils.java   |   42 -
 .../com/opensymphony/xwork2/util/DomHelper.java    |  397 --
 .../java/com/opensymphony/xwork2/util/Element.java |   81 -
 .../com/opensymphony/xwork2/util/Evaluated.java    |   36 -
 .../xwork2/util/GlobalLocalizedTextProvider.java   |  221 --
 .../java/com/opensymphony/xwork2/util/Key.java     |   78 -
 .../com/opensymphony/xwork2/util/KeyProperty.java  |   80 -
 .../xwork2/util/MemberAccessValueStack.java        |   34 -
 .../xwork2/util/NamedVariablePatternMatcher.java   |  160 -
 .../opensymphony/xwork2/util/OgnlTextParser.java   |  101 -
 .../opensymphony/xwork2/util/PatternMatcher.java   |   58 -
 .../opensymphony/xwork2/util/PropertiesReader.java |  552 ---
 .../com/opensymphony/xwork2/util/ProxyUtil.java    |  291 --
 .../com/opensymphony/xwork2/util/ResolverUtil.java |  485 ---
 .../xwork2/util/StrutsLocalizedTextProvider.java   |  430 --
 .../opensymphony/xwork2/util/TextParseUtil.java    |  296 --
 .../com/opensymphony/xwork2/util/TextParser.java   |   31 -
 .../com/opensymphony/xwork2/util/ValueStack.java   |  149 -
 .../xwork2/util/ValueStackFactory.java             |   41 -
 .../opensymphony/xwork2/util/WildcardHelper.java   |  464 ---
 .../com/opensymphony/xwork2/util/WildcardUtil.java |   71 -
 .../xwork2/util/XWorkTestCaseHelper.java           |   88 -
 .../util/classloader/AbstractResourceStore.java    |   53 -
 .../xwork2/util/classloader/FileResourceStore.java |   60 -
 .../xwork2/util/classloader/JarResourceStore.java  |   67 -
 .../util/classloader/ReloadingClassLoader.java     |  184 -
 .../xwork2/util/classloader/ResourceStore.java     |   30 -
 .../util/classloader/ResourceStoreClassLoader.java |   99 -
 .../xwork2/util/finder/ClassFinder.java            |  337 --
 .../xwork2/util/finder/ClassFinderFactory.java     |   32 -
 .../xwork2/util/finder/ClassLoaderInterface.java   |   44 -
 .../util/finder/ClassLoaderInterfaceDelegate.java  |   55 -
 .../xwork2/util/finder/ResourceFinder.java         | 1407 -------
 .../com/opensymphony/xwork2/util/finder/Test.java  |   32 -
 .../opensymphony/xwork2/util/finder/UrlSet.java    |  287 --
 .../xwork2/util/fs/DefaultFileManager.java         |  164 -
 .../xwork2/util/fs/DefaultFileManagerFactory.java  |  119 -
 .../opensymphony/xwork2/util/fs/FileRevision.java  |   70 -
 .../xwork2/util/fs/JarEntryRevision.java           |   74 -
 .../com/opensymphony/xwork2/util/fs/Revision.java  |   39 -
 .../xwork2/util/fs/StrutsJarURLConnection.java     |  191 -
 .../xwork2/util/location/Locatable.java            |   32 -
 .../xwork2/util/location/LocatableProperties.java  |   99 -
 .../opensymphony/xwork2/util/location/Located.java |   45 -
 .../xwork2/util/location/Location.java             |   72 -
 .../xwork2/util/location/LocationAttributes.java   |  356 --
 .../xwork2/util/location/LocationImpl.java         |  223 --
 .../xwork2/util/location/LocationUtils.java        |  316 --
 .../util/reflection/ReflectionContextFactory.java  |   33 -
 .../util/reflection/ReflectionContextState.java    |  179 -
 .../util/reflection/ReflectionException.java       |   59 -
 .../reflection/ReflectionExceptionHandler.java     |   32 -
 .../xwork2/util/reflection/ReflectionProvider.java |  188 -
 .../util/reflection/ReflectionProviderFactory.java |   32 -
 .../xwork2/validator/ActionValidatorManager.java   |   90 -
 .../AnnotationActionValidatorManager.java          |   82 -
 .../AnnotationValidationConfigurationBuilder.java  |  957 -----
 .../validator/DefaultActionValidatorManager.java   |  351 --
 .../xwork2/validator/DefaultValidatorFactory.java  |  198 -
 .../validator/DefaultValidatorFileParser.java      |  251 --
 .../validator/DelegatingValidatorContext.java      |  380 --
 .../xwork2/validator/FieldValidator.java           |   42 -
 .../validator/ShortCircuitableValidator.java       |   46 -
 .../xwork2/validator/ValidationException.java      |   46 -
 .../xwork2/validator/ValidationInterceptor.java    |  296 --
 .../opensymphony/xwork2/validator/Validator.java   |  488 ---
 .../xwork2/validator/ValidatorConfig.java          |  173 -
 .../xwork2/validator/ValidatorContext.java         |   40 -
 .../xwork2/validator/ValidatorFactory.java         |  255 --
 .../xwork2/validator/ValidatorFileParser.java      |   66 -
 .../ConditionalVisitorFieldValidator.java          |  184 -
 .../annotations/ConversionErrorFieldValidator.java |  141 -
 .../validator/annotations/CreditCardValidator.java |   68 -
 .../validator/annotations/CustomValidator.java     |  125 -
 .../annotations/DateRangeFieldValidator.java       |  201 -
 .../annotations/DoubleRangeFieldValidator.java     |  235 --
 .../validator/annotations/EmailValidator.java      |  135 -
 .../validator/annotations/ExpressionValidator.java |  125 -
 .../annotations/FieldExpressionValidator.java      |  136 -
 .../annotations/IntRangeFieldValidator.java        |  196 -
 .../annotations/LongRangeFieldValidator.java       |  196 -
 .../validator/annotations/RegexFieldValidator.java |  184 -
 .../annotations/RequiredFieldValidator.java        |  136 -
 .../annotations/RequiredStringValidator.java       |  150 -
 .../annotations/ShortRangeFieldValidator.java      |  194 -
 .../annotations/StringLengthFieldValidator.java    |  205 -
 .../xwork2/validator/annotations/UrlValidator.java |   82 -
 .../validator/annotations/ValidationParameter.java |   85 -
 .../xwork2/validator/annotations/Validations.java  |  197 -
 .../validator/annotations/ValidatorType.java       |   36 -
 .../annotations/VisitorFieldValidator.java         |  167 -
 .../ConditionalVisitorFieldValidator.java          |  106 -
 .../validators/ConversionErrorFieldValidator.java  |   85 -
 .../validator/validators/CreditCardValidator.java  |   48 -
 .../validators/DateRangeFieldValidator.java        |   95 -
 .../validators/DoubleRangeFieldValidator.java      |  223 --
 .../validator/validators/EmailValidator.java       |   90 -
 .../validator/validators/ExpressionValidator.java  |   87 -
 .../validators/FieldExpressionValidator.java       |   98 -
 .../validators/FieldValidatorSupport.java          |   60 -
 .../validators/IntRangeFieldValidator.java         |   86 -
 .../validators/LongRangeFieldValidator.java        |   85 -
 .../validators/RangeValidatorSupport.java          |  125 -
 .../validator/validators/RegexFieldValidator.java  |  241 --
 ...pulateConversionErrorFieldValidatorSupport.java |  203 -
 .../validators/RequiredFieldValidator.java         |   77 -
 .../validators/RequiredStringValidator.java        |  140 -
 .../validators/ShortRangeFieldValidator.java       |   85 -
 .../validators/StringLengthFieldValidator.java     |  201 -
 .../xwork2/validator/validators/URLValidator.java  |  146 -
 .../validator/validators/ValidatorSupport.java     |  217 -
 .../validators/VisitorFieldValidator.java          |  244 --
 .../java/org/apache/struts2/ActionContext.java     |   21 +-
 .../java/org/apache/struts2/ActionInvocation.java  |    4 +-
 .../main/java/org/apache/struts2/ActionProxy.java  |    2 +-
 .../org/apache/struts2/ActionProxyFactory.java     |   85 +
 .../java/org/apache/struts2/ActionSupport.java     |   22 +-
 .../main/java/org/apache/struts2/AsyncManager.java |   35 +
 .../apache/struts2/DefaultActionInvocation.java    |  514 +++
 .../org/apache/struts2/DefaultActionProxy.java     |  223 ++
 .../apache/struts2/DefaultActionProxyFactory.java  |   87 +
 .../struts2/DefaultUnknownHandlerManager.java      |  153 +
 .../main/java/org/apache/struts2/FileManager.java  |   93 +
 .../org/apache/struts2/FileManagerFactory.java     |   32 +
 .../java/org/apache/struts2/ObjectFactory.java     |  269 ++
 .../main/java/org/apache/struts2/Preparable.java   |    6 +-
 .../main/java/org/apache/struts2/RequestUtils.java |   11 +-
 .../org/apache/struts2/ServletActionContext.java   |   23 +-
 .../java/org/apache/struts2/StrutsConstants.java   |  426 +-
 .../java/org/apache/struts2/StrutsException.java   |   12 +-
 .../java/org/apache/struts2/StrutsStatics.java     |   23 +-
 .../main/java/org/apache/struts2/Unchainable.java  |    2 +-
 .../java/org/apache/struts2/UnknownHandler.java    |   67 +
 .../org/apache/struts2/UnknownHandlerManager.java  |   51 +
 .../main/java/org/apache/struts2/Validateable.java |    4 +-
 .../org/apache/struts2/ValidationAwareSupport.java |  183 +
 .../org/apache/struts2/XWorkJUnit4TestCase.java    |   86 +
 .../java/org/apache/struts2/XWorkTestCase.java     |  144 +
 .../org/apache/struts2/action/CspReportAction.java |    6 +-
 .../apache/struts2/action/ServletContextAware.java |    2 +-
 .../apache/struts2/action/ServletRequestAware.java |    2 +-
 .../struts2/action/ServletResponseAware.java       |    2 +-
 .../apache/struts2/components/ActionComponent.java |   33 +-
 .../org/apache/struts2/components/ActionError.java |    6 +-
 .../apache/struts2/components/ActionMessage.java   |    6 +-
 .../java/org/apache/struts2/components/Anchor.java |   21 +-
 .../apache/struts2/components/AppendIterator.java  |   54 +-
 .../java/org/apache/struts2/components/Bean.java   |    8 +-
 .../org/apache/struts2/components/Checkbox.java    |    8 +-
 .../apache/struts2/components/CheckboxList.java    |    6 +-
 .../apache/struts2/components/ClosingUIBean.java   |    6 +-
 .../org/apache/struts2/components/ComboBox.java    |   14 +-
 .../org/apache/struts2/components/Component.java   |   47 +-
 .../struts2/components/ComponentUrlProvider.java   |   53 +-
 .../org/apache/struts2/components/ContextBean.java |    8 +-
 .../java/org/apache/struts2/components/Date.java   |    6 +-
 .../apache/struts2/components/DateTextField.java   |   15 +-
 .../java/org/apache/struts2/components/Debug.java  |   26 +-
 .../struts2/components/DoubleListUIBean.java       |    6 +-
 .../apache/struts2/components/DoubleSelect.java    |    6 +-
 .../java/org/apache/struts2/components/Else.java   |    2 +-
 .../java/org/apache/struts2/components/ElseIf.java |    2 +-
 .../org/apache/struts2/components/FieldError.java  |   10 +-
 .../java/org/apache/struts2/components/File.java   |    9 +-
 .../java/org/apache/struts2/components/Form.java   |   49 +-
 .../org/apache/struts2/components/FormButton.java  |   14 +-
 .../apache/struts2/components/GenericUIBean.java   |   18 +-
 .../java/org/apache/struts2/components/Head.java   |    8 +-
 .../java/org/apache/struts2/components/Hidden.java |    6 +-
 .../java/org/apache/struts2/components/I18n.java   |   15 +-
 .../java/org/apache/struts2/components/If.java     |    7 +-
 .../org/apache/struts2/components/Include.java     |   78 +-
 .../struts2/components/InputTransferSelect.java    |    8 +-
 .../struts2/components/IteratorComponent.java      |   14 +-
 .../java/org/apache/struts2/components/Label.java  |   12 +-
 .../java/org/apache/struts2/components/Link.java   |    6 +-
 .../org/apache/struts2/components/ListUIBean.java  |   12 +-
 .../apache/struts2/components/MergeIterator.java   |   51 +-
 .../java/org/apache/struts2/components/Number.java |   12 +-
 .../org/apache/struts2/components/OptGroup.java    |   24 +-
 .../struts2/components/OptionTransferSelect.java   |   10 +-
 .../java/org/apache/struts2/components/Param.java  |    6 +-
 .../org/apache/struts2/components/Password.java    |    6 +-
 .../org/apache/struts2/components/Property.java    |    4 +-
 .../java/org/apache/struts2/components/Push.java   |    4 +-
 .../java/org/apache/struts2/components/Radio.java  |    8 +-
 .../java/org/apache/struts2/components/Reset.java  |    6 +-
 .../java/org/apache/struts2/components/Script.java |    8 +-
 .../java/org/apache/struts2/components/Select.java |    6 +-
 .../struts2/components/ServletUrlRenderer.java     |   13 +-
 .../java/org/apache/struts2/components/Set.java    |    7 +-
 .../java/org/apache/struts2/components/Submit.java |    9 +-
 .../java/org/apache/struts2/components/Text.java   |    6 +-
 .../org/apache/struts2/components/TextArea.java    |    6 +-
 .../org/apache/struts2/components/TextField.java   |    6 +-
 .../java/org/apache/struts2/components/Token.java  |    6 +-
 .../java/org/apache/struts2/components/UIBean.java |   23 +-
 .../java/org/apache/struts2/components/URL.java    |   10 +-
 .../apache/struts2/components/UpDownSelect.java    |    8 +-
 .../org/apache/struts2/components/UrlProvider.java |    6 +-
 .../org/apache/struts2/components/UrlRenderer.java |    2 +-
 .../components/date/DateTimeFormatterAdapter.java  |    2 +-
 .../components/date/SimpleDateFormatAdapter.java   |    2 +-
 .../components/template/BaseTemplateEngine.java    |    4 +-
 .../template/FreemarkerTemplateEngine.java         |   22 +-
 .../components/template/JspTemplateEngine.java     |   10 +-
 .../struts2/components/template/Template.java      |   11 +-
 .../components/template/TemplateEngineManager.java |   34 +-
 .../template/TemplateRenderingContext.java         |    2 +-
 .../config/AbstractBeanSelectionProvider.java      |   17 +-
 .../struts2/config/BeanSelectionProvider.java      |   26 +
 .../org/apache/struts2/config/Configuration.java   |   95 +
 .../struts2/config/ConfigurationException.java     |   98 +
 .../struts2/config/ConfigurationManager.java       |  232 ++
 .../struts2/config/ConfigurationProvider.java      |   25 +
 .../apache/struts2/config/ConfigurationUtil.java   |   97 +
 .../apache/struts2/config/ContainerProvider.java   |   60 +
 .../struts2/config/DefaultPropertiesProvider.java  |   14 +-
 .../org/apache/struts2/config/DefaultSettings.java |    6 +-
 .../apache/struts2/config/DelegatingSettings.java  |    2 +-
 .../struts2/config/FileManagerFactoryProvider.java |   55 +
 .../apache/struts2/config/FileManagerProvider.java |   57 +
 .../java/org/apache/struts2/config/NullResult.java |    5 +-
 .../org/apache/struts2/config/PackageProvider.java |   49 +
 .../config/PropertiesConfigurationProvider.java    |   15 +-
 .../apache/struts2/config/PropertiesSettings.java  |   18 +-
 .../struts2/config/RuntimeConfiguration.java       |   56 +
 .../ServletContextAwareConfigurationProvider.java  |   35 +
 .../java/org/apache/struts2/config/Settings.java   |    4 +-
 .../config/StrutsBeanSelectionProvider.java        |  154 +-
 .../config/StrutsJavaConfigurationProvider.java    |   41 +-
 .../config/StrutsXmlConfigurationProvider.java     |   67 +-
 .../struts2/config/entities/ActionConfig.java      |  373 ++
 .../struts2/config/entities/AllowedMethods.java    |  220 +
 .../apache/struts2/config/entities/BeanConfig.java |    4 +-
 .../config/entities/BeanSelectionConfig.java       |    4 +-
 .../struts2/config/entities/ConstantConfig.java    |   10 +-
 .../config/entities/ExceptionMappingConfig.java    |  179 +
 .../struts2/config/entities/InterceptorConfig.java |  162 +
 .../config/entities/InterceptorListHolder.java     |   34 +
 .../config/entities/InterceptorLocator.java        |   32 +
 .../config/entities/InterceptorMapping.java        |   84 +
 .../config/entities/InterceptorStackConfig.java    |  201 +
 .../struts2/config/entities/PackageConfig.java     |  648 +++
 .../struts2/config/entities/Parameterizable.java   |   45 +
 .../struts2/config/entities/ResultConfig.java      |  163 +
 .../struts2/config/entities/ResultTypeConfig.java  |  160 +
 .../config/entities/UnknownHandlerConfig.java      |   46 +
 .../apache/struts2}/config/entities/package.html   |    0
 .../struts2/config/impl/AbstractMatcher.java       |  227 ++
 .../struts2/config/impl/ActionConfigMatcher.java   |  153 +
 .../struts2/config/impl/DefaultConfiguration.java  |  674 ++++
 .../config/impl/LocatableConstantFactory.java      |   50 +
 .../struts2/config/impl/LocatableFactory.java      |   64 +
 .../struts2/config/impl/MockConfiguration.java     |  132 +
 .../apache/struts2/config/impl/NamespaceMatch.java |   50 +
 .../struts2/config/impl/NamespaceMatcher.java      |   68 +
 .../apache/struts2}/config/impl/package.html       |    0
 .../struts2/config/providers/CycleDetector.java    |   77 +
 .../struts2/config/providers/DirectedGraph.java    |  162 +
 .../config/providers/EnvsValueSubstitutor.java     |   52 +
 .../config/providers/InterceptorBuilder.java       |  218 +
 .../StrutsDefaultConfigurationProvider.java        |  168 +
 .../struts2/config/providers/ValueSubstitutor.java |   28 +
 .../config/providers/XmlConfigurationProvider.java |  246 ++
 .../providers/XmlDocConfigurationProvider.java     | 1013 +++++
 .../apache/struts2/config/providers/XmlHelper.java |  144 +
 .../apache/struts2}/config/providers/package.html  |    0
 .../conversion/ConversionAnnotationProcessor.java  |   41 +
 .../conversion/ConversionFileProcessor.java        |   37 +
 .../conversion/ConversionPropertiesProcessor.java  |   40 +
 .../org/apache/struts2/conversion/NullHandler.java |   57 +
 .../struts2/conversion/ObjectTypeDeterminer.java   |   44 +
 .../StrutsConversionPropertiesProcessor.java       |   10 +-
 .../conversion/StrutsTypeConverterCreator.java     |    6 +-
 .../conversion/StrutsTypeConverterHolder.java      |   22 +-
 .../apache/struts2/conversion/TypeConverter.java   |   51 +
 .../struts2/conversion/TypeConverterCreator.java   |   44 +
 .../struts2/conversion/TypeConverterHolder.java    |  100 +
 .../struts2/conversion/UploadedFileConverter.java  |    5 +-
 .../struts2/conversion/annotations/Conversion.java |  102 +
 .../conversion/annotations/ConversionRule.java     |   36 +
 .../conversion/annotations/ConversionType.java     |   37 +
 .../conversion/annotations/TypeConversion.java     |  213 +
 .../struts2}/conversion/annotations/package.html   |    0
 .../struts2/conversion/impl/ArrayConverter.java    |   54 +
 .../conversion/impl/CollectionConverter.java       |  113 +
 .../struts2/conversion/impl/ConversionData.java    |   49 +
 .../struts2/conversion/impl/DateConverter.java     |  257 ++
 .../impl/DefaultConversionAnnotationProcessor.java |  119 +
 .../impl/DefaultConversionFileProcessor.java       |  116 +
 .../impl/DefaultObjectTypeDeterminer.java          |  296 ++
 .../conversion/impl/DefaultTypeConverter.java      |  325 ++
 .../conversion/impl/InstantiatingNullHandler.java  |  162 +
 .../struts2/conversion/impl/NumberConverter.java   |  233 ++
 .../struts2/conversion/impl/StringConverter.java   |  100 +
 .../conversion/impl/XWorkBasicConverter.java       |  219 +
 .../struts2/conversion/impl/XWorkConverter.java    |  628 +++
 .../apache/struts2/conversion/impl/XWorkList.java  |  245 ++
 .../apache/struts2/dispatcher/ApplicationMap.java  |    8 +-
 .../apache/struts2/dispatcher/AttributeMap.java    |    5 +-
 .../apache/struts2/dispatcher/ContainerHolder.java |    2 +-
 .../struts2/dispatcher/DefaultActionSupport.java   |    8 +-
 .../dispatcher/DefaultDispatcherErrorHandler.java  |   24 +-
 .../dispatcher/DefaultStaticContentLoader.java     |   18 +-
 .../org/apache/struts2/dispatcher/Dispatcher.java  |  125 +-
 .../struts2/dispatcher/DispatcherErrorHandler.java |   18 +-
 .../struts2/dispatcher/DispatcherListener.java     |    4 +-
 .../struts2/dispatcher/ExecuteOperations.java      |    8 +-
 .../org/apache/struts2/dispatcher/HostConfig.java  |    2 +-
 .../apache/struts2/dispatcher/HttpParameters.java  |   57 +-
 .../apache/struts2/dispatcher/InitOperations.java  |   18 +-
 .../struts2/dispatcher/LocalizedMessage.java       |   11 +-
 .../apache/struts2/dispatcher/MockDispatcher.java  |   41 +
 .../org/apache/struts2/dispatcher/Parameter.java   |    3 +-
 .../struts2/dispatcher/PrepareOperations.java      |   34 +-
 .../org/apache/struts2/dispatcher/RequestMap.java  |    5 +-
 .../org/apache/struts2/dispatcher/SessionMap.java  |   13 +-
 .../struts2/dispatcher/StaticContentLoader.java    |    4 +-
 .../struts2/dispatcher/StringObjectEntry.java      |    7 +-
 .../struts2/dispatcher/StrutsRequestWrapper.java   |   12 +-
 .../dispatcher/filter/FilterHostConfig.java        |   13 +-
 .../dispatcher/filter/StrutsExecuteFilter.java     |   19 +-
 .../filter/StrutsPrepareAndExecuteFilter.java      |   30 +-
 .../dispatcher/filter/StrutsPrepareFilter.java     |   30 +-
 .../dispatcher/listener/ListenerHostConfig.java    |   11 +-
 .../dispatcher/listener/StrutsListener.java        |    8 +-
 .../struts2/dispatcher/mapper/ActionMapper.java    |    4 +-
 .../struts2/dispatcher/mapper/ActionMapping.java   |    6 +-
 .../dispatcher/mapper/CompositeActionMapper.java   |   12 +-
 .../dispatcher/mapper/DefaultActionMapper.java     |   45 +-
 .../dispatcher/mapper/PrefixBasedActionMapper.java |   13 +-
 .../dispatcher/mapper/Restful2ActionMapper.java    |   40 +-
 .../dispatcher/mapper/RestfulActionMapper.java     |   10 +-
 .../multipart/AbstractMultiPartRequest.java        |  308 +-
 .../multipart/JakartaMultiPartRequest.java         |  378 +-
 .../multipart/JakartaStreamMultiPartRequest.java   |  523 +--
 .../dispatcher/multipart/MultiPartRequest.java     |   14 +-
 .../multipart/MultiPartRequestWrapper.java         |   35 +-
 .../dispatcher/multipart/StrutsUploadedFile.java   |   13 -
 .../struts2/dispatcher/multipart/UploadedFile.java |   26 +-
 .../dispatcher/servlet/ServletHostConfig.java      |   13 +-
 .../struts2/dispatcher/servlet/StrutsServlet.java  |   10 +-
 .../org/apache/struts2/factory/ActionFactory.java  |   45 +
 .../apache/struts2/factory/ConverterFactory.java   |   42 +
 .../struts2/factory/DefaultActionFactory.java      |   43 +
 .../struts2/factory/DefaultInterceptorFactory.java |  100 +
 .../factory/DefaultUnknownHandlerFactory.java      |   44 +
 .../struts2/factory/DefaultValidatorFactory.java   |   52 +
 .../apache/struts2/factory/InterceptorFactory.java |   50 +
 .../factory/PrefixBasedActionProxyFactory.java     |   22 +-
 .../org/apache/struts2/factory/ResultFactory.java  |   33 +
 .../apache/struts2/factory/StrutsActionProxy.java  |   11 +-
 .../struts2/factory/StrutsActionProxyFactory.java  |    8 +-
 .../struts2/factory/StrutsConverterFactory.java    |   48 +
 .../struts2/factory/StrutsResultFactory.java       |   84 +-
 .../struts2/factory/UnknownHandlerFactory.java     |   42 +
 .../apache/struts2/factory/ValidatorFactory.java   |   43 +
 .../apache/struts2/inject/ConstructionContext.java |  119 +
 .../java/org/apache/struts2/inject/Container.java  |  133 +
 .../apache/struts2/inject/ContainerBuilder.java    |  658 +++
 .../org/apache/struts2/inject/ContainerImpl.java   |  607 +++
 .../java/org/apache/struts2/inject/Context.java    |   57 +
 .../apache/struts2/inject/DependencyException.java |   37 +
 .../apache/struts2/inject/EarlyInitializable.java  |   22 +
 .../org/apache/struts2/inject/ExternalContext.java |   77 +
 .../java/org/apache/struts2/inject/Factory.java    |   41 +
 .../org/apache/struts2/inject/Initializable.java   |   34 +
 .../struts2/inject/InitializableFactory.java       |   56 +
 .../java/org/apache/struts2/inject/Inject.java     |   49 +
 .../org/apache/struts2/inject/InternalContext.java |   77 +
 .../org/apache/struts2/inject/InternalFactory.java |   42 +
 .../main/java/org/apache/struts2/inject/Key.java   |   80 +
 .../main/java/org/apache/struts2/inject/Scope.java |  286 ++
 .../java/org/apache/struts2/inject/Scoped.java     |   38 +
 .../org/apache/struts2/inject/package-info.java    |   30 +
 .../inject/util/FinalizablePhantomReference.java   |   35 +
 .../struts2/inject/util/FinalizableReference.java  |   32 +
 .../inject/util/FinalizableReferenceQueue.java     |   77 +
 .../inject/util/FinalizableSoftReference.java      |   34 +
 .../inject/util/FinalizableWeakReference.java      |   34 +
 .../org/apache/struts2/inject/util/Function.java   |   44 +
 .../apache/struts2/inject/util/ReferenceCache.java |  205 +
 .../apache/struts2/inject/util/ReferenceMap.java   |  609 +++
 .../apache/struts2/inject/util/ReferenceType.java  |   55 +
 .../apache/struts2}/inject/util/package.html       |    0
 .../interceptor/AbstractFileUploadInterceptor.java |   15 +-
 .../struts2/interceptor/AbstractInterceptor.java   |    3 +
 .../interceptor/ActionFileUploadInterceptor.java   |   49 +-
 .../ActionMappingParametersInterceptor.java        |   11 +-
 .../struts2/interceptor/AliasInterceptor.java      |   26 +-
 .../struts2/interceptor/ApplicationAware.java      |   32 -
 .../struts2/interceptor/ChainingInterceptor.java   |   17 +-
 .../struts2/interceptor/CheckboxInterceptor.java   |    9 +-
 .../interceptor/ClearSessionInterceptor.java       |   13 +-
 .../struts2/interceptor/CoepInterceptor.java       |   12 +-
 .../interceptor/ConversionErrorInterceptor.java    |   19 +-
 .../struts2/interceptor/CookieInterceptor.java     |   29 +-
 .../apache/struts2/interceptor/CookieProvider.java |    2 +-
 .../interceptor/CookieProviderInterceptor.java     |   15 +-
 .../apache/struts2/interceptor/CookiesAware.java   |   40 -
 .../struts2/interceptor/CoopInterceptor.java       |   12 +-
 .../interceptor/CreateSessionInterceptor.java      |   14 +-
 .../interceptor/DateTextFieldInterceptor.java      |   42 +-
 .../interceptor/DefaultWorkflowInterceptor.java    |   24 +-
 .../struts2/interceptor/ExceptionHolder.java       |   82 +
 .../interceptor/ExceptionMappingInterceptor.java   |   14 +-
 .../interceptor/ExecuteAndWaitInterceptor.java     |   21 +-
 .../interceptor/FetchMetadataInterceptor.java      |   14 +-
 .../struts2/interceptor/FileUploadInterceptor.java |  263 --
 .../struts2/interceptor/HttpParametersAware.java   |   32 -
 .../struts2/interceptor/I18nInterceptor.java       |   17 +-
 .../apache/struts2/interceptor/Interceptor.java    |    7 +-
 .../struts2/interceptor/LoggingInterceptor.java    |    2 +-
 .../interceptor/MessageStoreInterceptor.java       |   19 +-
 .../interceptor/MessageStorePreResultListener.java |   10 +-
 .../interceptor/MethodFilterInterceptor.java       |    6 +-
 .../interceptor/MethodFilterInterceptorUtil.java   |   25 +-
 .../interceptor/ModelDrivenInterceptor.java        |   11 +-
 .../interceptor/MultiselectInterceptor.java        |    8 +-
 .../struts2/interceptor/NoOpInterceptor.java       |    4 +-
 .../apache/struts2/interceptor/ParameterAware.java |   36 -
 .../interceptor/ParameterRemoverInterceptor.java   |    2 +-
 .../struts2/interceptor/PreResultListener.java     |    7 +-
 .../interceptor/PrefixMethodInvocationUtil.java    |  175 +
 .../struts2/interceptor/PrepareInterceptor.java    |    3 +-
 .../apache/struts2/interceptor/PrincipalAware.java |   30 -
 .../apache/struts2/interceptor/PrincipalProxy.java |    2 -
 .../apache/struts2/interceptor/RequestAware.java   |   41 -
 .../interceptor/ResourceIsolationPolicy.java       |    2 +-
 .../struts2/interceptor/RolesInterceptor.java      |   29 +-
 .../struts2/interceptor/ScopeInterceptor.java      |   20 +-
 .../interceptor/ScopedModelDrivenInterceptor.java  |   11 +-
 .../interceptor/ServletConfigInterceptor.java      |   18 +-
 .../struts2/interceptor/ServletRequestAware.java   |   32 -
 .../struts2/interceptor/ServletResponseAware.java  |   32 -
 .../apache/struts2/interceptor/SessionAware.java   |   32 -
 .../interceptor/StaticParametersInterceptor.java   |   25 +-
 .../StrutsConversionErrorInterceptor.java          |   20 +-
 .../interceptor/StrutsResourceIsolationPolicy.java |    2 +-
 .../struts2/interceptor/TokenInterceptor.java      |   13 +-
 .../interceptor/TokenSessionStoreInterceptor.java  |   18 +-
 .../struts2/interceptor/ValidationErrorAware.java  |    2 +-
 .../apache/struts2/interceptor/WithLazyParams.java |   77 +
 .../struts2/interceptor/annotations/After.java     |   84 +
 .../annotations/AnnotationWorkflowInterceptor.java |  179 +
 .../struts2/interceptor/annotations/Before.java    |   83 +
 .../interceptor/annotations/BeforeResult.java      |   83 +
 .../interceptor/annotations/InputConfig.java       |   95 +
 .../struts2}/interceptor/annotations/package.html  |    0
 .../struts2/interceptor/csp/CspInterceptor.java    |   14 +-
 .../struts2/interceptor/csp/CspSettings.java       |   10 +-
 .../interceptor/csp/DefaultCspSettings.java        |    9 +-
 .../debugging/DebuggingInterceptor.java            |   57 +-
 .../interceptor/debugging/ObjectToHTMLWriter.java  |   19 +-
 .../interceptor/debugging/PrettyPrintWriter.java   |    2 +-
 .../interceptor/exec/BackgroundProcess.java        |    2 +-
 .../interceptor/exec/StrutsBackgroundProcess.java  |    6 +-
 .../interceptor/httpmethod/HttpMethodAware.java    |    2 +-
 .../httpmethod/HttpMethodInterceptor.java          |    8 +-
 .../apache/struts2}/interceptor/package.html       |    0
 .../parameter/ParametersInterceptor.java           |   95 +-
 .../interceptor/parameter/StrutsParameter.java     |    4 +-
 .../interceptor/servlet/ServletPrincipalProxy.java |    8 +-
 .../AnnotationValidationInterceptor.java           |    6 +-
 .../struts2/locale/DefaultLocaleProvider.java      |   69 +
 .../locale/DefaultLocaleProviderFactory.java       |   28 +
 .../org/apache/struts2/locale/LocaleProvider.java  |   73 +
 .../struts2/locale/LocaleProviderFactory.java      |   37 +
 .../apache/struts2/mock/MockActionInvocation.java  |  130 +
 .../org/apache/struts2/mock/MockActionProxy.java   |  129 +
 .../org/apache/struts2/mock/MockContainer.java     |   59 +
 .../org/apache/struts2/mock/MockInterceptor.java   |  111 +
 .../struts2/mock/MockObjectTypeDeterminer.java     |  131 +
 .../java/org/apache/struts2/mock/MockResult.java   |   61 +
 .../apache/struts2}/mock/package.html              |    0
 .../apache/struts2/ognl/BeanInfoCacheFactory.java  |   23 +
 .../ognl/DefaultOgnlBeanInfoCacheFactory.java      |   38 +
 .../struts2/ognl/DefaultOgnlCacheFactory.java      |   71 +
 .../ognl/DefaultOgnlExpressionCacheFactory.java    |   38 +
 .../apache/struts2/ognl/ErrorMessageBuilder.java   |   76 +
 .../struts2/ognl/ExpressionCacheFactory.java       |   23 +
 .../java/org/apache/struts2/ognl/ObjectProxy.java  |   57 +
 .../java/org/apache/struts2/ognl/OgnlCache.java    |   41 +
 .../org/apache/struts2/ognl/OgnlCacheFactory.java  |   46 +
 .../org/apache/struts2/ognl/OgnlCaffeineCache.java |   78 +
 .../org/apache/struts2/ognl/OgnlDefaultCache.java  |   88 +
 .../java/org/apache/struts2/ognl/OgnlGuard.java    |    2 +-
 .../java/org/apache/struts2/ognl/OgnlLRUCache.java |   89 +
 .../struts2/ognl/OgnlNullHandlerWrapper.java       |   44 +
 .../struts2/ognl/OgnlReflectionContextFactory.java |   33 +
 .../struts2/ognl/OgnlReflectionProvider.java       |  161 +
 .../struts2/ognl/OgnlTypeConverterWrapper.java     |   48 +
 .../java/org/apache/struts2/ognl/OgnlUtil.java     |  726 ++++
 .../org/apache/struts2/ognl/OgnlValueStack.java    |  524 +++
 .../apache/struts2/ognl/OgnlValueStackFactory.java |  161 +
 .../org/apache/struts2/ognl/ProviderAllowlist.java |   18 -
 .../apache/struts2/ognl/SecurityMemberAccess.java  |  533 +++
 .../org/apache/struts2/ognl/StrutsOgnlGuard.java   |    6 +-
 .../struts2/ognl/XWorkTypeConverterWrapper.java    |   41 +
 .../ognl/accessor/CompoundRootAccessor.java        |  371 ++
 .../accessor/HttpParametersPropertyAccessor.java   |   39 +
 .../struts2/ognl/accessor/ObjectAccessor.java      |   43 +
 .../ognl/accessor/ObjectProxyPropertyAccessor.java |   84 +
 .../ognl/accessor/ParameterPropertyAccessor.java   |   48 +
 .../apache/struts2/ognl/accessor/RootAccessor.java |   29 +
 .../accessor/XWorkCollectionPropertyAccessor.java  |  312 ++
 .../ognl/accessor/XWorkEnumerationAccessor.java    |   39 +
 .../accessor/XWorkIteratorPropertyAccessor.java    |   39 +
 .../ognl/accessor/XWorkListPropertyAccessor.java   |  194 +
 .../ognl/accessor/XWorkMapPropertyAccessor.java    |  162 +
 .../struts2/ognl/accessor/XWorkMethodAccessor.java |  140 +
 .../ognl/accessor/XWorkObjectPropertyAccessor.java |   43 +
 .../xwork2 => org/apache/struts2}/package.html     |    0
 .../apache/struts2/result/ActionChainResult.java   |   18 +-
 .../apache/struts2/result/HttpHeaderResult.java    |   21 +-
 .../struts2/result/ParamNameAwareResult.java       |   28 +
 .../org/apache/struts2/result/PlainResult.java     |    8 +-
 .../org/apache/struts2/result/PlainTextResult.java |   12 +-
 .../org/apache/struts2/result/PostbackResult.java  |   19 +-
 .../java/org/apache/struts2/result/Result.java     |    2 +-
 .../result/ServletActionRedirectResult.java        |   11 +-
 .../struts2/result/ServletDispatcherResult.java    |   39 +-
 .../struts2/result/ServletRedirectResult.java      |   27 +-
 .../org/apache/struts2/result/StreamResult.java    |   14 +-
 .../apache/struts2/result/StrutsResultSupport.java |   27 +-
 .../struts2/result/plain/DateHttpHeader.java       |    2 +
 .../apache/struts2/result/plain/HttpCookies.java   |    2 +-
 .../apache/struts2/result/plain/IntHttpHeader.java |    2 +
 .../struts2/result/plain/ResponseBuilder.java      |    2 +-
 .../struts2/security/AcceptedPatternsChecker.java  |  100 +
 .../security/DefaultAcceptedPatternsChecker.java   |  138 +
 .../security/DefaultExcludedPatternsChecker.java   |  121 +
 .../DefaultNotExcludedAcceptedPatternsChecker.java |  105 +
 .../struts2/security/ExcludedPatternsChecker.java  |  100 +
 .../NotExcludedAcceptedPatternsChecker.java        |   70 +
 .../struts2/test/StubConfigurationProvider.java    |   59 +
 .../text/AbstractLocalizedTextProvider.java        |  671 ++++
 .../apache/struts2/text/CompositeTextProvider.java |  295 ++
 .../apache/struts2/text/DefaultTextProvider.java   |  159 +
 .../struts2/text/GlobalLocalizedTextProvider.java  |   82 +
 .../apache/struts2/text/LocalizedTextProvider.java |  193 +
 .../struts2/text/ResourceBundleTextProvider.java   |   53 +
 .../struts2/text/StrutsLocalizedTextProvider.java  |  213 +
 .../struts2/text/StrutsTextProviderFactory.java    |   88 +
 .../java/org/apache/struts2/text/TextProvider.java |  190 +
 .../apache/struts2/text/TextProviderFactory.java   |   29 +
 .../apache/struts2/text/TextProviderSupport.java   |  331 ++
 .../org/apache/struts2/url/QueryStringParser.java  |    6 -
 .../struts2/url/StrutsQueryStringBuilder.java      |    9 +-
 .../struts2/url/StrutsQueryStringParser.java       |   10 +-
 .../org/apache/struts2/url/StrutsUrlDecoder.java   |    2 +-
 .../org/apache/struts2/url/StrutsUrlEncoder.java   |    2 +-
 .../org/apache/struts2/util/AnnotationUtils.java   |  211 +
 .../apache/struts2/util/AppendIteratorFilter.java  |   33 +-
 .../org/apache/struts2/util/ClassLoaderUtil.java   |  285 ++
 .../org/apache/struts2/util/ClassPathFinder.java   |  197 +
 .../apache/struts2/util/ClearableValueStack.java   |   30 +
 .../java/org/apache/struts2/util/CompoundRoot.java |   60 +
 .../org/apache/struts2/util/ConfigParseUtil.java   |  105 +
 .../java/org/apache/struts2/util/ContainUtil.java  |    4 +-
 .../apache/struts2/util/ContentTypeMatcher.java    |    2 +-
 .../main/java/org/apache/struts2/util/Counter.java |   12 +-
 .../java/org/apache/struts2/util/CreateIfNull.java |   77 +
 .../java/org/apache/struts2/util/DebugUtils.java   |   53 +
 .../struts2/util/DefaultContentTypeMatcher.java    |    8 +-
 .../java/org/apache/struts2/util/DomHelper.java    |  397 ++
 .../main/java/org/apache/struts2/util/Element.java |   81 +
 .../java/org/apache/struts2/util/Evaluated.java    |   36 +
 .../struts2/util/FastByteArrayOutputStream.java    |   17 +-
 .../struts2/util/InvocationSessionStore.java       |    6 +-
 .../org/apache/struts2/util/IteratorGenerator.java |    9 +-
 .../src/main/java/org/apache/struts2/util/Key.java |   78 +
 .../java/org/apache/struts2/util/KeyProperty.java  |   80 +
 .../java/org/apache/struts2/util/MakeIterator.java |    4 +-
 .../struts2/util/MemberAccessValueStack.java       |   34 +
 .../apache/struts2/util/MergeIteratorFilter.java   |   13 +-
 .../struts2/util/NamedVariablePatternMatcher.java  |  160 +
 .../org/apache/struts2/util/OgnlTextParser.java    |  101 +
 .../org/apache/struts2/util/PatternMatcher.java    |   58 +
 .../org/apache/struts2/util/PropertiesReader.java  |  562 +++
 .../java/org/apache/struts2/util/ProxyUtil.java    |  291 ++
 .../apache/struts2/util/RegexPatternMatcher.java   |   12 +-
 .../java/org/apache/struts2/util/ResolverUtil.java |  479 +++
 .../apache/struts2/util/ServletContextAware.java   |   32 -
 .../apache/struts2/util/SortIteratorFilter.java    |   11 +-
 .../apache/struts2/util/StrutsTestCaseHelper.java  |   21 +-
 .../apache/struts2/util/StrutsTypeConverter.java   |    2 +-
 .../java/org/apache/struts2/util/StrutsUtil.java   |   20 +-
 .../apache/struts2/util/SubsetIteratorFilter.java  |   15 +-
 .../java/org/apache/struts2/util/TabbedPane.java   |    2 +-
 .../org/apache/struts2/util/TextParseUtil.java     |  291 ++
 .../java/org/apache/struts2/util/TextParser.java   |   31 +
 .../apache/struts2/util/TextProviderHelper.java    |    3 +-
 .../java/org/apache/struts2/util/TokenHelper.java  |    4 +-
 .../main/java/org/apache/struts2/util/URLBean.java |    6 +-
 .../java/org/apache/struts2/util/ValueStack.java   |    5 +-
 .../org/apache/struts2/util/ValueStackFactory.java |   41 +
 .../apache/struts2/util/ValueStackProvider.java    |    2 +-
 .../org/apache/struts2/util/WildcardHelper.java    |  447 +++
 .../java/org/apache/struts2/util/WildcardUtil.java |   71 +
 .../apache/struts2/util/XWorkTestCaseHelper.java   |   88 +
 .../util/classloader/AbstractResourceStore.java    |   55 +
 .../util/classloader/FileResourceStore.java        |   61 +
 .../struts2/util/classloader/JarResourceStore.java |   72 +
 .../util/classloader/ReloadingClassLoader.java     |  191 +
 .../struts2/util/classloader/ResourceStore.java    |   30 +
 .../util/classloader/ResourceStoreClassLoader.java |   99 +
 .../apache/struts2/util/finder/ClassFinder.java    |  337 ++
 .../struts2/util/finder/ClassFinderFactory.java    |   32 +
 .../struts2/util/finder/ClassLoaderInterface.java  |   44 +
 .../util/finder/ClassLoaderInterfaceDelegate.java  |   60 +
 .../apache/struts2/util/finder/ResourceFinder.java | 1404 +++++++
 .../java/org/apache/struts2/util/finder/Test.java  |   32 +
 .../org/apache/struts2/util/finder/UrlSet.java     |  295 ++
 .../apache/struts2/util/fs/DefaultFileManager.java |  168 +
 .../struts2/util/fs/DefaultFileManagerFactory.java |  109 +
 .../org/apache/struts2/util/fs/FileRevision.java   |   71 +
 .../apache/struts2/util/fs/JBossFileManager.java   |    8 +-
 .../apache/struts2/util/fs/JarEntryRevision.java   |   73 +
 .../java/org/apache/struts2/util/fs/Revision.java  |   39 +
 .../struts2/util/fs/StrutsJarURLConnection.java    |  187 +
 .../apache/struts2/util/location/Locatable.java    |   32 +
 .../struts2/util/location/LocatableProperties.java |   98 +
 .../org/apache/struts2/util/location/Located.java  |   46 +
 .../org/apache/struts2/util/location/Location.java |   72 +
 .../struts2/util/location/LocationAttributes.java  |  356 ++
 .../apache/struts2/util/location/LocationImpl.java |  224 ++
 .../struts2/util/location/LocationUtils.java       |  307 ++
 .../apache/struts2}/util/location/package.html     |    0
 .../apache/struts2}/util/package.html              |    0
 .../util/reflection/ReflectionContextFactory.java  |   33 +
 .../util/reflection/ReflectionContextState.java    |  173 +
 .../util/reflection/ReflectionException.java       |   59 +
 .../reflection/ReflectionExceptionHandler.java     |   32 +
 .../util/reflection/ReflectionProvider.java        |  190 +
 .../struts2/validator/ActionValidatorManager.java  |   90 +
 .../AnnotationActionValidatorManager.java          |   82 +
 .../AnnotationValidationConfigurationBuilder.java  |  952 +++++
 .../validator/DefaultActionValidatorManager.java   |  351 ++
 .../struts2/validator/DefaultValidatorFactory.java |  202 +
 .../validator/DefaultValidatorFileParser.java      |  261 ++
 .../validator/DelegatingValidatorContext.java      |  402 ++
 .../apache/struts2/validator/FieldValidator.java   |   42 +
 .../validator/ShortCircuitableValidator.java       |   46 +
 .../struts2/validator/ValidationException.java     |   46 +
 .../struts2/validator/ValidationInterceptor.java   |  296 ++
 .../org/apache/struts2/validator/Validator.java    |  488 +++
 .../apache/struts2/validator/ValidatorConfig.java  |  173 +
 .../apache/struts2/validator/ValidatorContext.java |   40 +
 .../apache/struts2/validator/ValidatorFactory.java |  255 ++
 .../struts2/validator/ValidatorFileParser.java     |   66 +
 .../ConditionalVisitorFieldValidator.java          |  184 +
 .../annotations/ConversionErrorFieldValidator.java |  141 +
 .../validator/annotations/CreditCardValidator.java |   68 +
 .../validator/annotations/CustomValidator.java     |  125 +
 .../annotations/DateRangeFieldValidator.java       |  201 +
 .../annotations/DoubleRangeFieldValidator.java     |  235 ++
 .../validator/annotations/EmailValidator.java      |  135 +
 .../validator/annotations/ExpressionValidator.java |  125 +
 .../annotations/FieldExpressionValidator.java      |  136 +
 .../annotations/IntRangeFieldValidator.java        |  196 +
 .../annotations/LongRangeFieldValidator.java       |  196 +
 .../validator/annotations/RegexFieldValidator.java |  184 +
 .../annotations/RequiredFieldValidator.java        |  136 +
 .../annotations/RequiredStringValidator.java       |  150 +
 .../annotations/ShortRangeFieldValidator.java      |  194 +
 .../annotations/StringLengthFieldValidator.java    |  205 +
 .../validator/annotations/UrlValidator.java        |   82 +
 .../validator/annotations/ValidationParameter.java |   85 +
 .../struts2/validator/annotations/Validations.java |  197 +
 .../validator/annotations/ValidatorType.java       |   36 +
 .../annotations/VisitorFieldValidator.java         |  167 +
 .../struts2}/validator/annotations/package.html    |    0
 .../apache/struts2}/validator/package.html         |    0
 .../ConditionalVisitorFieldValidator.java          |  106 +
 .../validators/ConversionErrorFieldValidator.java  |   84 +
 .../validator/validators/CreditCardValidator.java  |   48 +
 .../validators/DateRangeFieldValidator.java        |   95 +
 .../validators/DoubleRangeFieldValidator.java      |  223 ++
 .../validator/validators/EmailValidator.java       |   90 +
 .../validator/validators/ExpressionValidator.java  |   87 +
 .../validators/FieldExpressionValidator.java       |   98 +
 .../validators/FieldValidatorSupport.java          |   62 +
 .../validators/IntRangeFieldValidator.java         |   86 +
 .../validators/LongRangeFieldValidator.java        |   85 +
 .../validators/RangeValidatorSupport.java          |  125 +
 .../validator/validators/RegexFieldValidator.java  |  241 ++
 ...pulateConversionErrorFieldValidatorSupport.java |  199 +
 .../validators/RequiredFieldValidator.java         |   77 +
 .../validators/RequiredStringValidator.java        |  139 +
 .../validators/ShortRangeFieldValidator.java       |   85 +
 .../validators/StringLengthFieldValidator.java     |  201 +
 .../struts2/validator/validators/URLValidator.java |  146 +
 .../validator/validators/ValidatorSupport.java     |  221 ++
 .../validators/VisitorFieldValidator.java          |  241 ++
 .../struts2}/validator/validators/package.html     |    0
 .../apache/struts2/views/DefaultTagLibrary.java    |    8 +-
 .../apache/struts2/views/JspSupportServlet.java    |    9 +-
 .../struts2/views/TagLibraryDirectiveProvider.java |    7 +-
 .../struts2/views/TagLibraryModelProvider.java     |    6 +-
 .../views/freemarker/FreemarkerManager.java        |   82 +-
 .../struts2/views/freemarker/FreemarkerResult.java |   20 +-
 .../freemarker/FreemarkerThemeTemplateLoader.java  |   10 +-
 .../struts2/views/freemarker/ScopesHashModel.java  |   26 +-
 .../views/freemarker/StrutsBeanWrapper.java        |   20 +-
 .../freemarker/StrutsClassTemplateLoader.java      |    2 +-
 .../views/freemarker/tags/ActionErrorModel.java    |    9 +-
 .../views/freemarker/tags/ActionMessageModel.java  |    9 +-
 .../struts2/views/freemarker/tags/ActionModel.java |    9 +-
 .../struts2/views/freemarker/tags/AnchorModel.java |    9 +-
 .../struts2/views/freemarker/tags/BeanModel.java   |    9 +-
 .../views/freemarker/tags/CallbackWriter.java      |   21 +-
 .../views/freemarker/tags/CheckboxListModel.java   |    9 +-
 .../views/freemarker/tags/CheckboxModel.java       |    9 +-
 .../views/freemarker/tags/ComboBoxModel.java       |    9 +-
 .../views/freemarker/tags/ComponentModel.java      |    9 +-
 .../struts2/views/freemarker/tags/DateModel.java   |    9 +-
 .../views/freemarker/tags/DoubleSelectModel.java   |    9 +-
 .../struts2/views/freemarker/tags/ElseIfModel.java |    9 +-
 .../struts2/views/freemarker/tags/ElseModel.java   |    9 +-
 .../views/freemarker/tags/FieldErrorModel.java     |    9 +-
 .../struts2/views/freemarker/tags/FileModel.java   |    9 +-
 .../struts2/views/freemarker/tags/FormModel.java   |    9 +-
 .../struts2/views/freemarker/tags/HeadModel.java   |    9 +-
 .../struts2/views/freemarker/tags/HiddenModel.java |    9 +-
 .../struts2/views/freemarker/tags/I18nModel.java   |    9 +-
 .../struts2/views/freemarker/tags/IfModel.java     |   10 +-
 .../views/freemarker/tags/IncludeModel.java        |    9 +-
 .../freemarker/tags/InputTransferSelectModel.java  |    9 +-
 .../views/freemarker/tags/IteratorModel.java       |    9 +-
 .../struts2/views/freemarker/tags/LabelModel.java  |    9 +-
 .../struts2/views/freemarker/tags/LinkModel.java   |    9 +-
 .../views/freemarker/tags/OptGroupModel.java       |    9 +-
 .../freemarker/tags/OptionTransferSelectModel.java |    9 +-
 .../struts2/views/freemarker/tags/ParamModel.java  |    9 +-
 .../views/freemarker/tags/PasswordModel.java       |    9 +-
 .../views/freemarker/tags/PropertyModel.java       |    7 +-
 .../struts2/views/freemarker/tags/PushModel.java   |    7 +-
 .../struts2/views/freemarker/tags/RadioModel.java  |    9 +-
 .../struts2/views/freemarker/tags/ResetModel.java  |    9 +-
 .../struts2/views/freemarker/tags/ScriptModel.java |    9 +-
 .../struts2/views/freemarker/tags/SelectModel.java |    9 +-
 .../struts2/views/freemarker/tags/SetModel.java    |    9 +-
 .../views/freemarker/tags/StrutsModels.java        |    8 +-
 .../struts2/views/freemarker/tags/SubmitModel.java |    7 +-
 .../struts2/views/freemarker/tags/TagModel.java    |   24 +-
 .../views/freemarker/tags/TextAreaModel.java       |    9 +-
 .../views/freemarker/tags/TextFieldModel.java      |    9 +-
 .../struts2/views/freemarker/tags/TextModel.java   |    9 +-
 .../struts2/views/freemarker/tags/TokenModel.java  |    9 +-
 .../struts2/views/freemarker/tags/URLModel.java    |    9 +-
 .../views/freemarker/tags/UpDownSelectModel.java   |    9 +-
 .../org/apache/struts2/views/jsp/ActionTag.java    |   12 +-
 .../java/org/apache/struts2/views/jsp/BeanTag.java |   17 +-
 .../struts2/views/jsp/ComponentTagSupport.java     |   22 +-
 .../apache/struts2/views/jsp/ContextBeanTag.java   |    4 +-
 .../java/org/apache/struts2/views/jsp/DateTag.java |   12 +-
 .../org/apache/struts2/views/jsp/ElseIfTag.java    |   13 +-
 .../java/org/apache/struts2/views/jsp/ElseTag.java |   11 +-
 .../java/org/apache/struts2/views/jsp/I18nTag.java |   13 +-
 .../java/org/apache/struts2/views/jsp/IfTag.java   |   13 +-
 .../org/apache/struts2/views/jsp/IncludeTag.java   |   13 +-
 .../org/apache/struts2/views/jsp/IteratorTag.java  |   14 +-
 .../org/apache/struts2/views/jsp/NumberTag.java    |   12 +-
 .../org/apache/struts2/views/jsp/ParamTag.java     |   14 +-
 .../org/apache/struts2/views/jsp/PropertyTag.java  |   17 +-
 .../java/org/apache/struts2/views/jsp/PushTag.java |   13 +-
 .../java/org/apache/struts2/views/jsp/SetTag.java  |   13 +-
 .../struts2/views/jsp/StrutsBodyTagSupport.java    |   14 +-
 .../org/apache/struts2/views/jsp/TagUtils.java     |   10 +-
 .../java/org/apache/struts2/views/jsp/TextTag.java |   15 +-
 .../java/org/apache/struts2/views/jsp/URLTag.java  |   23 +-
 .../views/jsp/iterator/AppendIteratorTag.java      |   11 +-
 .../views/jsp/iterator/IteratorGeneratorTag.java   |   16 +-
 .../views/jsp/iterator/MergeIteratorTag.java       |   11 +-
 .../views/jsp/iterator/SortIteratorTag.java        |   33 +-
 .../views/jsp/iterator/SubsetIteratorTag.java      |   22 +-
 .../struts2/views/jsp/ui/AbstractClosingTag.java   |    4 +-
 .../views/jsp/ui/AbstractDoubleListTag.java        |    4 +-
 .../struts2/views/jsp/ui/AbstractListTag.java      |    4 +-
 .../views/jsp/ui/AbstractRequiredListTag.java      |    2 +-
 .../apache/struts2/views/jsp/ui/AbstractUITag.java |   16 +-
 .../struts2/views/jsp/ui/ActionErrorTag.java       |   13 +-
 .../struts2/views/jsp/ui/ActionMessageTag.java     |   13 +-
 .../org/apache/struts2/views/jsp/ui/AnchorTag.java |   15 +-
 .../struts2/views/jsp/ui/CheckboxListTag.java      |   11 +-
 .../apache/struts2/views/jsp/ui/CheckboxTag.java   |   10 +-
 .../apache/struts2/views/jsp/ui/ComboBoxTag.java   |   13 +-
 .../apache/struts2/views/jsp/ui/ComponentTag.java  |   11 +-
 .../struts2/views/jsp/ui/DateTextFieldTag.java     |   15 +-
 .../org/apache/struts2/views/jsp/ui/DebugTag.java  |   11 +-
 .../struts2/views/jsp/ui/DoubleSelectTag.java      |   11 +-
 .../apache/struts2/views/jsp/ui/FieldErrorTag.java |   13 +-
 .../org/apache/struts2/views/jsp/ui/FileTag.java   |   13 +-
 .../org/apache/struts2/views/jsp/ui/FormTag.java   |   15 +-
 .../org/apache/struts2/views/jsp/ui/HeadTag.java   |   11 +-
 .../org/apache/struts2/views/jsp/ui/HiddenTag.java |   11 +-
 .../views/jsp/ui/InputTransferSelectTag.java       |   12 +-
 .../org/apache/struts2/views/jsp/ui/LabelTag.java  |   13 +-
 .../org/apache/struts2/views/jsp/ui/LinkTag.java   |    7 +-
 .../apache/struts2/views/jsp/ui/OptGroupTag.java   |   13 +-
 .../views/jsp/ui/OptionTransferSelectTag.java      |   13 +-
 .../apache/struts2/views/jsp/ui/PasswordTag.java   |   13 +-
 .../org/apache/struts2/views/jsp/ui/RadioTag.java  |   11 +-
 .../org/apache/struts2/views/jsp/ui/ResetTag.java  |   12 +-
 .../org/apache/struts2/views/jsp/ui/ScriptTag.java |    8 +-
 .../org/apache/struts2/views/jsp/ui/SelectTag.java |   13 +-
 .../org/apache/struts2/views/jsp/ui/SubmitTag.java |   11 +-
 .../apache/struts2/views/jsp/ui/TextFieldTag.java  |   12 +-
 .../apache/struts2/views/jsp/ui/TextareaTag.java   |   13 +-
 .../org/apache/struts2/views/jsp/ui/TokenTag.java  |   11 +-
 .../struts2/views/jsp/ui/UpDownSelectTag.java      |   13 +-
 .../org/apache/struts2/views/util/ContextUtil.java |    8 +-
 .../struts2/views/util/DefaultUrlHelper.java       |   11 +-
 .../apache/struts2/views/util/ResourceUtil.java    |    4 +-
 .../org/apache/struts2/views/util/UrlHelper.java   |    4 +-
 .../xwork2/validator/validators/default.xml        |   46 -
 .../org/apache/struts2/default.properties          |   41 +-
 .../org/apache/struts2/struts-messages.properties  |   53 +-
 .../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 +-
 .../struts2/validator/validators/default.xml       |   46 +
 .../apache/struts2}/xwork-messages.properties      |    0
 core/src/main/resources/struts-beans.xml           |  235 +-
 core/src/main/resources/struts-default.xml         |   39 +-
 .../src/main/resources/struts-excluded-classes.xml |   23 +-
 .../main/resources/template/css_xhtml/checkbox.ftl |   46 +-
 .../resources/template/css_xhtml/controlfooter.ftl |   22 +-
 .../template/css_xhtml/controlheader-core.ftl      |   36 +-
 .../resources/template/css_xhtml/controlheader.ftl |   12 +-
 .../resources/template/css_xhtml/form-validate.ftl |   10 +-
 .../src/main/resources/template/css_xhtml/head.ftl |    4 +-
 .../main/resources/template/css_xhtml/hidden.ftl   |    2 +-
 .../main/resources/template/css_xhtml/label.ftl    |   30 +-
 .../main/resources/template/css_xhtml/reset.ftl    |   14 +-
 .../resources/template/css_xhtml/submit-close.ftl  |   10 +-
 .../main/resources/template/css_xhtml/submit.ftl   |   14 +-
 .../src/main/resources/template/simple/a-close.ftl |   34 +-
 .../main/resources/template/simple/actionerror.ftl |   16 +-
 .../resources/template/simple/actionmessage.ftl    |   16 +-
 .../main/resources/template/simple/checkbox.ftl    |   32 +-
 .../resources/template/simple/checkboxlist.ftl     |   78 +-
 .../main/resources/template/simple/combobox.ftl    |   56 +-
 .../template/simple/common-attributes.ftl          |    4 +-
 core/src/main/resources/template/simple/css.ftl    |   22 +-
 core/src/main/resources/template/simple/debug.ftl  |    6 +-
 .../resources/template/simple/doubleselect.ftl     |  206 +-
 .../template/simple/dynamic-attributes.ftl         |    6 +-
 .../main/resources/template/simple/fielderror.ftl  |   24 +-
 core/src/main/resources/template/simple/file.ftl   |   32 +-
 .../template/simple/form-close-tooltips.ftl        |    6 +-
 .../main/resources/template/simple/form-close.ftl  |   44 +-
 .../main/resources/template/simple/form-common.ftl |   56 +-
 core/src/main/resources/template/simple/form.ftl   |    6 +-
 core/src/main/resources/template/simple/head.ftl   |    2 +-
 core/src/main/resources/template/simple/hidden.ftl |   22 +-
 .../template/simple/inputtransferselect.ftl        |  102 +-
 core/src/main/resources/template/simple/label.ftl  |   22 +-
 core/src/main/resources/template/simple/link.ftl   |   56 +-
 core/src/main/resources/template/simple/nonce.ftl  |    4 +-
 .../main/resources/template/simple/optgroup.ftl    |   32 +-
 .../template/simple/optiontransferselect.ftl       |  306 +-
 .../main/resources/template/simple/password.ftl    |   38 +-
 .../simple/prefixed-dynamic-attributes.ftl         |    6 +-
 .../main/resources/template/simple/radiomap.ftl    |   64 +-
 core/src/main/resources/template/simple/reset.ftl  |   74 +-
 core/src/main/resources/template/simple/script.ftl |   36 +-
 .../resources/template/simple/scripting-events.ftl |   56 +-
 core/src/main/resources/template/simple/select.ftl |  102 +-
 .../resources/template/simple/submit-close.ftl     |    6 +-
 core/src/main/resources/template/simple/submit.ftl |   84 +-
 core/src/main/resources/template/simple/text.ftl   |   40 +-
 .../main/resources/template/simple/textarea.ftl    |   50 +-
 core/src/main/resources/template/simple/token.ftl  |    4 +-
 .../resources/template/simple/updownselect.ftl     |   32 +-
 .../src/main/resources/template/xhtml/checkbox.ftl |   68 +-
 .../main/resources/template/xhtml/checkboxlist.ftl |    6 +-
 .../src/main/resources/template/xhtml/combobox.ftl |    6 +-
 core/src/main/resources/template/xhtml/control.ftl |    4 +-
 .../resources/template/xhtml/controlfooter.ftl     |   10 +-
 .../template/xhtml/controlheader-core.ftl          |   32 +-
 .../resources/template/xhtml/controlheader.ftl     |   10 +-
 .../resources/template/xhtml/datetextfield.ftl     |    6 +-
 .../main/resources/template/xhtml/doubleselect.ftl |    6 +-
 core/src/main/resources/template/xhtml/file.ftl    |    6 +-
 .../template/xhtml/form-close-validate.ftl         |    8 +-
 .../main/resources/template/xhtml/form-close.ftl   |   10 +-
 .../resources/template/xhtml/form-validate.ftl     |   10 +-
 core/src/main/resources/template/xhtml/form.ftl    |   14 +-
 core/src/main/resources/template/xhtml/head.ftl    |    4 +-
 core/src/main/resources/template/xhtml/hidden.ftl  |    2 +-
 .../template/xhtml/inputtransferselect.ftl         |    6 +-
 core/src/main/resources/template/xhtml/label.ftl   |    6 +-
 .../template/xhtml/optiontransferselect.ftl        |    6 +-
 .../src/main/resources/template/xhtml/password.ftl |    6 +-
 .../src/main/resources/template/xhtml/radiomap.ftl |    6 +-
 core/src/main/resources/template/xhtml/reset.ftl   |    4 +-
 core/src/main/resources/template/xhtml/select.ftl  |    6 +-
 .../main/resources/template/xhtml/submit-close.ftl |    4 +-
 core/src/main/resources/template/xhtml/submit.ftl  |    2 +-
 core/src/main/resources/template/xhtml/text.ftl    |    6 +-
 .../src/main/resources/template/xhtml/textarea.ftl |    6 +-
 core/src/main/resources/template/xhtml/tooltip.ftl |   22 +-
 .../main/resources/template/xhtml/updownselect.ftl |    6 +-
 core/src/main/resources/xwork-default.xml          |   52 +-
 core/src/test/java/PackagelessAction.java          |    2 +-
 .../opensymphony/xwork2/ActionChainResultTest.java |   39 -
 .../com/opensymphony/xwork2/ActionContextTest.java |  117 -
 .../xwork2/ActionContextThreadLocalTest.java       |   46 -
 .../opensymphony/xwork2/ActionInvocationTest.java  |  120 -
 .../com/opensymphony/xwork2/ActionNestingTest.java |  152 -
 .../com/opensymphony/xwork2/ActionSupportTest.java |  347 --
 .../com/opensymphony/xwork2/AnnotatedTestBean.java |   92 -
 .../com/opensymphony/xwork2/ChainResultTest.java   |  197 -
 .../xwork2/CompositeTextProviderTest.java          |  114 -
 .../xwork2/DefaultActionInvocationTest.java        |  576 ---
 .../xwork2/DefaultActionProxyTest.java             |   42 -
 .../com/opensymphony/xwork2/DefaultClasstTest.java |   63 -
 .../xwork2/DefaultLocaleProviderTest.java          |  174 -
 .../xwork2/DefaultTextProviderTest.java            |  147 -
 .../xwork2/DefaultUnknownHandlerManagerTest.java   |   83 -
 .../xwork2/ExternalReferenceAction.java            |   43 -
 .../src/test/java/com/opensymphony/xwork2/Foo.java |   38 -
 .../java/com/opensymphony/xwork2/GenericsBean.java |   75 -
 .../com/opensymphony/xwork2/LocaleAwareTest.java   |   75 -
 .../opensymphony/xwork2/LocaleProviderTest.java    |   82 -
 .../com/opensymphony/xwork2/ModelDrivenAction.java |   51 -
 .../xwork2/ModelDrivenAnnotationAction.java        |   51 -
 .../java/com/opensymphony/xwork2/NestedAction.java |   70 -
 .../com/opensymphony/xwork2/ObjectFactoryTest.java |   46 -
 .../opensymphony/xwork2/ProxyInvocationAction.java |   30 -
 .../xwork2/ProxyInvocationInterface.java           |   26 -
 .../opensymphony/xwork2/ProxyInvocationTest.java   |   71 -
 .../opensymphony/xwork2/ProxyObjectFactory.java    |   67 -
 .../java/com/opensymphony/xwork2/SimpleAction.java |  285 --
 .../xwork2/SimpleAnnotationAction.java             |  250 --
 .../com/opensymphony/xwork2/SimpleFooAction.java   |   44 -
 .../com/opensymphony/xwork2/StubTextProvider.java  |   96 -
 .../com/opensymphony/xwork2/StubValueStack.java    |  112 -
 .../java/com/opensymphony/xwork2/TestBean.java     |   74 -
 .../com/opensymphony/xwork2/TestChildBean.java     |   65 -
 .../xwork2/TextProviderSupportTest.java            |  141 -
 .../xwork2/UnknownHandlerManagerMock.java          |   33 -
 .../xwork2/UserSpecifiedDefaultAction.java         |   28 -
 .../opensymphony/xwork2/ValidationOrderAction.java |  194 -
 .../java/com/opensymphony/xwork2/VoidResult.java   |   41 -
 .../opensymphony/xwork2/WildCardResultTest.java    |   60 -
 .../xwork2/config/ConfigurationManagerTest.java    |  176 -
 .../xwork2/config/ConfigurationTest.java           |  371 --
 .../xwork2/config/entities/ActionConfigTest.java   |   47 -
 .../xwork2/config/entities/AllowedMethodsTest.java |  120 -
 .../xwork2/config/entities/PackageConfigTest.java  |   95 -
 .../xwork2/config/impl/AbstractMatcherTest.java    |   57 -
 .../config/impl/ActionConfigMatcherTest.java       |  257 --
 .../xwork2/config/impl/NamespaceMatcherTest.java   |   44 -
 .../ConfigurationProviderOgnlAllowlistTest.java    |  140 -
 .../config/providers/ConfigurationTestBase.java    |   45 -
 .../config/providers/EnvsValueSubstitutorTest.java |   67 -
 .../config/providers/InterceptorBuilderTest.java   |  288 --
 .../providers/InterceptorForTestPurpose.java       |   49 -
 .../providers/MockConfigurationProvider.java       |  197 -
 .../providers/NoNoArgsConstructorAction.java       |   44 -
 .../config/providers/PrivateConstructorAction.java |   48 -
 .../config/providers/SomeUnknownHandler.java       |   51 -
 .../XmlConfigurationProviderActionsTest.java       |  221 --
 ...XmlConfigurationProviderAllowedMethodsTest.java |  163 -
 ...lConfigurationProviderEnvsSubstitutionTest.java |   68 -
 ...ConfigurationProviderExceptionMappingsTest.java |   83 -
 ...urationProviderGlobalResultInheritenceTest.java |   72 -
 ...tionProviderInterceptorParamOverridingTest.java |  105 -
 ...roviderInterceptorStackParamOverridingTest.java |  108 -
 ...onfigurationProviderInterceptorsSpringTest.java |   83 -
 .../XmlConfigurationProviderInterceptorsTest.java  |  234 --
 .../XmlConfigurationProviderInvalidFileTest.java   |   43 -
 .../XmlConfigurationProviderMultilevelTest.java    |   73 -
 .../XmlConfigurationProviderPackagesTest.java      |  204 -
 .../XmlConfigurationProviderResultTypesTest.java   |  122 -
 .../XmlConfigurationProviderResultsTest.java       |  178 -
 .../providers/XmlConfigurationProviderTest.java    | 1101 -----
 ...nfigurationProviderUnknownHandlerStackTest.java |   58 -
 ...mlConfigurationProviderWildCardIncludeTest.java |   55 -
 .../xwork2/config/providers/XmlHelperTest.java     |  203 -
 .../xwork2/conversion/ConversionTestAction.java    |  101 -
 .../impl/AnnotationXWorkConverterTest.java         |  483 ---
 .../xwork2/conversion/impl/DateConverterTest.java  |  203 -
 .../xwork2/conversion/impl/FooBarConverter.java    |   75 -
 .../xwork2/conversion/impl/FooNumberConverter.java |   36 -
 .../impl/InstantiatingNullHandlerTest.java         |   57 -
 .../conversion/impl/NumberConverterTest.java       |  305 --
 .../xwork2/conversion/impl/ParentClass.java        |   45 -
 .../conversion/impl/StringConverterTest.java       |  129 -
 .../conversion/impl/XWorkBasicConverterTest.java   |  420 --
 .../xwork2/conversion/impl/XWorkConverterTest.java |  802 ----
 .../xwork2/conversion/impl/XWorkListTest.java      |   89 -
 .../xwork2/inject/ContainerImplTest.java           |  335 --
 .../xwork2/inject/EarlyInitializableBean.java      |   34 -
 .../xwork2/inject/InitializableBean.java           |   34 -
 .../xwork2/interceptor/AliasInterceptorTest.java   |  259 --
 .../interceptor/ChainingInterceptorTest.java       |  170 -
 .../ChainingInterceptorWithConfigTest.java         |  128 -
 .../ConversionErrorInterceptorTest.java            |  150 -
 .../DefaultWorkflowInterceptorTest.java            |  207 -
 .../ExceptionMappingInterceptorTest.java           |  311 --
 .../MethodFilterInterceptorUtilTest.java           |   86 -
 .../interceptor/ModelDrivenInterceptorTest.java    |  189 -
 .../ParameterFilterInterceptorTest.java            |  127 -
 .../ParameterRemoverInterceptorTest.java           |  131 -
 .../xwork2/interceptor/PreResultListenerTest.java  |  120 -
 .../PrefixMethodInvocationUtilTest.java            |  268 --
 .../xwork2/interceptor/PrepareInterceptorTest.java |  212 -
 .../ScopedModelDrivenInterceptorTest.java          |  253 --
 .../StaticParametersInterceptorTest.java           |  258 --
 .../interceptor/ValidationErrorAwareTest.java      |  111 -
 ...ationInterceptorPrefixMethodInvocationTest.java |  108 -
 .../annotations/AllowingByDefaultAction.java       |   44 -
 .../annotations/AllowingByDefaultModel.java        |   41 -
 .../interceptor/annotations/AnnotatedAction.java   |   49 -
 .../AnnotationParameterFilterInterceptorTest.java  |  199 -
 .../AnnotationWorkflowInterceptorTest.java         |  112 -
 .../annotations/BaseAnnotatedAction.java           |   67 -
 .../annotations/BlockingByDefaultAction.java       |   45 -
 .../annotations/BlockingByDefaultModel.java        |   40 -
 .../annotations/InterfaceAnnotatedAction.java      |   30 -
 .../annotations/ShortcircuitedAction.java          |   38 -
 .../xwork2/mock/DummyTextProvider.java             |   87 -
 .../opensymphony/xwork2/mock/InjectableAction.java |   36 -
 .../xwork2/mock/MockLazyInterceptor.java           |   42 -
 .../com/opensymphony/xwork2/ognl/MyCustomMap.java  |   28 -
 .../xwork2/ognl/OgnlUtilStrutsTest.java            |   48 -
 .../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 1825 ---------
 .../xwork2/ognl/OgnlValueStackTest.java            | 1363 -------
 .../xwork2/ognl/SecurityMemberAccessTest.java      | 1128 ------
 .../xwork2/ognl/SetPropertiesTest.java             |  378 --
 .../accessor/XWorkListPropertyAccessorTest.java    |   88 -
 .../accessor/XWorkMapPropertyAccessorTest.java     |   72 -
 .../DefaultAcceptedPatternsCheckerTest.java        |  264 --
 .../DefaultExcludedPatternsCheckerTest.java        |  248 --
 ...aultNotExcludedAcceptedPatternsCheckerTest.java |   91 -
 .../xwork2/test/AnnotationDataAware.java           |   48 -
 .../xwork2/test/AnnotationDataAware2.java          |   36 -
 .../xwork2/test/AnnotationTestBean2.java           |   67 -
 .../opensymphony/xwork2/test/AnnotationUser.java   |  109 -
 .../xwork2/test/AnnotationUserMarker.java          |   38 -
 .../com/opensymphony/xwork2/test/DataAware.java    |   38 -
 .../com/opensymphony/xwork2/test/DataAware2.java   |   32 -
 .../java/com/opensymphony/xwork2/test/Equidae.java |   55 -
 .../xwork2/test/ModelDrivenAction2.java            |   41 -
 .../xwork2/test/ModelDrivenAnnotationAction2.java  |   42 -
 .../opensymphony/xwork2/test/SimpleAction2.java    |   43 -
 .../opensymphony/xwork2/test/SimpleAction3.java    |   57 -
 .../xwork2/test/SimpleAnnotationAction2.java       |   47 -
 .../xwork2/test/SimpleAnnotationAction3.java       |   58 -
 .../opensymphony/xwork2/test/TestArrayBean.java    |   35 -
 .../com/opensymphony/xwork2/test/TestBean2.java    |   61 -
 .../java/com/opensymphony/xwork2/test/User.java    |   94 -
 .../com/opensymphony/xwork2/test/UserMarker.java   |   28 -
 .../xwork2/test/annotations/Address.java           |   58 -
 .../test/annotations/AddressTypeConverter.java     |   47 -
 .../xwork2/test/annotations/Person.java            |   40 -
 .../xwork2/test/annotations/PersonAction.java      |   65 -
 .../xwork2/test/annotations/PersonActionTest.java  |  105 -
 .../test/annotations/PersonTypeConverter.java      |   45 -
 .../ValidateAnnotatedMethodOnlyAction.java         |   71 -
 .../xwork2/test/subtest/NullModelDrivenAction.java |   38 -
 .../java/com/opensymphony/xwork2/util/Animal.java  |   23 -
 .../com/opensymphony/xwork2/util/AnnotatedCat.java |   68 -
 .../xwork2/util/AnnotationUtilsTest.java           |   70 -
 .../java/com/opensymphony/xwork2/util/Bar.java     |   67 -
 .../com/opensymphony/xwork2/util/BarJunior.java    |   22 -
 .../java/com/opensymphony/xwork2/util/Cat.java     |   61 -
 .../xwork2/util/ClassLoaderUtilTest.java           |  127 -
 .../xwork2/util/ClassPathFinderTest.java           |  108 -
 .../xwork2/util/DefaultFileManagerTest.java        |  207 -
 .../java/com/opensymphony/xwork2/util/Dog.java     |  126 -
 .../opensymphony/xwork2/util/DomHelperTest.java    |   77 -
 .../xwork2/util/DummyObjectFactory.java            |   25 -
 .../java/com/opensymphony/xwork2/util/Foo.java     |  260 --
 .../com/opensymphony/xwork2/util/FurColor.java     |   23 -
 .../xwork2/util/GetPropertiesTest.java             |   52 -
 .../java/com/opensymphony/xwork2/util/Indexed.java |   59 -
 .../com/opensymphony/xwork2/util/ListHolder.java   |   55 -
 .../java/com/opensymphony/xwork2/util/MyBean.java  |   57 -
 .../com/opensymphony/xwork2/util/MyBeanAction.java |   89 -
 .../opensymphony/xwork2/util/MyBeanActionTest.java |  138 -
 .../com/opensymphony/xwork2/util/MyNumber.java     |   22 -
 .../util/NamedVariablePatternMatcherTest.java      |  117 -
 .../java/com/opensymphony/xwork2/util/Owner.java   |   40 -
 .../opensymphony/xwork2/util/ResolverUtilTest.java |   63 -
 .../util/StrutsLocalizedTextProviderTest.java      |  641 ---
 .../xwork2/util/TextParseUtilTest.java             |  217 -
 .../java/com/opensymphony/xwork2/util/Tiger.java   |   42 -
 .../xwork2/util/UnknownHandlerManagerTest.java     |  105 -
 .../com/opensymphony/xwork2/util/UrlUtilTest2.java |   53 -
 .../xwork2/util/WildcardHelperTest.java            |   57 -
 .../opensymphony/xwork2/util/WildcardUtilTest.java |   57 -
 .../xwork2/util/annotation/Dummy2Class.java        |   27 -
 .../xwork2/util/annotation/Dummy3Class.java        |   25 -
 .../xwork2/util/annotation/DummyClass.java         |   32 -
 .../xwork2/util/annotation/DummyClassExt.java      |   26 -
 .../xwork2/util/annotation/MyAnnotation.java       |   29 -
 .../xwork2/util/annotation/MyAnnotation2.java      |   28 -
 .../xwork2/util/annotation/package-info.java       |   20 -
 .../pkg1/AbstractAbstractDummyAction.java          |   25 -
 .../util/annotation/pkg1/AbstractDummyAction.java  |   22 -
 .../annotation/pkg2/Package2DummyInterface.java    |   25 -
 .../xwork2/util/annotation/pkg2/package-info.java  |   23 -
 .../util/fs/DefaultFileManagerFactoryTest.java     |  153 -
 .../xwork2/util/fs/JarEntryRevisionTest.java       |  165 -
 .../util/location/LocationAttributesTest.java      |   90 -
 .../xwork2/util/location/LocationImplTest.java     |   90 -
 .../xwork2/util/location/LocationUtilsTest.java    |   89 -
 .../validator/ActionValidatorManagerTest.java      |  239 --
 .../AnnotationActionValidatorManagerTest.java      |  419 --
 .../validator/AnnotationValidationAction.java      |   95 -
 ...notationValidationConfigurationBuilderTest.java |  354 --
 .../validator/AnnotationValidationExpAction.java   |  158 -
 .../ConversionErrorFieldValidatorTest.java         |   89 -
 .../xwork2/validator/DateRangeValidatorTest.java   |   87 -
 .../DefaultActionValidatorManagerTest.java         |  377 --
 .../validator/DefaultValidatorFactoryTest.java     |   41 -
 .../validator/DefaultValidatorFileParserTest.java  |  218 -
 .../validator/DoubleRangeFieldValidatorTest.java   |  370 --
 .../xwork2/validator/DummyValidatorContext.java    |  147 -
 .../xwork2/validator/EmailValidatorTest.java       |  170 -
 .../xwork2/validator/ExpressionValidatorTest.java  |  146 -
 .../xwork2/validator/IntRangeValidatorTest.java    |   70 -
 .../xwork2/validator/LongRangeValidatorTest.java   |   67 -
 .../validator/ModelDrivenValidationTest.java       |   61 -
 .../opensymphony/xwork2/validator/MyValidator.java |  114 -
 .../xwork2/validator/RegexFieldValidatorTest.java  |  256 --
 ...teConversionErrorFieldValidatorSupportTest.java |  135 -
 .../xwork2/validator/ShortRangeValidatorTest.java  |   67 -
 .../validator/SimpleActionValidationTest.java      |  253 --
 .../validator/StringLengthFieldValidatorTest.java  |  275 --
 .../xwork2/validator/StringValidatorTest.java      |  225 --
 .../xwork2/validator/URLValidatorTest.java         |  353 --
 .../xwork2/validator/ValidatorAnnotationTest.java  |  130 -
 .../validator/VisitorFieldValidatorModelTest.java  |  126 -
 .../validator/VisitorFieldValidatorTest.java       |  236 --
 .../validator/VisitorValidatorModelAction.java     |   40 -
 .../validator/VisitorValidatorTestAction.java      |   97 -
 .../validators/AppendingValidatorContextTest.java  |   80 -
 .../validators/CreditCardValidatorTest.java        |  248 --
 .../validators/DateRangeFieldValidatorTest.java    |  117 -
 .../validators/IntRangeFieldValidatorTest.java     |  125 -
 .../validators/LongRangeFieldValidatorTest.java    |  102 -
 .../validators/RequiredFieldValidatorTest.java     |   96 -
 .../validators/RequiredStringValidatorTest.java    |  153 -
 .../validators/ShortRangeFieldValidatorTest.java   |  102 -
 .../validator/validators/ValidationAction.java     |  193 -
 .../validator/validators/ValidatorSupportTest.java |   46 -
 .../com/test/ExternalSecurityMemberAccess.java     |   33 -
 .../com/test/ExternalSecurityMemberAccessTest.java |   33 -
 .../org/apache/struts2/ActionChainResultTest.java  |   41 +
 .../java/org/apache/struts2/ActionContextTest.java |  117 +
 .../struts2/ActionContextThreadLocalTest.java      |   46 +
 .../org/apache/struts2/ActionInvocationTest.java   |  120 +
 .../java/org/apache/struts2/ActionNestingTest.java |  152 +
 .../java/org/apache/struts2/ActionSupportTest.java |  349 ++
 .../java/org/apache/struts2/AnnotatedTestBean.java |   91 +
 .../java/org/apache/struts2/ChainResultTest.java   |  197 +
 .../struts2/DefaultActionInvocationTest.java       |  568 +++
 .../org/apache/struts2/DefaultActionProxyTest.java |   42 +
 .../java/org/apache/struts2/DefaultClasstTest.java |   63 +
 .../struts2/DefaultUnknownHandlerManagerTest.java  |   83 +
 .../apache/struts2/ExecutionCountTestAction.java   |    2 +-
 .../apache/struts2/ExternalReferenceAction.java    |   45 +
 core/src/test/java/org/apache/struts2/Foo.java     |   38 +
 .../test/java/org/apache/struts2/GenericsBean.java |   75 +
 .../org/apache/struts2/HttpMethodsTestAction.java  |    2 +-
 .../java/org/apache/struts2/LocaleAwareTest.java   |   76 +
 .../org/apache/struts2/LocaleProviderTest.java     |   83 +
 .../java/org/apache/struts2/ModelDrivenAction.java |   51 +
 .../struts2/ModelDrivenAnnotationAction.java       |   51 +
 .../test/java/org/apache/struts2/NestedAction.java |   71 +
 .../java/org/apache/struts2/ObjectFactoryTest.java |   46 +
 .../org/apache/struts2/ProxyInvocationAction.java  |   30 +
 .../apache/struts2/ProxyInvocationInterface.java   |   26 +
 .../org/apache/struts2/ProxyInvocationTest.java    |   71 +
 .../org/apache/struts2/ProxyObjectFactory.java     |   67 +
 .../java/org/apache/struts2/RequestUtilsTest.java  |    2 +-
 .../apache/struts2/ServletActionContextTest.java   |   18 +-
 .../test/java/org/apache/struts2/SimpleAction.java |  286 ++
 .../org/apache/struts2/SimpleAnnotationAction.java |  250 ++
 .../java/org/apache/struts2/SimpleFooAction.java   |   46 +
 .../org/apache/struts2/StrutsExceptionTest.java    |    4 +-
 .../org/apache/struts2/StrutsInternalTestCase.java |    4 +-
 .../struts2/StrutsJUnit4InternalTestCase.java      |    4 +-
 .../java/org/apache/struts2/StubValueStack.java    |  112 +
 .../test/java/org/apache/struts2/TestAction.java   |   32 +-
 .../org/apache/struts2/TestActionTagResult.java    |    3 +-
 .../src/test/java/org/apache/struts2/TestBean.java |   74 +
 .../java/org/apache/struts2/TestChildBean.java     |   65 +
 .../apache/struts2/TestConfigurationProvider.java  |   41 +-
 .../test/java/org/apache/struts2/TestResult.java   |    8 +-
 .../apache/struts2/UnknownHandlerManagerMock.java  |   33 +
 .../apache/struts2/UserSpecifiedDefaultAction.java |   28 +
 .../org/apache/struts2/ValidationOrderAction.java  |  194 +
 .../test/java/org/apache/struts2/VoidResult.java   |   43 +
 .../org/apache/struts2/WildCardResultTest.java     |   60 +
 .../apache/struts2/action/CspReportActionTest.java |    2 +-
 .../struts2/components/ActionComponentTest.java    |    4 +-
 .../components/AnotherActionComponentTest.java     |    4 +-
 .../apache/struts2/components/ComponentTest.java   |   10 +-
 .../org/apache/struts2/components/DateTest.java    |    6 +-
 .../apache/struts2/components/FormButtonTest.java  |    6 +-
 .../org/apache/struts2/components/FormTest.java    |   18 +-
 .../struts2/components/IteratorComponentTest.java  |    6 +-
 .../apache/struts2/components/PropertyTest.java    |    6 +-
 .../org/apache/struts2/components/UIBeanTest.java  |   12 +-
 .../apache/struts2/components/UIComponentTest.java |    4 +-
 .../struts2/config/ConfigurationManagerTest.java   |  177 +
 .../apache/struts2/config/ConfigurationTest.java   |  370 ++
 .../PropertiesConfigurationProviderTest.java       |    6 +-
 .../org/apache/struts2/config/SettingsTest.java    |    6 +-
 .../config/StrutsBeanSelectionProviderTest.java    |   13 +-
 .../StrutsJavaConfigurationProviderTest.java       |   14 +-
 .../struts2/config/TestBeanSelectionProvider.java  |   10 +-
 .../org/apache/struts2/config/TestSettings.java    |    2 +-
 .../struts2/config/entities/ActionConfigTest.java  |   47 +
 .../config/entities/AllowedMethodsTest.java        |  120 +
 .../struts2/config/entities/BeanConfigTest.java    |    6 +-
 .../config/entities/ConstantConfigTest.java        |    4 +-
 .../struts2/config/entities/PackageConfigTest.java |   95 +
 .../struts2/config/impl/AbstractMatcherTest.java   |   57 +
 .../config/impl/ActionConfigMatcherTest.java       |  257 ++
 .../struts2/config/impl/NamespaceMatcherTest.java  |   44 +
 .../ConfigurationProviderOgnlAllowlistTest.java    |  114 +
 .../config/providers/ConfigurationTestBase.java    |   45 +
 .../config/providers/EnvsValueSubstitutorTest.java |   67 +
 .../config/providers/InterceptorBuilderTest.java   |  288 ++
 .../providers/InterceptorForTestPurpose.java       |   49 +
 .../providers/MockConfigurationProvider.java       |  209 +
 .../providers/NoNoArgsConstructorAction.java       |   44 +
 .../config/providers/PrivateConstructorAction.java |   48 +
 .../config/providers/SomeUnknownHandler.java       |   51 +
 .../XmlConfigurationProviderActionsTest.java       |  224 ++
 ...XmlConfigurationProviderAllowedMethodsTest.java |  163 +
 ...lConfigurationProviderEnvsSubstitutionTest.java |   68 +
 ...ConfigurationProviderExceptionMappingsTest.java |   83 +
 ...urationProviderGlobalResultInheritenceTest.java |   72 +
 ...tionProviderInterceptorParamOverridingTest.java |  105 +
 ...roviderInterceptorStackParamOverridingTest.java |  108 +
 ...onfigurationProviderInterceptorsSpringTest.java |   83 +
 .../XmlConfigurationProviderInterceptorsTest.java  |  234 ++
 .../XmlConfigurationProviderInvalidFileTest.java   |   43 +
 .../XmlConfigurationProviderMultilevelTest.java    |   73 +
 .../XmlConfigurationProviderPackagesTest.java      |  204 +
 .../XmlConfigurationProviderResultTypesTest.java   |  122 +
 .../XmlConfigurationProviderResultsTest.java       |  178 +
 .../providers/XmlConfigurationProviderTest.java    | 1101 +++++
 ...nfigurationProviderUnknownHandlerStackTest.java |   58 +
 ...mlConfigurationProviderWildCardIncludeTest.java |   55 +
 .../struts2/config/providers/XmlHelperTest.java    |  203 +
 .../struts2/conversion/ConversionTestAction.java   |  101 +
 .../impl/AnnotationXWorkConverterTest.java         |  481 +++
 .../struts2/conversion/impl/DateConverterTest.java |  203 +
 .../struts2/conversion/impl/FooBarConverter.java   |   69 +
 .../conversion/impl/FooNumberConverter.java        |   36 +
 .../impl/InstantiatingNullHandlerTest.java         |   57 +
 .../conversion/impl/NumberConverterTest.java       |  305 ++
 .../struts2/conversion/impl/ParentClass.java       |   45 +
 .../conversion/impl/StringConverterTest.java       |  129 +
 .../conversion/impl/XWorkBasicConverterTest.java   |  420 ++
 .../conversion/impl/XWorkConverterTest.java        |  809 ++++
 .../struts2/conversion/impl/XWorkListTest.java     |   89 +
 .../struts2/dispatcher/ApplicationMapTest.java     |    2 +-
 .../struts2/dispatcher/AttributeMapTest.java       |   31 +-
 .../DefaultDispatcherErrorHandlerTest.java         |   12 +-
 .../dispatcher/DefaultStaticContentLoaderTest.java |    4 +-
 .../apache/struts2/dispatcher/DispatcherTest.java  |   37 +-
 .../struts2/dispatcher/NullActionMapper.java       |    4 +-
 .../struts2/dispatcher/PrepareOperationsTest.java  |    8 +-
 .../apache/struts2/dispatcher/RequestMapTest.java  |    2 +-
 .../apache/struts2/dispatcher/SessionMapTest.java  |    4 +-
 .../dispatcher/StaticContentLoaderTest.java        |    2 +-
 ...rutsPrepareAndExecuteFilterIntegrationTest.java |    8 +-
 .../dispatcher/TwoFilterIntegrationTest.java       |   14 +-
 .../mapper/CompositeActionMapperTest.java          |   16 +-
 .../dispatcher/mapper/DefaultActionMapperTest.java |  176 +-
 .../mapper/Restful2ActionMapperTest.java           |  107 +-
 .../dispatcher/mapper/RestfulActionMapperTest.java |    8 +-
 .../multipart/AbstractMultiPartRequestTest.java    |  514 +++
 .../multipart/JakartaMultiPartRequestTest.java     |   28 +
 .../JakartaStreamMultiPartRequestTest.java         |   78 +-
 .../factory/PrefixBasedActionProxyFactoryTest.java |   24 +-
 .../struts2/factory/StrutsResultFactoryTest.java   |   11 +-
 .../apache/struts2/inject/ContainerImplTest.java   |  335 ++
 .../struts2/inject/EarlyInitializableBean.java     |   34 +
 .../apache/struts2/inject/InitializableBean.java   |   34 +
 .../ActionFileUploadInterceptorTest.java           |  446 +--
 .../ActionMappingParametersInterceptorTest.java    |    8 +-
 .../struts2/interceptor/AliasInterceptorTest.java  |  259 ++
 .../interceptor/ChainingInterceptorTest.java       |  172 +
 .../ChainingInterceptorWithConfigTest.java         |  128 +
 .../interceptor/CheckboxInterceptorTest.java       |    6 +-
 .../interceptor/ClearSessionInterceptorTest.java   |    4 +-
 .../struts2/interceptor/CoepInterceptorTest.java   |    4 +-
 .../ConversionErrorInterceptorTest.java            |  152 +
 .../struts2/interceptor/CookieInterceptorTest.java |  112 +-
 .../interceptor/CookieProviderInterceptorTest.java |    8 +-
 .../struts2/interceptor/CoopInterceptorTest.java   |    4 +-
 .../interceptor/CreateSessionInterceptorTest.java  |    6 +-
 .../struts2/interceptor/CspInterceptorTest.java    |   12 +-
 .../interceptor/DateTextFieldInterceptorTest.java  |    4 +-
 .../DefaultWorkflowInterceptorTest.java            |  213 +
 .../ExceptionMappingInterceptorTest.java           |  312 ++
 .../interceptor/ExecuteAndWaitDelayAction.java     |    2 +-
 .../interceptor/ExecuteAndWaitInterceptorTest.java |   38 +-
 .../interceptor/FetchMetadataInterceptorTest.java  |   21 +-
 .../interceptor/FileUploadInterceptorTest.java     |  806 ----
 .../struts2/interceptor/I18nInterceptorTest.java   |   16 +-
 .../interceptor/MessageStoreInterceptorTest.java   |   15 +-
 .../MessageStorePreResultListenerTest.java         |   22 +-
 .../MethodFilterInterceptorUtilTest.java           |   86 +
 .../interceptor/ModelDrivenInterceptorTest.java    |  189 +
 .../interceptor/MultiselectInterceptorTest.java    |    4 +-
 .../ParameterRemoverInterceptorTest.java           |  128 +
 .../struts2/interceptor/PreResultListenerTest.java |  127 +
 .../PrefixMethodInvocationUtilTest.java            |  268 ++
 .../interceptor/PrepareInterceptorTest.java        |  219 +
 .../struts2/interceptor/RolesInterceptorTest.java  |    8 +-
 .../ScopedModelDrivenInterceptorTest.java          |  253 ++
 .../interceptor/ServletConfigInterceptorTest.java  |    9 +-
 .../StaticParametersInterceptorTest.java           |  258 ++
 .../StrutsConversionErrorInterceptorTest.java      |   12 +-
 .../struts2/interceptor/TokenInterceptorTest.java  |   12 +-
 .../TokenSessionStoreInterceptorTest.java          |    4 +-
 .../interceptor/ValidationErrorAwareTest.java      |  111 +
 ...ationInterceptorPrefixMethodInvocationTest.java |  108 +
 .../interceptor/annotations/AnnotatedAction.java   |   49 +
 .../AnnotationWorkflowInterceptorTest.java         |  112 +
 .../annotations/BaseAnnotatedAction.java           |   67 +
 .../annotations/InterfaceAnnotatedAction.java      |   30 +
 .../annotations/ShortcircuitedAction.java          |   38 +
 .../exec/StrutsBackgroundProcessTest.java          |   14 +-
 .../httpmethod/HttpMethodInterceptorTest.java      |    6 +-
 .../parameter/ParametersInterceptorTest.java       |   79 +-
 .../parameter/StrutsParameterAnnotationTest.java   |   15 +-
 .../AnnotationValidationInterceptorTest.java       |    8 +-
 .../struts2/locale/DefaultLocaleProviderTest.java  |  175 +
 .../org/apache/struts2/mock/DummyTextProvider.java |   87 +
 .../org/apache/struts2/mock/InjectableAction.java  |   36 +
 .../apache/struts2/mock/MockLazyInterceptor.java   |   41 +
 .../java/org/apache/struts2/ognl/MyCustomMap.java  |   28 +
 .../struts2/ognl/OgnlSetPossiblePropertyTest.java  |    6 +-
 .../apache/struts2/ognl/OgnlUtilStrutsTest.java    |   48 +
 .../java/org/apache/struts2/ognl/OgnlUtilTest.java | 1838 +++++++++
 .../apache/struts2/ognl/OgnlValueStackTest.java    | 1364 +++++++
 .../struts2/ognl/SecurityMemberAccessTest.java     | 1130 ++++++
 .../org/apache/struts2/ognl/SetPropertiesTest.java |  382 ++
 .../apache/struts2/ognl/StrutsOgnlGuardTest.java   |    2 +-
 .../accessor/XWorkListPropertyAccessorTest.java    |   88 +
 .../accessor/XWorkMapPropertyAccessorTest.java     |   72 +
 .../struts2/result/HttpHeaderResultTest.java       |   18 +-
 .../org/apache/struts2/result/PlainResultTest.java |    5 +-
 .../apache/struts2/result/PlainTextResultTest.java |   23 +-
 .../apache/struts2/result/PostbackResultTest.java  |    9 +-
 .../result/ServletActionRedirectResultTest.java    |   14 +-
 .../result/ServletDispatcherResultTest.java        |  153 +-
 .../struts2/result/ServletRedirectResultTest.java  |   23 +-
 .../apache/struts2/result/StreamResultTest.java    |   14 +-
 .../struts2/result/StrutsResultSupportTest.java    |    8 +-
 .../DefaultAcceptedPatternsCheckerTest.java        |  264 ++
 .../DefaultExcludedPatternsCheckerTest.java        |  248 ++
 ...aultNotExcludedAcceptedPatternsCheckerTest.java |   91 +
 .../apache/struts2/test/AnnotationDataAware.java   |   48 +
 .../apache/struts2/test/AnnotationDataAware2.java  |   36 +
 .../apache/struts2/test/AnnotationTestBean2.java   |   67 +
 .../org/apache/struts2/test/AnnotationUser.java    |  109 +
 .../apache/struts2/test/AnnotationUserMarker.java  |   38 +
 .../java/org/apache/struts2/test/DataAware.java    |   38 +
 .../java/org/apache/struts2/test/DataAware2.java   |   32 +
 .../test/java/org/apache/struts2/test/Equidae.java |   55 +
 .../apache/struts2/test/ModelDrivenAction2.java    |   40 +
 .../struts2/test/ModelDrivenAnnotationAction2.java |   42 +
 .../org/apache/struts2/test/SimpleAction2.java     |   43 +
 .../org/apache/struts2/test/SimpleAction3.java     |   57 +
 .../struts2/test/SimpleAnnotationAction2.java      |   47 +
 .../struts2/test/SimpleAnnotationAction3.java      |   58 +
 .../org/apache/struts2/test/TestArrayBean.java     |   35 +
 .../java/org/apache/struts2/test/TestBean2.java    |   61 +
 .../test/java/org/apache/struts2/test/User.java    |   94 +
 .../java/org/apache/struts2/test/UserMarker.java   |   28 +
 .../apache/struts2/test/annotations/Address.java   |   58 +
 .../test/annotations/AddressTypeConverter.java     |   47 +
 .../apache/struts2/test/annotations/Person.java    |   40 +
 .../struts2/test/annotations/PersonAction.java     |   65 +
 .../struts2/test/annotations/PersonActionTest.java |  105 +
 .../test/annotations/PersonTypeConverter.java      |   45 +
 .../ValidateAnnotatedMethodOnlyAction.java         |   71 +
 .../test/subtest/NullModelDrivenAction.java        |   38 +
 .../apache/struts2/test/util/StrutsUtilTest.java   |  313 ++
 .../struts2/text/CompositeTextProviderTest.java    |  116 +
 .../struts2/text/DefaultTextProviderTest.java      |  145 +
 .../text/StrutsLocalizedTextProviderTest.java      |  620 +++
 .../org/apache/struts2/text/StubTextProvider.java  |   96 +
 .../struts2/text/TextProviderSupportTest.java      |  140 +
 .../test/java/org/apache/struts2/util/Animal.java  |   23 +
 .../java/org/apache/struts2/util/AnnotatedCat.java |   68 +
 .../apache/struts2/util/AnnotationUtilsTest.java   |   70 +
 .../src/test/java/org/apache/struts2/util/Bar.java |   67 +
 .../java/org/apache/struts2/util/BarJunior.java    |   22 +
 .../src/test/java/org/apache/struts2/util/Cat.java |   61 +
 .../apache/struts2/util/ClassLoaderUtilTest.java   |  127 +
 .../apache/struts2/util/ClassPathFinderTest.java   |  108 +
 .../struts2/util/DefaultFileManagerTest.java       |  207 +
 .../src/test/java/org/apache/struts2/util/Dog.java |  126 +
 .../org/apache/struts2/util/DomHelperTest.java     |   77 +
 .../apache/struts2/util/DummyObjectFactory.java    |   25 +
 .../src/test/java/org/apache/struts2/util/Foo.java |  259 ++
 .../java/org/apache/struts2/util/FurColor.java     |   23 +
 .../org/apache/struts2/util/GetPropertiesTest.java |   52 +
 .../test/java/org/apache/struts2/util/Indexed.java |   59 +
 .../struts2/util/InvocationSessionStoreTest.java   |   17 +-
 .../java/org/apache/struts2/util/ListHolder.java   |   55 +
 .../test/java/org/apache/struts2/util/MyBean.java  |   57 +
 .../java/org/apache/struts2/util/MyBeanAction.java |   88 +
 .../org/apache/struts2/util/MyBeanActionTest.java  |  138 +
 .../java/org/apache/struts2/util/MyNumber.java     |   22 +
 .../util/NamedVariablePatternMatcherTest.java      |  117 +
 .../test/java/org/apache/struts2/util/Owner.java   |   40 +
 .../org/apache/struts2/util/ResolverUtilTest.java  |   63 +
 .../util/SecurityMemberAccessInServletsTest.java   |   16 +-
 .../org/apache/struts2/util/StrutsUtilTest.java    |  311 --
 .../org/apache/struts2/util/TextParseUtilTest.java |  217 +
 .../test/java/org/apache/struts2/util/Tiger.java   |   42 +
 .../org/apache/struts2/util/TokenHelperTest.java   |    2 +-
 .../struts2/util/UnknownHandlerManagerTest.java    |  105 +
 .../java/org/apache/struts2/util/UrlUtilTest2.java |   53 +
 .../apache/struts2/util/WildcardHelperTest.java    |   57 +
 .../org/apache/struts2/util/WildcardUtilTest.java  |   57 +
 .../struts2/util/annotation/Dummy2Class.java       |   27 +
 .../struts2/util/annotation/Dummy3Class.java       |   25 +
 .../apache/struts2/util/annotation/DummyClass.java |   32 +
 .../struts2/util/annotation/DummyClassExt.java     |   26 +
 .../struts2/util/annotation/MyAnnotation.java      |   29 +
 .../struts2/util/annotation/MyAnnotation2.java     |   28 +
 .../struts2/util/annotation/package-info.java      |   20 +
 .../pkg1/AbstractAbstractDummyAction.java          |   25 +
 .../util/annotation/pkg1/AbstractDummyAction.java  |   22 +
 .../annotation/pkg2/Package2DummyInterface.java    |   25 +
 .../struts2/util/annotation/pkg2/package-info.java |   23 +
 .../util/fs/DefaultFileManagerFactoryTest.java     |  153 +
 .../struts2/util/fs/JarEntryRevisionTest.java      |  167 +
 .../util/location/LocationAttributesTest.java      |   90 +
 .../struts2/util/location/LocationImplTest.java    |   90 +
 .../struts2/util/location/LocationUtilsTest.java   |   89 +
 .../validator/ActionValidatorManagerTest.java      |  239 ++
 .../AnnotationActionValidatorManagerTest.java      |  419 ++
 .../validator/AnnotationValidationAction.java      |   95 +
 ...notationValidationConfigurationBuilderTest.java |  354 ++
 .../validator/AnnotationValidationExpAction.java   |  158 +
 .../ConversionErrorFieldValidatorTest.java         |   89 +
 .../struts2/validator/DateRangeValidatorTest.java  |   87 +
 .../DefaultActionValidatorManagerTest.java         |  378 ++
 .../validator/DefaultValidatorFactoryTest.java     |   41 +
 .../validator/DefaultValidatorFileParserTest.java  |  218 +
 .../validator/DoubleRangeFieldValidatorTest.java   |  370 ++
 .../struts2/validator/DummyValidatorContext.java   |  147 +
 .../struts2/validator/EmailValidatorTest.java      |  170 +
 .../struts2/validator/ExpressionValidatorTest.java |  153 +
 .../struts2/validator/IntRangeValidatorTest.java   |   70 +
 .../struts2/validator/LongRangeValidatorTest.java  |   67 +
 .../validator/ModelDrivenValidationTest.java       |   61 +
 .../org/apache/struts2/validator/MyValidator.java  |  114 +
 .../struts2/validator/RegexFieldValidatorTest.java |  254 ++
 ...teConversionErrorFieldValidatorSupportTest.java |  135 +
 .../struts2/validator/ShortRangeValidatorTest.java |   67 +
 .../validator/SimpleActionValidationTest.java      |  251 ++
 .../validator/StringLengthFieldValidatorTest.java  |  275 ++
 .../struts2/validator/StringValidatorTest.java     |  225 ++
 .../apache/struts2/validator/URLValidatorTest.java |  353 ++
 .../struts2/validator/ValidatorAnnotationTest.java |  130 +
 .../validator/VisitorFieldValidatorModelTest.java  |  124 +
 .../validator/VisitorFieldValidatorTest.java       |  236 ++
 .../validator/VisitorValidatorModelAction.java     |   40 +
 .../validator/VisitorValidatorTestAction.java      |   97 +
 .../validators/AppendingValidatorContextTest.java  |   80 +
 .../validators/CreditCardValidatorTest.java        |  248 ++
 .../validators/DateRangeFieldValidatorTest.java    |  117 +
 .../validators/IntRangeFieldValidatorTest.java     |  125 +
 .../validators/LongRangeFieldValidatorTest.java    |  102 +
 .../validators/RequiredFieldValidatorTest.java     |   96 +
 .../validators/RequiredStringValidatorTest.java    |  153 +
 .../validators/ShortRangeFieldValidatorTest.java   |  102 +
 .../validator/validators/ValidationAction.java     |  193 +
 .../validator/validators/ValidatorSupportTest.java |   46 +
 .../struts2/views/TemplateEngineManagerTest.java   |   10 +-
 .../views/freemarker/FreeMarkerResultTest.java     |   10 +-
 .../views/freemarker/FreemarkerManagerTest.java    |   19 +-
 .../freemarker/FreemarkerResultMockedTest.java     |   10 +-
 .../struts2/views/freemarker/FreemarkerTest.java   |    2 +-
 .../struts2/views/freemarker/TestAction.java       |    2 +-
 .../views/freemarker/tags/TagModelTest.java        |    6 +-
 .../apache/struts2/views/jsp/AbstractTagTest.java  |   29 +-
 .../struts2/views/jsp/AbstractUITagTest.java       |    2 +-
 .../apache/struts2/views/jsp/ActionTagTest.java    |   22 +-
 .../apache/struts2/views/jsp/AnchorTagTest.java    |    4 +-
 .../struts2/views/jsp/AppendIteratorTagTest.java   |    4 +-
 .../org/apache/struts2/views/jsp/BeanTagTest.java  |   11 +-
 .../apache/struts2/views/jsp/DynAttribsTest.java   |    4 +-
 .../apache/struts2/views/jsp/ElseIfTagTest.java    |   30 +-
 .../org/apache/struts2/views/jsp/ElseTagTest.java  |   31 +-
 .../org/apache/struts2/views/jsp/I18nTagTest.java  |   30 +-
 .../org/apache/struts2/views/jsp/IfTagTest.java    |   27 +-
 .../apache/struts2/views/jsp/IncludeTagTest.java   |   21 +-
 .../views/jsp/IteratorGeneratorTagTest.java        |    4 +-
 .../apache/struts2/views/jsp/IteratorTagTest.java  |   23 +-
 .../struts2/views/jsp/MergeIteratorTagTest.java    |    4 +-
 .../apache/struts2/views/jsp/NumberTagTest.java    |    2 +-
 .../apache/struts2/views/jsp/PropertyTagTest.java  |  353 +-
 .../org/apache/struts2/views/jsp/PushTagTest.java  |    2 +-
 .../org/apache/struts2/views/jsp/SetTagTest.java   |   23 +-
 .../struts2/views/jsp/SortIteratorTagTest.java     |    7 +-
 .../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 +-
 .../struts2/views/jsp/SubsetIteratorTagTest.java   |    4 +-
 .../org/apache/struts2/views/jsp/TextTagTest.java  |   33 +-
 .../org/apache/struts2/views/jsp/URLTagTest.java   |   78 +-
 .../struts2/views/jsp/ui/ActionErrorTagTest.java   |    4 +-
 .../struts2/views/jsp/ui/ActionMessageTagTest.java |    4 +-
 .../apache/struts2/views/jsp/ui/CheckboxTest.java  |   11 +-
 .../apache/struts2/views/jsp/ui/DateTagTest.java   |    4 +-
 .../apache/struts2/views/jsp/ui/DebugTagTest.java  |    6 +-
 .../views/jsp/ui/DoubleValidationAction.java       |    2 +-
 .../struts2/views/jsp/ui/FieldErrorTagTest.java    |    4 +-
 .../apache/struts2/views/jsp/ui/FormTagTest.java   |   42 +-
 .../apache/struts2/views/jsp/ui/HiddenTest.java    |    4 +-
 .../struts2/views/jsp/ui/IntValidationAction.java  |    2 +-
 .../struts2/views/jsp/ui/JspTemplateTest.java      |   10 +-
 .../apache/struts2/views/jsp/ui/LinkTagTest.java   |    2 +-
 .../struts2/views/jsp/ui/LocaleTestAction.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/SubmitTest.java    |    2 +-
 .../apache/struts2/views/jsp/ui/TestAction1.java   |    2 +-
 .../apache/struts2/views/jsp/ui/TokenTagTest.java  |    2 +-
 .../apache/struts2/views/jsp/ui/TooltipTest.java   |   12 +-
 .../struts2/views/jsp/ui/UpDownSelectTagTest.java  |    4 +-
 .../struts2/views/util/DefaultUrlHelperTest.java   |   26 +-
 .../struts2/views/util/ResourceUtilTest.java       |    2 +-
 .../org/test/ExternalSecurityMemberAccess.java     |   35 +
 .../org/test/ExternalSecurityMemberAccessTest.java |   33 +
 .../xwork2/config/providers/xwork- test.xml        |  100 -
 .../providers/xwork-include-after-package-2.xml    |   33 -
 .../providers/xwork-include-after-package.xml      |   39 -
 .../providers/xwork-include-before-package-2.xml   |   33 -
 .../providers/xwork-include-before-package.xml     |   41 -
 .../config/providers/xwork-include-parent.xml      |   41 -
 .../config/providers/xwork-test-action-invalid.xml |   42 -
 .../xwork-test-actions-packagedefaultclassref.xml  |   58 -
 .../xwork2/config/providers/xwork-test-actions.xml |  100 -
 .../config/providers/xwork-test-allowlist-2.xml    |   41 -
 .../config/providers/xwork-test-allowlist.xml      |   48 -
 .../xwork-test-defaultclassref-package.xml         |   30 -
 .../providers/xwork-test-exception-mappings.xml    |   52 -
 .../xwork-test-global-result-inheritence.xml       |   66 -
 .../providers/xwork-test-include-wildcard.xml      |   27 -
 .../xwork-test-interceptor-defaultref.xml          |   49 -
 .../xwork-test-interceptor-param-overriding.xml    |   62 -
 .../providers/xwork-test-interceptor-params.xml    |   56 -
 ...ork-test-interceptor-stack-param-overriding.xml |   73 -
 .../providers/xwork-test-interceptors-basic.xml    |   46 -
 .../config/providers/xwork-test-invalid-file.xml   |   30 -
 .../config/providers/xwork-test-multilevel.xml     |   64 -
 .../providers/xwork-test-package-extends-final.xml |   37 -
 .../config/providers/xwork-test-package-final.xml  |   37 -
 .../providers/xwork-test-package-inheritance.xml   |   46 -
 .../providers/xwork-test-result-inheritance.xml    |   45 -
 .../config/providers/xwork-test-result-names.xml   |   67 -
 .../config/providers/xwork-test-result-types.xml   |   72 -
 .../xwork2/config/providers/xwork-test-results.xml |   51 -
 .../providers/xwork-test-wildcard-include.xml      |   31 -
 .../providers/xwork-unknownhandler-stack-empty.xml |   31 -
 .../providers/xwork-unknownhandler-stack.xml       |   33 -
 .../impl/test-struts-conversion.properties         |   19 -
 .../xwork2/test/DataAware-conversion.properties    |   19 -
 .../xwork2/test/TestBean2-conversion.properties    |   19 -
 .../xwork2/util/Cat-conversion.properties          |   20 -
 .../xwork2/util/Foo-conversion.properties          |   30 -
 .../xwork2/util/MyBeanAction-conversion.properties |   26 -
 .../xwork2/util/Tiger-conversion.properties        |   19 -
 .../xwork2/validator/validators-fail.xml           |   41 -
 core/src/test/resources/includeTest.xml            |    2 +-
 core/src/test/resources/my-validators.xml          |    2 +-
 core/src/test/resources/myOther-validators.xml     |    2 +-
 ...ActionSupportTest$MyActionSupport_da.properties |    0
 .../apache/struts2}/AnnotatedTestBean.properties   |    0
 .../struts2}/ModelDrivenAction-validation.xml      |    0
 .../apache/struts2}/ModelDrivenAction.properties   |    0
 .../ModelDrivenAnnotationAction.properties         |    0
 .../SimpleAction-some-alias-validation.xml         |    0
 .../SimpleAction-subproperty-validation.xml        |    0
 .../apache/struts2}/SimpleAction-validation.xml    |    0
 .../SimpleAction-validationAlias-validation.xml    |    0
 .../apache/struts2}/SimpleAction.properties        |    0
 .../apache/struts2}/SimpleAction_de.properties     |    0
 .../apache/struts2}/SimpleAction_en.properties     |    0
 .../struts2}/SimpleAnnotationAction.properties     |    0
 .../struts2}/SimpleAnnotationAction_de.properties  |    0
 .../struts2}/SimpleAnnotationAction_en.properties  |    0
 .../TestBean-anotherContext-validation.xml         |    0
 .../struts2}/TestBean-badtest-validation.xml       |    0
 .../TestBean-beanMessageBundle-validation.xml      |    0
 .../TestBean-expressionValidation-validation.xml   |    0
 .../apache/struts2}/TestBean-validation.xml        |    0
 .../TestBean-visitorChildValidation-validation.xml |    0
 .../TestBean-visitorValidation-validation.xml      |    0
 .../apache/struts2}/TestBean.properties            |    0
 .../apache/struts2}/TestChildBean-validation.xml   |    0
 .../struts2}/ValidationOrderAction-validation.xml  |    0
 .../providers/loadorder1/xwork-test-load-order.xml |    0
 .../providers/loadorder2/xwork-test-load-order.xml |    0
 .../providers/loadorder3/xwork-test-load-order.xml |    0
 .../struts2/config/providers/xwork- test.xml       |  100 +
 .../providers/xwork-include-after-package-2.xml    |   33 +
 .../providers/xwork-include-after-package.xml      |   39 +
 .../providers/xwork-include-before-package-2.xml   |   33 +
 .../providers/xwork-include-before-package.xml     |   41 +
 .../config/providers/xwork-include-parent.xml      |   41 +
 .../config/providers/xwork-test-action-invalid.xml |   42 +
 .../xwork-test-actions-packagedefaultclassref.xml  |   58 +
 .../config/providers/xwork-test-actions.xml        |  100 +
 .../providers/xwork-test-allowed-methods.xml       |    0
 .../config/providers/xwork-test-allowlist-2.xml    |   41 +
 .../config/providers/xwork-test-allowlist.xml      |   48 +
 .../providers/xwork-test-bad-inheritance.xml       |    0
 .../config/providers/xwork-test-basic-packages.xml |    0
 .../providers/xwork-test-default-package.xml       |    0
 .../xwork-test-defaultclassref-package.xml         |   30 +
 .../providers/xwork-test-envs-substitution.xml     |    0
 .../providers/xwork-test-exception-mappings.xml    |   52 +
 .../xwork-test-global-result-inheritence.xml       |   66 +
 .../providers/xwork-test-include-wildcard.xml      |   27 +
 .../xwork-test-interceptor-defaultref.xml          |   49 +
 .../xwork-test-interceptor-inheritance.xml         |    0
 .../xwork-test-interceptor-param-overriding.xml    |   62 +
 .../providers/xwork-test-interceptor-params.xml    |   56 +
 ...ork-test-interceptor-stack-param-overriding.xml |   73 +
 .../providers/xwork-test-interceptors-basic.xml    |   46 +
 .../providers/xwork-test-interceptors-spring.xml   |    0
 .../config/providers/xwork-test-invalid-file.xml   |   30 +
 .../config/providers/xwork-test-multilevel.xml     |   64 +
 .../providers/xwork-test-package-extends-final.xml |   37 +
 .../config/providers/xwork-test-package-final.xml  |   37 +
 .../providers/xwork-test-package-inheritance.xml   |   46 +
 .../config/providers/xwork-test-reload.xml         |    0
 .../providers/xwork-test-result-inheritance.xml    |   45 +
 .../config/providers/xwork-test-result-names.xml   |   67 +
 .../config/providers/xwork-test-result-types.xml   |   72 +
 .../config/providers/xwork-test-results.xml        |   51 +
 .../config/providers/xwork-test-wildcard-1.xml     |    0
 .../config/providers/xwork-test-wildcard-2.xml     |    0
 .../providers/xwork-test-wildcard-include.xml      |   31 +
 .../providers/xwork-unknownhandler-stack-empty.xml |   31 +
 .../providers/xwork-unknownhandler-stack.xml       |   33 +
 .../impl/test-struts-conversion.properties         |   19 +
 .../xwork2 => org/apache/struts2}/somefile.txt     |    0
 .../xwork2 => org/apache/struts2}/test.properties  |    0
 .../struts2/test/DataAware-conversion.properties   |   19 +
 .../apache/struts2}/test/DataAware-validation.xml  |    0
 .../test/DataAware-validationAlias-validation.xml  |    0
 .../apache/struts2}/test/DataAware.properties      |    0
 .../apache/struts2}/test/DataAware2-validation.xml |    0
 .../apache/struts2}/test/Equidae-validation.xml    |    0
 .../struts2}/test/SimpleAction2-validation.xml     |    0
 .../SimpleAction2-validationAlias-validation.xml   |    0
 .../struts2/test/TestBean2-conversion.properties   |   19 +
 .../struts2}/test/User-conversion.properties       |    0
 .../apache/struts2}/test/User-validation.xml       |    0
 .../apache/struts2}/test/UserMarker-validation.xml |    0
 .../apache/struts2}/test/package.properties        |    0
 .../text}/DefaultTextProviderTest_en_CA.properties |    0
 .../text}/TextProviderSupportTest_en.properties    |    0
 .../apache/struts2}/util/Bar.properties            |    0
 .../apache/struts2/util/Cat-conversion.properties  |   20 +
 .../apache/struts2}/util/FindMe.properties         |    0
 .../apache/struts2/util/Foo-conversion.properties  |   30 +
 .../struts2}/util/ListHolder-conversion.properties |    0
 .../struts2}/util/LocalizedTextUtilTest.properties |    0
 .../util/MyBeanAction-conversion.properties        |   26 +
 .../struts2/util/Tiger-conversion.properties       |   19 +
 .../apache/struts2}/util/XW404_de.properties       |    0
 .../apache/struts2}/util/XW404_fr.properties       |    0
 .../struts2}/util/location/xml-with-location.xml   |    0
 ...ositeTextProviderTestResourceBundle1.properties |    0
 ...ositeTextProviderTestResourceBundle2.properties |    0
 .../VisitorValidatorModelAction-validation.xml     |    0
 ...atorTestAction-beanMessageBundle-validation.xml |    0
 ...alidatorTestAction-validateArray-validation.xml |    0
 ...ValidatorTestAction-validateList-validation.xml |    0
 .../VisitorValidatorTestAction-validation.xml      |    0
 ...estAction-visitorChildValidation-validation.xml |    0
 ...atorTestAction-visitorValidation-validation.xml |    0
 ...estAction-visitorValidationAlias-validation.xml |    0
 .../VisitorValidatorTestAction.properties          |    0
 .../struts2}/validator/validator-parser-test.xml   |    0
 .../struts2}/validator/validator-parser-test2.xml  |    0
 .../struts2}/validator/validator-parser-test3.xml  |    0
 .../struts2}/validator/validator-parser-test4.xml  |    0
 .../struts2}/validator/validator-parser-test5.xml  |    0
 .../struts2}/validator/validator-parser-test6.xml  |    0
 .../apache/struts2/validator/validators-fail.xml   |   41 +
 .../struts-object-factory-result-builder.xml       |    2 +-
 core/src/test/resources/struts-testing.xml         |    6 +-
 core/src/test/resources/struts.properties          |    2 +-
 core/src/test/resources/struts.xml                 |   24 +-
 .../src/test/resources/template/test/Component.ftl |   10 +-
 core/src/test/resources/template/test/text.ftl     |    2 +-
 core/src/test/resources/validators.xml             |   34 +-
 core/src/test/resources/xwork - jar.jar            |  Bin 2063 -> 902 bytes
 core/src/test/resources/xwork - zip.zip            |  Bin 2572 -> 664 bytes
 core/src/test/resources/xwork-jar.jar              |  Bin 2059 -> 898 bytes
 core/src/test/resources/xwork-proxyinvoke.xml      |   28 +-
 core/src/test/resources/xwork-sample.xml           |   68 +-
 core/src/test/resources/xwork-test-beans.xml       |    2 +-
 core/src/test/resources/xwork-test-default.xml     |   24 +-
 core/src/test/resources/xwork-test-validation.xml  |   26 +-
 core/src/test/resources/xwork-zip.zip              |  Bin 2564 -> 660 bytes
 jakarta/pom.xml                                    |   44 +
 jakarta/velocity-tools-jsp-jakarta/README.md       |    4 +
 jakarta/velocity-tools-jsp-jakarta/pom.xml         |   75 +
 jakarta/velocity-tools-view-jakarta/README.md      |    4 +
 jakarta/velocity-tools-view-jakarta/pom.xml        |   69 +
 plugins/async/pom.xml                              |    8 +-
 .../apache/struts2/async/DefaultAsyncManager.java  |   10 +-
 plugins/async/src/main/resources/struts-plugin.xml |    2 +-
 .../struts2/async/DefaultAsyncManagerTest.java     |    2 +-
 plugins/bean-validation/pom.xml                    |   16 +-
 .../beanvalidation/constraints/FieldMatch.java     |    4 +-
 .../constraints/ValidationGroup.java               |    2 +-
 .../constraints/impl/FieldMatchValidator.java      |    4 +-
 .../interceptor/BeanValidationInterceptor.java     |   22 +-
 .../interceptor/BeanValidationManager.java         |    2 +-
 .../interceptor/DefaultBeanValidationManager.java  |   12 +-
 .../src/main/resources/struts-plugin.xml           |    2 +-
 .../BeanValidationInterceptorTest.java             |    8 +-
 .../apache/struts/beanvalidation/VoidResult.java   |    4 +-
 .../struts/beanvalidation/actions/FieldAction.java |    2 +-
 .../actions/FieldActionDoExecute.java              |    4 +-
 .../beanvalidation/actions/FieldMatchAction.java   |    2 +-
 .../beanvalidation/actions/ModelDrivenAction.java  |    7 +-
 .../actions/ValidateGroupAction.java               |    7 +-
 .../constraints/impl/FieldMatchValidatorTest.java  |    2 +-
 .../struts/beanvalidation/models/Address.java      |    6 +-
 .../struts/beanvalidation/models/Person.java       |    8 +-
 plugins/cdi/pom.xml                                |   12 +-
 .../org/apache/struts2/cdi/CdiObjectFactory.java   |   12 +-
 plugins/cdi/src/main/resources/struts-plugin.xml   |    2 +-
 .../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 +-
 .../struts2/config_browser/ActionNamesAction.java  |    6 +-
 .../config_browser/ConfigurationHelper.java        |   14 +-
 .../config_browser/ListValidatorsAction.java       |   12 +-
 .../struts2/config_browser/ShowBeansAction.java    |   16 +-
 .../struts2/config_browser/ShowConfigAction.java   |    8 +-
 .../config_browser/ShowConstantsAction.java        |    4 +-
 .../struts2/config_browser/ShowJarsAction.java     |    2 +-
 .../config_browser/ShowValidatorAction.java        |   10 +-
 plugins/convention/pom.xml                         |    2 +-
 .../convention/AbstractActionNameBuilder.java      |    4 +-
 .../convention/ClasspathConfigurationProvider.java |   14 +-
 .../convention/ClasspathPackageProvider.java       |   10 +-
 .../convention/ConventionUnknownHandler.java       |   31 +-
 .../struts2/convention/ConventionsService.java     |    6 +-
 .../struts2/convention/ConventionsServiceImpl.java |   14 +-
 .../convention/DefaultActionNameBuilder.java       |    2 +-
 .../struts2/convention/DefaultClassFinder.java     |   12 +-
 .../convention/DefaultInterceptorMapBuilder.java   |   14 +-
 .../convention/DefaultResultMapBuilder.java        |   37 +-
 .../struts2/convention/InterceptorMapBuilder.java  |    4 +-
 .../PackageBasedActionConfigBuilder.java           |   56 +-
 .../struts2/convention/ResultMapBuilder.java       |    4 +-
 .../struts2/convention/SEOActionNameBuilder.java   |    2 +-
 .../org/apache/struts2/convention/StringTools.java |    2 +-
 .../convention/annotation/AllowedMethods.java      |    2 +-
 .../struts2/convention/annotation/Result.java      |    2 +-
 .../src/main/resources/struts-plugin.xml           |    6 +-
 .../src/test/java/actions/MessageAction.java       |    2 +-
 .../convention/ConventionUnknownHandlerTest.java   |   14 +-
 .../convention/DefaultResultMapBuilderTest.java    |   10 +-
 .../PackageBasedActionConfigBuilderTest.java       |   50 +-
 .../apache/struts2/convention/TestInterceptor.java |    4 +-
 .../apache/struts2/convention/actions/Skip.java    |    2 +-
 .../convention/actions/action/TestBase.java        |    2 +-
 .../SingleActionNameAction2.java                   |    4 +-
 .../struts2/convention/actions/idx/Index.java      |    2 +-
 .../struts2/convention/actions/idx/idx2/Index.java |    2 +-
 .../actions/result/InheritedResultTestBase.java    |    2 +-
 .../struts2/convention/actions/skip/Index.java     |    2 +-
 plugins/dwr/README.md                              |   10 -
 plugins/dwr/pom.xml                                |   44 -
 .../apache/struts2/validators/DWRValidator.java    |  118 -
 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   |   16 +-
 .../views/jasperreports/ValueStackDataSource.java  |    2 +-
 .../views/jasperreports/ValueStackShadowMap.java   |    2 +-
 .../jasperreports/JasperReportsResultTest.java     |   12 +-
 plugins/javatemplates/pom.xml                      |    2 +-
 .../struts2/views/java/JavaTemplateEngine.java     |    8 +-
 .../views/java/simple/AbstractTagHandler.java      |    4 +-
 .../views/java/simple/CheckboxListHandler.java     |    8 +-
 .../struts2/views/java/simple/RadioHandler.java    |    8 +-
 .../struts2/views/java/simple/SelectHandler.java   |    2 +-
 .../struts2/views/java/simple/AbstractTest.java    |   20 +-
 .../struts2/views/java/simple/AnchorTest.java      |    2 +-
 .../struts2/views/java/simple/CheckboxTest.java    |    2 +-
 .../struts2/views/java/simple/ScriptTest.java      |    2 +-
 .../struts2/views/java/simple/TokenTest.java       |    2 +-
 plugins/jfreechart/pom.xml                         |    2 +-
 .../org/apache/struts2/dispatcher/ChartResult.java |   16 +-
 .../apache/struts2/dispatcher/ChartResultTest.java |   14 +-
 plugins/json/pom.xml                               |   14 +-
 .../org/apache/struts2/json/DefaultJSONWriter.java |    8 +-
 .../struts2/json/JSONActionRedirectResult.java     |    4 +-
 .../java/org/apache/struts2/json/JSONCleaner.java  |    6 +-
 .../org/apache/struts2/json/JSONInterceptor.java   |   40 +-
 .../java/org/apache/struts2/json/JSONResult.java   |   16 +-
 .../java/org/apache/struts2/json/JSONUtil.java     |   34 +-
 .../struts2/json/JSONValidationInterceptor.java    |   18 +-
 .../apache/struts2/json/SerializationParams.java   |    2 +-
 .../org/apache/struts2/json/smd/SMDGenerator.java  |    6 +-
 .../struts2/json/JSONActionRedirectResultTest.java |   10 +-
 .../apache/struts2/json/JSONInterceptorTest.java   |    6 +-
 .../org/apache/struts2/json/JSONResultTest.java    |   10 +-
 .../json/JSONValidationInterceptorTest.java        |   22 +-
 .../struts2/json/StrutsMockHttpServletRequest.java |    6 +-
 .../json/StrutsMockHttpServletResponse.java        |    6 +-
 .../apache/struts2/json/StrutsMockHttpSession.java |    2 +-
 .../struts2/json/StrutsMockServletContext.java     |   40 +-
 .../java/org/apache/struts2/json/TestAction.java   |    4 +-
 plugins/junit/pom.xml                              |    2 +-
 .../apache/struts2/junit/StrutsJUnit4TestCase.java |   24 +-
 .../apache/struts2/junit/StrutsRestTestCase.java   |   12 +-
 .../org/apache/struts2/junit/StrutsTestCase.java   |   17 +-
 .../apache/struts2/junit/XWorkJUnit4TestCase.java  |    2 +-
 .../org/apache/struts2/junit/XWorkTestCase.java    |   22 -
 .../org/apache/struts2/junit/JUnitTestAction.java  |    2 +-
 .../struts2/junit/StrutsJUnit4TestCaseTest.java    |    2 +-
 .../junit/StrutsSpringJUnit4TestCaseTest.java      |    6 +-
 .../apache/struts2/junit/StrutsTestCaseTest.java   |    6 +-
 .../struts2/junit/session/SessionGetAction.java    |    2 +-
 .../struts2/junit/session/SessionSetAction.java    |    4 +-
 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    |  357 --
 .../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     |  362 --
 .../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       |   72 -
 .../struts2/oval/interceptor/MemberObject.java     |   36 -
 .../oval/interceptor/ModelDrivenAction.java        |   38 -
 .../interceptor/OValValidationInterceptorTest.java |  322 --
 .../struts2/oval/interceptor/SimpleField.java      |   60 -
 .../struts2/oval/interceptor/SimpleFieldI18n.java  |   39 -
 .../interceptor/SimpleFieldI18nDefaultKey.java     |   37 -
 .../interceptor/SimpleFieldJPAAnnotations.java     |   38 -
 .../interceptor/SimpleFieldOGNLExpression.java     |   38 -
 .../struts2/oval/interceptor/SimpleFieldsXML.java  |   48 -
 .../oval/interceptor/SimpleFieldsXMLChild.java     |   34 -
 .../struts2/oval/interceptor/SimpleMethod.java     |   41 -
 .../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 |  165 -
 .../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                                    |   22 +-
 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     |  213 -
 .../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/PortletContextAware.java   |   32 -
 .../interceptor/PortletPreferencesAware.java       |   32 -
 .../portlet/interceptor/PortletPrincipalProxy.java |   80 -
 .../portlet/interceptor/PortletRequestAware.java   |   32 -
 .../portlet/interceptor/PortletResponseAware.java  |   32 -
 .../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      |  294 --
 .../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 |  220 -
 .../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                               |    4 +-
 .../struts2/rest/ContentTypeHandlerManager.java    |   26 +-
 .../struts2/rest/ContentTypeInterceptor.java       |    8 +-
 .../rest/DefaultContentTypeHandlerManager.java     |   26 +-
 .../apache/struts2/rest/DefaultHttpHeaders.java    |    8 +-
 .../java/org/apache/struts2/rest/HttpHeaders.java  |    4 +-
 .../apache/struts2/rest/RestActionInvocation.java  |   24 +-
 .../org/apache/struts2/rest/RestActionMapper.java  |   46 +-
 .../struts2/rest/RestActionProxyFactory.java       |    8 +-
 .../org/apache/struts2/rest/RestActionSupport.java |   34 +-
 .../struts2/rest/RestWorkflowInterceptor.java      |   16 +-
 .../rest/handler/AbstractContentTypeHandler.java   |   20 -
 .../struts2/rest/handler/ContentTypeHandler.java   |   33 +-
 .../rest/handler/FormUrlEncodedHandler.java        |   10 +-
 .../apache/struts2/rest/handler/HtmlHandler.java   |    8 +-
 .../struts2/rest/handler/JacksonJsonHandler.java   |   10 +-
 .../struts2/rest/handler/JacksonXmlHandler.java    |   10 +-
 .../struts2/rest/handler/JuneauXmlHandler.java     |    8 +-
 .../rest/handler/MultipartFormDataHandler.java     |   12 +-
 .../struts2/rest/handler/XStreamHandler.java       |   10 +-
 plugins/rest/src/main/resources/struts-plugin.xml  |    4 +-
 .../rest/ContentTypeHandlerManagerTest.java        |   20 +-
 .../struts2/rest/ContentTypeInterceptorTest.java   |    8 +-
 .../rest/DefaultContentTypeHandlerManagerTest.java |   11 +-
 .../struts2/rest/DefaultHttpHeadersTest.java       |    2 +-
 .../struts2/rest/RestActionInvocationTest.java     |   38 +-
 .../apache/struts2/rest/RestActionMapperTest.java  |   22 +-
 .../struts2/rest/RestWorkflowInterceptorTest.java  |    8 +-
 .../rest/handler/JacksonJsonHandlerTest.java       |    2 +-
 .../rest/handler/JacksonXmlHandlerTest.java        |    8 +-
 .../struts2/rest/handler/JuneauXmlHandlerTest.java |    9 +-
 .../struts2/rest/handler/XStreamHandlerTest.java   |   10 +-
 plugins/sitemesh/README.md                         |    2 -
 plugins/sitemesh/pom.xml                           |   51 -
 .../sitemesh/FreemarkerDecoratorServlet.java       |  337 --
 .../FreemarkerMapper2DecoratorSelector.java        |   56 -
 .../struts2/sitemesh/FreemarkerPageFilter.java     |   65 -
 .../struts2/sitemesh/NoneDecoratorMapper.java      |   39 -
 .../sitemesh/OldDecorator2NewStrutsDecorator.java  |  204 -
 .../OldDecorator2NewStrutsFreemarkerDecorator.java |  101 -
 .../OldDecorator2NewStrutsVelocityDecorator.java   |  110 -
 .../struts2/sitemesh/StrutsSiteMeshFactory.java    |   55 -
 .../struts2/sitemesh/VelocityDecoratorServlet.java |  200 -
 .../sitemesh/VelocityMapper2DecoratorSelector.java |   58 -
 .../struts2/sitemesh/VelocityPageFilter.java       |   65 -
 plugins/sitemesh/src/main/resources/LICENSE.txt    |  174 -
 plugins/sitemesh/src/main/resources/NOTICE.txt     |    8 -
 .../src/main/resources/SITEMESH-LICENSE.txt        |   51 -
 .../sitemesh/src/main/resources/struts-plugin.xml  |   30 -
 plugins/sitemesh/src/site/site.xml                 |   56 -
 plugins/spring/pom.xml                             |    2 +-
 .../xwork2/spring/SpringObjectFactory.java         |  291 --
 .../spring/SpringProxyableObjectFactory.java       |   94 -
 .../interceptor/ActionAutowiringInterceptor.java   |  142 -
 .../ClassReloadingXMLWebApplicationContext.java    |    8 +-
 .../apache/struts2/spring/SpringObjectFactory.java |  290 ++
 .../spring/SpringProxyableObjectFactory.java       |   94 +
 .../struts2/spring/StrutsSpringObjectFactory.java  |   12 +-
 .../interceptor/ActionAutowiringInterceptor.java   |  142 +
 .../spring/src/main/resources/struts-plugin.xml    |   21 +-
 .../com/opensymphony/xwork2/ModelDrivenAction.java |   51 -
 .../java/com/opensymphony/xwork2/SimpleAction.java |  284 --
 .../java/com/opensymphony/xwork2/TestBean.java     |   75 -
 .../com/opensymphony/xwork2/TestChildBean.java     |   65 -
 .../java/com/opensymphony/xwork2/TestSubBean.java  |   32 -
 .../xwork2/mock/DummyTextProvider.java             |   87 -
 .../xwork2/ognl/SecurityMemberAccessProxyTest.java |   90 -
 .../xwork2/spring/ActionsFromSpringTest.java       |  152 -
 .../xwork2/spring/ExecuteInterceptor.java          |   36 -
 .../xwork2/spring/SpringObjectFactoryTest.java     |  409 --
 .../xwork2/spring/SpringProxyUtilTest.java         |  121 -
 .../opensymphony/xwork2/spring/SpringResult.java   |   54 -
 .../com/opensymphony/xwork2/spring/TestAspect.java |   69 -
 .../ActionAutowiringInterceptorTest.java           |  131 -
 .../spring/interceptor/TestActionInvocation.java   |   89 -
 .../com/test/SecurityMemberAccessProxyTest.java    |   22 -
 .../java/org/apache/struts2/ModelDrivenAction.java |   51 +
 .../test/java/org/apache/struts2/SimpleAction.java |  287 ++
 .../src/test/java/org/apache/struts2/TestBean.java |   75 +
 .../java/org/apache/struts2/TestChildBean.java     |   65 +
 .../test/java/org/apache/struts2/TestSubBean.java  |   32 +
 .../org/apache/struts2/mock/DummyTextProvider.java |   87 +
 .../ognl/SecurityMemberAccessProxyTest.java        |   90 +
 .../struts2/spring/ActionsFromSpringTest.java      |  152 +
 .../apache/struts2/spring/ExecuteInterceptor.java  |   36 +
 .../struts2/spring/SpringObjectFactoryTest.java    |  409 ++
 .../apache/struts2/spring/SpringProxyUtilTest.java |  121 +
 .../org/apache/struts2/spring/SpringResult.java    |   54 +
 .../spring/StrutsSpringObjectFactoryTest.java      |    8 +-
 .../java/org/apache/struts2/spring/TestAspect.java |   69 +
 .../ActionAutowiringInterceptorTest.java           |  131 +
 .../spring/interceptor/TestActionInvocation.java   |   93 +
 .../xwork2/spring/actionContext-spring.xml         |   95 -
 .../xwork2/spring/actionContext-xwork.xml          |   70 -
 .../xwork2/spring/emptyContext-spring.xml          |   25 -
 .../apache/struts2/spring/actionContext-spring.xml |  111 +
 .../apache/struts2/spring/actionContext-xwork.xml  |   68 +
 ...licationContext.xml => emptyContext-spring.xml} |    0
 plugins/testng/pom.xml                             |    2 +-
 .../org/apache/struts2/testng/StrutsTestCase.java  |   64 -
 .../struts2/testng/TestNGStrutsTestCase.java       |   64 +
 .../apache/struts2/testng/TestNGXWorkTestCase.java |   14 +-
 .../struts2/testng/TestNGStrutsTestCaseTest.java   |    7 +-
 .../struts2/testng/TestNGXWorkTestCaseTest.java    |    2 +-
 plugins/tiles/pom.xml                              |   15 +-
 .../struts2/tiles/I18NAttributeEvaluator.java      |   10 +-
 .../struts2/tiles/StrutsAttributeEvaluator.java    |    8 +-
 .../tiles/StrutsFreeMarkerAttributeRenderer.java   |   12 +-
 .../struts2/tiles/StrutsPreparerFactory.java       |    4 +-
 .../struts2/tiles/StrutsTilesContainerFactory.java |   26 +-
 .../struts2/tiles/StrutsTilesInitializer.java      |    2 +-
 .../struts2/tiles/StrutsTilesLocaleResolver.java   |    8 +-
 .../StrutsWildcardServletApplicationContext.java   |    8 +-
 .../apache/struts2/views/tiles/TilesResult.java    |    8 +-
 .../main/java/org/apache/tiles/api/Attribute.java  |    2 +-
 .../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      |    6 +-
 .../request/freemarker/FreemarkerRequestUtil.java  |    6 +-
 .../servlet/WebappClassTemplateLoader.java         |    4 +-
 .../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 +-
 .../velocity/render/VelocityRendererBuilder.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       |   13 +-
 .../org/apache/tiles/autotag/jsp/bodyTag.vm        |    4 +-
 .../tiles/StrutsTilesContainerFactoryTest.java     |    3 +-
 ...trutsWildcardServletApplicationContextTest.java |    3 +-
 .../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                           |   13 +-
 .../views/velocity/StrutsResourceLoader.java       |    2 +-
 .../views/velocity/StrutsVelocityContext.java      |   20 +-
 .../views/velocity/StrutsVelocityManager.java      |  402 ++
 .../velocity/VelocityBeanSelectionProvider.java    |    8 +-
 .../struts2/views/velocity/VelocityManager.java    |  466 +--
 .../views/velocity/VelocityManagerInterface.java   |   39 -
 .../struts2/views/velocity/VelocityStrutsUtil.java |    6 +-
 .../struts2/views/velocity/VelocityTagLibrary.java |    8 -
 .../struts2/views/velocity/VelocityTools.java      |   59 +
 .../velocity/components/AbstractDirective.java     |   20 +-
 .../views/velocity/components/ActionDirective.java |    6 +-
 .../velocity/components/ActionErrorDirective.java  |    6 +-
 .../components/ActionMessageDirective.java         |    6 +-
 .../views/velocity/components/AnchorDirective.java |    6 +-
 .../views/velocity/components/BeanDirective.java   |    6 +-
 .../velocity/components/CheckBoxDirective.java     |    6 +-
 .../velocity/components/CheckBoxListDirective.java |    6 +-
 .../velocity/components/ComboBoxDirective.java     |    6 +-
 .../velocity/components/ComponentDirective.java    |    6 +-
 .../views/velocity/components/DateDirective.java   |    6 +-
 .../velocity/components/DoubleSelectDirective.java |    6 +-
 .../velocity/components/FieldErrorDirective.java   |    6 +-
 .../views/velocity/components/FileDirective.java   |    6 +-
 .../views/velocity/components/FormDirective.java   |    6 +-
 .../views/velocity/components/HeadDirective.java   |    6 +-
 .../views/velocity/components/HiddenDirective.java |    6 +-
 .../views/velocity/components/I18nDirective.java   |    6 +-
 .../velocity/components/IncludeDirective.java      |    6 +-
 .../components/InputTransferSelectDirective.java   |    6 +-
 .../views/velocity/components/LabelDirective.java  |    6 +-
 .../velocity/components/OptGroupDirective.java     |    6 +-
 .../components/OptionTransferSelectDirective.java  |    6 +-
 .../views/velocity/components/ParamDirective.java  |    6 +-
 .../velocity/components/PasswordDirective.java     |    6 +-
 .../velocity/components/PropertyDirective.java     |    6 +-
 .../views/velocity/components/PushDirective.java   |    6 +-
 .../views/velocity/components/RadioDirective.java  |    6 +-
 .../views/velocity/components/ResetDirective.java  |    6 +-
 .../views/velocity/components/SelectDirective.java |    6 +-
 .../views/velocity/components/SetDirective.java    |    6 +-
 .../views/velocity/components/SubmitDirective.java |    6 +-
 .../velocity/components/TextAreaDirective.java     |    6 +-
 .../views/velocity/components/TextDirective.java   |    6 +-
 .../velocity/components/TextFieldDirective.java    |    6 +-
 .../views/velocity/components/TokenDirective.java  |    6 +-
 .../views/velocity/components/URLDirective.java    |    6 +-
 .../velocity/components/UpDownSelectDirective.java |    6 +-
 .../views/velocity/result/VelocityResult.java      |   47 +-
 .../velocity/template/VelocityTemplateEngine.java  |   21 +-
 .../velocity/src/main/resources/struts-plugin.xml  |    7 +-
 .../views/velocity/StrutsVelocityContextTest.java  |    2 +-
 .../views/velocity/StrutsVelocityManagerTest.java  |  158 +
 .../views/velocity/VelocityManagerTest.java        |  114 -
 .../views/velocity/result/VelocityResultTest.java  |    8 +-
 .../template/VelocityTemplateEngineTest.java       |    4 +-
 .../resources/WEB-INF/webinf-velocity.properties   |   20 +
 .../src/test/resources/test-velocity.properties    |   20 +
 plugins/xslt/pom.xml                               |    2 +-
 .../struts2/result/xslt/ServletURIResolver.java    |    2 +-
 .../apache/struts2/result/xslt/StringAdapter.java  |    2 +-
 .../org/apache/struts2/result/xslt/XSLTResult.java |   12 +-
 .../apache/struts2/result/xslt/XSLTResultTest.java |   14 +-
 .../xslt/src/test/resources/XSLTResultTest-val.xml |   26 +-
 pom.xml                                            |  295 +-
 src/etc/project-suppression.xml                    |   30 -
 2976 files changed, 93251 insertions(+), 194025 deletions(-)
 delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/decorators.xml
 delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
 delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
 delete mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
 create mode 100644 apps/showcase/src/main/webapp/WEB-INF/sitemesh3.xml
 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
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/Action.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionChainResult.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionEventListener.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionInvocation.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionProxy.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionProxyFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/AsyncManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultLocaleProviderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/FileManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/FileManagerFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/LocaleProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/LocaleProviderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/LocalizedTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ModelDriven.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/Preparable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ResourceBundleTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/Result.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/StrutsTextProviderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/TextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/TextProviderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/Unchainable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/Validateable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ValidationAwareSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/XWorkJUnit4TestCase.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/XWorkTestCase.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/BeanSelectionProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/Configuration.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ConfigurationException.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ConfigurationManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ConfigurationUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ContainerProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/FileManagerFactoryProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/FileManagerProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/PackageProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/ServletContextAwareConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorListHolder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorLocator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorMapping.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/Parameterizable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/AbstractMatcher.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/package.html
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/CycleDetector.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/DirectedGraph.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/ValueSubstitutor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/ConversionAnnotationProcessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/ConversionFileProcessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/ConversionPropertiesProcessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterCreator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverterHolder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/ArrayConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/ConversionData.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionAnnotationProcessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultConversionFileProcessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/StringConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/ActionFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/ConverterFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/DefaultActionFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/DefaultInterceptorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/DefaultResultFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/DefaultUnknownHandlerFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/DefaultValidatorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/InterceptorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/ResultFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/StrutsConverterFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/UnknownHandlerFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/factory/ValidatorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Container.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Context.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/EarlyInitializable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Factory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Initializable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/InitializableFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Inject.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Key.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Scope.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/package-info.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/AbstractInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/AliasInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ConditionalInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/Interceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/LoggingInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterValueAware.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/PreResultListener.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDriven.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationAware.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationErrorAware.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/ValidationWorkflowAware.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/WithLazyParams.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/After.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Allowed.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Before.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BeforeResult.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/BlockByDefault.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/Blocked.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/InputConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockActionInvocation.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockActionProxy.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockContainer.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockObjectTypeDeterminer.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/mock/MockResult.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/BeanInfoCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlBeanInfoCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/DefaultOgnlExpressionCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/ErrorMessageBuilder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/ExpressionCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/ObjectProxy.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCache.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCacheFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlCaffeineCache.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlDefaultCache.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlLRUCache.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlNullHandlerWrapper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlTypeConverterWrapper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/XWorkTypeConverterWrapper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/CompoundRootAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/HttpParametersPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ObjectProxyPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/ParameterPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/RootAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkCollectionPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkEnumerationAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkIteratorPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkMethodAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkObjectPropertyAccessor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/result/ParamNameAwareResult.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/AcceptedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/ExcludedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/security/NotExcludedAcceptedPatternsChecker.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/test/StubConfigurationProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/AbstractLocalizedTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/AnnotationUtils.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ClassPathFinder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ClearableValueStack.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ConfigParseUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/CreateIfNull.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/DebugUtils.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/DomHelper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/Element.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/Evaluated.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/GlobalLocalizedTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/Key.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/KeyProperty.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/MemberAccessValueStack.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/OgnlTextParser.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/PatternMatcher.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/PropertiesReader.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ProxyUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ResolverUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/TextParseUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/TextParser.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/ValueStackFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/WildcardHelper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/XWorkTestCaseHelper.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/AbstractResourceStore.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/FileResourceStore.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/JarResourceStore.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/ReloadingClassLoader.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStore.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/classloader/ResourceStoreClassLoader.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/ClassFinderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterface.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/ClassLoaderInterfaceDelegate.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/Test.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/FileRevision.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/Revision.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/fs/StrutsJarURLConnection.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/Locatable.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/LocatableProperties.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/Located.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/Location.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/LocationAttributes.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/LocationImpl.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/location/LocationUtils.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextState.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionException.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionExceptionHandler.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProvider.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ActionValidatorManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilder.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParser.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/FieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ShortCircuitableValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidationException.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/Validator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidatorConfig.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidatorContext.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFactory.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/ValidatorFileParser.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConditionalVisitorFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ConversionErrorFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/CreditCardValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/CustomValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/DateRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/DoubleRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/EmailValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ExpressionValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/FieldExpressionValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/IntRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/LongRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/RegexFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/RequiredStringValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ShortRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/StringLengthFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/UrlValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidationParameter.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/Validations.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/ValidatorType.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/annotations/VisitorFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/ConversionErrorFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/CreditCardValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/DoubleRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/ExpressionValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldExpressionValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/FieldValidatorSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/RangeValidatorSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/RegexFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/StringLengthFieldValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/URLValidator.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/ValidatorSupport.java
 delete mode 100644 core/src/main/java/com/opensymphony/xwork2/validator/validators/VisitorFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/ActionProxyFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/AsyncManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
 create mode 100644 core/src/main/java/org/apache/struts2/DefaultActionProxy.java
 create mode 100644 core/src/main/java/org/apache/struts2/DefaultActionProxyFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/FileManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/FileManagerFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ObjectFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/UnknownHandler.java
 create mode 100644 core/src/main/java/org/apache/struts2/UnknownHandlerManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/ValidationAwareSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/XWorkJUnit4TestCase.java
 create mode 100644 core/src/main/java/org/apache/struts2/XWorkTestCase.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/Configuration.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ConfigurationException.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ConfigurationManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ConfigurationUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ContainerProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/FileManagerFactoryProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/FileManagerProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/PackageProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/RuntimeConfiguration.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/ServletContextAwareConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/ActionConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/AllowedMethods.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/ExceptionMappingConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/InterceptorConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/InterceptorListHolder.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/InterceptorLocator.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/InterceptorMapping.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/InterceptorStackConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/PackageConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/Parameterizable.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/ResultConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/ResultTypeConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/entities/UnknownHandlerConfig.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/entities/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/AbstractMatcher.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/ActionConfigMatcher.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/DefaultConfiguration.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/LocatableConstantFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/LocatableFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/MockConfiguration.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/NamespaceMatch.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/impl/NamespaceMatcher.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/impl/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/CycleDetector.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/DirectedGraph.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/EnvsValueSubstitutor.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/InterceptorBuilder.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/StrutsDefaultConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/ValueSubstitutor.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/XmlConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/XmlDocConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/config/providers/XmlHelper.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/ConversionAnnotationProcessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/ConversionFileProcessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/ConversionPropertiesProcessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/NullHandler.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/ObjectTypeDeterminer.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/TypeConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/TypeConverterCreator.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/TypeConverterHolder.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/annotations/Conversion.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/annotations/ConversionRule.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/annotations/ConversionType.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/annotations/TypeConversion.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/annotations/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/ArrayConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/CollectionConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/ConversionData.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/DateConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionAnnotationProcessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/DefaultConversionFileProcessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/DefaultObjectTypeDeterminer.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/DefaultTypeConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/InstantiatingNullHandler.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/NumberConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/StringConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/XWorkBasicConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/XWorkConverter.java
 create mode 100644 core/src/main/java/org/apache/struts2/conversion/impl/XWorkList.java
 create mode 100644 core/src/main/java/org/apache/struts2/dispatcher/MockDispatcher.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/ActionFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/ConverterFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/DefaultActionFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/DefaultInterceptorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/DefaultUnknownHandlerFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/DefaultValidatorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/InterceptorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/ResultFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/StrutsConverterFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/UnknownHandlerFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/factory/ValidatorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/ConstructionContext.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Container.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/ContainerBuilder.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/ContainerImpl.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Context.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/DependencyException.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/EarlyInitializable.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/ExternalContext.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Factory.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Initializable.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/InitializableFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Inject.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/InternalContext.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/InternalFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Key.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Scope.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/Scoped.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/package-info.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/FinalizablePhantomReference.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/FinalizableReference.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/FinalizableReferenceQueue.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/FinalizableSoftReference.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/FinalizableWeakReference.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/Function.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/ReferenceCache.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/ReferenceMap.java
 create mode 100644 core/src/main/java/org/apache/struts2/inject/util/ReferenceType.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/inject/util/package.html (100%)
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ApplicationAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/ExceptionHolder.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/HttpParametersAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/PrefixMethodInvocationUtil.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/PrincipalAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/RequestAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ServletRequestAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ServletResponseAware.java
 delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/SessionAware.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/WithLazyParams.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/annotations/After.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptor.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/annotations/Before.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/annotations/BeforeResult.java
 create mode 100644 core/src/main/java/org/apache/struts2/interceptor/annotations/InputConfig.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/annotations/package.html (100%)
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/interceptor/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/locale/DefaultLocaleProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/locale/DefaultLocaleProviderFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/locale/LocaleProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/locale/LocaleProviderFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockActionProxy.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockContainer.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockInterceptor.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockObjectTypeDeterminer.java
 create mode 100644 core/src/main/java/org/apache/struts2/mock/MockResult.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/mock/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/BeanInfoCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/DefaultOgnlBeanInfoCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/DefaultOgnlCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/DefaultOgnlExpressionCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/ErrorMessageBuilder.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/ExpressionCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/ObjectProxy.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlCache.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlCacheFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlCaffeineCache.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlDefaultCache.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlLRUCache.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlNullHandlerWrapper.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlReflectionContextFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlReflectionProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlTypeConverterWrapper.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlValueStack.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/OgnlValueStackFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/SecurityMemberAccess.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/XWorkTypeConverterWrapper.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/CompoundRootAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/HttpParametersPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/ObjectAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/ObjectProxyPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/ParameterPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/RootAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkCollectionPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkEnumerationAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkIteratorPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkListPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMapPropertyAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkMethodAccessor.java
 create mode 100644 core/src/main/java/org/apache/struts2/ognl/accessor/XWorkObjectPropertyAccessor.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/AcceptedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/DefaultAcceptedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/DefaultExcludedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/DefaultNotExcludedAcceptedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/ExcludedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/security/NotExcludedAcceptedPatternsChecker.java
 create mode 100644 core/src/main/java/org/apache/struts2/test/StubConfigurationProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/AbstractLocalizedTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/CompositeTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/DefaultTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/GlobalLocalizedTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/LocalizedTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/ResourceBundleTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/StrutsLocalizedTextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/StrutsTextProviderFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/TextProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/TextProviderFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/text/TextProviderSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/AnnotationUtils.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ClassLoaderUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ClassPathFinder.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ClearableValueStack.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/CompoundRoot.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ConfigParseUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/CreateIfNull.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/DebugUtils.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/DomHelper.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/Element.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/Evaluated.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/Key.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/KeyProperty.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/MemberAccessValueStack.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/NamedVariablePatternMatcher.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/OgnlTextParser.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/PatternMatcher.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/PropertiesReader.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ProxyUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ResolverUtil.java
 delete mode 100644 core/src/main/java/org/apache/struts2/util/ServletContextAware.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/TextParseUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/TextParser.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/ValueStackFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/WildcardHelper.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/WildcardUtil.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/XWorkTestCaseHelper.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/AbstractResourceStore.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/FileResourceStore.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/JarResourceStore.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/ReloadingClassLoader.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/ResourceStore.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/classloader/ResourceStoreClassLoader.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/ClassFinder.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/ClassFinderFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterface.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/ClassLoaderInterfaceDelegate.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/ResourceFinder.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/Test.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/finder/UrlSet.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/DefaultFileManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/DefaultFileManagerFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/FileRevision.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/JarEntryRevision.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/Revision.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/fs/StrutsJarURLConnection.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/Locatable.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/LocatableProperties.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/Located.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/Location.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/LocationAttributes.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/LocationImpl.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/location/LocationUtils.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/package.html (100%)
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/util/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/reflection/ReflectionContextState.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/reflection/ReflectionException.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/reflection/ReflectionExceptionHandler.java
 create mode 100644 core/src/main/java/org/apache/struts2/util/reflection/ReflectionProvider.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ActionValidatorManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/AnnotationActionValidatorManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/AnnotationValidationConfigurationBuilder.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/DefaultActionValidatorManager.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/DefaultValidatorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/DefaultValidatorFileParser.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/DelegatingValidatorContext.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/FieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ShortCircuitableValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidationException.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/Validator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidatorConfig.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidatorContext.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidatorFactory.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/ValidatorFileParser.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ConditionalVisitorFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ConversionErrorFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/CreditCardValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/CustomValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/DateRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/DoubleRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/EmailValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ExpressionValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/FieldExpressionValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/IntRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/LongRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/RegexFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/RequiredFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/RequiredStringValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ShortRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/StringLengthFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/UrlValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ValidationParameter.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/Validations.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/ValidatorType.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/annotations/VisitorFieldValidator.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/annotations/package.html (100%)
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/package.html (100%)
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/ConditionalVisitorFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/ConversionErrorFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/CreditCardValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/DateRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/DoubleRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/EmailValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/ExpressionValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/FieldExpressionValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/FieldValidatorSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/IntRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/LongRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/RangeValidatorSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/RegexFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/RequiredFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/RequiredStringValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/ShortRangeFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/StringLengthFieldValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/URLValidator.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/ValidatorSupport.java
 create mode 100644 core/src/main/java/org/apache/struts2/validator/validators/VisitorFieldValidator.java
 rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validators/package.html (100%)
 delete mode 100644 core/src/main/resources/com/opensymphony/xwork2/validator/validators/default.xml
 create mode 100644 core/src/main/resources/org/apache/struts2/validator/validators/default.xml
 rename core/src/main/resources/{com/opensymphony/xwork2 => org/apache/struts2}/xwork-messages.properties (100%)
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionChainResultTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionContextThreadLocalTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionNestingTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/AnnotatedTestBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultLocaleProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/DefaultUnknownHandlerManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/Foo.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/GenericsBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/LocaleProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/NestedAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ObjectFactoryTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/StubTextProvider.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/TestBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/TestChildBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/VoidResult.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/impl/AbstractMatcherTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/EnvsValueSubstitutorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInvalidFileTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderMultilevelTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderPackagesTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultTypesTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderResultsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/ConversionTestAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/AnnotationXWorkConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/DateConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooBarConverter.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/FooNumberConverter.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandlerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/ParentClass.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/StringConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/inject/ContainerImplTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/inject/EarlyInitializableBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/inject/InitializableBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/AliasInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ChainingInterceptorWithConfigTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/MethodFilterInterceptorUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ParameterRemoverInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/PreResultListenerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/PrefixMethodInvocationUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ScopedModelDrivenInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationErrorAwareTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AllowingByDefaultModel.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotatedAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BaseAnnotatedAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/BlockingByDefaultModel.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/InterfaceAnnotatedAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/ShortcircuitedAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/mock/DummyTextProvider.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/mock/InjectableAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/mock/MockLazyInterceptor.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/MyCustomMap.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilStrutsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/SetPropertiesTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkMapPropertyAccessorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/security/DefaultAcceptedPatternsCheckerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/security/DefaultNotExcludedAcceptedPatternsCheckerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/AnnotationDataAware2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/AnnotationTestBean2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/AnnotationUser.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/AnnotationUserMarker.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/DataAware.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/DataAware2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/Equidae.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/SimpleAction2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/SimpleAction3.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/SimpleAnnotationAction3.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/TestArrayBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/TestBean2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/User.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/UserMarker.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/Address.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/AddressTypeConverter.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/Person.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonActionTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/PersonTypeConverter.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/annotations/ValidateAnnotatedMethodOnlyAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Animal.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/AnnotatedCat.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/AnnotationUtilsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Bar.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/BarJunior.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Cat.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/ClassPathFinderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/DefaultFileManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Dog.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/DomHelperTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/DummyObjectFactory.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Foo.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/FurColor.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/GetPropertiesTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Indexed.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/ListHolder.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/MyBean.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/MyBeanAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/MyBeanActionTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/MyNumber.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcherTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Owner.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/ResolverUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/StrutsLocalizedTextProviderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/TextParseUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/Tiger.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/UnknownHandlerManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/UrlUtilTest2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/WildcardHelperTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/WildcardUtilTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy2Class.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/Dummy3Class.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClass.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/DummyClassExt.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/MyAnnotation2.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/package-info.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/pkg1/AbstractAbstractDummyAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/pkg1/AbstractDummyAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/pkg2/Package2DummyInterface.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/annotation/pkg2/package-info.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/fs/JarEntryRevisionTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/location/LocationAttributesTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/location/LocationImplTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/location/LocationUtilsTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ActionValidatorManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationConfigurationBuilderTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/AnnotationValidationExpAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ConversionErrorFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DateRangeValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManagerTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFactoryTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/DummyValidatorContext.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ExpressionValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/IntRangeValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/LongRangeValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ModelDrivenValidationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/MyValidator.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/RegexFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ShortRangeValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/StringLengthFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/StringValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorModelTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/VisitorFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorTestAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/AppendingValidatorContextTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/CreditCardValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/DateRangeFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/IntRangeFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/LongRangeFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/RequiredStringValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/ShortRangeFieldValidatorTest.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidationAction.java
 delete mode 100644 core/src/test/java/com/opensymphony/xwork2/validator/validators/ValidatorSupportTest.java
 delete mode 100644 core/src/test/java/com/test/ExternalSecurityMemberAccess.java
 delete mode 100644 core/src/test/java/com/test/ExternalSecurityMemberAccessTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionChainResultTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionContextTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionContextThreadLocalTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionInvocationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionNestingTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ActionSupportTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/AnnotatedTestBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/ChainResultTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/DefaultActionProxyTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/DefaultClasstTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/DefaultUnknownHandlerManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ExternalReferenceAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/Foo.java
 create mode 100644 core/src/test/java/org/apache/struts2/GenericsBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/LocaleAwareTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/LocaleProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ModelDrivenAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/ModelDrivenAnnotationAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/NestedAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/ObjectFactoryTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ProxyInvocationAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/ProxyInvocationInterface.java
 create mode 100644 core/src/test/java/org/apache/struts2/ProxyInvocationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ProxyObjectFactory.java
 create mode 100644 core/src/test/java/org/apache/struts2/SimpleAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/SimpleAnnotationAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/SimpleFooAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/StubValueStack.java
 create mode 100644 core/src/test/java/org/apache/struts2/TestBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/TestChildBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/UnknownHandlerManagerMock.java
 create mode 100644 core/src/test/java/org/apache/struts2/UserSpecifiedDefaultAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/ValidationOrderAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/VoidResult.java
 create mode 100644 core/src/test/java/org/apache/struts2/WildCardResultTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/ConfigurationManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/ConfigurationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/entities/ActionConfigTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/entities/AllowedMethodsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/entities/PackageConfigTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/impl/AbstractMatcherTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/impl/ActionConfigMatcherTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/impl/NamespaceMatcherTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/ConfigurationTestBase.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/EnvsValueSubstitutorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/InterceptorBuilderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/InterceptorForTestPurpose.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/MockConfigurationProvider.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/NoNoArgsConstructorAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/PrivateConstructorAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderActionsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderEnvsSubstitutionTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderInterceptorsSpringTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderInterceptorsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderInvalidFileTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderMultilevelTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderPackagesTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultTypesTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderResultsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderUnknownHandlerStackTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlConfigurationProviderWildCardIncludeTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/config/providers/XmlHelperTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/ConversionTestAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/AnnotationXWorkConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/DateConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/FooBarConverter.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/FooNumberConverter.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/InstantiatingNullHandlerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/NumberConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/ParentClass.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/StringConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/XWorkBasicConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/XWorkConverterTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/conversion/impl/XWorkListTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequestTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/inject/ContainerImplTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/inject/EarlyInitializableBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/inject/InitializableBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/AliasInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ChainingInterceptorWithConfigTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ConversionErrorInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/DefaultWorkflowInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ExceptionMappingInterceptorTest.java
 delete mode 100644 core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/MethodFilterInterceptorUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ModelDrivenInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ParameterRemoverInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/PreResultListenerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/PrefixMethodInvocationUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/PrepareInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ScopedModelDrivenInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/StaticParametersInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ValidationErrorAwareTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/ValidationInterceptorPrefixMethodInvocationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotatedAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/annotations/AnnotationWorkflowInterceptorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/annotations/BaseAnnotatedAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/annotations/InterfaceAnnotatedAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/interceptor/annotations/ShortcircuitedAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/locale/DefaultLocaleProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/mock/DummyTextProvider.java
 create mode 100644 core/src/test/java/org/apache/struts2/mock/InjectableAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/mock/MockLazyInterceptor.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/MyCustomMap.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/OgnlUtilStrutsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/OgnlUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/OgnlValueStackTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/SecurityMemberAccessTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/SetPropertiesTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/accessor/XWorkListPropertyAccessorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/ognl/accessor/XWorkMapPropertyAccessorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/security/DefaultAcceptedPatternsCheckerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/security/DefaultExcludedPatternsCheckerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/security/DefaultNotExcludedAcceptedPatternsCheckerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/AnnotationDataAware.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/AnnotationDataAware2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/AnnotationTestBean2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/AnnotationUser.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/AnnotationUserMarker.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/DataAware.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/DataAware2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/Equidae.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/ModelDrivenAction2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/ModelDrivenAnnotationAction2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/SimpleAction2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/SimpleAction3.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/SimpleAnnotationAction2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/SimpleAnnotationAction3.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/TestArrayBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/TestBean2.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/User.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/UserMarker.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/Address.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/AddressTypeConverter.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/Person.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/PersonAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/PersonActionTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/PersonTypeConverter.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/annotations/ValidateAnnotatedMethodOnlyAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/subtest/NullModelDrivenAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/test/util/StrutsUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/text/CompositeTextProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/text/DefaultTextProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/text/StrutsLocalizedTextProviderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/text/StubTextProvider.java
 create mode 100644 core/src/test/java/org/apache/struts2/text/TextProviderSupportTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Animal.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/AnnotatedCat.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/AnnotationUtilsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Bar.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/BarJunior.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Cat.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/ClassLoaderUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/ClassPathFinderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/DefaultFileManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Dog.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/DomHelperTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/DummyObjectFactory.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Foo.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/FurColor.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/GetPropertiesTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Indexed.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/ListHolder.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/MyBean.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/MyBeanAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/MyBeanActionTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/MyNumber.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/NamedVariablePatternMatcherTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Owner.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/ResolverUtilTest.java
 delete mode 100644 core/src/test/java/org/apache/struts2/util/StrutsUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/TextParseUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/Tiger.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/UnknownHandlerManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/UrlUtilTest2.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/WildcardHelperTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/WildcardUtilTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/Dummy2Class.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/Dummy3Class.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/DummyClass.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/DummyClassExt.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/MyAnnotation.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/MyAnnotation2.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/package-info.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/pkg1/AbstractAbstractDummyAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/pkg1/AbstractDummyAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/pkg2/Package2DummyInterface.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/annotation/pkg2/package-info.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/fs/DefaultFileManagerFactoryTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/fs/JarEntryRevisionTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/location/LocationAttributesTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/location/LocationImplTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/util/location/LocationUtilsTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ActionValidatorManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/AnnotationActionValidatorManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/AnnotationValidationAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/AnnotationValidationConfigurationBuilderTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/AnnotationValidationExpAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ConversionErrorFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DateRangeValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DefaultActionValidatorManagerTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DefaultValidatorFactoryTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DefaultValidatorFileParserTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DoubleRangeFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/DummyValidatorContext.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/EmailValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ExpressionValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/IntRangeValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/LongRangeValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ModelDrivenValidationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/MyValidator.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/RegexFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/RepopulateConversionErrorFieldValidatorSupportTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ShortRangeValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/SimpleActionValidationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/StringLengthFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/StringValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/URLValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/ValidatorAnnotationTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorModelTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/VisitorFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/VisitorValidatorModelAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/VisitorValidatorTestAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/AppendingValidatorContextTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/CreditCardValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/DateRangeFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/IntRangeFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/LongRangeFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/RequiredFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/RequiredStringValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/ShortRangeFieldValidatorTest.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/ValidationAction.java
 create mode 100644 core/src/test/java/org/apache/struts2/validator/validators/ValidatorSupportTest.java
 create mode 100644 core/src/test/java/org/test/ExternalSecurityMemberAccess.java
 create mode 100644 core/src/test/java/org/test/ExternalSecurityMemberAccessTest.java
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowlist-2.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowlist.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-global-result-inheritence.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-param-overriding.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-extends-final.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-final.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-types.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-include.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack-empty.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-unknownhandler-stack.xml
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/conversion/impl/test-struts-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/test/DataAware-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/test/TestBean2-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/util/Cat-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/util/Foo-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/util/MyBeanAction-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/util/Tiger-conversion.properties
 delete mode 100644 core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ActionSupportTest$MyActionSupport_da.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/AnnotatedTestBean.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAction.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ModelDrivenAnnotationAction.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-some-alias-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-subproperty-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction-validationAlias-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction_de.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAction_en.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction_de.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/SimpleAnnotationAction_en.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-anotherContext-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-badtest-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-beanMessageBundle-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-expressionValidation-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-visitorChildValidation-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean-visitorValidation-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestBean.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/TestChildBean-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/ValidationOrderAction-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder1/xwork-test-load-order.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder2/xwork-test-load-order.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/loadorder3/xwork-test-load-order.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork- test.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-include-after-package-2.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-include-after-package.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-include-before-package-2.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-include-before-package.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-include-parent.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-action-invalid.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions-packagedefaultclassref.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-actions.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-allowed-methods.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist-2.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-allowlist.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-bad-inheritance.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-basic-packages.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-default-package.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-defaultclassref-package.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-envs-substitution.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-exception-mappings.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-global-result-inheritence.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-include-wildcard.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-interceptor-defaultref.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptor-inheritance.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-interceptor-param-overriding.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-interceptor-params.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-interceptor-stack-param-overriding.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-interceptors-basic.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-interceptors-spring.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-invalid-file.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-multilevel.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-package-extends-final.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-package-final.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-package-inheritance.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-reload.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-inheritance.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-names.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-result-types.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-results.xml
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-wildcard-1.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/config/providers/xwork-test-wildcard-2.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-test-wildcard-include.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-unknownhandler-stack-empty.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/config/providers/xwork-unknownhandler-stack.xml
 create mode 100644 core/src/test/resources/org/apache/struts2/conversion/impl/test-struts-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/somefile.txt (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test.properties (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/test/DataAware-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware-validationAlias-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/DataAware2-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/Equidae-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction2-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/SimpleAction2-validationAlias-validation.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/test/TestBean2-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/User-conversion.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/User-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/UserMarker-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/test/package.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2/text}/DefaultTextProviderTest_en_CA.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2/text}/TextProviderSupportTest_en.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/Bar.properties (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/util/Cat-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/FindMe.properties (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/util/Foo-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/ListHolder-conversion.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/LocalizedTextUtilTest.properties (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/util/MyBeanAction-conversion.properties
 create mode 100644 core/src/test/resources/org/apache/struts2/util/Tiger-conversion.properties
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/XW404_de.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/XW404_fr.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/util/location/xml-with-location.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/CompositeTextProviderTestResourceBundle1.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/CompositeTextProviderTestResourceBundle2.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorModelAction-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validateArray-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validateList-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorValidation-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/VisitorValidatorTestAction.properties (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test2.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test3.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test4.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test5.xml (100%)
 rename core/src/test/resources/{com/opensymphony/xwork2 => org/apache/struts2}/validator/validator-parser-test6.xml (100%)
 create mode 100644 core/src/test/resources/org/apache/struts2/validator/validators-fail.xml
 create mode 100644 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/pom.xml
 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/PortletContextAware.java
 delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
 delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java
 delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java
 delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
 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
 delete mode 100644 plugins/sitemesh/README.md
 delete mode 100644 plugins/sitemesh/pom.xml
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerMapper2DecoratorSelector.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerPageFilter.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/NoneDecoratorMapper.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsDecorator.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsFreemarkerDecorator.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/OldDecorator2NewStrutsVelocityDecorator.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/StrutsSiteMeshFactory.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityMapper2DecoratorSelector.java
 delete mode 100644 plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
 delete mode 100644 plugins/sitemesh/src/main/resources/LICENSE.txt
 delete mode 100644 plugins/sitemesh/src/main/resources/NOTICE.txt
 delete mode 100644 plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt
 delete mode 100644 plugins/sitemesh/src/main/resources/struts-plugin.xml
 delete mode 100644 plugins/sitemesh/src/site/site.xml
 delete mode 100644 plugins/spring/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
 delete mode 100644 plugins/spring/src/main/java/com/opensymphony/xwork2/spring/SpringProxyableObjectFactory.java
 delete mode 100644 plugins/spring/src/main/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptor.java
 create mode 100644 plugins/spring/src/main/java/org/apache/struts2/spring/SpringObjectFactory.java
 create mode 100644 plugins/spring/src/main/java/org/apache/struts2/spring/SpringProxyableObjectFactory.java
 create mode 100644 plugins/spring/src/main/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptor.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/SimpleAction.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/TestBean.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/TestChildBean.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/TestSubBean.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/mock/DummyTextProvider.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessProxyTest.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/ActionsFromSpringTest.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/ExecuteInterceptor.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/SpringObjectFactoryTest.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/SpringProxyUtilTest.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/SpringResult.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/TestAspect.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/interceptor/ActionAutowiringInterceptorTest.java
 delete mode 100644 plugins/spring/src/test/java/com/opensymphony/xwork2/spring/interceptor/TestActionInvocation.java
 delete mode 100644 plugins/spring/src/test/java/com/test/SecurityMemberAccessProxyTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/ModelDrivenAction.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/TestBean.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/TestChildBean.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/TestSubBean.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/mock/DummyTextProvider.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/ognl/SecurityMemberAccessProxyTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/ActionsFromSpringTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/ExecuteInterceptor.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/SpringProxyUtilTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/TestAspect.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/ActionAutowiringInterceptorTest.java
 create mode 100644 plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java
 delete mode 100644 plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-spring.xml
 delete mode 100644 plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/actionContext-xwork.xml
 delete mode 100644 plugins/spring/src/test/resources/com/opensymphony/xwork2/spring/emptyContext-spring.xml
 create mode 100644 plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-spring.xml
 create mode 100644 plugins/spring/src/test/resources/org/apache/struts2/spring/actionContext-xwork.xml
 rename plugins/spring/src/test/resources/org/apache/struts2/spring/{StrutsSpringObjectFactoryTest-applicationContext.xml => emptyContext-spring.xml} (100%)
 delete mode 100644 plugins/testng/src/main/java/org/apache/struts2/testng/StrutsTestCase.java
 create mode 100644 plugins/testng/src/main/java/org/apache/struts2/testng/TestNGStrutsTestCase.java
 create mode 100644 plugins/velocity/src/main/java/org/apache/struts2/views/velocity/StrutsVelocityManager.java
 delete mode 100644 plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityManagerInterface.java
 create mode 100644 plugins/velocity/src/main/java/org/apache/struts2/views/velocity/VelocityTools.java
 create mode 100644 plugins/velocity/src/test/java/org/apache/struts2/views/velocity/StrutsVelocityManagerTest.java
 delete mode 100644 plugins/velocity/src/test/java/org/apache/struts2/views/velocity/VelocityManagerTest.java
 create mode 100644 plugins/velocity/src/test/resources/WEB-INF/webinf-velocity.properties
 create mode 100644 plugins/velocity/src/test/resources/test-velocity.properties